Version bump

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)

3 files changed, 154 insertions, 1 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index f3c6d6a6e21d..5d637bec9c21 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.128 2015/02/28 14:49:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.129 2015/05/20 15:39:56 xarthisius Exp $
+
+*hdf5-1.8.15 (20 May 2015)
+
+  20 May 2015; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/hdf5-1.8.15-implicits.patch, +hdf5-1.8.15.ebuild:
+  Version bump
 
   28 Feb 2015; Justin Lecher <jlec@gentoo.org> -hdf5-1.8.10.ebuild,
   -hdf5-1.8.13.ebuild, metadata.xml:
diff --git a/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch b/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
new file mode 100644
index 000000000000..72e096170975
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.15-implicits.patch
@@ -0,0 +1,43 @@
+--- a/hl/src/H5LTanalyze.c
++++ b/hl/src/H5LTanalyze.c
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ /* end standard C headers. */
+ 
+--- a/hl/src/H5LTanalyze.l
++++ b/hl/src/H5LTanalyze.l
+@@ -16,6 +16,7 @@
+ %{
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <hdf5.h>
+ #include "H5LTparse.h"
+ 
+--- a/test/cache_common.h
++++ b/test/cache_common.h
+@@ -702,5 +702,8 @@ void validate_mdc_config(hid_t file_id,
+                          hbool_t compare_init,
+                          int test_num);
+ 
++hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
++                                 const H5C_auto_size_ctl_t *b,
++                                 hbool_t compare_init);
+ #endif /* _CACHE_COMMON_H */
+ 
+--- a/testpar/t_span_tree.c
++++ b/testpar/t_span_tree.c
+@@ -37,6 +37,9 @@
+ #include "hdf5.h"
+ #include "H5private.h"
+ #include "testphdf5.h"
++#define H5S_PACKAGE
++#define H5S_TESTING
++#include "H5Spkg.h"
+ 
+ 
+ static void coll_write_test(int chunk_factor);
diff --git a/sci-libs/hdf5/hdf5-1.8.15.ebuild b/sci-libs/hdf5/hdf5-1.8.15.ebuild
new file mode 100644
index 000000000000..d652d2b3be8f
--- /dev/null
+++ b/sci-libs/hdf5/hdf5-1.8.15.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.15.ebuild,v 1.1 2015/05/20 15:39:56 xarthisius Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils fortran-2 flag-o-matic toolchain-funcs multilib
+
+MY_P=${PN}-${PV/_p/-patch}
+
+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/${MY_P}/src/${MY_P}.tar.bz2"
+
+LICENSE="NCSA-HDF"
+SLOT="0/${PV%%_p*}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cxx debug examples fortran fortran2003 mpi static-libs szip threads zlib"
+
+REQUIRED_USE="
+	cxx? ( !mpi ) mpi? ( !cxx )
+	threads? ( !cxx !mpi !fortran )
+	fortran2003? ( fortran )"
+
+RDEPEND="
+	mpi? ( virtual/mpi[romio] )
+	szip? ( >=sci-libs/szip-2.1:0= )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool:2
+	>=sys-devel/autoconf-2.69"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch
+	"${FILESDIR}"/${PN}-1.8.9-mpicxx.patch
+	"${FILESDIR}"/${PN}-1.8.13-no-messing-ldpath.patch
+	"${FILESDIR}"/${PN}-1.8.15-implicits.patch
+)
+
+pkg_setup() {
+	tc-export CXX CC AR # workaround for bug 285148
+	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
+		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() {
+	# 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
+	if ! use examples; then
+		sed -e '/^install:/ s/install-examples//' \
+			-i Makefile.am || die #409091
+	fi
+	# enable shared libs by default for h5cc config utility
+	sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" tools/misc/h5cc.in	|| die
+	# bug #419677
+	use prefix && \
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir) \
+		-Wl,-rpath,"${EPREFIX}"/$(get_libdir)
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-production
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--enable-deprecated-symbols
+		$(use_enable prefix sharedlib-rpath)
+		$(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)
+	)
+	autotools-utils_src_configure
+}