commit: 21b10dcf8333205528a096a4ba5223ee0713be60 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Wed May 25 04:08:36 2022 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Wed May 25 05:32:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b10dcf
sci-visualization/paraview: drop 5.9.0, 5.9.1 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> sci-visualization/paraview/Manifest | 2 - .../files/paraview-4.0.1-xdmf-cstring.patch | 12 -- .../files/paraview-5.9.0-gcc11-include.patch | 41 ---- sci-visualization/paraview/paraview-5.9.0.ebuild | 238 --------------------- sci-visualization/paraview/paraview-5.9.1.ebuild | 238 --------------------- 5 files changed, 531 deletions(-) diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 657b09e18500..30d39dae379e 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,3 +1 @@ DIST ParaView-v5.10.1.tar.xz 70218088 BLAKE2B 3134c5df35994a3a153ebd97770066b9963911ae7fb1877681135e01a19c4a879306ae844ef3a29719be5cd509f35117f74eb3c264f1a101fa19180d9a126011 SHA512 1feb855432ea7bc40f77ee214e5877d5170e4f31f520dc7198d72a271506b65a4bc79922875d2c176e54219818a428497c606390a2b9da2770de403bd1593e6c -DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5 -DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2 diff --git a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch b/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch deleted file mode 100644 index 665f40ad4fa7..000000000000 --- a/sci-visualization/paraview/files/paraview-4.0.1-xdmf-cstring.patch +++ /dev/null @@ -1,12 +0,0 @@ -gcc header fix - ---- ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h -+++ ParaView-3.98.0-src/VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfObject.h -@@ -82,6 +82,7 @@ - # ifdef UNIX - # include "sys/file.h" - # include "strings.h" -+# include <cstring> - # define STRCASECMP strcasecmp - # define STRNCASECMP strncasecmp - # define STRCMP strcmp diff --git a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch b/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch deleted file mode 100644 index d5850073fb94..000000000000 --- a/sci-visualization/paraview/files/paraview-5.9.0-gcc11-include.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/789573 ---- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h -+++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h -@@ -25,6 +25,7 @@ - #include "vtkIdList.h" - #include <algorithm> - #include <cmath> -+#include <limits> - #include <unordered_map> - #include <vector> - ---- a/VTK/Common/DataModel/vtkPiecewiseFunction.cxx -+++ b/VTK/Common/DataModel/vtkPiecewiseFunction.cxx -@@ -22,6 +22,7 @@ - #include <cassert> - #include <cmath> - #include <iterator> -+#include <limits> - #include <set> - #include <vector> - ---- a/VTK/Rendering/Core/vtkColorTransferFunction.cxx -+++ b/VTK/Rendering/Core/vtkColorTransferFunction.cxx -@@ -21,6 +21,7 @@ - #include <algorithm> - #include <cmath> - #include <iterator> -+#include <limits> - #include <set> - #include <vector> - ---- a/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -+++ b/VTK/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -@@ -27,6 +27,7 @@ - #include "vtkHyperTreeGridNonOrientedCursor.h" - - #include <cmath> -+#include <limits> - - vtkStandardNewMacro(vtkHyperTreeGridThreshold); - diff --git a/sci-visualization/paraview/paraview-5.9.0.ebuild b/sci-visualization/paraview/paraview-5.9.0.ebuild deleted file mode 100644 index f3ceac1728a1..000000000000 --- a/sci-visualization/paraview/paraview-5.9.0.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils - -MAIN_PV=$(ver_cut 0-1) -MAJOR_PV=$(ver_cut 1-2) -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.xz"; - -LICENSE="paraview GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boost cg 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} ) - mysql? ( sqlite ) - webengine? ( qt5 ) - qt5? ( sqlite ) - ?? ( offscreen qt5 )" - -# TODO: Verify that these two are not needed any more for the catalyst -# module: -# - dev-python/PyQt5 -# - dev-qt/qtgui:5[-gles2-only] -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 - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ffmpeg? ( media-video/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} - $(python_gen_cond_dep ' - 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[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) - ') - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qthelp:5 - dev-qt/qtopengl:5[-gles2-only] - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtx11extras:5 - dev-qt/qtxmlpatterns:5 - ) - sqlite? ( dev-db/sqlite:3 ) - tk? ( dev-lang/tk:0= ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - boost? ( - $(python_gen_cond_dep ' - dev-libs/boost[mpi?,${PYTHON_USEDEP}] - ') - ) - doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch - "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - use python && python-single-r1_pkg_setup - PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -} - -src_prepare() { - # Bug #661812 - mkdir -p Plugins/StreamLinesRepresentation/doc || die - - cmake_src_prepare - - # lib64 fixes - sed -i \ - -e "s:/lib/python:/$(get_libdir)/python:g" \ - VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die - sed -i \ - -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - Remoting/Application/vtkInitializationHelper.cxx || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" - -UBUILD_SHARED_LIBS - -DPARAVIEW_BUILD_SHARED_LIBS=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - - # boost - -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" - - # doc - -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" - - # examples - -DBUILD_EXAMPLES="$(usex examples)" - - # ffmpeg - -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" - -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)" - - # mpi - -DPARAVIEW_USE_MPI="$(usex mpi)" - -DXDMF_BUILD_MPI="$(usex mpi)" - -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" - - # mysql - -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)" - - # offscreen - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - - # plugins - -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" - - # python - -DModule_pqPython="$(usex python)" - -DPARAVIEW_USE_PYTHON="$(usex python)" - - # qt5 - -DPARAVIEW_USE_QT="$(usex qt5)" - -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" - -DVTK_USE_NVCONTROL="$(usex nvcontrol)" - -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" - - # sqlite - -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" - - # test - -DBUILD_TESTING="$(usex test)" - - # tk - -DVTK_USE_TK="$(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 qt5; then - mycmakeargs+=( - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_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 - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die - doenvd "${T}"/40${PN} - - 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} -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/sci-visualization/paraview/paraview-5.9.1.ebuild b/sci-visualization/paraview/paraview-5.9.1.ebuild deleted file mode 100644 index f3ceac1728a1..000000000000 --- a/sci-visualization/paraview/paraview-5.9.1.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils - -MAIN_PV=$(ver_cut 0-1) -MAJOR_PV=$(ver_cut 1-2) -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.xz"; - -LICENSE="paraview GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boost cg 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} ) - mysql? ( sqlite ) - webengine? ( qt5 ) - qt5? ( sqlite ) - ?? ( offscreen qt5 )" - -# TODO: Verify that these two are not needed any more for the catalyst -# module: -# - dev-python/PyQt5 -# - dev-qt/qtgui:5[-gles2-only] -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 - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ffmpeg? ( media-video/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} - $(python_gen_cond_dep ' - 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[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - mpi? ( dev-python/mpi4py ) - qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] ) - ') - ) - qt5? ( - dev-qt/designer:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qthelp:5 - dev-qt/qtopengl:5[-gles2-only] - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtx11extras:5 - dev-qt/qtxmlpatterns:5 - ) - sqlite? ( dev-db/sqlite:3 ) - tk? ( dev-lang/tk:0= ) - webengine? ( dev-qt/qtwebengine:5[widgets] )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - boost? ( - $(python_gen_cond_dep ' - dev-libs/boost[mpi?,${PYTHON_USEDEP}] - ') - ) - doc? ( app-doc/doxygen )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch - "${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch - "${FILESDIR}"/${PN}-5.9.0-gcc11-include.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - use python && python-single-r1_pkg_setup - PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV} -} - -src_prepare() { - # Bug #661812 - mkdir -p Plugins/StreamLinesRepresentation/doc || die - - cmake_src_prepare - - # lib64 fixes - sed -i \ - -e "s:/lib/python:/$(get_libdir)/python:g" \ - VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die - sed -i \ - -e "s:lib/paraview-:$(get_libdir)/paraview-:g" \ - Remoting/Application/vtkInitializationHelper.cxx || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" - -UBUILD_SHARED_LIBS - -DPARAVIEW_BUILD_SHARED_LIBS=ON - -DCMAKE_VERBOSE_MAKEFILE=ON - - # boost - -DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)" - - # doc - -DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)" - - # examples - -DBUILD_EXAMPLES="$(usex examples)" - - # ffmpeg - -DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)" - -DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)" - - # mpi - -DPARAVIEW_USE_MPI="$(usex mpi)" - -DXDMF_BUILD_MPI="$(usex mpi)" - -DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)" - - # mysql - -DVTK_MODULE_ENABLE_VTK_IOMySQL="$(usex mysql YES NO)" - - # offscreen - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - -DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)" - - # plugins - -DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)" - - # python - -DModule_pqPython="$(usex python)" - -DPARAVIEW_USE_PYTHON="$(usex python)" - - # qt5 - -DPARAVIEW_USE_QT="$(usex qt5)" - -DModule_pqPython="$(usex qt5 "$(usex python)" "off")" - -DVTK_USE_NVCONTROL="$(usex nvcontrol)" - -DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)" - - # sqlite - -DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)" - - # test - -DBUILD_TESTING="$(usex test)" - - # tk - -DVTK_USE_TK="$(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 qt5; then - mycmakeargs+=( - -DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so - -DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so - -DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_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 - - # set up the environment - echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die - doenvd "${T}"/40${PN} - - 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} -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -}
