From 26e134b31c1f85dba848457c90a385efdd2ae56c Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Thu, 17 Jun 2010 01:59:10 +0000 Subject: [PATCH] Remove sys-cluster/lam-mpi handling from sci-libs/openfoam-bin, see #324415. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/openfoam-bin/ChangeLog | 8 ++++++-- sci-libs/openfoam-bin/openfoam-bin-1.5.ebuild | 11 ++++------- sci-libs/openfoam-bin/openfoam-bin-1.6.ebuild | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sci-libs/openfoam-bin/ChangeLog b/sci-libs/openfoam-bin/ChangeLog index 04867c2e9c46..b921035c0e6a 100644 --- 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 + openfoam-bin-1.5.ebuild, openfoam-bin-1.6.ebuild: + Remove sys-cluster/lam-mpi handling, see #324415. 25 Sep 2009; Diego E. Pettenò 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 40cbe1158cac..66461c90788a 100644 --- 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 11ec3d852243..14866f763f43 100644 --- 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 -- 2.26.2