Remove sys-cluster/lam-mpi handling from sci-libs/openfoam-bin, see #324415.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/openfoam-bin/ChangeLog b/sci-libs/openfoam-bin/ChangeLog
index 04867c2e9c4663b6c29c339a0f6beca447016db5..b921035c0e6a84b5e29aa3708a045f3dca7d2a55 100644 (file)
--- a/sci-libs/openfoam-bin/ChangeLog
+++ b/sci-libs/openfoam-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/openfoam-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/ChangeLog,v 1.4 2009/09/25 09:29:15 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/ChangeLog,v 1.5 2010/06/17 01:59:10 jsbronder Exp $
+
+  17 Jun 2010; Justin Bronder <jsbronder@gentoo.org>
+  openfoam-bin-1.5.ebuild, openfoam-bin-1.6.ebuild:
+  Remove sys-cluster/lam-mpi handling, see #324415.
 
   25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   openfoam-bin-1.5.ebuild, -files/OpenFOAM-1.5-compile.patch,

diff --git a/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild b/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild
index 40cbe1158cacd8f893e3c8fa9cacff87388c6ef7..66461c90788acdd38855e1a9f09d57a75dc5acbb 100644 (file)
--- a/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild
+++ b/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild,v 1.2 2009/09/25 09:29:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild,v 1.3 2010/06/17 01:59:10 jsbronder Exp $
 
 inherit eutils versionator multilib toolchain-funcs
 
@@ -61,17 +61,14 @@ src_unpack() {
 }
 
 src_compile() {
-       if has_version sys-cluster/lam-mpi ; then
-               export WM_MPLIB=LAM
-               export MPI_VERSION=lam
-       elif has_version sys-cluster/mpich2 ; then
+       if has_version sys-cluster/mpich2 ; then
                export WM_MPLIB=MPICH
                export MPI_VERSION=mpich
        elif has_version sys-cluster/openmpi ; then
                export WM_MPLIB=OPENMPI
                export MPI_VERSION=openmpi
        else
-               die "You need one of the following mpi implementations: openmpi, lam-mpi or mpich2"
+               die "You need one of the following mpi implementations: openmpi, mpich2"
        fi
 
        sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc

diff --git a/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild b/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild
index 11ec3d8522432f1d98f17dbc181a94fa28b0f5a2..14866f763f4312374501bacae0e8f38bf332ba7d 100644 (file)
--- a/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild
+++ b/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild,v 1.2 2009/09/25 09:29:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild,v 1.3 2010/06/17 01:59:10 jsbronder Exp $
 
 EAPI="2"
 
@@ -67,7 +67,7 @@ src_configure() {
                export WM_MPLIB=OPENMPI
                export MPI_VERSION=openmpi
        else
-               die "You need one of the following mpi implementations: openmpi, lam-mpi or mpich2"
+               die "You need one of the following mpi implementations: openmpi, mpich2"
        fi
 
        sed -i -e "s|WM_MPLIB:=OPENMPI|WM_MPLIB:="${WM_MPLIB}"|" etc/bashrc