[gentoo-commits] proj/sci:master commit in: sci-libs/mumps/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     efcff6df1ff30ec13bb235b246e517412f3ee159
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Mar 13 00:56:05 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 00:56:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=efcff6df

sci-libs/mumps: Fixed for sequential (non mpi) libraries

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/mumps/ChangeLog           |    4 ++++
 sci-libs/mumps/metadata.xml        |    5 +++++
 sci-libs/mumps/mumps-4.10.0.ebuild |   18 ++++++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index d8f6c12..93973ef 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild,
+  metadata.xml:
+  Fixed for sequential (non mpi) libraries
+
   12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.ebuild:
   Only allow earlier parmetis versions
 

diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index e9804fe..3c712bd 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -10,4 +10,9 @@
   interfaces, and can interface with ordering tools such 
   as Scotch or Metis.
 </longdescription>
+<use>
+  <flag name="metis">Enable ordering with METIS
+  (<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
+  <flag name="scotch">Enable ordering with <pkg>sci-libs/scotch</pkg></flag>
+</use>
 </pkgmetadata>

diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
index e1c5015..dc6a62d 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs flag-o-matic versionator
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2
 
 MYP=MUMPS_${PV}
 
@@ -17,11 +17,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples metis mpi +scotch static-libs"
 
 RDEPEND="virtual/blas
-   sci-libs/parmetis[mpi?]
-   scotch? ( sci-libs/scotch[mpi?] )
-   mpi? ( virtual/scalapack )"
+	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
+		mpi? ( <sci-libs/parmetis-4 ) )
+	scotch? ( sci-libs/scotch[mpi=] )
+	mpi? ( virtual/scalapack )"
 
 DEPEND="${RDEPEND}
+	virtual/fortran
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
@@ -51,6 +53,8 @@ src_prepare() {
 		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \
 		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \
 		Make.inc/Makefile.inc.generic > Makefile.inc || die
+	# fixed a missing copy of libseq to libdir
+
 }
 
 src_configure() {
@@ -95,6 +99,12 @@ src_configure() {
 			Makefile.inc || die
 		export LINK=mpif90
 		LIBADD="${LIBADD} $(pkg-config --libs scalapack)"
+	else
+		sed -i \
+			-e 's:-Llibseq:-L$(topdir)/libseq:' \
+			-e 's:PAR):SEQ):g' \
+			-e 's:^LIBSEQNEEDED =:LIBSEQNEEDED = libseqneeded:g' \
+			Makefile.inc || die
 	fi
 	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die
 }