Added patch fixing cmake files to properly detect and add lam-mpi libraries.

Package-Manager: portage-2.1.2.7

4 files changed, 71 insertions, 10 deletions

diff --git a/sci-libs/vtk/ChangeLog b/sci-libs/vtk/ChangeLog
index 74d856d50228..7e0df7fbacb8 100644
--- a/sci-libs/vtk/ChangeLog
+++ b/sci-libs/vtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/vtk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.31 2007/05/04 01:49:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/ChangeLog,v 1.32 2007/05/07 12:38:32 markusle Exp $
+
+  06 May 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/vtk-5.0.3-lammpi.patch, vtk-5.0.3.ebuild:
+  Added patch fixing cmake files to properly detect and add lam-mpi
+  libraries.
 
   04 May 2007; Markus Dittrich <markusle@gentoo.org> vtk-5.0.3.ebuild:
   Check for qt3support useflag when building the examples under qt4
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index e4c397a2b21d..141bbd203877 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,6 +2,10 @@ AUX vtk-5.0.1-python2.5-gentoo.patch 419 RMD160 1efc90044670b8b57903a5374a73e566
 MD5 789db4f040cbaffcc7a92a835bb24d2c files/vtk-5.0.1-python2.5-gentoo.patch 419
 RMD160 1efc90044670b8b57903a5374a73e566bf11879f files/vtk-5.0.1-python2.5-gentoo.patch 419
 SHA256 b548640a70834ef8d8d6e738b5d407d133135903789de35ef7e9fcf9ef1314d2 files/vtk-5.0.1-python2.5-gentoo.patch 419
+AUX vtk-5.0.3-lammpi.patch 1660 RMD160 59e39d3f6181919d1bcc92537fb057e1dafd9068 SHA1 30f296eeb9139b9243272073529463ca7f5dd903 SHA256 d458ff5d39765f394bcaa544e2a532dbf238eaae038dd7e7bfa49f79cbf35885
+MD5 4fd25f68dbbfc843305db995d3e51259 files/vtk-5.0.3-lammpi.patch 1660
+RMD160 59e39d3f6181919d1bcc92537fb057e1dafd9068 files/vtk-5.0.3-lammpi.patch 1660
+SHA256 d458ff5d39765f394bcaa544e2a532dbf238eaae038dd7e7bfa49f79cbf35885 files/vtk-5.0.3-lammpi.patch 1660
 DIST vtk-5.0.2.tar.gz 8339510 RMD160 81b22986a31203e0d9434a159b2470936147a59f SHA1 0a574f481c65a3d188c48dfc4e284aa8f70bad84 SHA256 045f71e609f14877a1dc59cb9b2d697565ae727fdeab09d76a7c62d4a1f4421d
 DIST vtk-5.0.3.tar.gz 8324346 RMD160 bc844d562d69bb8e74452ba238986522de9fea9e SHA1 a0c514f6a2b3735e779b1eb5d53b27ae9ef129b6 SHA256 3ba05f6cb33cfcfb9d448c332b9292d6fca836fd979249d086762a7ac1c65d5c
 DIST vtkdata-5.0.2.tar.gz 22397793 RMD160 93e649caaaef4e37aa4f9807c4d2b8420cd07cfd SHA1 ab853dfe0e8a48001a8db24d74799954965dffc3 SHA256 2a5f58d2fa5eb877ff5cc271baddec2e9ed90f83ba2d9b3ba46d7d1dc987c7f5
@@ -10,14 +14,14 @@ EBUILD vtk-5.0.2.ebuild 8371 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 SHA
 MD5 3ab1a3c117bfaf08a05d31daed7b4518 vtk-5.0.2.ebuild 8371
 RMD160 259b238fa303851c651f7a6cb0c36ab4514449d8 vtk-5.0.2.ebuild 8371
 SHA256 4001ba54ffe6c8fc2291d527b8f6d5f68a01d4cbd1e7767085efd98b00374c44 vtk-5.0.2.ebuild 8371
