[gentoo-commits] repo/gentoo:master commit in: sci-misc/h5utils/files/, sci-misc/h5utils/

["David Seifert" <soap@gentoo.org>]

commit:     2afadf2e1c5f6ce1c7abc35fa6833f35d89bc1ff
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Jan 24 13:48:25 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 13:48:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afadf2e

sci-misc/h5utils: Bump to 1.13.1

Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-misc/h5utils/Manifest                          |  1 +
 .../h5utils/files/h5utils-1.13.1-automagic.patch   | 64 ++++++++++++++++++++++
 sci-misc/h5utils/h5utils-1.13.1.ebuild             | 39 +++++++++++++
 3 files changed, 104 insertions(+)

diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index 4a979d4a4b0..3cf11f1a7a2 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1 +1,2 @@
 DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547
+DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4

diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
new file mode 100644
index 00000000000..7c166040cb4
--- /dev/null
+++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,44 +75,25 @@ fi
+ 
+ ###########################################################################
+ 
+-# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and
+-# thus don't have the superior h4toh5 utility.  Similarly for h5toh4.
+-AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5)
+-AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4)
+-
+-AC_ARG_WITH(hdf4,
+-	[AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh4 are present])],
+-	ok=$withval, ok=maybe)
+-if test "x$ok" = xyes; then
+-	H4TOH5=""
+-	H5TOH4=""
+-elif test "x$ok" = xno; then
+-	H4TOH5="h4toh5"
+-	H5TOH4="h5toh4"
+-fi
++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
++
++AS_IF([test "x$with_hdf" = "xyes"], [
++  AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
++  AC_CHECK_LIB(jpeg, jpeg_start_compress,
++      [AC_CHECK_LIB(df, DFSDgetdata,
++         [H4_LIBS="-ldf -ljpeg"; HDF4=yes],
++         [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
++      [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
++  if test $HDF4 = yes; then
++      MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
++      MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
++      MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
++  fi
++
++  AC_SUBST(H4_LIBS)
++])
+ 
+-HDF4=no
+-if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then
+-	AC_CHECK_LIB(jpeg, jpeg_start_compress,
+-		[AC_CHECK_LIB(df, DFSDgetdata,
+-			[H4_LIBS="-ldf -ljpeg"; HDF4=yes],
+-			[AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
+-		[AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
+-
+-	if test $HDF4 = yes; then
+-		if test "x$H4TOH5" != xh4toh5; then
+-		   MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
+-		   MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS"
+-		fi
+-		if test "x$H5TOH4" != xh5toh4; then
+-		   MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
+-		   # MORE_H5UTILS_MANS="doc/man/h4fromh5.1 $MORE_H5UTILS_MANS"
+-		fi
+-	fi
+-fi
+-AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
+ 
+-AC_SUBST(H4_LIBS)
+ 
+ ###########################################################################
+ 

diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild
new file mode 100644
index 00000000000..3055754da18
--- /dev/null
+++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utilities for visualization and conversion of HDF5 files"
+HOMEPAGE="https://github.com/NanoComp/h5utils"
+SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="hdf octave"
+
+DEPEND="
+	media-libs/libpng:0=
+	sci-libs/hdf5:0=
+	sys-libs/zlib
+	hdf? (
+		sci-libs/hdf:0=
+		virtual/jpeg:0
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-automagic.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-v5d \
+		$(use_with octave) \
+		$(use_with hdf)
+}