gentoo resync : 11.07.2019

5 files changed, 189 insertions, 127 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 51897d6cab80..9b8620b23871 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 7bcf9f215131..b8d51f59d44d 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -2,9 +2,11 @@ AUX paraview-4.0.1-xdmf-cstring.patch 360 BLAKE2B 919de8333b22125dd1122987f780ad
 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.5.2-qt-5.11.patch 6035 BLAKE2B 063f4418bdf5b65946df71350d5dc5bdd4546f93d7a01064f653cbf2eb07af0167a7fbff54f192f4a4a53e554ad48c075ed66f1732dbead65bf0a2c112c92ec7 SHA512 3e6a640c515bb64be1052e41f219630747676be69d40b8695a97d60bc1a94ce9eef629ce9ed93001e019520096fe3b85bd1ad3b5a97b6f207cdedd3e3905e601
+AUX paraview-5.6.1-fix_openmp_4.0.patch 1922 BLAKE2B d1f70b8852baf75fd43898909c6416b35734a63ae0ca7ffd4d0ed14f744ee8295e43bd7646576c7c6c29e58f4c25df04c8f14483ccc947d0946b520ab2315419 SHA512 c65ef5808be1d487624a913891e1f4209af3aa41a23df5e06d19677da5b70ee7c86a8bb92466bff9379dbacff1bca162e7f8dc19bb33c97f0e08def92c91b502
 DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
 DIST ParaView-v5.6.0.tar.gz 54085457 BLAKE2B a99a320f87af19ad4d39336e148f4ab1989225111299341ff3ebb095c652f1392362e42ce90dab8fe7390c44f9200637e76c1076e07d61c7e6cd4aad93df3a83 SHA512 4d7c1b9f5781411cdd290a0ef105221deca1af28bb29b8e6e6c077f3377b110e7c86637c11514559d2d826d36f189d5b5c1caa9e5f9c53820cf35c3ade1ae1f6
+DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
 EBUILD paraview-5.5.2.ebuild 8315 BLAKE2B 874ccb9698bdcb6d0b166bee19189b3a86599ab04aa00ac74f025934cd1c5083558ad467a8ce98b82627f8b2ff44847820105ccd27a8aa65f92f27abc165ce33 SHA512 847beb7f94e582c952142d28e87181d109d147403496e523a92d23932cbd84542bc4cfd5417346037b681d6f0505d21d5160393ca732ca686661d74e13c5a775
