Remove automagic dependency on virtual/jpeg and sci-libs/hdf. Simplify logic since we don't provide h4toh5

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

5 files changed, 101 insertions, 13 deletions

diff --git a/sci-misc/h5utils/ChangeLog b/sci-misc/h5utils/ChangeLog
index acea4b0fb6fe..893590242491 100644
--- a/sci-misc/h5utils/ChangeLog
+++ b/sci-misc/h5utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-misc/h5utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.12 2011/08/25 15:57:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.13 2011/08/25 16:47:50 xarthisius Exp $
+
+*h5utils-1.12.1-r2 (25 Aug 2011)
+
+  25 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -h5utils-1.12.1-r1.ebuild, +h5utils-1.12.1-r2.ebuild,
+  +files/h5utils-1.12.1-automagic.patch:
+  Remove automagic dependency on virtual/jpeg and sci-libs/hdf. Simplify logic
+  since we don't provide h4toh5
 
 *h5utils-1.12.1-r1 (25 Aug 2011)
 
diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index a6bdf0df3ae2..a4c11d0d7369 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX h5utils-1.12.1-automagic.patch 2226 RMD160 1fb63952a15a752726a3330366b20b3b04643be1 SHA1 42205dd82302b3d165296bfc5df4e5210df39ef6 SHA256 e69b005a086749e530a037f37ca5069473947bfb21b2f9dc98e470c26cc0c69c
 DIST h5utils-1.12.1.tar.gz 156785 RMD160 f7d1d1b9254e5946c382fad2bd5ffc41e238860d SHA1 1bd8ef8c50221da35aafb5424de9b5f177250d2d SHA256 7290290ca5d5d4451d757a70c86baaa70d23a28edb09c951b6b77c22b924a38d
 DIST h5utils-1.7.2.tar.gz 116927 RMD160 f13d1ed6c95206f32e8462ae2015dc55c25b8db3 SHA1 3ec581bbb59397a21ea39b129b1f6354bf242b29 SHA256 ced462d7fc51a43789a284efc346c94c4dfa6a4d8754f87584ffdd694f060e5e
-EBUILD h5utils-1.12.1-r1.ebuild 657 RMD160 11cf14ea47115fe70af7b9992466742aec22683d SHA1 3ceb746f5168c6235072d52d4e2db04fb241739a SHA256 5fd2285b732de947483f1b2b299974edea0dfb1d0e0e6721f68b3aa3f1f2aa50
+EBUILD h5utils-1.12.1-r2.ebuild 851 RMD160 91b29dce2dbcf07aa427f75a1a7b02d9af9c006e SHA1 4c737334d59c4a80f4140c612cd6b061bc742b3d SHA256 512d7e7b27556fae5a9d989d0ed832b6047dc7db9f84e370cb15a9eefc7521d9
 EBUILD h5utils-1.7.2.ebuild 632 RMD160 d266b1cbd0f8a2f9e8f37e9f139c4915156a7575 SHA1 9cdd29d30e050a785e458baa67f122a48a1f8714 SHA256 091c1e9ea801d94bea9a7425d784327ad20ef67819161293c222bb1166dd1d0b
