diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-25 00:48:14 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-25 06:43:43 +0200 |
| commit | 5e7125c27b2beb7df386bcdaae1329b4a6aed8fb (patch) | |
| tree | 0eb271aefbd67e6cdf76a4fdf52fedfcc5233d76 /sci-visualization | |
| parent | dev-db/mariadb: Reorder dependencies on 5.7.22 (diff) | |
| download | gentoo-5e7125c27b2beb7df386bcdaae1329b4a6aed8fb.tar.gz gentoo-5e7125c27b2beb7df386bcdaae1329b4a6aed8fb.tar.bz2 gentoo-5e7125c27b2beb7df386bcdaae1329b4a6aed8fb.zip | |
sci-visualization/visit: EAPI-6 bump, set x11-libs/qwt:6[qt5(+)]
Bug: https://bugs.gentoo.org/657952
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'sci-visualization')
9 files changed, 144 insertions, 34 deletions
diff --git a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch index 8c8618a24219..f0f56f5a6d5d 100644 --- a/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch +++ b/sci-visualization/visit/files/visit-2.12.3-cmakelist.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2015-06-25 07:30:40.907149341 +0200 -+++ CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200 +--- a/CMakeLists.txt 2015-06-25 07:30:40.907149341 +0200 ++++ b/CMakeLists.txt 2015-06-25 07:30:57.537148929 +0200 @@ -991,7 +991,6 @@ DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE diff --git a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch index 0953e5b9e605..5ab4c7c995dd 100644 --- a/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch +++ b/sci-visualization/visit/files/visit-2.12.3-dont_symlink_visit_dir.patch @@ -1,6 +1,6 @@ diff -ru visit2.7.1.old2/src/CMakeLists.txt visit2.7.1/src/CMakeLists.txt ---- visit2.7.1.old2/src/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100 -+++ visit2.7.1/src/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100 +--- a/CMakeLists.txt 2014-01-27 22:10:06.520297262 +0100 ++++ b/CMakeLists.txt 2014-01-27 22:11:30.520298002 +0100 @@ -807,14 +807,6 @@ \"${VISIT_VERSION}\" \"${CMAKE_INSTALL_PREFIX}/beta\") diff --git a/sci-visualization/visit/files/visit-2.12.3-findpython.patch b/sci-visualization/visit/files/visit-2.12.3-findpython.patch index 180ffbf379ab..4723c494de9b 100644 --- a/sci-visualization/visit/files/visit-2.12.3-findpython.patch +++ b/sci-visualization/visit/files/visit-2.12.3-findpython.patch @@ -1,6 +1,6 @@ diff -ru visit2.7.1.old/src/CMake/FindVisItPython.cmake visit2.7.1.new/src/CMake/FindVisItPython.cmake ---- visit2.7.1.old/src/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200 -+++ visit2.7.1.new/src/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100 +--- a/CMake/FindVisItPython.cmake 2013-09-13 21:06:57.000000000 +0200 ++++ b/CMake/FindVisItPython.cmake 2014-01-25 20:30:06.948654123 +0100 @@ -141,11 +141,12 @@ FIND_LIBRARY(PYTHON_LIBRARY NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} diff --git a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch index 04d73c37fc16..987907c3a71d 100644 --- a/sci-visualization/visit/files/visit-2.12.3-findsilo.patch +++ b/sci-visualization/visit/files/visit-2.12.3-findsilo.patch @@ -1,6 +1,6 @@ diff -ru visit2.7.1-old/src/CMake/FindSilo.cmake visit2.7.1-new/src/CMake/FindSilo.cmake ---- visit2.7.1-old/src/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100 -+++ visit2.7.1-new/src/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100 +--- a/CMake/FindSilo.cmake 2013-11-20 20:30:44.000000000 +0100 ++++ b/CMake/FindSilo.cmake 2014-02-01 02:22:29.410541850 +0100 @@ -90,7 +90,7 @@ NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH) diff --git a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch index 2fec72e1f4f3..2b24e91d084f 100644 --- a/sci-visualization/visit/files/visit-2.12.3-findvtk.patch +++ b/sci-visualization/visit/files/visit-2.12.3-findvtk.patch @@ -1,5 +1,5 @@ ---- visit2.8.2/src/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100 -+++ visit2.8.2/src/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100 +--- a/CMake/FindVisItVTK.cmake.orig 2015-01-09 12:18:54.467780216 +0100 ++++ b/CMake/FindVisItVTK.cmake 2015-01-09 12:19:59.737780932 +0100 @@ -234,15 +234,22 @@ # check for python wrappers diff --git a/sci-visualization/visit/files/visit-2.12.3-qwt.patch b/sci-visualization/visit/files/visit-2.12.3-qwt.patch index b714aec45630..4d0dbb19aac3 100644 --- a/sci-visualization/visit/files/visit-2.12.3-qwt.patch +++ b/sci-visualization/visit/files/visit-2.12.3-qwt.patch @@ -1,5 +1,5 @@ ---- CMake/FindQwt.cmake.orig 2017-07-12 07:46:34.560120549 +0200 -+++ CMake/FindQwt.cmake 2017-07-12 07:46:58.120121063 +0200 +--- a/CMake/FindQwt.cmake.orig 2017-07-12 07:46:34.560120549 +0200 ++++ b/CMake/FindQwt.cmake 2017-07-12 07:46:58.120121063 +0200 @@ -54,7 +54,10 @@ SET(QWT_LIBRARY ${QWT_LIBRARY_DIR}/${QWT_LIB}/qwt) ENDIF(VISIT_STATIC) diff --git a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch index a6b47096e813..8b8c88e59a33 100644 --- a/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch +++ b/sci-visualization/visit/files/visit-2.12.3-vtklibs.patch @@ -1,6 +1,6 @@ diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine/main/CMakeLists.txt ---- visit2.8.2-old/src/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200 -+++ visit2.8.2-new/src/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100 +--- a/engine/main/CMakeLists.txt 2014-10-01 00:28:19.000000000 +0200 ++++ b/engine/main/CMakeLists.txt 2015-01-05 15:14:43.850783973 +0100 @@ -188,8 +188,8 @@ ${engine_ser_exe_EPlot_ser} engine_ser @@ -24,8 +24,8 @@ diff -ur visit2.8.2-old/src/engine/main/CMakeLists.txt visit2.8.2-new/src/engine ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdserver/main/CMakeLists.txt ---- visit2.8.2-old/src/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200 -+++ visit2.8.2-new/src/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100 +--- a/mdserver/main/CMakeLists.txt 2014-08-11 23:45:16.000000000 +0200 ++++ b/mdserver/main/CMakeLists.txt 2015-01-05 15:15:41.810784062 +0100 @@ -119,10 +119,10 @@ visit_verdict vtkCommonCore @@ -41,8 +41,8 @@ diff -ur visit2.8.2-old/src/mdserver/main/CMakeLists.txt visit2.8.2-new/src/mdse ${CMAKE_THREAD_LIBS} ${DL_LIB} diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tools/convert/CMakeLists.txt ---- visit2.8.2-old/src/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200 -+++ visit2.8.2-new/src/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100 +--- a/tools/convert/CMakeLists.txt 2014-08-11 23:46:08.000000000 +0200 ++++ b/tools/convert/CMakeLists.txt 2015-01-05 15:14:28.880783951 +0100 @@ -105,8 +105,8 @@ ) @@ -55,8 +55,8 @@ diff -ur visit2.8.2-old/src/tools/convert/CMakeLists.txt visit2.8.2-new/src/tool ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/tools/dataserver/CMakeLists.txt ---- visit2.8.2-old/src/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200 -+++ visit2.8.2-new/src/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100 +--- a/tools/dataserver/CMakeLists.txt 2014-08-11 23:46:12.000000000 +0200 ++++ b/tools/dataserver/CMakeLists.txt 2015-01-05 15:13:02.000783818 +0100 @@ -70,9 +70,9 @@ ) @@ -71,8 +71,8 @@ diff -ur visit2.8.2-old/src/tools/dataserver/CMakeLists.txt visit2.8.2-new/src/t ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt ---- visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 -+++ visit2.8.2-new/src/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100 +--- a/tools/mcurvit/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 ++++ b/tools/mcurvit/CMakeLists.txt 2015-01-05 15:16:02.400784093 +0100 @@ -104,9 +104,9 @@ ) @@ -87,8 +87,8 @@ diff -ur visit2.8.2-old/src/tools/mcurvit/CMakeLists.txt visit2.8.2-new/src/tool ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/tools/protocol/CMakeLists.txt ---- visit2.8.2-old/src/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200 -+++ visit2.8.2-new/src/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100 +--- a/tools/protocol/CMakeLists.txt 2014-08-11 23:46:14.000000000 +0200 ++++ b/tools/protocol/CMakeLists.txt 2015-01-05 15:12:46.480783795 +0100 @@ -76,9 +76,9 @@ ) @@ -103,8 +103,8 @@ diff -ur visit2.8.2-old/src/tools/protocol/CMakeLists.txt visit2.8.2-new/src/too ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer/main/CMakeLists.txt ---- visit2.8.2-old/src/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200 -+++ visit2.8.2-new/src/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100 +--- a/viewer/main/CMakeLists.txt 2014-08-11 23:46:26.000000000 +0200 ++++ b/viewer/main/CMakeLists.txt 2015-01-05 15:12:11.380783741 +0100 @@ -279,8 +279,8 @@ ${viewer_exe_IPlot} ${viewer_exe_VPlot} @@ -117,8 +117,8 @@ diff -ur visit2.8.2-old/src/viewer/main/CMakeLists.txt visit2.8.2-new/src/viewer ${VTK_FREETYPE_LIBRARIES} vtkftgl diff -ur visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt ---- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200 -+++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100 +--- a/visit_vtk/full/CMakeLists.txt 2014-08-11 23:45:14.000000000 +0200 ++++ b/visit_vtk/full/CMakeLists.txt 2015-01-05 15:11:17.680783659 +0100 @@ -125,9 +125,9 @@ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) diff --git a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch index 40aa7b8e2e50..39dc85711730 100644 --- a/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch +++ b/sci-visualization/visit/files/visit-2.12.3-vtkmpi.patch @@ -1,6 +1,6 @@ diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/tools/annotations/CMakeLists.txt ---- visit2.8.2-old/src/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 -+++ visit2.8.2-new/src/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100 +--- a/tools/annotations/CMakeLists.txt 2014-08-11 23:46:11.000000000 +0200 ++++ b/tools/annotations/CMakeLists.txt 2015-01-07 08:19:35.000735956 +0100 @@ -54,9 +54,9 @@ # Specify the libraries to link against TARGET_LINK_LIBRARIES(text2polys vtkIOLegacy) @@ -14,8 +14,8 @@ diff -ru visit2.8.2-old/src/tools/annotations/CMakeLists.txt visit2.8.2-new/src/ # add vtk definitions ADD_TARGET_DEFINITIONS(time_annotation "${VTK_DEFINITIONS}") diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeLists.txt ---- visit2.8.2-old/src/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200 -+++ visit2.8.2-new/src/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100 +--- a/vtkqt/CMakeLists.txt 2014-08-11 23:46:46.000000000 +0200 ++++ b/vtkqt/CMakeLists.txt 2015-01-07 08:19:00.950735904 +0100 @@ -64,9 +64,9 @@ # Specify the libraries to link against on Windows & Mac @@ -28,8 +28,8 @@ diff -ru visit2.8.2-old/src/vtkqt/CMakeLists.txt visit2.8.2-new/src/vtkqt/CMakeL ENDIF(HAVE_LIB_R) # Add vtk definitions ADD_TARGET_DEFINITIONS(vtkqt "${VTK_DEFINITIONS}") ---- visit2.8.2-old/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100 -+++ visit2.8.2-new/src/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100 +--- a/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:53.249224731 +0100 ++++ b/visit_vtk/full/CMakeLists.txt 2015-01-14 13:08:28.569224460 +0100 @@ -125,9 +125,11 @@ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES}) diff --git a/sci-visualization/visit/visit-2.12.3-r1.ebuild b/sci-visualization/visit/visit-2.12.3-r1.ebuild new file mode 100644 index 000000000000..4dde1a6975f8 --- /dev/null +++ b/sci-visualization/visit/visit-2.12.3-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +inherit cmake-utils python-single-r1 + +DESCRIPTION="A software that delivers parallel interactive visualizations" +HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/visit" +SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/${PN}${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cgns debug hdf5 mpi netcdf silo tcmalloc threads xdmf2" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + tcmalloc? ( dev-util/google-perftools ) + cgns? ( sci-libs/cgnslib ) + hdf5? ( sci-libs/hdf5 ) + netcdf? ( sci-libs/netcdf ) + silo? ( sci-libs/silo ) + =sci-libs/vtk-6.1.0*[imaging,mpi=,python,rendering,qt5,xdmf2?,${PYTHON_USEDEP}] + dev-qt/qtx11extras:5 + sys-libs/zlib + x11-libs/qwt:6[qt5(+)]" +DEPEND="${RDEPEND} + xdmf2? ( sci-libs/xdmf2 ) +" + +S="${WORKDIR}/${PN}${PV}/src" + +PATCHES=( + "${FILESDIR}/${P}-findpython.patch" + "${FILESDIR}/${P}-findsilo.patch" + "${FILESDIR}/${P}-findvtk.patch" + "${FILESDIR}/${P}-vtklibs.patch" + "${FILESDIR}/${P}-dont_symlink_visit_dir.patch" + "${FILESDIR}/${P}-cmakelist.patch" + "${FILESDIR}/${P}-qwt.patch" +) + +src_prepare() { + cmake-utils_src_prepare + use mpi && eapply "${FILESDIR}/${P}-vtkmpi.patch" + + sed -i 's/exec python $frontendlauncherpy $0 ${1+"$@"}/exec '${EPYTHON}' $frontendlauncherpy $0 ${1+"$@"}/g' "bin/frontendlauncher" +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=/opt/visit + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_DIR="${EPREFIX}/usr" + -DVISIT_PYTHON_SKIP_INSTALL=true + -DVISIT_VTK_SKIP_INSTALL=true + -DQT_BIN="${EPREFIX}/usr/bin" + -DVISIT_ZLIB_DIR="${EPREFIX}/usr" + -DVISIT_HEADERS_SKIP_INSTALL=false + -DVISIT_QWT_DIR="${EPREFIX}/usr" + -DVISIT_QT5=true + -DVISIT_QT_DIR=/usr/lib/qt5/ + -DUSE_VISIT_THREAD=$(usex threads) + ) + if use hdf5; then + mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" ) + fi + if use tcmalloc; then + mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" ) + fi + if use cgns; then + mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr" ) + fi + if use silo; then + mycmakeargs+=( -DSILO_DIR="${EPREFIX}/usr" ) + fi + if use netcdf; then + mycmakeargs+=( -DNETCDF_DIR="${EPREFIX}/usr" ) + fi + if use xdmf2; then + mycmakeargs+=( -DOPT_VTK_MODS="vtklibxml2" -DVISIT_XDMF_DIR=/usr/ ) + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + PACKAGES_DIR="${ROOT}opt/${PN}/${PV}/linux-$(arch)/lib/site-packages" + cd "${ED}${PACKAGES_DIR}" + for i in *; do + dosym "${PACKAGES_DIR}/${i}" "$(python_get_sitedir)/$i" + done + + cat > "${T}"/99visit <<- EOF + PATH=${EPREFIX}/opt/${PN}/bin + LDPATH=${EPREFIX}/opt/${PN}/${PV}/linux-$(arch)/lib/ + EOF + doenvd "${T}"/99visit +} + +pkg_postinst () { + ewarn "Remember to run " + ewarn "env-update && source /etc/profile" + ewarn "if you want to use visit in already opened session" +} |