From a23479e9426f8134068ed82231842f514fb67ea4 Mon Sep 17 00:00:00 2001
From: grozin <grozin@32389bae-6d03-0410-99cf-db05cde120eb>
Date: Fri, 16 Jun 2006 15:58:49 +0000
Subject: bug fix in matio-1.1.4

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@249 32389bae-6d03-0410-99cf-db05cde120eb
---
 sci-libs/matio/Manifest                | 16 ++++++++--------
 sci-libs/matio/files/matio-1.1.4.patch | 23 +++++++----------------
 sci-libs/matio/matio-1.1.4.ebuild      |  2 +-
 3 files changed, 16 insertions(+), 25 deletions(-)

(limited to 'sci-libs/matio')

diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index d58c3fd53..c67441756 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,12 +1,12 @@
-AUX matio-1.1.4.patch 1902 RMD160 d4b40ee01c1f1473ff18dd4fc3493e54d1ad4df5 SHA1 fd721dd05143001173a2d90dd9259240a1216c2f SHA256 f0a8cfafabf34d68b5395318bf30a206f313fa0f2720613fddf5cc53f01b93b5
-MD5 6d611903f170bcc143daa31558331559 files/matio-1.1.4.patch 1902
-RMD160 d4b40ee01c1f1473ff18dd4fc3493e54d1ad4df5 files/matio-1.1.4.patch 1902
-SHA256 f0a8cfafabf34d68b5395318bf30a206f313fa0f2720613fddf5cc53f01b93b5 files/matio-1.1.4.patch 1902
+AUX matio-1.1.4.patch 1739 RMD160 5b831e45ad0def3256670d8d9f6c9329ebfdac6e SHA1 b064e7c237bd00b4157caf3ce0b1cfbd0cd7f472 SHA256 a2badfee510bf5e065a0afcad07ae7263a1e0dde72ae2526949aff5aceba8d07
+MD5 2d0c14e9de64ee960ae141b8bd05afc8 files/matio-1.1.4.patch 1739
+RMD160 5b831e45ad0def3256670d8d9f6c9329ebfdac6e files/matio-1.1.4.patch 1739
+SHA256 a2badfee510bf5e065a0afcad07ae7263a1e0dde72ae2526949aff5aceba8d07 files/matio-1.1.4.patch 1739
 DIST matio.zip 1109306 RMD160 fd3ebb883e7064592972470b113847dd860d53cf SHA1 856156aa2fceae0188cbead52c08dccd4d35cb20 SHA256 49e034c1770eb767481466177e4405990d865ad38f086ded22fa5e07d2178aea
-EBUILD matio-1.1.4.ebuild 1068 RMD160 9e26ce3786477a1dbb94ff43b668b29ee60b7dcb SHA1 6b9857e3b11d6a863b6f4ec0e2434e6880e042d6 SHA256 01dc7aaf264efcc51c145d84c5353652ce0821f102e349aaddc0ee36c2cdd561
-MD5 1aa6f1be55691b077609e74343912d54 matio-1.1.4.ebuild 1068
-RMD160 9e26ce3786477a1dbb94ff43b668b29ee60b7dcb matio-1.1.4.ebuild 1068
-SHA256 01dc7aaf264efcc51c145d84c5353652ce0821f102e349aaddc0ee36c2cdd561 matio-1.1.4.ebuild 1068
+EBUILD matio-1.1.4.ebuild 1051 RMD160 fa2369f72454598071d872df419f7319f2d93047 SHA1 ebdc96e0c6f9ec10cd6e1423b4ade020411d9db0 SHA256 001d336c43ab5b4adc331f58b8dc2f59b0ceac5441dd0207aa2095e506b02d53
+MD5 0f81ac390ae55d3682fcd91efdd6c24d matio-1.1.4.ebuild 1051
+RMD160 fa2369f72454598071d872df419f7319f2d93047 matio-1.1.4.ebuild 1051
+SHA256 001d336c43ab5b4adc331f58b8dc2f59b0ceac5441dd0207aa2095e506b02d53 matio-1.1.4.ebuild 1051
 MISC ChangeLog 280 RMD160 0212ccf3011ea2c8073afbc674838b2c468ab48f SHA1 a7a136659d1451bbebe43feb7738f61844ce3f2b SHA256 bbb89ab123d4e6119e30e55b319b008ffc964648af792bd80980598a5562b5b2
 MD5 8ed76d02c2596a8fb646bf84c9728dcf ChangeLog 280
 RMD160 0212ccf3011ea2c8073afbc674838b2c468ab48f ChangeLog 280
