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

Package-Manager: portage-2.1.4.4

4 files changed, 64 insertions, 5 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/Manifest b/sci-visualization/paraview/Manifest
index d35e7713ade4..c310c9cf1353 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -3,10 +3,11 @@ AUX paraview-2.6.0-include.patch 476 RMD160 9f44a83f73da1accd7ea3d8c353f4de50849
 AUX paraview-2.6.2-tkImgGIF.patch 1333 RMD160 e941a279bbfa4a47c407f294f30e63ec8a1b59bd SHA1 e03435a33f287c1a656fd5b58eb347e6e724acfd SHA256 859a574a854195affde43eb1a835bbc1e0470d39e4ac8e3d2aa664cd6a806cd0
 AUX paraview-3.2-libxml2-fix.patch 1774 RMD160 11ab022b0abca2a226deb648d48fe69cbf5c9352 SHA1 476d18040197100127184e1f547fc5840d8d0d45 SHA256 fda2240e2f0deaef39081e7375e7b99f967cbbe3aa99761f6940bb7c27c942e4
 AUX paraview-3.2-support-qt4.3.patch 3835 RMD160 06d572100ee65f6f68c042bf7204b49c062c4e3a SHA1 ea7a30324e36ea9ed58129818769bafab30c078d SHA256 c2a412b2418f4b34e210851e6d1d7f7d5112d1ead93ddcadd5c8119ea40c160e
+AUX paraview-3.2.1-openmpi.patch 1651 RMD160 64025fcb74f62939e0b71f4cfc0de09e83aa38fb SHA1 f3863c718d8c2d9da4201b194b24fb75c2794269 SHA256 148d4e22419b31af9f1c357b478820a09bffff0eada0acd3758e6dca7da3209b
 DIST ParaView-2.6.2.tar.gz 75658768 RMD160 068f3fbfea17166d34c488b4e6bd8d8fb07d3cd9 SHA1 ac5efb1c850e89b76dda4f28ecfa4575e45aa22e SHA256 de7cbd808e1ab1730ad87436d30c0a752096a65fe9aa6b82f35a39fc3b67d7c7
 DIST paraview-3.2.1-OpenFOAM.patch.bz2 35956 RMD160 b4f6d3f64e6a0cc952b73d70b59168d33f09b7d5 SHA1 4b63ca09cae3b9197b840319e3bbb7b6594a66d3 SHA256 16bf34d126c65966de20644cb44685bf90cd81f97f9ddb8b6d1749ed97918c7e
 DIST paraview-3.2.1.tar.gz 21360301 RMD160 f7df024f4668901900b7633cf6dbe78337991b49 SHA1 a14e46cbeb7292f5511e1361afeb37455689c325 SHA256 d613d6a86f8a9173f42333760c9f0c29b5fcaa85554ba4b9bf61b6fddfae0cb9
 EBUILD paraview-2.6.2.ebuild 3614 RMD160 260078b3c86eef59821d8dc8e4a4c67a9c6bc0e5 SHA1 e3184bfd9210d62a23aa84c1de151d33a6159337 SHA256 d5c61939201a2a59d1fbff60e40f3f11e6fd1afcc1115a0b5e4528e7807b8623
-EBUILD paraview-3.2.1.ebuild 5245 RMD160 8101d4197065924102e22d6eaed396f472e093c6 SHA1 b94ce093ad11e8f3d89561cc5be0ea3c81a01ea9 SHA256 574569eb4aba41a5a4e8e9d5f3d33b09f72a07edd0644cffa3aaa55ba9321fa8
-MISC ChangeLog 3167 RMD160 14b174f259c015d6399c09c49c419a814158060d SHA1 cd694c6a65c7a3c96527e2919d2e67c93eac86ea SHA256 d4fb136ee156dbc81f16b635f90f38a4d5584022a6c9e93224a002e8370d90c2
+EBUILD paraview-3.2.1.ebuild 5496 RMD160 3b31acf4ee842068b9235765e260a70b12eec277 SHA1 9ad26886c8883f786d88d50c9aaed9b7759842dd SHA256 f5980181572256d2ccacd7bfc6ebb8838fa9f458db8934a7728cb2e28d681e29
+MISC ChangeLog 3343 RMD160 aa558d0f4e468eb29af04a4502178647674c8139 SHA1 30a255b0e384bf7e067957483b8bced70e055f4c SHA256 f60a649b759b431a476ff7b192370ff91293ad8489c52fc7b8296490fd77ed9a
 MISC metadata.xml 254 RMD160 8e9562c9dd3bd05fdf2dd40bcc5b2ed3dbe9ab75 SHA1 53acb8f334765223c1030a8eb242d584ad376706 SHA256 131c089c8a699c3fb7e8b914f68af259e0b0ad341fba3a8f87827871fc7be701
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