Added optional Octave support, avoid access violations (fixes bug #109684).

Package-Manager: portage-2.0.51.22-r3

diff --git a/sci-misc/h5utils/ChangeLog b/sci-misc/h5utils/ChangeLog
index 309fcec0cd34bc3bc998ebf5d81cbc60d72b3b75..841bf78172241451f8bdef9d09ed6b4bdf632605 100644 (file)
--- a/sci-misc/h5utils/ChangeLog
+++ b/sci-misc/h5utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/h5utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.6 2005/10/20 01:00:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/ChangeLog,v 1.7 2005/10/20 23:40:29 ribosome Exp $
+
+  20 Oct 2005; Olivier Fisette <ribosome@gentoo.org> h5utils-1.10.ebuild:
+  Added optional Octave support, along with a patch to avoid access violations
+  when Octave plug-ins are built. Thanks to Andrey <aela@gorodok.net> for his
+  work. Fixes bug #109684.
 
 *h5utils-1.10 (20 Oct 2005)
 

diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index 3ca98e78970bc76db03e366622b85cf41bf4c1d7..b110f3e9e0f3367e6b3dec3ef47f6fab5eda46a8 100644 (file)
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,6 +1,6 @@
-MD5 652c01cb50f1dddf4eb0df32335f1b1e h5utils-1.10.ebuild 687
+MD5 0372a1cb73c9675b336ec76f4475f71d h5utils-1.10.ebuild 772
 MD5 fea64ac9ca882d2653c1676b54f23a79 h5utils-1.7.2.ebuild 630
-MD5 595e57702a183b63cec4483f5459ed50 ChangeLog 1330
+MD5 a9ad0659206979575af8aa6fe6be657d ChangeLog 1589
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 19a6aeba061c7f0ae3ebdeb37e58914d files/digest-h5utils-1.10 64
 MD5 68582ef0ca181f569ea15f38c3a8eda7 files/digest-h5utils-1.7.2 65

diff --git a/sci-misc/h5utils/h5utils-1.10.ebuild b/sci-misc/h5utils/h5utils-1.10.ebuild
index 35b45a308d3f63f7b76b648ea14a5bd4e6b392c3..c0df4be0f66c413b96c1c4dc5b52d38302b464e4 100644 (file)
--- a/sci-misc/h5utils/h5utils-1.10.ebuild
+++ b/sci-misc/h5utils/h5utils-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/h5utils-1.10.ebuild,v 1.1 2005/10/20 01:00:30 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/h5utils/h5utils-1.10.ebuild,v 1.2 2005/10/20 23:40:29 ribosome Exp $
 
 inherit eutils autotools
 
@@ -11,14 +11,19 @@ HOMEPAGE="http://ab-initio.mit.edu/h5utils/"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-IUSE=""
+IUSE="octave"
 SLOT="0"
 
 DEPEND="sci-libs/hdf5"
 
+src_unpack() {
+       unpack ${A}
+       epatch "${FILESDIR}"/${PV}-octave-path.patch
+}
+
 src_compile() {
        eautoconf
-       econf --without-octave --without-h5fromh4 || die
+       econf $(use_with octave) --without-h5fromh4 || die
        emake || die
 }