gentoo resync : 14.07.2018

5 files changed, 5 insertions, 305 deletions

diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 607e9e91c52e..ae2a79d0c9a4 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index f3e075224daa..4317a15a97d9 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,9 +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.4.1-jsoncpp_1.8.4.patch 787 BLAKE2B 1978d56feb0d25fb4730dac0138803327984c4a7defee2921a9d42ba69a75788d3b5abde03c99c33024e3c89de71b93f24d3ba2a60011a24445919f16824fbf4 SHA512 9ffd209bfc5de42e6100669614771a20c904b809cea7beda90709b5b2e2c36a533ab3474495d6f6e6e7141d033e2cc53ff1dfc241287eadfb13996b7a123eadf
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
-DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5
-DIST ParaView-v5.5.0.tar.gz 51414419 BLAKE2B 832a01701d21f463c07186912501796756c2477063803fa3b2b67dbb9ac2c9db28a45a8b3d22077085255adf16eb429c3289093848b3712ebab46c0ae4c17956 SHA512 0915eac75a710736334fa9d436369a14546e2f90a1b55f9a0f7a96fedb94ced043d27576d2a179f275478be17e326cd3bee76f06266a776d586f6510722f3172
-EBUILD paraview-5.4.1.ebuild 8162 BLAKE2B e5ac791d2e598f6f18b238bcc2ddc73677ef7a73e0094880b7df3b80084a92025e463eee46ae3d9f7438117c351f46804f845bd163c4172d3e09a424064f2aa2 SHA512 f2e4c0939dfe6b3413d4d6683c21793ad3449061c0b7f867f5e9999e319fa1f97b1e9b86c112789adbcd997fa7df28c01da0c7f2f8d1b46656a5cd27687ec703
-EBUILD paraview-5.5.0.ebuild 8306 BLAKE2B a29723366f2524727657cd25f4994e62385d984d5c24ce236dc52a4e678942a14602d5aa91d95577886957cb0955ee9d66b49ffc7ad4eec8f03fea81827c56ba SHA512 dc733226df988c419cc56b8b2cc1a567f7d9f7f9aa6b2888edbb50c790178d9dfd449f7eabeb7d76e2f2e844f0570e8daaeb646672877842bbc7862415d090fc
+DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a
+EBUILD paraview-5.5.2.ebuild 8355 BLAKE2B 024db792d3b708049e4bf09a294621e802de48e1d3c0f528330f61431e26e67c75226918a2db3356f7c50990fc0dc44c36ce4dfdbc6c1c353aa3ca21db983f98 SHA512 da6247117d63f194d5d24a3aa1f8ab91b58bceaa5be919a450e0f32d6d9950dac6a0bd94bf47418d23aebaf68d7677999cc31febfe56505acb3b2234675877e7
 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
deleted file mode 100644
index b4b64e94eef8..000000000000
--- a/sci-visualization/paraview/files/paraview-5.4.1-jsoncpp_1.8.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.4.1.ebuild b/sci-visualization/paraview/paraview-5.4.1.ebuild
deleted file mode 100644
index f1b68b99b8af..000000000000
--- a/sci-visualization/paraview/paraview-5.4.1.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
-
-MAIN_PV=$(get_major_version)
-MAJOR_PV=$(get_version_component_range 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="ParaView is a powerful scientific data visualization application"
-HOMEPAGE="http://www.paraview.org"
-SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-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"
-RESTRICT="test"
-
-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
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	coprocessing? (
-		plugins? (
-			dev-python/PyQt5
-			dev-qt/qtgui:5[-gles2]
-		)
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	mpi? ( virtual/mpi[cxx,romio] )
-	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/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}] )
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qthelp:5
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtsql:5
-		dev-qt/qttest:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.4
-	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
-	doc? ( app-doc/doxygen )"
-
-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() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
-		eerror "For USE=openmp a gcc with openmp support is required"
-		eerror
-		return 1
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# lib64 fixes
-	sed -i \
-		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		 VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
-	sed -i \
-		-e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
-		 VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
-	sed -i \
-		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
-		CMakeLists.txt \
-		ParaViewConfig.cmake.in \
-		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
-		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
-		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx || die
-
-	# no proper switch
-	if ! use nvcontrol; then
-		sed -i \
-			-e '/VTK_USE_NVCONTROL/s#1#0#' \
-			VTK/Rendering/OpenGL/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-
-	local mycmakeargs=(
-		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
-		-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_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_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=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-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)"
-
-		-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" "")
-
-		-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
-
-	# 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)"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# set up the environment
-	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-
-	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}
-}
diff --git a/sci-visualization/paraview/paraview-5.5.0.ebuild b/sci-visualization/paraview/paraview-5.5.2.ebuild
index 82c2a17ce248..b34d4ec9805e 100644
--- a/sci-visualization/paraview/paraview-5.5.0.ebuild
+++ b/sci-visualization/paraview/paraview-5.5.2.ebuild
@@ -67,7 +67,9 @@ RDEPEND="
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sip[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
+		|| ( dev-python/twisted[${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}] )