Forced fortran and lapack settings when mpi is set, secure mpi toolchain propagation, bug #508030 thanks Matthias Maier

(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

3 files changed, 13 insertions, 86 deletions

diff --git a/sci-libs/hypre/ChangeLog b/sci-libs/hypre/ChangeLog
index bbcd49a53db4..1594b0d478f6 100644
--- a/sci-libs/hypre/ChangeLog
+++ b/sci-libs/hypre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/hypre
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hypre/ChangeLog,v 1.12 2013/12/26 21:15:27 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hypre/ChangeLog,v 1.13 2014/04/22 17:27:16 bicatali Exp $
+
+  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> -hypre-2.8.0b-r1.ebuild,
+  hypre-2.9.0b.ebuild:
+  Forced fortran and lapack settings when mpi is set, secure mpi toolchain
+  propagation, bug #508030 thanks Matthias Maier
 
   26 Dec 2013; Justin Lecher <jlec@gentoo.org> hypre-2.8.0b-r1.ebuild,
   hypre-2.9.0b.ebuild, metadata.xml:
diff --git a/sci-libs/hypre/hypre-2.8.0b-r1.ebuild b/sci-libs/hypre/hypre-2.8.0b-r1.ebuild
deleted file mode 100644
index fa1aa5597144..000000000000
--- a/sci-libs/hypre/hypre-2.8.0b-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hypre/hypre-2.8.0b-r1.ebuild,v 1.10 2013/12/26 21:15:27 jlec Exp $
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 toolchain-funcs
-
-DESCRIPTION="Parallel matrix preconditioners library"
-HOMEPAGE="http://acts.nersc.gov/hypre/"
-SRC_URI="https://computation.llnl.gov/casc/hypre/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas doc examples fortran lapack mpi"
-
-RDEPEND="
-	sci-libs/superlu
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( "${WORKDIR}"/${P}/{CHANGELOG,COPYRIGHT,README} )
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	# link with system superlu and propagate LDFLAGS
-	sed -i \
-		-e 's:@LIBS@:@LIBS@ -lsuperlu:' \
-		-e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \
-		config/Makefile.config.in || die
-	sed \
-		-e '/HYPRE_ARCH/s: = :=:g' \
-		-i configure || die
-	tc-export CC CXX
-}
-
-src_configure() {
-	local myeconfargs+=(
-		--enable-shared
-		--without-superlu
-		--without-strict-checking
-		$(use_enable fortran)
-		$(use_with mpi MPI)
-	)
-	if use blas; then
-		myeconfargs+=(
-			--with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')"
-			--with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')"
-		)
-	else
-		myeconfargs+=( --without-blas )
-	fi
-	if use lapack; then
-		myeconfargs+=(
-			--with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')"
-			--with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')"
-		)
-	else
-		myeconfargs+=( --without-lapack )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dolib.so hypre/lib/lib*
-	insinto /usr/include/hypre
-	doins -r hypre/include/*
-
-	use doc && dodoc "${WORKDIR}"/${P}/docs/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/hypre/hypre-2.9.0b.ebuild b/sci-libs/hypre/hypre-2.9.0b.ebuild
index 3b189e0e7320..43ae648d8a23 100644
--- a/sci-libs/hypre/hypre-2.9.0b.ebuild
+++ b/sci-libs/hypre/hypre-2.9.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hypre/hypre-2.9.0b.ebuild,v 1.2 2013/12/26 21:15:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hypre/hypre-2.9.0b.ebuild,v 1.3 2014/04/22 17:27:16 bicatali Exp $
 
 EAPI=5
 
@@ -17,8 +17,10 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="blas doc examples fortran lapack mpi"
 
+REQUIRED_USE="mpi? ( fortran lapack )"
+
 RDEPEND="
-	sci-libs/superlu
+	sci-libs/superlu:0=
 	blas? ( virtual/blas )
 	lapack? ( virtual/lapack )
 	mpi? ( virtual/mpi )"
@@ -43,6 +45,7 @@ src_prepare() {
 		-e '/^BLASFILES/d' \
 		-e '/^LAPACKFILES/d' \
 		lib/Makefile || die
+	use mpi && export CC=mpicc CXX=mpicxx FC=mpif77
 	tc-export CC CXX
 }