added matio-1.1.4, removed matio-1.0 (this last ebuild was unsatisfactory)

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@248 32389bae-6d03-0410-99cf-db05cde120eb

6 files changed, 101 insertions, 26 deletions

diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog
index 11b2540a0..9f25faa13 100644
--- a/sci-libs/matio/ChangeLog
+++ b/sci-libs/matio/ChangeLog
@@ -2,8 +2,8 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*matio-1.0 (13 June 2006)
+*matio-1.1.4 (16 June 2006)
 
-  13 June 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
-  +metadata.xml, +algae-4.3.6.ebuild, +files/Makefile.in.patch:
+  16 June 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
+  +metadata.xml, +matio-1.1.4.ebuild, +files/matio-1.1.4.patch:
   Initial import.
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 3159f9528..d58c3fd53 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,20 +1,20 @@
-AUX Makefile.in.patch 205 RMD160 ad4d25768d5fe19d82309eaa1d620408452aa376 SHA1 a6ee5b2a24e663990a330293a5035da7c91d1c0b SHA256 4cc2eb4df9dd80affe1b25aa80a3fafcd0b6c6afd241a27e0ffbf4654dfdd706
-MD5 b060cd824f954380bbac775d06145b80 files/Makefile.in.patch 205
-RMD160 ad4d25768d5fe19d82309eaa1d620408452aa376 files/Makefile.in.patch 205
-SHA256 4cc2eb4df9dd80affe1b25aa80a3fafcd0b6c6afd241a27e0ffbf4654dfdd706 files/Makefile.in.patch 205
+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
 DIST matio.zip 1109306 RMD160 fd3ebb883e7064592972470b113847dd860d53cf SHA1 856156aa2fceae0188cbead52c08dccd4d35cb20 SHA256 49e034c1770eb767481466177e4405990d865ad38f086ded22fa5e07d2178aea
