From: Kacper Kowalik Date: Thu, 17 Nov 2011 12:19:37 +0000 (+0000) Subject: Version bump wrt #390811 by Tolga Dalman, fixes bug #383843 by Cedric X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b076e1fdc84d66be9f96171b47b9f51e7ab37aa5;p=gentoo.git Version bump wrt #390811 by Tolga Dalman, fixes bug #383843 by Cedric Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog index e5d9dcc8c8c8..115613f1a475 100644 --- a/sci-libs/hdf5/ChangeLog +++ b/sci-libs/hdf5/ChangeLog @@ -1,6 +1,12 @@ # 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.75 2011/10/23 11:40:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.76 2011/11/17 12:19:37 xarthisius Exp $ + +*hdf5-1.8.8 (17 Nov 2011) + + 17 Nov 2011; Kacper Kowalik + +files/hdf5-1.8.8-buildsystem.patch, +hdf5-1.8.8.ebuild, metadata.xml: + Version bump wrt #390811 by Tolga Dalman, fixes bug #383843 by Cedric 23 Oct 2011; Tomáš Chvátal -hdf5-1.8.6.ebuild, hdf5-1.8.7.ebuild: diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest index 932bf32e359b..799417ef3f34 100644 --- a/sci-libs/hdf5/Manifest +++ b/sci-libs/hdf5/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 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 @@ -9,27 +9,30 @@ AUX hdf5-1.8.4-scaleoffset.patch 1098 RMD160 4983755ff2d284c73f8479cbf11a19b1bf4 AUX hdf5-1.8.4-sigbus.patch 779 RMD160 ba4c92e0ba5ef95b1459d4b570d9113acbc65613 SHA1 3fc4c90ac42b9a59f26a459e6faf6f7410b87a9a SHA256 69c0ef464d99b6c2bd3a959b8210e7772a662054b481bed7775ec21c731bf106 AUX hdf5-1.8.5-implicits.patch 1782 RMD160 968ff2c36606ca85644e23200d90bb566b67a418 SHA1 eda61db0fafdc738db992fc055a9ad9626743872 SHA256 cd352f026daabba1c1a17725ebbc21a59015d3103697fd6e1181ea1998c07bb3 AUX hdf5-1.8.5-noreturn.patch 1477 RMD160 52c0e72b78b00effe3337f6016f716b425d29f03 SHA1 88eee2a0bb02512795a61f0ceb9d54f8df454e31 SHA256 7278c504b0e252ea5d0a9d7de5b332f0f1c0981a441efb286864b9599790c0b2 +AUX hdf5-1.8.8-buildsystem.patch 1410 RMD160 a88c63145bf088b018d4dcf327415938d467914e SHA1 f8a48e3602967ef15ceabab9ad499a8f6b3aa009 SHA256 a97a7a82197eb4f3c9d43836f24c2c2ae14962970a0b680e5305a977b8c611a5 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.7.tar.bz2 5710170 RMD160 34641bf8e664c3b3382d1346a65e2f5c3eb485ee SHA1 be1daff26f066aca0b5be52d86dada6757fc4b95 SHA256 771761c9bec30b9a4137fa59ef88fdafdb0f4f35d1db0fd655f2591d19570fec +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 -MISC ChangeLog 15183 RMD160 a7d084d7a0e13189796b30615fa4dc29d68ac223 SHA1 cc5c324381a9913dfa7eff0542adc0edc234c6ba SHA256 e4f86527919e4cb7e0249f27878bcc7f4748717b4bf916d3835f79d865b30717 -MISC metadata.xml 447 RMD160 c0dc1e22971e3a09c9df171fec79e1f63b5ca47f SHA1 5e9be3a88b19d1651aef3f867829c3e25f2e6a16 SHA256 1f01480c1833905629ecb1defd9fd0d12355a49929fb0277dd342d3012cec4cc +EBUILD hdf5-1.8.8.ebuild 3099 RMD160 7b17f388bcee774a374f371e6b3fcf981ce8b7e4 SHA1 ed38932cd77076e542bb8761d6f357210e6d5f38 SHA256 2e10b20a0680627186f2678ef2f72570542dce52cb12d54a79752cb011efddb3 +MISC ChangeLog 15411 RMD160 b6f8bfe9bc9fa4dacaba695e91e2c3120a4f27f0 SHA1 eab434b6cf89e13d6a59e218b546d370c17933e4 SHA256 f3951dea5dc19857f46a9598e2406121d79d464d093b1ecc25e5ce822852f86b +MISC metadata.xml 728 RMD160 3863f8962e54ddbd28c78256e03feedc571148a7 SHA1 f4ac101d9b30cca655a89a87185364dd4a24816b SHA256 1a503997c6e2248b43a36eccd2c09337a0e02b498926b4430b9d8df059e638ba -----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 +iQIcBAEBCAAGBQJOxPvjAAoJEF0huFKJUZL5k+wP/001mXTV4lhTFRiKU/3z892B +fY3rotP2oeEk5Qr4AB30NL8Gi93jZcLxWq5RrHXYf7KhsEQGaLm//SIKW5mo7RFC +qrkr1ODDg7NsMhKt/xYwFsSTAycDSJW3eaqXTRLa/C64HRwisP0rH5GiBaw0M3gQ +Bh48DXQDxg3fbVtfubMd3JyQ6wVvDiOQmwWaVGcJP02s4cd0VU1HXdwl8D+JwZ9G +1Q4A1t0ODMdYkFsaqFi4GYMgLzEBB2YMST4SgNuDjW4ZsZ9LibrKF6/9WSq92PN6 +8tuUYg7hUAifTkFxJtx1ekBKWGOM16I4lDg4zG3LJzGPIEeFsVB0nZCI03x3Z3Wd +QG+79q/jzn7SmSqvRccXzauLIdMjLNYIcC1FbsNtALed6N+YzWirSZmhQARofWyU +qF8CbTRrPPpgd8T2Op9Cqcdq0ZqWuUUbJtWDF/qx7OLvQVYSKDnNkMALrPjoQ5so +LtAUmUAoYFeM5idYsHzkifdqBqjRy++m7ml6z67bxF5fuliCnDOAm/SUiJxaxnUh +bdpb8JvpG/A+qyXfbWFbX4vPrvOV+fP5eucFLSwMOJiCU3+6AMEMsATZQ1Wt2PnZ +mrVTPdYy1j4FbAUwt0GUf5aO3e8TSi/UnnlkgOFZ50d66I4Tq84OjFScF0D+FBBz +Pp0RjdOiZKv8BjhkQM9+ +=7efn -----END PGP SIGNATURE----- diff --git a/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch b/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch new file mode 100644 index 000000000000..0f85cf5ed245 --- /dev/null +++ b/sci-libs/hdf5/files/hdf5-1.8.8-buildsystem.patch @@ -0,0 +1,33 @@ +Prevent build system with messing up LD_LIBRARY_PATH + +--- a/configure.in ++++ b/configure.in +@@ -2328,8 +2328,6 @@ + dnl + AC_MSG_CHECKING([how to print long long]) + AC_CACHE_VAL([hdf5_cv_printf_ll], +-LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`" +-export LD_LIBRARY_PATH + + for hdf5_cv_printf_ll in l ll L q unknown; do + AC_TRY_RUN([ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -125,8 +125,6 @@ + # Remove the generated .c file if errors occur unless HDF5_Make_Ignore + # is set to ignore the error. + H5Tinit.c: H5detect$(EXEEXT) +- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ +- sed -e 's/-L/:/g' -e 's/ //g'`" \ + $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + ($(RM) $@ ; exit 1) +@@ -137,8 +135,6 @@ + # Remove the generated .c file if errors occur unless HDF5_Make_Ignore + # is set to ignore the error. + H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings +- LD_LIBRARY_PATH="$$LD_LIBRARY_PATH`echo $(LDFLAGS) | \ +- sed -e 's/-L/:/g' -e 's/ //g'`" \ + $(RUNSERIAL) ./H5make_libsettings$(EXEEXT) > $@ || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + ($(RM) $@ ; exit 1) diff --git a/sci-libs/hdf5/hdf5-1.8.8.ebuild b/sci-libs/hdf5/hdf5-1.8.8.ebuild new file mode 100644 index 000000000000..3310cb052610 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.8.8.ebuild @@ -0,0 +1,108 @@ +# 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.1 2011/11/17 12:19:37 xarthisius Exp $ + +EAPI=4 + +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/releases/${P}/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 fortran2003 mpi static-libs szip threads zlib" +REQUIRED_USE="fortran2003? ( fortran )" + +RDEPEND=" + fortran? ( virtual/fortran ) + mpi? ( virtual/mpi[romio] ) + szip? ( >=sci-libs/szip-2.1 ) + zlib? ( sys-libs/zlib )" + +DEPEND="${RDEPEND} + sys-devel/libtool:2" + +pkg_setup() { + if use fortran; then + use fortran2003 && FORTRAN_STANDARD=2003 + fortran-2_pkg_setup + fi + 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 + 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." + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-buildsystem.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 +} + +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="${EPREFIX}"/usr/share/doc/${PF} \ + --enable-deprecated-symbols \ + --enable-shared \ + --disable-silent-rules \ + $(use_enable static-libs static) \ + $(use_enable debug debug all) \ + $(use_enable fortran) \ + $(use_enable fortran2003) \ + $(use_enable mpi parallel) \ + $(use_with szip szlib) \ + $(use_with threads pthread) \ + $(use_with zlib) \ + ${myconf} +} + +src_install() { + default + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + + + if use examples; then + emake DESTDIR="${D}" install-examples + fi +} diff --git a/sci-libs/hdf5/metadata.xml b/sci-libs/hdf5/metadata.xml index 2058812bfd6c..6b6f68735c02 100644 --- a/sci-libs/hdf5/metadata.xml +++ b/sci-libs/hdf5/metadata.xml @@ -2,10 +2,18 @@ sci + + xarthisius@gentoo.org + Kacper Kowalik + - HDF5 is a file format and library for storing scientific data. HDF5 - was designed and implemented to address the deficiencies of HDF4.x. It - has a more powerful and flexible data model, supports files larger - than 2 GB, and supports parallel I/O. - + HDF5 is a file format and library for storing scientific data. HDF5 + was designed and implemented to address the deficiencies of HDF4.x. It + has a more powerful and flexible data model, supports files larger + than 2 GB, and supports parallel I/O. + + + enable new features that require Fortran 2003 + (http://www.hdfgroup.org/HDF5/doc/fortran/NewFeatures_F2003.pdf) +