[gentoo-commits] proj/sci:master commit in: sci-visualization/visit/, sci-visualization/visit/files/

[Christoph Junghans]

commit:     15a15fe6b533307ba9e815987a049b9a24ebabf4
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Sat Mar 22 09:48:46 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 09:48:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15a15fe6

added updated ebuild for VisIt 2.7.2

---
 .../files/visit-2.7.2-dont_symlink_visit_dir.patch |  18 +++
 .../visit/files/visit-2.7.2-findpython.patch       |  19 +++
 .../visit/files/visit-2.7.2-findsilo.patch         |  12 ++
 .../visit/files/visit-2.7.2-findvtk.patch          |  24 ++++
 .../visit/files/visit-2.7.2-vtklibs.patch          | 142 +++++++++++++++++++++
 sci-visualization/visit/visit-2.7.2.ebuild         |  77 +++++++++++
 6 files changed, 292 insertions(+)

diff --git a/sci-visualization/visit/files/visit-2.7.2-dont_symlink_visit_dir.patch b/sci-visualization/visit/files/visit-2.7.2-dont_symlink_visit_dir.patch
new file mode 100644
index 0000000..0953e5b
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.2-dont_symlink_visit_dir.patch
@@ -0,0 +1,18 @@
+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
+@@ -807,14 +807,6 @@
+             \"${VISIT_VERSION}\"
+             \"${CMAKE_INSTALL_PREFIX}/beta\")
+         ")
+-    ELSE(VISIT_INSTALL_AS_BETA)
+-        INSTALL(CODE "
+-          MESSAGE(\"Symlinking current to ${VISIT_VERSION}\")
+-          EXECUTE_PROCESS(WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX}
+-            COMMAND \${CMAKE_COMMAND} -E create_symlink
+-            \"${VISIT_VERSION}\"
+-            \"${CMAKE_INSTALL_PREFIX}/current\")
+-        ")
+     ENDIF(VISIT_INSTALL_AS_BETA)
+ ENDIF(WIN32)
+ MARK_AS_ADVANCED(

diff --git a/sci-visualization/visit/files/visit-2.7.2-findpython.patch b/sci-visualization/visit/files/visit-2.7.2-findpython.patch
new file mode 100644
index 0000000..180ffbf
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.2-findpython.patch
@@ -0,0 +1,19 @@
+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
+@@ -141,11 +141,12 @@
+   FIND_LIBRARY(PYTHON_LIBRARY
+     NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION}
+     PATHS
+-      ${PYTHON_DIR}/lib
+-      ${PYTHON_DIR}/libs
+-      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
++    ${PYTHON_DIR}/lib
++    ${PYTHON_DIR}/lib64
++    ${PYTHON_DIR}/libs
++    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
+     NO_DEFAULT_PATH
+     NO_CMAKE_ENVIRONMENT_PATH
+     NO_CMAKE_PATH
+     NO_SYSTEM_ENVIRONMENT_PATH)
+ 

diff --git a/sci-visualization/visit/files/visit-2.7.2-findsilo.patch b/sci-visualization/visit/files/visit-2.7.2-findsilo.patch
new file mode 100644
index 0000000..04d73c3
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.2-findsilo.patch
@@ -0,0 +1,12 @@
+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
+@@ -90,7 +90,7 @@
+       NO_CMAKE_PATH
+       NO_SYSTEM_ENVIRONMENT_PATH)
+     IF(SILOH5_LIBRARY_EXISTS)
+-        SET_UP_THIRD_PARTY(SILO lib include siloh5)
++        SET_UP_THIRD_PARTY(SILO lib include siloh5 hdf5 z)
+     ELSE(SILOH5_LIBRARY_EXISTS)
+         SET_UP_THIRD_PARTY(SILO lib include silo)
+     ENDIF(SILOH5_LIBRARY_EXISTS)

diff --git a/sci-visualization/visit/files/visit-2.7.2-findvtk.patch b/sci-visualization/visit/files/visit-2.7.2-findvtk.patch
new file mode 100644
index 0000000..c241e13
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.2-findvtk.patch
@@ -0,0 +1,24 @@
+diff -ru visit2.7.1.old/src/CMake/FindVisItVTK.cmake visit2.7.1.new/src/CMake/FindVisItVTK.cmake
+--- visit2.7.1.old/src/CMake/FindVisItVTK.cmake	2013-09-13 21:06:57.000000000 +0200
++++ visit2.7.1.new/src/CMake/FindVisItVTK.cmake	2014-01-25 20:30:06.948654123 +0100
+@@ -234,11 +234,17 @@
+ 
+ # check for python wrappers
+ IF (NOT WIN32)
+-    FILE(GLOB VTK_PY_WRAPPERS_DIR ${VTK_LIBRARY_DIRS}/python*/)
++    FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VTK_LIBRARY_DIRS}/python*/)
+ ELSE (NOT WIN32)
+-    FILE(GLOB VTK_PY_WRAPPERS_DIR ${VISIT_VTK_DIR}/lib)
++    FILE(GLOB VTK_PY_WRAPPERS_DIRECTORIES ${VISIT_VTK_DIR}/lib)
+ ENDIF (NOT WIN32)
+-MESSAGE(STATUS "  VTK_PY_WRAPPERS_DIR=${VTK_PY_WRAPPERS_DIR}")
++MESSAGE(STATUS "  VTK_PY_WRAPPERS_DIRECTORIES=${VTK_PY_WRAPPERS_DIRECTORIES}")
++
++FOREACH(X ${VTK_PY_WRAPPERS_DIRECTORIES})
++    IF(EXISTS "${X}/site-packages/vtk")
++      SET(VTK_PY_WRAPPERS_DIR "${X}")
++    ENDIF()
++ENDFOREACH(X)
+ 
+ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
+     MESSAGE(STATUS "Found VTK Python Wrappers - ${VTK_PY_WRAPPERS_DIR}")