-EBUILD matio-1.0.ebuild 911 RMD160 1de0e1579aaa6fb655f14666a2a51e6faf087e4b SHA1 154205014f2d7edcad1051aa1e0c794297ab0a44 SHA256 e91fef7180f7840ff9e4f6a5c4ec943be0300ad2ec2098ca016a25433c4d48ab
-MD5 3516518cf4ab2a55bfa56b40d9cb370b matio-1.0.ebuild 911
-RMD160 1de0e1579aaa6fb655f14666a2a51e6faf087e4b matio-1.0.ebuild 911
-SHA256 e91fef7180f7840ff9e4f6a5c4ec943be0300ad2ec2098ca016a25433c4d48ab matio-1.0.ebuild 911
-MISC ChangeLog 278 RMD160 be23b2c0fcfb29b73d3c165e6b9a70d0397ba9e4 SHA1 7b7fc430156b2f868480e9644b66b25a84cd6b3b SHA256 51caa0ddaa1eed5bc72a4b107ff97733d2170972262a76888536a0028ec860b4
-MD5 3f6d3b7c2d7113abbf5157cf98d4bc8a ChangeLog 278
-RMD160 be23b2c0fcfb29b73d3c165e6b9a70d0397ba9e4 ChangeLog 278
-SHA256 51caa0ddaa1eed5bc72a4b107ff97733d2170972262a76888536a0028ec860b4 ChangeLog 278
+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
+MISC ChangeLog 280 RMD160 0212ccf3011ea2c8073afbc674838b2c468ab48f SHA1 a7a136659d1451bbebe43feb7738f61844ce3f2b SHA256 bbb89ab123d4e6119e30e55b319b008ffc964648af792bd80980598a5562b5b2
+MD5 8ed76d02c2596a8fb646bf84c9728dcf ChangeLog 280
+RMD160 0212ccf3011ea2c8073afbc674838b2c468ab48f ChangeLog 280
+SHA256 bbb89ab123d4e6119e30e55b319b008ffc964648af792bd80980598a5562b5b2 ChangeLog 280
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
-MD5 3083ea523147e18cc69242d4dce4a694 files/digest-matio-1.0 211
-RMD160 918d96fe766afbb09843e4a641524dbde58b2ebc files/digest-matio-1.0 211
-SHA256 30700d8e3eebdb0257568ef4d8f32fbee46e1cdc45c3fe32e1d959e581493d07 files/digest-matio-1.0 211
+MD5 3083ea523147e18cc69242d4dce4a694 files/digest-matio-1.1.4 211
+RMD160 918d96fe766afbb09843e4a641524dbde58b2ebc files/digest-matio-1.1.4 211
+SHA256 30700d8e3eebdb0257568ef4d8f32fbee46e1cdc45c3fe32e1d959e581493d07 files/digest-matio-1.1.4 211
diff --git a/sci-libs/matio/files/Makefile.in.patch b/sci-libs/matio/files/Makefile.in.patch
deleted file mode 100644
index eb80b7baa..000000000
--- a/sci-libs/matio/files/Makefile.in.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- doxygen/Makefile.in.orig	2006-03-11 03:37:32.000000000 +0100
-+++ doxygen/Makefile.in	2006-06-14 00:01:41.000000000 +0200
-@@ -182 +182 @@
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc/matio-1.0
diff --git a/sci-libs/matio/files/digest-matio-1.0 b/sci-libs/matio/files/digest-matio-1.1.4
index 2a3464d06..2a3464d06 100644
--- a/sci-libs/matio/files/digest-matio-1.0
+++ b/sci-libs/matio/files/digest-matio-1.1.4
diff --git a/sci-libs/matio/files/matio-1.1.4.patch b/sci-libs/matio/files/matio-1.1.4.patch
new file mode 100644
index 000000000..965033121
--- /dev/null
+++ b/sci-libs/matio/files/matio-1.1.4.patch
@@ -0,0 +1,73 @@
+diff -U2 -r 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 @@
+ ACLOCAL_AMFLAGS = -Iconfig
+ 
+-
+ EXTRA_DIST = matio.pc.in
+-data_DATA  = share/test_file.mat share/test_file_v6.mat
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -21,5 +19,5 @@
+ endif
+ 
+-SUBDIRS = src test $(DOCS)
++SUBDIRS = src $(DOCS)
+ 
+ dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+@@ -27,7 +25,4 @@
+               -e 's,\/,\\,g'
+ 
+-doc:
+-	
+-
+ print:
+ 	subdirs='$(SUBDIRS)'; \
+diff -U2 -r 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)
+ doc_DATA = $(top_builddir)/doxygen/latex/libmatio.pdf
+ 
+diff -U2 -r 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 @@
+               -e 's,\/,\\,g'
+ 
+-doc:
+-	
+-
+ print:
+ 	@list='$(libmatio_a_SOURCES)'; \
+diff -U2 -r 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 @@
+ TEST_LFLAGS = $(all_libraries) -L$(top_builddir)/src
+ 
+-bin_PROGRAMS = test_mat test_snprintf
++noinst_PROGRAMS = test_mat test_snprintf
+ 
+ test_mat_SOURCES = test_mat.c
+@@ -18,5 +18,5 @@
+ 
+ if ENABLE_FORTRAN
+-bin_PROGRAMS += test_matf
++noinst_PROGRAMS += test_matf
+ 
+ test_matf_SOURCES = test_matf.f90
diff --git a/sci-libs/matio/matio-1.0.ebuild b/sci-libs/matio/matio-1.1.4.ebuild
index 5f779b748..da4c24a19 100644
--- a/sci-libs/matio/matio-1.0.ebuild
+++ b/sci-libs/matio/matio-1.1.4.ebuild
@@ -11,7 +11,8 @@ LICENSE="LGPL"
 KEYWORDS="~x86"
 IUSE="doc fortran"
 SRC_URI="${PN}.zip"
-DEPEND="doc? ( app-doc/doxygen )"
+DEPEND="doc? ( app-doc/doxygen virtual/tetex )
+	fortran? ( >=gcc-4.1 )"
 S="${WORKDIR}/${PN}"
 RESTRICT="fetch"
 
@@ -22,19 +23,25 @@ pkg_nofetch() {
 	einfo "and put it into ${DISTDIR}"
 }
 
+pkg_setup() {
+	use fortran && ! built_with_use gcc fortran && die "Re-emerge gcc with USE flag fortran"
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}/Makefile.in.patch"
+	epatch "${FILESDIR}/matio-1.1.4.patch"
 }
 
 src_compile() {
+	aclocal
+	automake || die "automake failed"
 	econf --enable-shared $(use_enable fortran ) $(use_enable doc docs ) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	docdir="${D}usr/share/doc/${P}" make DESTDIR="${D}" install
+	make DESTDIR="${D}" install
 	dodoc README ChangeLog
 }