-EBUILD paraview-5.6.0-r1.ebuild 8468 BLAKE2B bb4ca55f74b37c1f03932a63d53aaf79303ed290eadff02a24ca2c66981c21e8c0cd1647e4632b5834f8d4223d13e1df356547f1ffb134794dc42d0f215e286a SHA512 4e7a1db6d0fd8abfb692ae10c6965289dda3b999bb8c780f514eccde90a31511ebbef7809cb52de5394e8fe8888473072981c15d360276a3a5e90f62149f8c45
-EBUILD paraview-5.6.0.ebuild 8281 BLAKE2B a011c23552106ada6d31bc3b475db515c0f922e25f503bbf937aead482ecbf380fa026a70b2f5040eb82179f5e07e77ec121bf263bc3874d1660e0c52cde494b SHA512 9795092365d0e491cd0891bb062b6e8d80d367cd8d40477f2da5493df93339c056e1e0d9c61bd68665bf17c22651697c1d8f4e05aeb7a23a7442c1a057a1b606
+EBUILD paraview-5.6.0-r1.ebuild 8492 BLAKE2B 109d26e85a89bb9f5301e9e4faa9c377e0206b8dc031aaf033858d8b694bfc3693c3d91bea00f8353aa7e4c1aad4c501ed80901cad7673de978fddfd32e48fdd SHA512 7f8fb3f3cef50886ac329ec6ac50785e4fb48357e977381d5906663db40592fc467481998a4d319683bf802d50ec9e6aa0193b5f17ad8c34255421424de732d4
+EBUILD paraview-5.6.1.ebuild 8561 BLAKE2B dc3b1ff6536a6d2105cf83ac5bc4cbd659154913b691663b3fcd170d71f3660cb1fc7a33342fbe2f9bf9e0fca876a5a1f96997e381433d1a62999eab8ae47257 SHA512 9d47d2ab1c784f6d6ee5d21bddc0433c9a959c1467c3d658f2af53dffe33fe91b5b179582c4ad184b745f636546262328e010f11625241f8eb07b802d6a0eca9
 MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca
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
new file mode 100644
index 000000000000..515624150315
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.6.1-fix_openmp_4.0.patch
@@ -0,0 +1,32 @@
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h ParaView-v5.6.0-openmp/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	2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/FunctorsOpenMP.h	2019-06-28 14:04:02.292922908 +1000
+@@ -290,7 +290,7 @@
+     std::unique_ptr<ReturnType[]> threadData;
+ 
+     VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(f)
+-                            shared(data, doParallel, numThreads, threadData))
++                            shared(data, doParallel, numThreads, threadData, numVals))
+     {
+ 
+       int tid = omp_get_thread_num();
+@@ -422,7 +422,7 @@
+   vtkm::Id outIdx = 0;
+ 
+   VTKM_OPENMP_DIRECTIVE(parallel default(none) firstprivate(keysIn, valuesIn, keysOut, valuesOut, f)
+-                          shared(outIdx))
++                          shared(outIdx, numValues))
+   {
+     int tid = omp_get_thread_num();
+     int numThreads = omp_get_num_threads();
+diff -urNd ParaView-v5.6.0/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h ParaView-v5.6.0-openmp/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	2018-11-07 05:05:18.000000000 +1000
++++ ParaView-v5.6.0-openmp/VTK/ThirdParty/vtkm/vtk-m/vtkm/cont/openmp/internal/ParallelSortOpenMP.h	2019-06-28 13:54:33.132064191 +1000
+@@ -133,6 +133,7 @@
+       VTKM_OPENMP_DIRECTIVE(parallel for
+                             default(none)
+                             firstprivate(valuesInPortal, indexPortal, valuesOutPortal)
++                            shared(size)
+                             schedule(static))
+       for (vtkm::Id i = 0; i < size; ++i)
+       {
diff --git a/sci-visualization/paraview/paraview-5.6.0-r1.ebuild b/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
index 600d7d5c79d0..6f1c6c8e57f7 100644
--- a/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
+++ b/sci-visualization/paraview/paraview-5.6.0-r1.ebuild
@@ -278,33 +278,33 @@ src_configure() {
 src_install() {
 	cmake-utils_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
-
-	# 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
-	make_desktop_entry paraview "Paraview" paraview
-
-	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
+		# 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
+
+		# 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
+		make_desktop_entry paraview "Paraview" paraview
+
+		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+	}
+
+	pkg_postinst() {
+		gnome2_icon_cache_update
+	}
+
+	pkg_postrm() {
+		gnome2_icon_cache_update
+	}
diff --git a/sci-visualization/paraview/paraview-5.6.0.ebuild b/sci-visualization/paraview/paraview-5.6.1.ebuild
index 7375640e59da..9a1a2b03d216 100644
--- a/sci-visualization/paraview/paraview-5.6.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils desktop eapi7-ver gnome2-utils python-single-r1 toolchain-funcs
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit cmake-utils desktop python-single-r1 toolchain-funcs xdg-utils
 
 MAIN_PV=$(ver_cut 0-1)
 MAJOR_PV=$(ver_cut 1-2)
@@ -12,24 +12,26 @@ 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.gz"
+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 plugins python +qt5 sqlite tcl test tk"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
 
 RESTRICT="mirror test"
 
+# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
 REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
-	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+	mysql? ( sqlite )
+	?? ( offscreen qt5 )"
 
 RDEPEND="
 	app-arch/lz4
 	dev-libs/expat
 	dev-libs/jsoncpp
 	dev-libs/libxml2:2
-	dev-libs/protobuf
+	dev-libs/protobuf:=
 	dev-libs/pugixml
 	media-libs/freetype
 	media-libs/glew:0
@@ -37,14 +39,12 @@ RDEPEND="
 	media-libs/libtheora
 	media-libs/tiff:0=
 	sci-libs/cgnslib
-	sci-libs/hdf5[mpi=]
+	sci-libs/hdf5:=[mpi=]
 	>=sci-libs/netcdf-4.2[hdf5]
 	>=sci-libs/netcdf-cxx-4.2:3
-	sci-libs/xdmf2
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
-	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
@@ -58,6 +58,8 @@ RDEPEND="
 	ffmpeg? ( virtual/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}
 		dev-python/constantly[${PYTHON_USEDEP}]
@@ -98,8 +100,11 @@ 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
@@ -132,16 +137,13 @@ src_configure() {
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
 		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
-		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
-		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
 		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DCMAKE_VERBOSE_MAKEFILE=ON
+
 		-DVTK_Group_StandAlone=ON
-		-DVTK_RENDERING_BACKEND=OpenGL2
-		-DVTK_USE_FFMPEG_ENCODER=OFF
-		-DVTK_USE_OFFSCREEN=TRUE
-		# -DVTK_USE_SYSTEM_AUTOBAHN once we transitioned to Python 3...
+		-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
@@ -149,41 +151,35 @@ src_configure() {
 		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
 		-DVTK_USE_SYSTEM_GLEW=ON
 		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_INCREMENTAL=ON
 		-DVTK_USE_SYSTEM_JPEG=ON
 		-DVTK_USE_SYSTEM_JSONCPP=ON
-		-DVTK_USE_SYSTEM_LIBHARU=OFF # doesn't compile, requires modified sources
 		-DVTK_USE_SYSTEM_LIBXML2=ON
 		-DVTK_USE_SYSTEM_LZ4=ON
 		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=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
-		# force this module due to incorrect build system deps
-		# wrt bug 460528
-		-DModule_vtkUtilitiesProcessXML=ON
-		)
 
-	mycmakeargs+=(
-		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+		# boost
+		-DModule_vtkInfovisBoost="$(usex boost)"
 
-		-DModule_vtkGUISupportQtOpenGL="$(usex qt5)"
-		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
-		-DModule_vtkGUISupportQtWebkit="$(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)"
-		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
-		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
-		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		# coprocessing
+		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
 
-		-DModule_vtkInfovisBoost="$(usex boost)"
+		# doc
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
 
+		# 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)"
@@ -191,60 +187,92 @@ src_configure() {
 		-DVTK_XDMF_USE_MPI="$(usex mpi)"
 		-DXDMF_BUILD_MPI="$(usex mpi)"
 
-		-DModule_AutobahnPython="$(usex python)"
+		# mysql
+		-DModule_vtkIOMySQL="$(usex mysql)"
+
+		# 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
+
+		# python
 		-DModule_pqPython="$(usex python)"
-		-DModule_Twisted="$(usex python)"
 		-DModule_vtkmpi4py="$(usex python)"
 		-DModule_vtkPython="$(usex python)"
 		-DModule_vtkWrappingPythonCore="$(usex python)"
-		-DModule_ZopeInterface="$(usex python)"
 		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
 		-DXDMF_WRAP_PYTHON="$(usex python)"
 
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-
-		-DBUILD_EXAMPLES="$(usex examples)"
-
-		-DModule_vtkIOMySQL="$(usex mysql)"
+		# 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)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
 
+		# sqlite
 		-DModule_vtksqlite="$(usex sqlite)"
 
-		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+		# tcl
+		-DModule_vtkTclTk="$(usex tcl)"
 
-		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
-		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+		# test
+		-DBUILD_TESTING="$(usex test)"
 
+		# tk
 		-DVTK_Group_Tk="$(usex tk)"
 		-DVTK_USE_TK="$(usex tk)"
 		-DModule_vtkRenderingTk="$(usex tk)"
-		-DModule_vtkTclTk="$(usex tcl)"
-		-DModule_vtkWrappingTcl="$(usex tcl)"
-		-DBUILD_TESTING="$(usex test)"
-		)
+	)
 
 	if use openmp; then
 		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
 	fi
 
-	# TODO: MantaView VaporPlugin VRPlugin
-	mycmakeargs+=(
-		-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)"
+	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
 
 	cmake-utils_src_configure
 }
@@ -252,33 +280,33 @@ src_configure() {
 src_install() {
 	cmake-utils_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
+		# 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
 
-	# 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
+		# 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}
+		# 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
-	make_desktop_entry paraview "Paraview" paraview
+		newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+		make_desktop_entry paraview "Paraview" paraview
 
-	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-}
+		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+	}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	pkg_postinst() {
+		xdg_icon_cache_update
+	}
 
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
+	pkg_postrm() {
+		xdg_icon_cache_update
+	}