gentoo resync : 02.04.2018

3 files changed, 114 insertions, 94 deletions

diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index b56b95ae7557..d2b082337bb5 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,7 +1,8 @@
 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
-DIST ParaView-v5.2.0.tar.gz 47087129 BLAKE2B 4792569c28c8c800882389810cb3a73087ee64a26971b59ed76d3e5b3c0e121b2dad3736f610cfef8cdc99b61098cee82379bd08e06f750c0eb2e0728ec3535d SHA512 d46b71a03717bde164fe2b6cdcc1c478384ad0d379e203e75e69e1532f8703b4ce12f8992d39e61d09e2ad7bbf1e249fc1f00c4cdd65aabef831e0dca83485f1
+AUX paraview-5.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac0138803327984c4a7defee2921a9d42ba69a75788d3b5abde03c99c33024e3c89de71b93f24d3ba2a60011a24445919f16824fbf4 SHA512 9ffd209bfc5de42e6100669614771a20c904b809cea7beda90709b5b2e2c36a533ab3474495d6f6e6e7141d033e2cc53ff1dfc241287eadfb13996b7a123eadf
 DIST ParaView-v5.3.0.tar.gz 45173528 BLAKE2B 878e8dae0b5de4bee5d72a4a272a5048fa587fac8e949d39c8e040b9fe3553b787e53f183ae98d20f24755db7e355280b85a9f572037764c53740de2eb4a9e30 SHA512 3dc3c2a1c27a0f0dc82fc04ce84477a26aacb329d6ea42c276c4204e39d11bc78adbc1807e1e7168aade31aa48b6d628775841b8b94b5122084eac46e358a23f
-EBUILD paraview-5.2.0.ebuild 9346 BLAKE2B c1a56fd0c8ea13fb0dbe62659af561735edcee444ef0746f0eb7d6863ff8d02bbdc379408d884c7c2a4d0b59251ae22749648efe0799fb03c75895b3bde0e229 SHA512 9be4b41d1589eadaa6fd54a7bee6036210b6753704dbf1fcae3f757620b9cb26230f12a4e73ad0d19dd5ef32cee923aacdaa1e605794092357d1505fbd9c31e2
+DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
 EBUILD paraview-5.3.0.ebuild 9230 BLAKE2B c65d17b150e9a9aacaa9a98331556d06422140cde16a066df2ae2107fe35fd445d6f6b427b6cee9a7cbcbb21c7ea451a6973079490bc473e1cd981c4ea81cace SHA512 7d8ea25c399d2951b3892d50c429cf136a5c9d7be199a0b55978d1ee3dc0228298ba79e69f57358e3cce9517804e509d6680ba700552e1f86e277693164c6cec
+EBUILD paraview-5.4.1.ebuild 8315 BLAKE2B f89db2b9909c164b5742387336905ed6345993c31de0eed15d2eccd34e4cf3fc7fcb6da1555eac6039d8261f7fb07c4713ff343b10569ea6d62a15e27ab9e471 SHA512 48c83c2aa241f2336d6ed876583fb6cf012c85d88599d1e9e9cba795251d73c2ebc8eac605381adf37363ca3c2b3b213a4cccc53c607327b17956bc13ab2309e
 MISC metadata.xml 748 BLAKE2B 25046c08c0a8df768efba10cae82ef24d583776d21ddda5fd65f895e11214ca9745205458f27e96f45d83fd0d6e77d5f2c12653206eaef09f398fa7a9275418e SHA512 5354c12b5448883903bca724a5d3adfc1cccf352d378317f7ab43f3e4125e2329d9477081eff7e37c8602aaba2aa6df0c73a240d409541017555920f57847d65
