Add static-libs switch, punt overshadowed version.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index bc91d18f5c702833446f47a575fb219949ab09f5..e5d9dcc8c8c84e5495eb5ca11c5babaf761da1b7 100644 (file)
--- 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.74 2011/07/13 15:49:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.75 2011/10/23 11:40:12 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -hdf5-1.8.6.ebuild,
+  hdf5-1.8.7.ebuild:
+  Add static-libs switch, punt overshadowed version.
 
   13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> hdf5-1.8.7.ebuild:
   Add ~amd64-linux ~x86-linux

diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 1f7a6c0b55d4029f1863888ace02c9f967bf408a..932bf32e359b8eff6f85be7fe072a388c0dc515c 100644 (file)
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hdf5-1.8.3-as-needed.patch 1821 RMD160 a20e65447625134132cb3e8e19917eb499a463e8 SHA1 b295f26b8d39fae21201449441a8ac3c0c699048 SHA256 6f03f955186e2e2870517580bd14a637e2cf0206e7547184948653e04c464bb3
 AUX hdf5-1.8.3-includes.patch 398 RMD160 5112dd05bebbc702f24fa22aeebc67209a4e6611 SHA1 339137d04a803e25a0cafaa4f4d167a4cbc9a7ae SHA256 cd82d8b3817d83d59054a2a32ce44aca060157095875f6e91c560ab830b32561
 AUX hdf5-1.8.3-noreturn.patch 3222 RMD160 39285ba18447b0f8db22a5f8e9d51a3cd8a8e91e SHA1 c5d8f7528fbe5c0bde0cb0ac5c1dd189559ac140 SHA256 d902cfbda0382b8998506ea765d0795937485c44d8824051275ad668bcbd6565
@@ -8,10 +11,25 @@ AUX hdf5-1.8.5-implicits.patch 1782 RMD160 968ff2c36606ca85644e23200d90bb566b67a
 AUX hdf5-1.8.5-noreturn.patch 1477 RMD160 52c0e72b78b00effe3337f6016f716b425d29f03 SHA1 88eee2a0bb02512795a61f0ceb9d54f8df454e31 SHA256 7278c504b0e252ea5d0a9d7de5b332f0f1c0981a441efb286864b9599790c0b2
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 DIST hdf5-1.8.4.tar.gz 7181176 RMD160 e448e2326b55aa89ff0bd7488cd4291d6c5485ee SHA1 37877e29c49a6af3e23aa9ad798ef12b8ba1c05c SHA256 a992fce9387a17f175b3b188dc2a42f545a3057aeb141beb3fc3361c7521f465
-DIST hdf5-1.8.6.tar.bz2 5521674 RMD160 e0feec256e61e4947367a2144d9835f569035577 SHA1 348bd881c03a9568ac4ea9071833d6119c733757 SHA256 585ddb775a2aa752ebf673f972b90fb14f3732f5f1806255d101d7adc9a53004
 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 3037 RMD160 6c548f6d7d2031f49f474e234d558850d47f7a31 SHA1 4dc43bb87e8c316d8d8aed0e7495ffe542eaedeb SHA256 7b1f2bc944ea2ccf86a46d566afbb54c1d5f6223bddac171ca4ab25fde7a95a2
-MISC ChangeLog 15034 RMD160 50f567d22f3d1397b98494ff158a3526558aacef SHA1 dcacd17b31cde51763a71c58c06c10a1e0d7edc6 SHA256 bd13724fe72622a70b25adedec70fb0a941c963a217f056b0ceeba0940e254dd
+EBUILD hdf5-1.8.7.ebuild 3150 RMD160 dd97bcfbd37b1a8ccc58b68f132924524ef48ad7 SHA1 8be1115834e11ebead352ca696b95739709ff5d5 SHA256 64352ffb1767130ba79d14c6a4ba89b5a37065c7f9e09a2c282e4dc0298c1314
+MISC ChangeLog 15183 RMD160 a7d084d7a0e13189796b30615fa4dc29d68ac223 SHA1 cc5c324381a9913dfa7eff0542adc0edc234c6ba SHA256 e4f86527919e4cb7e0249f27878bcc7f4748717b4bf916d3835f79d865b30717
 MISC metadata.xml 447 RMD160 c0dc1e22971e3a09c9df171fec79e1f63b5ca47f SHA1 5e9be3a88b19d1651aef3f867829c3e25f2e6a16 SHA256 1f01480c1833905629ecb1defd9fd0d12355a49929fb0277dd342d3012cec4cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOo/zNAAoJEOSiRoyO7jvo+WAP/iiZg4h/L3JX5lTzVf4a8enh
