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

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 19 insertions, 104 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/Manifest b/sci-libs/hypre/Manifest
index 49e27d0530d0..ed4ee6440a05 100644
--- a/sci-libs/hypre/Manifest
+++ b/sci-libs/hypre/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST hypre-2.8.0b.tar.gz 9979835 SHA256 78c3b073e3bd0627d7102f6f53e71e74619f9a8cb1c5e6cefdb9a6b2e9c7b9f5 SHA512 f13ec8c6d84dc200afbcbef45af3827ac522e52bcc22a148ef6941af80c8b4ed33b7ef03fd0a7a030fb2e4e63bd91cec882d539ce78ad3fac7a0c290be4018d8 WHIRLPOOL a53cf808c289a512a8592b59d0a43e3842d844940ec1bed22440871b93cc51fbfd7f64f8f697291de7a878843ee47b26f5c700e20a2ea9d63a1e377069103fbe
 DIST hypre-2.9.0b.tar.gz 9053035 SHA256 6568f65e7c3c11531a00c300a059f0b81dcab3b2d038cd1154e1458a73edbe5d SHA512 6856f2c80eaf669258d73a36a59c0fd0f43e20a5b2e633b6aefbccf41f5217ea821a6201dadc0de2b17a039ba9f53d98031f0b091e3db552cc5251a4f766acb8 WHIRLPOOL acc84dec19fca2908170286adc582adb7c6b06d058a5518d87ccb4093a301046f978fea3ede6f854f9fcdf482993612b420bb0391474421b95721a91122b72dd
-EBUILD hypre-2.8.0b-r1.ebuild 2002 SHA256 11e2d067721f487faad9a046e28346adf3dc5244bbf84afef4022306198fe567 SHA512 ad519db7426c2a35ce47b0ae7de3fa53df849946e561cb7d54b266c43ec0a33f8b4ceb3093e9c7b49ce4ec0466bcf52dcd747e58f1dd57f5c65d3766dfa50195 WHIRLPOOL 064e4052b1aa37a5edb1c8f985950c6dc2b16aeabe6677527ba2a135dc1e771f0bb422d6429af4bc12c041121cb4968cf8270a8985871f284a67753ebb706338
-EBUILD hypre-2.9.0b.ebuild 2120 SHA256 85e07ada7d41faaa3d55c583646911d9894d6975ca04ee5b59fccc1e33d93388 SHA512 8dd3632c29694f496ff809bba4fa2c0d02a2ec81a932374ce60f719e1f36ffd538acc5de7ac6bad97b35905a575d8bad656d69b8679e84e36819f9f9ccc6b473 WHIRLPOOL 0f36c09a8829311a7c8b4251a33870b96d0c8d91d9144bfbae0b41f38376e7621d81f92084fce91ae40a9b856a2dcff5fe9bd0ece65cce2e8c6bc6db46b7c4a2
-MISC ChangeLog 1882 SHA256 5bdb9ff624fd439cb4b4012e8c33184834a64e0c34d65bf57675a5c90aa4415a SHA512 2fdf90bbe57414181675dcd2f6f6c5c44260920fc84c141176969aefd9df3a3f6b4ef5b90ef6914083bb23f0a58470328f49c2aa1bd7a11bd6c78709020764f6 WHIRLPOOL 5db877f05a11f28f887501df1806724176fc72dfe8283cbebee6fa701c48a2ad7c0901a6ea4843d4a8334597ac1d227ded2acd0f01b1d3f0077ccda05d38b70d
+EBUILD hypre-2.9.0b.ebuild 2216 SHA256 4190287646b830dc94ad8118d60b37636f51314c1ba90677a49467062371ab74 SHA512 b0872ab8c224d1195750d8b7d8a31ff80c3a86285525f3e7b449b7a25a7a5e69246d0be0d46ba4657e46fc7a92d74ea1e649a7822e9480d66a4e6dc8ab35dcf3 WHIRLPOOL 388a21626fc9714d6a9256a318583fef72217ac449357a16df7bc1df061a83e74fb2bde809a2a3beecd54d069e2e77d778fcfadd7d225f1a98312cb4551979dd
+MISC ChangeLog 2114 SHA256 09931b607744fdf6cd187bf8c46aef308b82dd2d0fb22b163399dc98015461e0 SHA512 9ede916abe8b1fb4565655d8f37a99c16ed0c7e6ffd2ab1cc303aac4916c651bbf0b7b9da43cc7dca94c7dfc7f6de24daeafdc3a15dbfcd2ad649632e9e41081 WHIRLPOOL 4623c385499d32c355c1300ba2df24b9d68c9dc6cb10e9f05e6e618d6d688aa758a33ced6ba9c80fb635c8fc61340331f8585985cac35ab1bfb14beb9b09d646
 MISC metadata.xml 335 SHA256 a48689a0e7995c40e445bce551d2ca389a10c50b1520e2f81db7584180f22255 SHA512 1ca0073f28cd72ebba36f0365a4d34b520befe39a81f2c59d0bec7d039737c1454ac0f83a65500a501944fd2c9d5be932498a6b0fc6f18793baea149e6693db0 WHIRLPOOL e64d22ae3ee573c41dcca2dbdf8e0a9a606299f50e85a90309e6022a794711e7cf98855238b8aabcc9efa972b34fcb4bf6f790db1d7d8d34436ba2db786e24c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSvJxwAAoJELnU8jG9FVirJ0UP/jLc5yG+KXuplCKDD3e3ZS5W
-emSjgZMc1dOJdFL2URGOQt6lf1WWyRc9V2RjPgWJRwfMtb4NQ27NNvx025FsLSJa
-IsL2539OkRDYVtY6oAgWuZ3/EKSHArkQi/EK06Su9R0R+3JTfiq+3OD4oGJpcoz9
-ojtmp3vsmDJskMc79i3ZEbMR/qnvXyO07FawC8M8nj2uG4LqtTx2TtEgd50vIIvG
-VytdAVT0aGDYePHNf3p4Ki9jGvH8x04qJfEgUzEWVcQcuVpLxBxHmm6eh1Q6Kw9i
-n9Pw8+6SgZsfK5KNDne9K22AgZp7naprHC0B5Gq0/ZOh155ozJXJ7jYuQROCtgRo
-Nn5mZGUZQZKo3znKhzkGK1JdZjFLgrmdR9vX4uUmtcmZJDuOb08JYvBToGokT0mg
-y5bqI01EB2yMBilDoI8/Gg/XJGPV6pwlPj+Wu+EFZLNe17f009V1ph3Wvj35ea0I
-U/56FkTXMBDMLFTcBYGuMh3eLf2YcJkTAv87HyhC/UhMReaO33HqWbVx4c8fTNes
-LYQKoB3ZtCGRa9hkLNbwsjivEka7AqXLY4bESLurxUOpmmP8PRzb3cLeLXjfiiom
-kkosOBUTrvfmez2QqPdEb+BCHTUfLNAuVzF9g0IeH/f8feOfUVkajn0qgAJ+wlrz
-dqI97mEK4iPWTiDkbX3N
-=omlx
+iEYEAREIAAYFAlNWpnoACgkQ1ycZbhPLE2CvMwCghYAyLocI3JV2LGYGneZr5M3G
+SrkAn0P5wF6I/vzuydmOu7LcrmxmkWkZ
+=CJVq
 -----END PGP SIGNATURE-----
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
 }