Enabled support for openmpi and mpich2 (see bug #210639).

(Portage version: 2.1.4.4)

3 files changed, 61 insertions, 3 deletions

diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog
index 9b84f8825719..d7c5e14dbc63 100644
--- a/sci-visualization/paraview/ChangeLog
+++ b/sci-visualization/paraview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/paraview
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.16 2008/02/15 11:14:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.17 2008/02/20 23:35:51 markusle Exp $
+
+  20 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/paraview-3.2.1-openmpi.patch, paraview-3.2.1.ebuild:
+  Enabled support for openmpi and mpich2 (see bug #210639).
 
   15 Feb 2008; Markus Dittrich <markusle@gentoo.org>
   +files/paraview-2.6.2-tkImgGIF.patch, paraview-2.6.2.ebuild:
diff --git a/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch b/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch
new file mode 100644
index 000000000000..ba40c8d6ec22
--- /dev/null
+++ b/sci-visualization/paraview/files/paraview-3.2.1-openmpi.patch
@@ -0,0 +1,46 @@
+diff -Naur ParaView3.2.1/VTK/Parallel/CMakeLists.txt ParaView3.2.1.new/VTK/Parallel/CMakeLists.txt
+--- ParaView3.2.1/VTK/Parallel/CMakeLists.txt	2007-11-07 15:51:57.000000000 -0500
++++ ParaView3.2.1.new/VTK/Parallel/CMakeLists.txt	2008-02-20 08:51:14.000000000 -0500
+@@ -104,6 +104,7 @@
+ 
+ IF (VTK_USE_MPI)
+   INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake)
++  INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindOpenmpi.cmake)
+   SET ( Kit_SRCS
+     ${Kit_SRCS}
+     vtkMPICommunicator.cxx
+@@ -138,6 +139,12 @@
+   IF (MPI_EXTRA_LIBRARY)   
+     SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}")   
+   ENDIF (MPI_EXTRA_LIBRARY) 
++  IF (OPENMPI_LIBRARY) 
++    SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_LIBRARY}")   
++  ENDIF (OPENMPI_LIBRARY)   
++  IF (OPENMPI_EXTRA_LIBRARY)   
++      SET(KIT_LIBS ${KIT_LIBS} "${OPENMPI_EXTRA_LIBRARY}")   
++  ENDIF (OPENMPI_EXTRA_LIBRARY)
+ ENDIF (VTK_USE_MPI)
+ 
+ SET(Kit_EXTRA_SRCS)
+diff -Naur ParaView3.2.1/VTK/Parallel/FindOpenmpi.cmake ParaView3.2.1.new/VTK/Parallel/FindOpenmpi.cmake
+--- ParaView3.2.1/VTK/Parallel/FindOpenmpi.cmake	1969-12-31 19:00:00.000000000 -0500
++++ ParaView3.2.1.new/VTK/Parallel/FindOpenmpi.cmake	2008-02-20 09:35:06.000000000 -0500
+@@ -0,0 +1,18 @@
++# - Find openmpi
++FIND_PATH(MPI_INCLUDE_PATH mpi.h 
++          /usr/include 
++          /usr/include/openmpi
++)
++
++FIND_LIBRARY(OPENMPI_LIBRARY 
++             NAMES mpi
++             PATHS /usr/lib /usr/lib64 
++)
++
++FIND_LIBRARY(OPENMPI_EXTRA_LIBRARY 
++             NAMES mpi_cxx
++             PATHS /usr/lib /usr/lib64 
++             DOC "If a second mpi library is necessary, specify it here.")
++
++MARK_AS_ADVANCED(OPENMPI_LIBRARY OPENMPI_EXTRA_LIBRARY)
++
diff --git a/sci-visualization/paraview/paraview-3.2.1.ebuild b/sci-visualization/paraview/paraview-3.2.1.ebuild
index 537028ec2e82..b1f913ce10fa 100644
--- a/sci-visualization/paraview/paraview-3.2.1.ebuild
+++ b/sci-visualization/paraview/paraview-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.2.1.ebuild,v 1.6 2008/02/14 15:49:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-3.2.1.ebuild,v 1.7 2008/02/20 23:35:51 markusle Exp $
 
 EAPI="1"
 
@@ -20,7 +20,9 @@ SLOT="0"
 IUSE="mpi python hdf5 doc examples threads qt4"
 RDEPEND="hdf5? ( sci-libs/hdf5 )
 	doc? ( app-doc/doxygen )
-	mpi? ( sys-cluster/mpich )
+	mpi? ( || (
+				sys-cluster/openmpi
+				sys-cluster/mpich2 ) )
 	python? ( >=dev-lang/python-2.0 )
 	qt4? ( $(qt4_min_version 4.3) )
 	dev-libs/libxml2
@@ -45,6 +47,11 @@ QT4_BUILT_WITH_USE_CHECK="qt3support"
 
 pkg_setup() {
 	use qt4 && qt4_pkg_setup
+	if use mpi && has_version sys-cluster/mpich2; then
+		if ! built_with_use sys-cluster/mpich2 cxx; then
+			die "Please re-emerge sys-cluster/mpich2 with USE=\"cxx\""
+		fi
+	fi
 }
 
 src_unpack() {
@@ -54,6 +61,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-${MY_MAJOR_PV}-support-qt4.3.patch
 	epatch "${FILESDIR}"/${PN}-${MY_MAJOR_PV}-libxml2-fix.patch
 	epatch "${DISTDIR}"/${P}-OpenFOAM.patch.bz2
+	epatch "${FILESDIR}"/${P}-openmpi.patch
 
 	# rename paraview's assistant wrapper
 	if use qt4; then