From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S7G2z-00017O-4F for garchives@archives.gentoo.org; Tue, 13 Mar 2012 00:57:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C746E0C0B; Tue, 13 Mar 2012 00:56:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D74D7E0C0B for ; Tue, 13 Mar 2012 00:56:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 218231BC033 for ; Tue, 13 Mar 2012 00:56:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6928E5432 for ; Tue, 13 Mar 2012 00:56:49 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1331600165.efcff6df1ff30ec13bb235b246e517412f3ee159.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mumps/ChangeLog sci-libs/mumps/metadata.xml sci-libs/mumps/mumps-4.10.0.ebuild X-VCS-Directories: sci-libs/mumps/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: efcff6df1ff30ec13bb235b246e517412f3ee159 X-VCS-Branch: master Date: Tue, 13 Mar 2012 00:56:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: da2ac383-7e7a-453b-8cfa-fbbfebe236f5 X-Archives-Hash: 9308d3edd9fbd8d7acd6116cfbdf0b37 commit: efcff6df1ff30ec13bb235b246e517412f3ee159 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Tue Mar 13 00:56:05 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Mar 13 00:56:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Defcff6df 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: $ =20 + 13 Mar 2012; S=C3=A9bastien Fabbro mumps-4.10.0.= ebuild, + metadata.xml: + Fixed for sequential (non mpi) libraries + 12 Mar 2012; S=C3=A9bastien Fabbro mumps-4.10.0.= ebuild: Only allow earlier parmetis versions =20 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=20 as Scotch or Metis. + + Enable ordering with METIS + (sci-libs/metis, sci-libs/parmetis) + Enable ordering with sci-libs/scotch<= /flag> + 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: $ =20 EAPI=3D4 -inherit eutils toolchain-funcs flag-o-matic versionator +inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 =20 MYP=3DMUMPS_${PV} =20 @@ -17,11 +17,13 @@ KEYWORDS=3D"~amd64 ~x86" IUSE=3D"doc examples metis mpi +scotch static-libs" =20 RDEPEND=3D"virtual/blas - sci-libs/parmetis[mpi?] - scotch? ( sci-libs/scotch[mpi?] ) - mpi? ( virtual/scalapack )" + metis? ( || ( sci-libs/metis Makefile.inc || die + # fixed a missing copy of libseq to libdir + } =20 src_configure() { @@ -95,6 +99,12 @@ src_configure() { Makefile.inc || die export LINK=3Dmpif90 LIBADD=3D"${LIBADD} $(pkg-config --libs scalapack)" + else + sed -i \ + -e 's:-Llibseq:-L$(topdir)/libseq:' \ + -e 's:PAR):SEQ):g' \ + -e 's:^LIBSEQNEEDED =3D:LIBSEQNEEDED =3D libseqneeded:g' \ + Makefile.inc || die fi sed -i -e "s:^\s*\(ORDERINGSF\s*=3D\).*:\1 ${ord}:" Makefile.inc || die }