aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schäfer <gentryx@gmx.de>2014-02-02 08:49:21 +0100
committerAndreas Schäfer <gentryx@gmx.de>2014-02-02 08:49:21 +0100
commit79571933bc8708ed73dd48aed08066d5c331326b (patch)
treeb1ce59a88c2ddfaf65e975d4b32cf75331ddcebe /sci-visualization/visit
parentMerge branch 'master' of github.com:gentoo-science/sci (diff)
parentadded use-flags for silo and netcdf to VisIt (diff)
downloadsci-79571933bc8708ed73dd48aed08066d5c331326b.tar.gz
sci-79571933bc8708ed73dd48aed08066d5c331326b.tar.bz2
sci-79571933bc8708ed73dd48aed08066d5c331326b.zip
Merge /usr/local/portage/andis_overlay
Diffstat (limited to 'sci-visualization/visit')
-rw-r--r--sci-visualization/visit/files/visit-2.7.1-findsilo.patch12
-rw-r--r--sci-visualization/visit/metadata.xml3
-rw-r--r--sci-visualization/visit/visit-2.7.1.ebuild19
3 files changed, 29 insertions, 5 deletions
diff --git a/sci-visualization/visit/files/visit-2.7.1-findsilo.patch b/sci-visualization/visit/files/visit-2.7.1-findsilo.patch
new file mode 100644
index 000000000..04d73c37f
--- /dev/null
+++ b/sci-visualization/visit/files/visit-2.7.1-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/metadata.xml b/sci-visualization/visit/metadata.xml
index 1ee8959b7..65f194d1a 100644
--- a/sci-visualization/visit/metadata.xml
+++ b/sci-visualization/visit/metadata.xml
@@ -14,5 +14,8 @@
<flag name="cgns">
Builds the reader for the CFD General Notation System file format.
</flag>
+ <flag name="silo">
+ Adds support for reading .silo files.
+ </flag>
</use>
</pkgmetadata>
diff --git a/sci-visualization/visit/visit-2.7.1.ebuild b/sci-visualization/visit/visit-2.7.1.ebuild
index 9b77f15f0..6a951c54e 100644
--- a/sci-visualization/visit/visit-2.7.1.ebuild
+++ b/sci-visualization/visit/visit-2.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://portal.nersc.gov/svn/visit/trunk/releases/${PV}/visit${PV}.tar.g
SLOT="0"
LICENSE="BSD"
KEYWORDS="~amd64"
-IUSE="hdf5 tcmalloc cgns"
+IUSE="hdf5 tcmalloc cgns silo netcdf"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
@@ -23,12 +23,15 @@ RDEPEND="
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"
@@ -38,7 +41,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX=/opt/visit
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_DIR="${EPREFIX}/usr/"
+ -DPYTHON_DIR="${EPREFIX}/usr"
-DVISIT_PYTHON_SKIP_INSTALL=true
-DVISIT_VTK_SKIP_INSTALL=true
-DVISIT_THREAD=true
@@ -46,13 +49,19 @@ src_configure() {
-DVISIT_ZLIB_DIR="${EPREFIX}/usr"
)
if use hdf5; then
- mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr/" )
+ mycmakeargs+=( -DHDF5_DIR="${EPREFIX}/usr" )
fi
if use tcmalloc; then
- mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr/" )
+ mycmakeargs+=( -DTCMALLOC_DIR="${EPREFIX}/usr" )
fi
if use cgns; then
- mycmakeargs+=( -DCGNS_DIR="${EPREFIX}/usr/" )
+ 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