commit: 01a37861b1cc39f1b86581e4cdf38d5be563df5e Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sun Jul 8 02:55:45 2018 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sun Jul 8 02:56:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a37861
sci-visualization/paraview: drop old Closes: https://bugs.gentoo.org/660654 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sci-visualization/paraview/Manifest | 1 - .../files/paraview-5.4.1-jsoncpp_1.8.4.patch | 17 -- sci-visualization/paraview/paraview-5.4.1.ebuild | 282 --------------------- 3 files changed, 300 deletions(-) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 7c9055385da..93c27c17c6e 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,2 +1 @@ -DIST ParaView-v5.4.1.tar.gz 43783720 BLAKE2B 2197d7f390b7192eb58ad67b88c84119da35fc4229547a42ef12a600874304addb410d0a53684a785855f617011762bf6a819231821f0bff8ee226111df8e577 SHA512 6a720f9ed9e03b7b97f0e84bb6d67b2a28c4ffc5079427d544e9522ce313264eed273c9b7ae13b11e34ab4de903132a22bacc337452d1e9da9876416449520f5 DIST ParaView-v5.5.2.tar.gz 51418473 BLAKE2B 3300ccbd3fdb522889e9689bd3ad3b37602168658332438d1403f0fcd235722b1751e5acdf01536e4398d759ad26abc4d87f98902f09f64e067a1025e4dcd7a3 SHA512 3150d01cdeaf04aba449b7ffdc22d425d4bace8f17923b56aaf9393695e61fc96406ca49a9ca33ff57f1a2b94a3111b080d4fce5763cce5d082cfbc5c68ea94a 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 b4b64e94eef..00000000000 --- 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 f1b68b99b8a..00000000000 --- 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} -}
