summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-07-08 11:24:29 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-07-08 11:24:29 +0000
commit19d1f25f346a73a67f1c1756fd4a286bd40dc471 (patch)
tree50ca0d1854a529fa57d2c428fa2deb3ee431cfab /sci-libs/hdf5
parentBump to 2.7 (diff)
downloadhistorical-19d1f25f346a73a67f1c1756fd4a286bd40dc471.tar.gz
historical-19d1f25f346a73a67f1c1756fd4a286bd40dc471.tar.bz2
historical-19d1f25f346a73a67f1c1756fd4a286bd40dc471.zip
Export mpi wrappers again due to clash with fortran-2.eclass. Fixes bug 374431 by Ruggero Morsucci <mors_1tflops@yahoo.it>
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/hdf5')
-rw-r--r--sci-libs/hdf5/ChangeLog6
-rw-r--r--sci-libs/hdf5/Manifest14
-rw-r--r--sci-libs/hdf5/hdf5-1.8.7.ebuild4
3 files changed, 15 insertions, 9 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 574f9a5e5e01..1c07588d8489 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/hdf5
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.72 2011/07/06 15:00:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.73 2011/07/08 11:24:29 xarthisius Exp $
+
+ 08 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.7.ebuild:
+ Export mpi wrappers again due to clash with fortran-2.eclass. Fixes bug
+ 374431 by Ruggero Morsucci <mors_1tflops@yahoo.it>
06 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.4-r1.ebuild,
hdf5-1.8.6.ebuild, hdf5-1.8.7.ebuild:
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index d250050f14fb..bfbe32a9c231 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -15,15 +15,15 @@ DIST hdf5-1.8.6.tar.bz2 5521674 RMD160 e0feec256e61e4947367a2144d9835f569035577
DIST hdf5-1.8.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee SHA1 be1daff26f066aca0b5be52d86dada6757fc4b95 SHA256 771761c9bec30b9a4137fa59ef88fdafdb0f4f35d1db0fd655f2591d19570fec
EBUILD hdf5-1.8.4-r1.ebuild 3134 RMD160 6dfc52e18b8d0005560f6c543b9641daeb20a11e SHA1 9f01a942144e3a1cdf8d9eea9b3e3620cd180892 SHA256 89aa8ed18e2d68e4c55d8f24c0db221f6e3f13d056f4f14eb29016dffddcdda7
EBUILD hdf5-1.8.6.ebuild 3101 RMD160 e0329c86e0593e3a13830ac3b4a92a4b9116f614 SHA1 46012018d70646e025f4b19335eb77e147cc4c53 SHA256 aa9c4609c90b82561086f5cbb643fad56b4f1b84e26098c985d260e6fbf23d68
-EBUILD hdf5-1.8.7.ebuild 2949 RMD160 b504baf10586227e98f5f32f3dd98128a9cf57ce SHA1 511cd1640b82fd58711ddd4bf1f67323ba2738f5 SHA256 1b840428cccc439a7f2108ea84fe64305dfed9e6f76d484aeda9971450beca81
-MISC ChangeLog 14729 RMD160 218ab54a1052ab26adb8d1f3bfe27483fab26340 SHA1 73b8963930373e2f321d147558fd6311fc38120b SHA256 86bda176223e612c09c1a04e1aee912e9117637e876786e52452c4735ce5ed31
+EBUILD hdf5-1.8.7.ebuild 3001 RMD160 63c2fb67f8fc886aecf981a13e205ec9595b51de SHA1 9b3b64600002555b1de479b4f772850c772a799d SHA256 d4f7ac45aeadf62d61cd4e3c120842bc6bdfc281273bc37236dae0e26c1b088a
+MISC ChangeLog 14930 RMD160 c03e3a44967d8588790a06024053160ccdf7d85b SHA1 8fbe3de9fd6de412e096358132bbe0fd43b3735f SHA256 89356b57b866ba734307a911ba3fb63b0f1af7a1375b106b5214b5b8ea5c8238
MISC metadata.xml 447 RMD160 c0dc1e22971e3a09c9df171fec79e1f63b5ca47f SHA1 5e9be3a88b19d1651aef3f867829c3e25f2e6a16 SHA256 1f01480c1833905629ecb1defd9fd0d12355a49929fb0277dd342d3012cec4cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQEIAAYFAk4UeKgACgkQIiMqcbOVdxSOXAP/WO0bEqPSbMZsaPUehiOd7Y9R
-jFXu+UhSEWn/zXiTP/G13BH4/v8l+mEmmrCUC//1vZkHJeU3wquWmfunUmOJeoEB
-XAh5maojXylwchcBvX4mzRqhTsEu5VcLS44D5nzBOQ/Zy0hxrIam/vEdSz/ubtZN
-B5HIfL1k+OAd9ACYkqc=
-=8PYM
+iJwEAQEIAAYFAk4W6PYACgkQIiMqcbOVdxTd8AP+OJQxWM6z1ipDPCHAsQ03LcFG
+MaVpnfIIy+BMeYjrMGk6FrdP/KDQHCzmFPsrnThy96fHxlZNHsknLMwvF+BqyRzE
+PIyaBMCsINUfyAYbYOnrjrfwcNNKV1sx35GPOxFPTuVjvXMNM+iQziJcjJ4V7O6M
+ojMUijMYoB+v533z4QY=
+=+gyz
-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.7.ebuild b/sci-libs/hdf5/hdf5-1.8.7.ebuild
index ab77c75ee769..6a425cba2b26 100644
--- a/sci-libs/hdf5/hdf5-1.8.7.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.7 2011/07/06 15:00:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.8 2011/07/08 11:24:29 xarthisius Exp $
EAPI=4
@@ -36,6 +36,8 @@ pkg_setup() {
ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
ewarn "Will disable cxx interface"
fi
+ export CC=mpicc
+ use fortran && export FC=mpif90
elif has_version 'sci-libs/hdf5[mpi]'; then
ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail."
ewarn "Try to uninstall the current hdf5 prior to disabling mpi support."