diff --git a/sci-libs/matio/files/matio-1.1.4.patch b/sci-libs/matio/files/matio-1.1.4.patch
index 965033121..4f0adca65 100644
--- a/sci-libs/matio/files/matio-1.1.4.patch
+++ b/sci-libs/matio/files/matio-1.1.4.patch
@@ -1,4 +1,4 @@
-diff -U2 -r matio.orig/Makefile.am matio/Makefile.am
+diff -r -U2 matio.orig/Makefile.am matio/Makefile.am
 --- matio.orig/Makefile.am	2006-01-11 15:34:34.000000000 +0100
 +++ matio/Makefile.am	2006-06-16 21:16:52.000000000 +0200
 @@ -8,7 +8,5 @@
@@ -24,29 +24,20 @@ diff -U2 -r matio.orig/Makefile.am matio/Makefile.am
 -
  print:
  	subdirs='$(SUBDIRS)'; \
-diff -U2 -r matio.orig/doxygen/Makefile.am matio/doxygen/Makefile.am
+diff -r -U2 matio.orig/doxygen/Makefile.am matio/doxygen/Makefile.am
 --- matio.orig/doxygen/Makefile.am	2006-01-11 15:34:29.000000000 +0100
 +++ matio/doxygen/Makefile.am	2006-06-16 21:07:05.000000000 +0200
 @@ -8,5 +8,5 @@
  VPATH = @srcdir@
  
 -docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc/matio-$(PV)
++docdir = $(prefix)/share/doc/matio-1.0
  doc_DATA = $(top_builddir)/doxygen/latex/libmatio.pdf
  
-diff -U2 -r matio.orig/src/Makefile.am matio/src/Makefile.am
+diff -r -U2 matio.orig/src/Makefile.am matio/src/Makefile.am
 --- matio.orig/src/Makefile.am	2006-03-11 03:36:40.000000000 +0100
-+++ matio/src/Makefile.am	2006-06-16 21:16:47.000000000 +0200
-@@ -9,8 +9,4 @@
- AM_LDFLAGS =
- 
--if HAVE_ZLIB
--    ZLIB_SRC = inflate.c
--endif
--
- include_HEADERS     = matio.h matioConfig.h
- lib_LTLIBRARIES     = libmatio.la
-@@ -29,7 +25,4 @@
++++ matio/src/Makefile.am	2006-06-16 23:36:48.000000000 +0200
+@@ -29,7 +29,4 @@
                -e 's,\/,\\,g'
  
 -doc:
@@ -54,7 +45,7 @@ diff -U2 -r matio.orig/src/Makefile.am matio/src/Makefile.am
 -
  print:
  	@list='$(libmatio_a_SOURCES)'; \
-diff -U2 -r matio.orig/test/Makefile.am matio/test/Makefile.am
+diff -r -U2 matio.orig/test/Makefile.am matio/test/Makefile.am
 --- matio.orig/test/Makefile.am	2006-02-09 20:48:24.000000000 +0100
 +++ matio/test/Makefile.am	2006-06-16 21:36:44.000000000 +0200
 @@ -7,5 +7,5 @@
diff --git a/sci-libs/matio/matio-1.1.4.ebuild b/sci-libs/matio/matio-1.1.4.ebuild
index da4c24a19..f78b3d020 100644
--- a/sci-libs/matio/matio-1.1.4.ebuild
+++ b/sci-libs/matio/matio-1.1.4.ebuild
@@ -35,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	aclocal
-	automake || die "automake failed"
+	automake || true
 	econf --enable-shared $(use_enable fortran ) $(use_enable doc docs ) \
 		|| die "econf failed"
 	emake || die "emake failed"
-- 
cgit v1.2.3-65-gdbad