summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2010-01-30 18:01:05 +0000
committerMarkus Dittrich <markusle@gentoo.org>2010-01-30 18:01:05 +0000
commit9cc96e115e471979d1a8d55c9407d854d4c487fc (patch)
tree56ee3360589a6be5a76282fb0474330dc6ee58a4 /sci-visualization/paraview
parentsparc stable wrt #296426 (diff)
downloadgentoo-2-9cc96e115e471979d1a8d55c9407d854d4c487fc.tar.gz
gentoo-2-9cc96e115e471979d1a8d55c9407d854d4c487fc.tar.bz2
gentoo-2-9cc96e115e471979d1a8d55c9407d854d4c487fc.zip
Add temporary fix for broken h5part plugin (see bug #301538). Also changed hdf5 dependency to hd5[mpi=] per bug #302621
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/paraview')
-rw-r--r--sci-visualization/paraview/ChangeLog7
-rw-r--r--sci-visualization/paraview/files/paraview-3.6.2-h5part.patch12
-rw-r--r--sci-visualization/paraview/paraview-3.6.2.ebuild5
3 files changed, 21 insertions, 3 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 2d3435c61f01..d94cc3c1e2d8 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-visualization/paraview
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.45 2010/01/22 03:40:02 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.46 2010/01/30 18:01:05 markusle Exp $
+
+ 30 Jan 2010; Markus Dittrich <markusle@gentoo.org> paraview-3.6.2.ebuild,
+ +files/paraview-3.6.2-h5part.patch:
+ Add temporary fix for broken h5part plugin (see bug #301538).
+ Also changed hdf5 dependency to hd5[mpi=] per bug #302621.
21 Jan 2010; Markus Dittrich <markusle@gentoo.org> paraview-3.6.2.ebuild,
+files/paraview-3.6.2-boost-property_map.patch,
diff --git a/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch b/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch
new file mode 100644
index 000000000000..59f27d0bb6ab
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.6.2-h5part.patch
@@ -0,0 +1,12 @@
+diff -Naur ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h
+--- ParaView3/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2009-10-01 15:19:59.000000000 -0400
++++ ParaView3.new/Plugins/H5PartReader/H5Part/src/H5PartTypes.h 2010-01-30 09:40:22.000000000 -0500
+@@ -17,7 +17,7 @@
+ #endif
+ ;
+
+-#ifndef H5PART_HAS_MPI
++#if !defined(H5PART_HAS_MPI) && !defined(MPI_BOTTOM)
+ typedef int MPI_Comm;
+ #endif
+
diff --git a/sci-visualization/paraview/paraview-3.6.2.ebuild b/sci-visualization/paraview/paraview-3.6.2.ebuild
index 52b54be18f3d..bba1357b08ca 100644
--- a/sci-visualization/paraview/paraview-3.6.2.ebuild
+++ b/sci-visualization/paraview/paraview-3.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.3 2010/01/22 03:40:02 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.6.2.ebuild,v 1.4 2010/01/30 18:01:05 markusle Exp $
EAPI="2"
@@ -19,7 +19,7 @@ LICENSE="paraview GPL-2"
KEYWORDS="~x86 ~amd64"
SLOT="0"
IUSE="mpi +python doc examples +gui plugins boost streaming cg overview mysql postgres odbc"
-RDEPEND="sci-libs/hdf5
+RDEPEND="sci-libs/hdf5[mpi=]
mpi? ( || (
sys-cluster/openmpi
sys-cluster/mpich2[cxx] ) )
@@ -69,6 +69,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-about.html.patch
epatch "${FILESDIR}"/${P}-boost-property_map.patch
epatch "${FILESDIR}"/${P}-odbc.patch
+ epatch "${FILESDIR}"/${P}-h5part.patch
if has_version '>=sci-libs/hdf5-1.8.0'; then
epatch "${FILESDIR}"/${P}-hdf-1.8.3.patch