+4BCY2hrogRy0TXzwTuGuhRpmas15t/s+sgvdUYw6zAUz9srhbjwH/en1YS9mwxHb
+3XMRiGR8CzUTOx5lIzz9j7TavHC3g7WahJ6SFms870604RYOAwO0sCjceJ4oB25k
+5cHINod6FkKX4IOExJON60Rv6g28r9qHAZRwBlmK33IgqyMk1kJ1fUv5M5YcKc51
+BJZE2k6EBT2sUGsj4KlzoeRi177P7kghic/8argP7zlXU4fqGJmk+4d78rsOEfCF
++3DSdqG1AnAO9vCNDRYMfVhTJC6gQtFO07R6/XW+tZNXNUdxCf1uDMmNP4WpQvQE
+jD/n7sfXgcHQhG1802V5U2TMq3J9mRo9JPfSK6X6lE0qjsKreSI+rr+Tq9ZYcbvx
+wWKsWFPk663gOflZCNEphS5+t8IR9PX4p3I+pAM/FEHgUJ2iVvHia5FvoYOPNfK9
+VycPeloUP0eFGKIQbPiYWKaiXgkDfK4cLwgJMhXzr/Fho2IFqxC3jUxnUbExRMpU
+nZ0toeM9qEdUonudkEOY0U2KLXQhaVhK4NhbYcNGk2yFXd2A9BKQgUBaqw8j4Kyj
+uhCXQAvOsiZahhBEzS4be3YACbdZZsMqeA5Nar6+3AS4UMdReYhKI2OSYVhU4zYZ
+04zHSOp0UJvoxoz1xnzu
+=ooy1
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/hdf5/hdf5-1.8.6.ebuild b/sci-libs/hdf5/hdf5-1.8.6.ebuild
deleted file mode 100644 (file)
index 9851225..0000000
--- a/sci-libs/hdf5/hdf5-1.8.6.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.6.ebuild,v 1.7 2011/07/06 15:00:48 xarthisius Exp $
-
-EAPI=3
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${P}.tar.bz2"
-
-LICENSE="NCSA-HDF"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cxx debug examples fortran mpi szip threads zlib"
-
-RDEPEND="
-       fortran? ( virtual/fortran )
-       mpi? ( virtual/mpi[romio] )
-       szip? ( >=sci-libs/szip-2.1 )
-       zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-       sys-devel/libtool:2
-       sys-process/time"
-
-pkg_setup() {
-       use fortran && fortran-2_pkg_setup
-       if use mpi; then
-               if has_version 'sci-libs/hdf5[-mpi]'; then
-                       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
-               if use fortran; then
-                       export FC=mpif90
-               fi
-       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."
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-1.8.3-as-needed.patch \
-               "${FILESDIR}"/${PN}-1.8.5-implicits.patch \
-               "${FILESDIR}"/${PN}-1.8.5-noreturn.patch \
-               "${FILESDIR}"/${PN}-1.8.4-scaleoffset.patch \
-
-       # respect gentoo examples directory
-       sed \
-               -e "s:hdf5_examples:doc/${PF}/examples:g" \
-               -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die
-       sed \
-               -e '/docdir/d' \
-               -i config/commence.am || die
-       eautoreconf
-       # enable shared libs by default for h5cc config utility
-       sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in \
-               || die "sed h5cc.in failed"
-}
-
-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 \
-               --docdir=/usr/share/doc/${PF} \
-               --enable-deprecated-symbols \
-               --enable-shared \
-               $(use_enable debug debug all) \
-               $(use_enable fortran) \
-               $(use_enable mpi parallel) \
-               $(use_with szip szlib) \
-               $(use_with threads pthread) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-       dodoc README.txt
-       if use examples; then
-               emake DESTDIR="${D}" install-examples \
-                       || die "emake install examples failed"
-       fi
-}

diff --git a/sci-libs/hdf5/hdf5-1.8.7.ebuild b/sci-libs/hdf5/hdf5-1.8.7.ebuild
index 7e16468da0bda016c171d755f2136f57d0f3051f..f0d98fc15512522dd2e48bc7890d059587776762 100644 (file)
--- 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.9 2011/07/13 15:49:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.7.ebuild,v 1.10 2011/10/23 11:40:12 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/current/src/${P}.tar.bz2"
 LICENSE="NCSA-HDF"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx debug examples fortran mpi szip threads zlib"
+IUSE="cxx debug examples fortran mpi static-libs szip threads zlib"
 
 RDEPEND="
        fortran? ( virtual/fortran )
@@ -90,6 +90,7 @@ src_configure() {
                --enable-deprecated-symbols \
                --enable-shared \
                --disable-silent-rules \
+               $(use_enable static-libs static) \
                $(use_enable debug debug all) \
                $(use_enable fortran) \
                $(use_enable mpi parallel) \
@@ -101,6 +102,8 @@ src_configure() {
 
 src_install() {
        default
+       use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
        if use examples; then
                emake DESTDIR="${D}" install-examples
        fi