diff --git a/sci-visualization/visit/files/visit-2.7.2-vtklibs.patch b/sci-visualization/visit/files/visit-2.7.2-vtklibs.patch
new file mode 100644
index 0000000..9f2416d
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.2-vtklibs.patch
@@ -0,0 +1,142 @@
+diff -ru visit2.7.1.old/src/engine/main/CMakeLists.txt visit2.7.1.new/src/engine/main/CMakeLists.txt
+--- visit2.7.1.old/src/engine/main/CMakeLists.txt	2013-09-13 21:13:13.000000000 +0200
++++ visit2.7.1.new/src/engine/main/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -184,8 +184,8 @@
+     ${engine_ser_exe_EPlot_ser}
+     engine_ser 
+     visit_verdict 
+-    vtkjpeg
+-    vtkpng
++    jpeg
++    png
+     ${VTKZLIB_LIB}
+     ${VTK_FREETYPE_LIBRARIES}
+     vtkftgl
+@@ -268,8 +268,8 @@
+         ${engine_par_exe_EPlot_par}
+         engine_par
+         visit_verdict 
+-        vtkjpeg
+-        vtkpng
++        jpeg
++        png
+         ${VTKZLIB_LIB}
+         ${VTK_FREETYPE_LIBRARIES}
+         vtkftgl
+diff -ru visit2.7.1.old/src/mdserver/main/CMakeLists.txt visit2.7.1.new/src/mdserver/main/CMakeLists.txt
+--- visit2.7.1.old/src/mdserver/main/CMakeLists.txt	2013-09-13 21:07:04.000000000 +0200
++++ visit2.7.1.new/src/mdserver/main/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -118,10 +118,10 @@
+     visit_verdict 
+     vtkCommonCore
+     vtkIOCore 
+-    vtktiff
++    tiff
+     ${VTKZLIB_LIB}
+-    vtkpng
+-    vtkjpeg
++    png
++    jpeg
+     ${ZLIB_LIB} 
+     ${CMAKE_THREAD_LIBS} 
+     ${DL_LIB}
+diff -ru visit2.7.1.old/src/svn_bin/static_simV2.py visit2.7.1.new/src/svn_bin/static_simV2.py
+--- visit2.7.1.old/src/svn_bin/static_simV2.py	2013-09-13 21:12:52.000000000 +0200
++++ visit2.7.1.new/src/svn_bin/static_simV2.py	2014-01-25 20:30:06.948654123 +0100
+@@ -176,7 +176,7 @@
+ #
+ # Print the link lines that we'd have to use to get the -l's
+ #
+-vtk_libs="-lvtkCommon -lvtkGraphics -lvtkHybrid -lvtkRendering -lvtkImaging -lvtkGenericFiltering -lvtkFiltering -lvtkIO -lvtksys -lvtkfreetype -lvtkftgl -lvtkjpeg -lvtktiff -lvtkpng -lvtkexpat -lvtklibxml2 -lvtkzlib "
++vtk_libs="-lvtkCommon -lvtkGraphics -lvtkHybrid -lvtkRendering -lvtkImaging -lvtkGenericFiltering -lvtkFiltering -lvtkIO -lvtksys -lvtkfreetype -lvtkftgl -ljpeg -ltiff -lpng -lexpat -lvtklibxml2 -lz "
+ frameworks = "-lGL "
+ if sys.platform == "darwin":
+     frameworks = "-framework OpenGL -framework AGL -framework SystemConfiguration -framework IOKit -framework Cocoa "
+diff -ru visit2.7.1.old/src/tools/convert/CMakeLists.txt visit2.7.1.new/src/tools/convert/CMakeLists.txt
+--- visit2.7.1.old/src/tools/convert/CMakeLists.txt	2013-10-09 22:15:21.000000000 +0200
++++ visit2.7.1.new/src/tools/convert/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -104,8 +104,8 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtkjpeg
+-vtkpng
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ru visit2.7.1.old/src/tools/dataserver/CMakeLists.txt visit2.7.1.new/src/tools/dataserver/CMakeLists.txt
+--- visit2.7.1.old/src/tools/dataserver/CMakeLists.txt	2013-09-13 21:08:25.000000000 +0200
++++ visit2.7.1.new/src/tools/dataserver/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -69,9 +69,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ru visit2.7.1.old/src/tools/mcurvit/CMakeLists.txt visit2.7.1.new/src/tools/mcurvit/CMakeLists.txt
+--- visit2.7.1.old/src/tools/mcurvit/CMakeLists.txt	2013-09-13 21:08:15.000000000 +0200
++++ visit2.7.1.new/src/tools/mcurvit/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -104,9 +104,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ru visit2.7.1.old/src/tools/protocol/CMakeLists.txt visit2.7.1.new/src/tools/protocol/CMakeLists.txt
+--- visit2.7.1.old/src/tools/protocol/CMakeLists.txt	2013-09-13 21:08:16.000000000 +0200
++++ visit2.7.1.new/src/tools/protocol/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -75,9 +75,9 @@
+ )
+ 
+ SET(VTK_EXTRA_LIBS
+-vtktiff
+-vtkjpeg
+-vtkpng
++tiff
++jpeg
++png
+ ${VTKZLIB_LIB}
+ ${VTK_FREETYPE_LIBRARIES}
+ vtkftgl
+diff -ru visit2.7.1.old/src/viewer/main/CMakeLists.txt visit2.7.1.new/src/viewer/main/CMakeLists.txt
+--- visit2.7.1.old/src/viewer/main/CMakeLists.txt	2013-09-13 21:08:36.000000000 +0200
++++ visit2.7.1.new/src/viewer/main/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -272,8 +272,8 @@
+     ${viewer_exe_IPlot}
+     ${viewer_exe_VPlot}
+     viewer
+-    vtkpng
+-    vtkjpeg
++    png
++    jpeg
+     ${VTKZLIB_LIB}
+     ${VTK_FREETYPE_LIBRARIES}
+     vtkftgl
+diff -ru visit2.7.1.old/src/visit_vtk/full/CMakeLists.txt visit2.7.1.new/src/visit_vtk/full/CMakeLists.txt
+--- visit2.7.1.old/src/visit_vtk/full/CMakeLists.txt	2013-09-13 21:07:03.000000000 +0200
++++ visit2.7.1.new/src/visit_vtk/full/CMakeLists.txt	2014-01-25 20:30:06.948654123 +0100
+@@ -122,7 +122,7 @@
+ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
+ 
+ ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
+-TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle vtktiff)
++TARGET_LINK_LIBRARIES(visit_vtk lightweight_visit_vtk vtkFiltersExtraction vtkFiltersFlowPaths vtkImagingHybrid vtkRenderingOpenGL vtkRenderingFreeType vtkRenderingFreeTypeOpenGL vtkInteractionStyle tiff)
+ # Add vtk definitions
+ ADD_TARGET_DEFINITIONS(visit_vtk "${VTK_DEFINITIONS}")
+ 

diff --git a/sci-visualization/visit/visit-2.7.2.ebuild b/sci-visualization/visit/visit-2.7.2.ebuild
new file mode 100644
index 0000000..928e60f
--- /dev/null
+++ b/sci-visualization/visit/visit-2.7.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A software that delivers parallel interactive visualizations"
+HOMEPAGE="https://wci.llnl.gov/codes/visit/home.html"
+SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/visit${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="debug hdf5 tcmalloc cgns silo netcdf threads"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-libs/silo
+	hdf5? ( sci-libs/hdf5 )
+	tcmalloc? ( dev-util/google-perftools )
+	cgns? ( sci-libs/cgnslib )
+	silo? ( sci-libs/silo )
+	netcdf? ( sci-libs/netcdf )
+	>=sci-libs/vtk-6.0.0[imaging,python,rendering,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+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"
+)
+
+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"
+		$(cmake-utils_use threads VISIT_THREAD)
+	)
+	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
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	cat > "${T}"/99visit <<- EOF
+		PATH=${EPREFIX}/opt/visit/bin
+	EOF
+	doenvd "${T}"/99visit
+}