diff --git a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
new file mode 100644
index 000000000000..b4b64e94eef8
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
@@ -0,0 +1,17 @@
+diff --git a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+index b6e2b55..d27ad9d 100644
+--- a/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
++++ b/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx
+@@ -788,7 +788,10 @@ public:
+           this->GetSettingBelowPriority(propertySettingCString, highestPriority);
+         if (lowerPriorityValue.isNull())
+         {
+-          if (!proxyValue.removeMember(property->GetXMLName()).isNull())
++          // Allocated as done in Json::Value removeMember(const char* key).
++          Json::Value removedValue;
++          if (proxyValue.removeMember(property->GetXMLName(), &removedValue) &&
++            !removedValue.isNull())
+           {
+             this->Modified();
+           }
+
diff --git a/sci-visualization/paraview/paraview-5.2.0.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
index 5abd820a7332..ebd30586b09a 100644
--- a/sci-visualization/paraview/paraview-5.2.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
@@ -25,21 +25,26 @@ REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
 	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
 
 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
+	sci-libs/xdmf2
 	sys-libs/zlib
+	virtual/glu
 	virtual/jpeg:0
 	virtual/opengl
-	virtual/glu
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
@@ -55,10 +60,14 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	python? (
 		${PYTHON_DEPS}
+		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/twisted-core
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
 		mpi? ( dev-python/mpi4py )
 		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
@@ -86,6 +95,8 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+	"${FILESDIR}"/${P}-jsoncpp_1.8.4.patch
 )
 
 pkg_pretend() {
@@ -102,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	default
 
 	# lib64 fixes
 	sed -i \
@@ -114,13 +125,10 @@ src_prepare() {
 	sed -i \
 		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
 		CMakeLists.txt \
-		Plugins/SciberQuestToolKit/CMakeLists.txt \
 		ParaViewConfig.cmake.in \
 		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
 		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
-		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
-		Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
-		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
 
 	# no proper switch
 	if ! use nvcontrol; then
@@ -135,8 +143,6 @@ src_configure() {
 		export QT_SELECT=qt5
 	fi
 
-	# VTK_USE_SYSTEM_QTTESTING
-	# PARAVIEW_USE_SYSTEM_AUTOBAHN
 	local mycmakeargs=(
 		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
@@ -148,24 +154,33 @@ src_configure() {
 		-DCMAKE_COLOR_MAKEFILE=TRUE
 		-DCMAKE_USE_PTHREADS=ON
 		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
-		-DPROTOC_LOCATION=$(type -P protoc)
 		-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_USE_SYSTEM_CGNS=ON
+		-DVTK_USE_SYSTEM_PUGIXML=ON
+		-DVTK_USE_SYSTEM_PYGMENTS=ON
 		-DVTK_USE_SYSTEM_EXPAT=ON
 		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-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_MPI4PY=ON
 		-DVTK_USE_SYSTEM_NETCDF=ON
 		-DVTK_USE_SYSTEM_OGGTHEORA=ON
 		-DVTK_USE_SYSTEM_PNG=ON
 		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_SIX=ON
 		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_XDMF2=ON
 		-DVTK_USE_SYSTEM_TWISTED=ON
 		-DVTK_USE_SYSTEM_XDMF2=OFF
 		-DVTK_USE_SYSTEM_ZLIB=ON
@@ -175,95 +190,82 @@ src_configure() {
 		-DModule_vtkUtilitiesProcessXML=ON
 		)
 
-	# TODO: XDMF_USE_MYSQL?
-	# VTK_WRAP_JAVA
 	mycmakeargs+=(
-		$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-		$(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI)
+		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+
+		-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" "")
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL)
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtSQL)
-		$(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit)
-		$(cmake-utils_use qt5 Module_vtkRenderingQt)
-		$(cmake-utils_use qt5 Module_vtkViewsQt)
-		$(cmake-utils_use qt5 VTK_Group_ParaViewQt)
-		$(cmake-utils_use qt5 VTK_Group_Qt)
-		$(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT)
-		$(cmake-utils_use boost Module_vtkInfovisBoost)
-		$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
-		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
-		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
-		$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
-		$(cmake-utils_use mpi VTK_Group_MPI)
-		$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
-		$(cmake-utils_use mpi XDMF_BUILD_MPI)
-		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
-		$(cmake-utils_use python VTK_Group_ParaViewPython)
-		$(cmake-utils_use python XDMF_WRAP_PYTHON)
-		$(cmake-utils_use python Module_vtkPython)
-		$(cmake-utils_use python Module_pqPython)
-		$(cmake-utils_use python Module_vtkWrappingPythonCore)
-		$(cmake-utils_use python Module_vtkPVPythonSupport)
-		$(cmake-utils_use python Module_AutobahnPython)
-		$(cmake-utils_use python Module_Twisted)
-		$(cmake-utils_use python Module_ZopeInterface)
-		$(cmake-utils_use python Module_vtkmpi4py)
-		$(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
-		$(cmake-utils_use doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
-		$(cmake-utils_use examples BUILD_EXAMPLES)
-		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
-		$(cmake-utils_use mysql Module_vtkIOMySQL)
-		$(cmake-utils_use sqlite Module_vtksqlite)
-		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
-		$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
-		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
-		$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
-		$(cmake-utils_use tk VTK_Group_Tk)
-		$(cmake-utils_use tk VTK_USE_TK)
-		$(cmake-utils_use tk Module_vtkRenderingTk)
-		$(cmake-utils_use tcl Module_vtkTclTk)
-		$(cmake-utils_use tcl Module_vtkWrappingTcl)
-		$(cmake-utils_use test BUILD_TESTING)
+
+		-DModule_vtkInfovisBoost="$(usex boost)"
+
+		-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)"
+
+		-DModule_AutobahnPython="$(usex 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)"
+
+		-DModule_vtksqlite="$(usex sqlite)"
+
+		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+		-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
 
-	if use qt5 ; then
-		mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
-		if use python ; then
-			# paraview cannot guess sip directory properly
-			mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
-		fi
-	fi
-
 	# TODO: MantaView VaporPlugin VRPlugin
 	mycmakeargs+=(
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
-		$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
-		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
+		-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
-		$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
-		$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
+		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
+		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
 		)
 
 	cmake-utils_src_configure