-MISC ChangeLog 2404 RMD160 e35f3c2f83cdb02d19b917c6ee149a6d42ae8a72 SHA1 74c7caf4de1f53c285a9f636452540ab6a46b767 SHA256 495cf6707cc254a8a1198ad661fee3c5aefafc27fc45d7a408ee583acc9af597
-MISC metadata.xml 219 RMD160 b79a3eb3a97147163718fc136d386478a58f75b0 SHA1 788a40cf05a07a705523269798041e116d1475d2 SHA256 0f29e01285bb233547985f7ac96c3a39ecaa679578f4758889441fe6fb94cbe4
+MISC ChangeLog 2701 RMD160 ba19570da207e27477633fdef4cae59af22db528 SHA1 dc533fc3b599f39dc6b0fe4a1201741cbb8c2224 SHA256 ba9fb48d690995984c423f0064fd095ad0eaf13c28de362a204fa6e5c1e8e53f
+MISC metadata.xml 290 RMD160 312192828583c46dc9342aa15a2939fad901ca95 SHA1 665f4d94e197b4b055d8e86034aa3f7fbdb145c3 SHA256 1ea962e3a289f9e2a618ba538bc8432bf504a8a5fe249b33084f5fde4d2f1885
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk5WcOwACgkQIiMqcbOVdxQuDgP/QrH14ULlwwnHo5dF5L6L39Pz
-uzFFikoYJk89AX2Pd3u02l+5vP9eEJIF8rynBG+zQyWrIY76sTYv6l2gHZE2MSf/
-8/AH5Rrd+J02lXtG1GP4LoOCQsvW54AzO+ojrpO0d1VvRz0DUcGuA7ML/gyeVbWV
-4q39RzUlYilJVj7JaB8=
-=rhdm
+iJwEAQECAAYFAk5WfL8ACgkQIiMqcbOVdxTMqwP/QaIV8A1VcUGzJTIEoieSy3/d
+IAWazLt0LhrlSXR1kGKgMNq9PFcFqj/fsR+cYFrqlLE7uxhV2gGkZASP5cGSOhaq
+z2fKHtuLS37vxf2WBfLziL9DkQQvGxdVHOfTQr7gjsIzlngOUw2KmzgwlnMMj0LD
+AVJeIpJ0XWJTSsLIyiY=
+=JTVX
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
new file mode 100644
index 000000000000..8de8580cfe38
--- /dev/null
+++ b/sci-misc/h5utils/files/h5utils-1.12.1-automagic.patch
@@ -0,0 +1,63 @@
+--- configure.ac
++++ configure.ac
+@@ -74,44 +74,23 @@
+ 
+ ###########################################################################
+ 
+-# 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
+-
+-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="h5fromh4.1 $MORE_H5UTILS_MANS"
+-		fi
+-		if test "x$H5TOH4" != xh5toh4; then
+-		   MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
+-		   # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS"
+-		fi
+-	fi
+-fi
+-AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
+ 
+-AC_SUBST(H4_LIBS)
++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)
++])
+ 
+ ###########################################################################
+ 
diff --git a/sci-misc/h5utils/h5utils-1.12.1-r1.ebuild b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
index 53aa7c2d923a..b9497503360f 100644
--- a/sci-misc/h5utils/h5utils-1.12.1-r1.ebuild
+++ b/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/h5utils-1.12.1-r1.ebuild,v 1.1 2011/08/25 15:57:24 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/h5utils-1.12.1-r2.ebuild,v 1.1 2011/08/25 16:47:50 xarthisius Exp $
 
 EAPI=4
 
+inherit autotools eutils
+
 DESCRIPTION="utilities for visualization and conversion of HDF5 files"
 HOMEPAGE="http://ab-initio.mit.edu/h5utils/"
 SRC_URI="http://ab-initio.mit.edu/h5utils/${P}.tar.gz"
@@ -11,14 +13,27 @@ SRC_URI="http://ab-initio.mit.edu/h5utils/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="octave"
+IUSE="hdf octave"
 SLOT="0"
 
-DEPEND="sci-libs/hdf5"
+DEPEND="media-libs/libpng
+	sci-libs/hdf5
+	hdf? (
+		sci-libs/hdf
+		virtual/jpeg
+	)"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagic.patch
+	eautoreconf
+}
+
 src_configure() {
-	econf $(use_with octave) --without-v5d
+	econf \
+		 --without-v5d \
+		$(use_with octave) \
+		$(use_with hdf)
 }
 
 src_install() {
diff --git a/sci-misc/h5utils/metadata.xml b/sci-misc/h5utils/metadata.xml
index ed8298ef88d2..35866ea57d98 100644
--- a/sci-misc/h5utils/metadata.xml
+++ b/sci-misc/h5utils/metadata.xml
@@ -4,5 +4,6 @@
 <herd>sci</herd>
 <use>
   <flag name='octave'>Build Octave plugins</flag>
+  <flag name='hdf'>Build hdf to hdf5 (and vice-versa) converter</flag>
 </use>
 </pkgmetadata>