summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-12-05 10:17:24 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-12-05 10:17:24 +0000
commitd1374b1d18a5a585523ffe88dbcf7c807fa0fc13 (patch)
tree608481d3d74d3b6accad31bdd0eef12b2eacaa63 /sci-libs
parentremove old (diff)
downloadhistorical-d1374b1d18a5a585523ffe88dbcf7c807fa0fc13.tar.gz
historical-d1374b1d18a5a585523ffe88dbcf7c807fa0fc13.tar.bz2
historical-d1374b1d18a5a585523ffe88dbcf7c807fa0fc13.zip
Use REQUIRED_USE instead of providing sane defaults wrt #392683 by Murph <MattFinn@gmail.com>
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/hdf5/ChangeLog6
-rw-r--r--sci-libs/hdf5/Manifest30
-rw-r--r--sci-libs/hdf5/hdf5-1.8.8.ebuild33
3 files changed, 29 insertions, 40 deletions
diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index 68ec612baf02..f1ed0f168fc9 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.77 2011/11/21 17:33:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.78 2011/12/05 10:17:24 xarthisius Exp $
+
+ 05 Dec 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.8.ebuild:
+ Use REQUIRED_USE instead of providing sane defaults wrt #392683 by Murph
+ <MattFinn@gmail.com>
21 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org>
+files/hdf5-1.8.8-array_bounds.patch, +files/hdf5-1.8.8-implicits.patch,
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 1701c9127bec..fde5abffefb7 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -18,23 +18,23 @@ DIST hdf5-1.8.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee
DIST hdf5-1.8.8.tar.bz2 5827394 RMD160 077580c9828747473836cc39f8cb3fd4e5e045d9 SHA1 1bc16883ecd631840b70857bea637a06eb0155da SHA256 b0ebb0b5478c6c0427631d4ad08f96e39f1b09fde615aa98d2a1b8fb7f6dced3
EBUILD hdf5-1.8.4-r1.ebuild 3134 RMD160 6dfc52e18b8d0005560f6c543b9641daeb20a11e SHA1 9f01a942144e3a1cdf8d9eea9b3e3620cd180892 SHA256 89aa8ed18e2d68e4c55d8f24c0db221f6e3f13d056f4f14eb29016dffddcdda7
EBUILD hdf5-1.8.7.ebuild 3150 RMD160 dd97bcfbd37b1a8ccc58b68f132924524ef48ad7 SHA1 8be1115834e11ebead352ca696b95739709ff5d5 SHA256 64352ffb1767130ba79d14c6a4ba89b5a37065c7f9e09a2c282e4dc0298c1314
-EBUILD hdf5-1.8.8.ebuild 3180 RMD160 dc1dfe7b23de81179bd9f42002a6d994667c2621 SHA1 39fbbb5cace946d6f0d972de8af899c4c6d8cc13 SHA256 f55fc3bd5d11e37df8635a9ee9a7b7eac07b3c9f5b1666f9409adf1bfd867b1f
-MISC ChangeLog 15602 RMD160 695be9fa15ee6609c0e663fa3ade7fe324ee0bf8 SHA1 2abf4c2339a7c2751c575c362955afc6b66faf46 SHA256 52a1e551b193445704f86ed9e73c2c9e7a26d0a6a595700191e524172c399314
+EBUILD hdf5-1.8.8.ebuild 2825 RMD160 9cf936e761e463c82cdf2e6addeb945b8c62ee23 SHA1 d9bf60d4f5afa79a9171b3ec9b9b86147c0ba04c SHA256 ad3d28d35c96dd194ad74900ad6411e40dff668015b67580e5286b34f2a62020
+MISC ChangeLog 15774 RMD160 9719ec62c08edbe493b3d28dd60148bdcf3f172d SHA1 84f6ec62077a6da2206c36f9a75ea70d57fe6fe5 SHA256 4b57d62bbf03e056c2e7780cf2df49d0072cecc5d3bbfaed7fdd4abcf8553309
MISC metadata.xml 728 RMD160 3863f8962e54ddbd28c78256e03feedc571148a7 SHA1 f4ac101d9b30cca655a89a87185364dd4a24816b SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJOyotfAAoJEF0huFKJUZL5KO0QAI68Fo2MPakK7IOcaGBmH9EX
-t2PSytvxQIrOlWfxYeMqxgMTd/D2HbfQoHbvqcNYygU9qI9MzAMuejchBPpe1mxu
-NGBvrDqEkh93qokoluc8VmThxluQj8N10RWXYbeCEzR0/GwxF43ZGyifP+iRrdjD
-BHnzYRlPzHZ7sbzjEomt2OffKSlyuD3P3PVwpiudT61G1kjBmy3RxIlTD+o2lBSF
-llEPo/eivhWNyIe8WW0zRzEQYJNavi71W94nIICNQQpQ1uGTTvjq3hAAsB25L4uY
-5xjCELqZxYBLi5Qhbo5GM/TGlmW08yX2Dgk1PJGwTRuGEP65FKF1BaFjJDGJydqG
-mIWnHAZDOO7Z+OZATqHeCc4TZ0NOXFiaJ9nptPzoN2EFFwbhSe+wr5YiCPw/jZJy
-nxXzLVro5sD+o1xW5kOOGG+62+0iPqAuiyIeBnmPD6sAecRiGBTlvxfPzRp4Mjyo
-qpSNxzc3BhAF4I1ZsTD5JxdUwTa4ail+wLTE5oPWOsuGXrckEFNwFsZlI3K3rplg
-/aBKynwCF6Cjamr2h0AnMpo2+465Dx3/dg+5M0cdGIkdI0VNfyvIKkBx1ceJWwvx
-vtSRP67K/Y1Jl75HAa/hvTgONyi/dsM86KbZFxujVBfcuFFpih3R5DWm+lekPMGj
-9uyvFzGLB+lHzEpieGnt
-=xNCQ
+iQIcBAEBCAAGBQJO3Jo/AAoJEF0huFKJUZL5+B8P/j1566QdFEzgdYjEq2LYfetO
+unQ6i46FBbxlfHUg9Mnj8q68rU1r2cEMbEdYilrWJQe5qztohNPTeAzyj6WoKWN0
+q9hy2QONZP1AX7et+JaClIo2MQhJ7Ck2INfGVzS5/Smy7m9mo+NhZn6d3YHpzDYK
+HyM7QrWw46ElCNd3N5geLPzVePiJuw03d/o8iK6nRQtYXsflCWFW2BJtB3Xwk3Mf
+lqAEwSpC9UXgFeh24/VURmXS8N+eDuBjkotCHi/mV5pGD2Jxcy44YEj3sueKL0Bo
+45REX7dlp8IKuckDfWmUkraJ1pl+FWnhtkDwvv1WskZcAohyaTAACm6Fc4rwguAG
+WCZytxEQ/rts4M1zB5boBdnVGhafvmVmamy8agJRniiCLA+urf+0cR8tRxb8GKeR
+QW1VACAy4ixWAxbiCzXh6nhDNMdfihgcZxlbAe0mNyiICbS5awsnrABVnCKkF7dF
+QOBUF5gUnMAkIFFxROMaeiXxW/YjvKo76LEAT4hNVTUhHRQS5NhoaempJYiJQwj9
+fnDt7aLgsxpm+K//GuERCxzRDRusjDvN4SULUH5Ulvc7UhGivsWWswmGt7bDtpG4
+e9GASq8RX/+q1nASVViC4UP0yD73+1cOuTtU3euey9ohWjX3sxV+v1W/RoY3+KAa
+AK8EK9kCgR7pRpn4kXeZ
+=/aO/
-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/hdf5-1.8.8.ebuild b/sci-libs/hdf5/hdf5-1.8.8.ebuild
index abf3331123e7..0e94db9f32ed 100644
--- a/sci-libs/hdf5/hdf5-1.8.8.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.8.ebuild
@@ -1,10 +1,10 @@
# 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.8.ebuild,v 1.2 2011/11/21 17:33:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.8.ebuild,v 1.3 2011/12/05 10:17:24 xarthisius Exp $
EAPI=4
-inherit autotools eutils fortran-2
+inherit autotools eutils fortran-2 toolchain-funcs
DESCRIPTION="General purpose library and file format for storing scientific data"
HOMEPAGE="http://www.hdfgroup.org/HDF5/"
@@ -25,7 +25,11 @@ RDEPEND="
DEPEND="${RDEPEND}
sys-devel/libtool:2"
+REQUIRED_USE="cxx? ( !mpi ) mpi? ( !cxx )
+ threads? ( !cxx !mpi !fortran )"
+
pkg_setup() {
+ tc-export CXX CC FC # workaround for bug 285148
if use fortran; then
use fortran2003 && FORTRAN_STANDARD=2003
fortran-2_pkg_setup
@@ -35,10 +39,6 @@ pkg_setup() {
ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail."
ewarn "Try to uninstall the current hdf5 prior to enabling mpi support."
fi
- if use cxx; then
- 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
@@ -64,24 +64,6 @@ src_prepare() {
}
src_configure() {
- # threadsafe incompatible with many options
- local myconf="--disable-threadsafe"
- use debug && myconf="${myconf} --enable-codestack"
- use threads && ! use fortran && ! use cxx && ! use mpi \
- && myconf="--enable-threadsafe"
-
- if use mpi; then
- myconf="${myconf} --disable-cxx"
- else
- # workaround for bug 285148
- if use cxx; then
- myconf="${myconf} $(use_enable cxx) CXX=$(tc-getCXX)"
- fi
- if use fortran; then
- myconf="${myconf} FC=$(tc-getFC)"
- fi
- fi
-
econf \
--disable-sharedlib-rpath \
--enable-production \
@@ -91,9 +73,12 @@ src_configure() {
--disable-silent-rules \
$(use_enable static-libs static) \
$(use_enable debug debug all) \
+ $(use_enable debug codestack) \
+ $(use_enable cxx) \
$(use_enable fortran) \
$(use_enable fortran2003) \
$(use_enable mpi parallel) \
+ $(use_enable threads threadsafe) \
$(use_with szip szlib) \
$(use_with threads pthread) \
$(use_with zlib) \