From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 691EF138B39 for ; Sun, 2 Feb 2014 17:01:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01285E09B2; Sun, 2 Feb 2014 17:01:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B14AE09AD for ; Sun, 2 Feb 2014 17:01:13 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22A5433F816 for ; Sun, 2 Feb 2014 17:01:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7D31918278 for ; Sun, 2 Feb 2014 17:01:09 +0000 (UTC) From: "Reinis Danne" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Reinis Danne" Message-ID: <1391327169.9dfca568223d096d343f7649c82c98bf1ad6d5b8.rei4dan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-visualization/visit/, sci-visualization/visit/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-visualization/visit/files/visit-2.7.1-findsilo.patch sci-visualization/visit/metadata.xml sci-visualization/visit/visit-2.7.1.ebuild X-VCS-Directories: sci-visualization/visit/ sci-visualization/visit/files/ X-VCS-Committer: rei4dan X-VCS-Committer-Name: Reinis Danne X-VCS-Revision: 9dfca568223d096d343f7649c82c98bf1ad6d5b8 X-VCS-Branch: master Date: Sun, 2 Feb 2014 17:01:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a8ee62c2-83f3-4312-98cb-9e6277d811ed X-Archives-Hash: b3c664c25a6a1a2651469cd5c1f4a370 commit: 9dfca568223d096d343f7649c82c98bf1ad6d5b8 Author: Andreas Schäfer gmx de> AuthorDate: Sun Feb 2 07:46:09 2014 +0000 Commit: Reinis Danne gmail com> CommitDate: Sun Feb 2 07:46:09 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9dfca568 added use-flags for silo and netcdf to VisIt --- .../visit/files/visit-2.7.1-findsilo.patch | 12 ++++++++++++ sci-visualization/visit/metadata.xml | 3 +++ sci-visualization/visit/visit-2.7.1.ebuild | 19 ++++++++++++++----- 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 0000000..04d73c3 --- /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 1ee8959..65f194d 100644 --- a/sci-visualization/visit/metadata.xml +++ b/sci-visualization/visit/metadata.xml @@ -14,5 +14,8 @@ Builds the reader for the CFD General Notation System file format. + + Adds support for reading .silo files. + diff --git a/sci-visualization/visit/visit-2.7.1.ebuild b/sci-visualization/visit/visit-2.7.1.ebuild index 4b9c34d..e749abc 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