-EBUILD vtk-5.0.3.ebuild 8298 RMD160 5e4226bb6c88364a6b84f79df99207ed27ad82fc SHA1 abc75285f34bd10574715dadfdf9d4941ecc2ae9 SHA256 96045b3221d304064de24b73810715eb22248feb171ac296f5789872681fc238
-MD5 96bab498664492d9c313daa60b27ac2e vtk-5.0.3.ebuild 8298
-RMD160 5e4226bb6c88364a6b84f79df99207ed27ad82fc vtk-5.0.3.ebuild 8298
-SHA256 96045b3221d304064de24b73810715eb22248feb171ac296f5789872681fc238 vtk-5.0.3.ebuild 8298
-MISC ChangeLog 5724 RMD160 eea19355f00748cad4efa0de98cdfa67da6f572d SHA1 f19c6c4b69aa1343bda478d4b0d29a438e8f31bd SHA256 cbca1b53de25f66620fd2a9f4fd7a09ba7d64e241dc5e066c073b5192fd1d682
-MD5 55e8d9fe3128f82e281cb2b66428f08e ChangeLog 5724
-RMD160 eea19355f00748cad4efa0de98cdfa67da6f572d ChangeLog 5724
-SHA256 cbca1b53de25f66620fd2a9f4fd7a09ba7d64e241dc5e066c073b5192fd1d682 ChangeLog 5724
+EBUILD vtk-5.0.3.ebuild 8381 RMD160 f94e8217d17317452f5145c632afb275a53658b7 SHA1 6a753de7f32df3cd66c25114113a9096ac898a33 SHA256 ee94fa0f33a683b32324012bf214e1101a2831c208efce2827854c5d6a5f7b75
+MD5 947e8adc032d41489a7ee58837b6a814 vtk-5.0.3.ebuild 8381
+RMD160 f94e8217d17317452f5145c632afb275a53658b7 vtk-5.0.3.ebuild 8381
+SHA256 ee94fa0f33a683b32324012bf214e1101a2831c208efce2827854c5d6a5f7b75 vtk-5.0.3.ebuild 8381
+MISC ChangeLog 5910 RMD160 27ff79a3f37638f5337a189657a99d4e2a288960 SHA1 10f52fb429f703ed03946d53d00a1c59086fd3ff SHA256 a08248ee94f47f1e35f7ed95875275ceaa56cd6fb5bd3837117f3f666d3b9b03
+MD5 13e7d61a0a4cd9764820558797edcc22 ChangeLog 5910
+RMD160 27ff79a3f37638f5337a189657a99d4e2a288960 ChangeLog 5910
+SHA256 a08248ee94f47f1e35f7ed95875275ceaa56cd6fb5bd3837117f3f666d3b9b03 ChangeLog 5910
 MISC metadata.xml 273 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec SHA1 852b5371f1bb0b4d5c4934f75b434e8f252533b7 SHA256 b930aead56cb1a6abb648c097836b6e8bf08c1ffa2038ad071aa1c98d1602e56
 MD5 d7a28dcb154993208468f0227e99c94b metadata.xml 273
 RMD160 813d00f411ea6b62bca9352968caa1c05daaaeec metadata.xml 273
diff --git a/sci-libs/vtk/files/vtk-5.0.3-lammpi.patch b/sci-libs/vtk/files/vtk-5.0.3-lammpi.patch
new file mode 100644
index 000000000000..4493667cf7db
--- /dev/null
+++ b/sci-libs/vtk/files/vtk-5.0.3-lammpi.patch
@@ -0,0 +1,45 @@
+diff -Naur VTK/Parallel/CMakeLists.txt VTK-new/Parallel/CMakeLists.txt
+--- VTK/Parallel/CMakeLists.txt	2007-03-28 16:38:46.000000000 -0400
++++ VTK-new/Parallel/CMakeLists.txt	2007-05-06 08:46:55.000000000 -0400
+@@ -78,6 +78,7 @@
+ 
+ IF (VTK_USE_MPI)
+   INCLUDE (${CMAKE_ROOT}/Modules/FindMPI.cmake)
++  INCLUDE(${VTK_SOURCE_DIR}/Parallel/FindLAMMPI.cmake)
+   SET ( Kit_SRCS
+     ${Kit_SRCS}
+     vtkMPICommunicator.cxx
+@@ -94,6 +95,12 @@
+   IF (MPI_EXTRA_LIBRARY)   
+     SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}")   
+   ENDIF (MPI_EXTRA_LIBRARY) 
++  IF (LAMMPI_LIBRARY) 
++    SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_LIBRARY}")   
++  ENDIF (LAMMPI_LIBRARY)   
++  IF (LAMMPI_EXTRA_LIBRARY)   
++    SET(KIT_LIBS ${KIT_LIBS} "${LAMMPI_EXTRA_LIBRARY}")   
++  ENDIF (LAMMPI_EXTRA_LIBRARY) 
+ ENDIF (VTK_USE_MPI)
+ 
+ SET(Kit_EXTRA_SRCS)
+diff -Naur VTK/Parallel/FindLAMMPI.cmake VTK-new/Parallel/FindLAMMPI.cmake
+--- VTK/Parallel/FindLAMMPI.cmake	1969-12-31 19:00:00.000000000 -0500
++++ VTK-new/Parallel/FindLAMMPI.cmake	2007-05-06 18:30:22.000000000 -0400
+@@ -0,0 +1,17 @@
++# - Find LamMPI
++FIND_LIBRARY(LAMMPI_LIBRARY 
++             NAMES lam
++             PATHS /usr/lib /usr/lib64 
++             "$ENV{ProgramFiles}/MPICH/SDK/Lib"
++             "$ENV{ProgramFiles}/MPICH2/Lib"
++             "C:/Program Files/MPICH/SDK/Lib" 
++)
++
++FIND_LIBRARY(LAMMPI_EXTRA_LIBRARY 
++             NAMES lammpi++
++             PATHS /usr/lib /usr/lib64 
++             "$ENV{ProgramFiles}/MPICH/SDK/Lib"
++             "C:/Program Files/MPICH/SDK/Lib" 
++             DOC "If a second mpi library is necessary, specify it here.")
++
++MARK_AS_ADVANCED(LAMMPI_LIBRARY LAMMPI_EXTRA_LIBRARY)
diff --git a/sci-libs/vtk/vtk-5.0.3.ebuild b/sci-libs/vtk/vtk-5.0.3.ebuild
index ed7f2f054efb..3c9eb8a3526b 100644
--- a/sci-libs/vtk/vtk-5.0.3.ebuild
+++ b/sci-libs/vtk/vtk-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.3.ebuild,v 1.3 2007/05/04 01:49:31 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.0.3.ebuild,v 1.4 2007/05/07 12:38:32 markusle Exp $
 
 inherit distutils eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 python qt3
 
@@ -55,6 +55,13 @@ pkg_setup() {
 		fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-lammpi.patch
+}
+
+
 src_compile() {
 	# gcc versions 3.2.x seem to have sse-related bugs that are 
 	# triggered by VTK when compiling for pentium3/4