matio-1.3.3 version bump

6 files changed, 101 insertions, 43 deletions

diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog
index 2e51a3bb3..6d402fd7c 100644
--- a/sci-libs/matio/ChangeLog
+++ b/sci-libs/matio/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-libs/matio
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*matio-1.3.3 (22 Jan 2009)
+
+  22 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +sci-libs/matio/files/matio-1.3.3-makefile.patch,
+  sci-astronomy/scamp/metadata.xml, sci-libs/matio/metadata.xml,
+  sci-mathematics/gap/metadata.xml:
+  Version bump
+
 *matio-1.3.1 (20 Sep 2006)
 
   20 Sep 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index e145fa37f..5bd6b2a63 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,4 +1,5 @@
-DIST matio-1.3.1.tar.gz 938713 RMD160 64e12e1774db3054ce11f6efd15686c8432a3197 SHA1 70af161a788f7f5e171f27e2655763454ec33839 SHA256 5c8e5df8500c4e444865f65e94ba2b1084a0a370733195655099f5c6f2069eb0
-EBUILD matio-1.3.1.ebuild 914 RMD160 eb29d7b49384781c1a9f5d597613df2f80cb5885 SHA1 62d8c149d89d04a83a4765ff0763a2dcb5673996 SHA256 73931df6056b3a856b16b174342ce7e536aee0ca95ee465a4ec1db38f6186e04
-MISC ChangeLog 614 RMD160 4f8e87a9ab63a5a191d44506e709bb6b12b4053f SHA1 02008a45278e5c147425e2878c2edb14bb4c6b1a SHA256 b484aadb1ab72c5b263ba70a319a48e95afaff6f5e580a5c09a5d44abdc00847
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+AUX matio-1.3.3-makefile.patch 1002 RMD160 f0714522a3e6cebb5ce22e446022a8530f236616 SHA1 34a0c2654b120e886b1bcfcf5154a33fa0c7150c SHA256 88f3bc24bb707c5f25cfebb09a807704f289c24bfbde655443ff110bd7fa36b9
+DIST matio-1.3.3.tar.gz 418794 RMD160 acc835c83fc615978c9ba407f8c17b79afdafb9a SHA1 3f8c0dd2eb1abe4ded77ecfca6376f171bcff66c SHA256 5ab18a4e31e7688623a74493f06a493b857c8a58f60c67673b7b7ff4a4cf08b0
+EBUILD matio-1.3.3.ebuild 1183 RMD160 2b9d43f35ccd15e172ef4bd0f1d7c3b8ac9c4a3c SHA1 b9a6f51c13efbe642dfe7fdf9f15fdd6ea71343e SHA256 a4e6474bb652fb8686f996df67eff7e7da3c0616391bb67e309c069f7a15b211
+MISC ChangeLog 866 RMD160 bc77215c88e442070cd2ba96f108fbf4365b4abf SHA1 a09a8089008362147da6a103092c1a732e448dde SHA256 5d329cc4bb8bdd647d46dbe05376272006a22f03f3489c8b04142654371de8a4
+MISC metadata.xml 313 RMD160 974b1335daa5b99cc1afc3d1592ca45e64b12259 SHA1 0e01789e32462b40a3d646d9de831a5987de65d2 SHA256 d7d339f2978f3b717d87eeffa70343181e30d19b42a74a498291bf641353e9aa
diff --git a/sci-libs/matio/files/matio-1.3.3-makefile.patch b/sci-libs/matio/files/matio-1.3.3-makefile.patch
new file mode 100644
index 000000000..49b192314
--- /dev/null
+++ b/sci-libs/matio/files/matio-1.3.3-makefile.patch
@@ -0,0 +1,29 @@
+--- src/Makefile.am.orig	2009-01-22 09:41:46.000000000 +0000
++++ src/Makefile.am	2009-01-22 11:12:09.000000000 +0000
+@@ -17,14 +17,16 @@
+ lib_LTLIBRARIES     = libmatio.la
+ libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \
+                       mat5.c mat4.c mat.c
++libmatio_la_LIBADD  = $(ZLIB_LIBS)
+ 
+ if ENABLE_FORTRAN
+     AM_FCFLAGS             = -I. -I$(top_builddir)/src/fortran
+     AM_LDFLAGS            +=  $(FCLDFLAGS)
+-    nodist_include_HEADERS =  $(top_builddir)/src/matio.mod
++    nodist_include_HEADERS = $(top_builddir)/src/matio.mod
+     noinst_HEADERS        += fortran/create.f90 fortran/read_data.f90 \
+                              fortran/write_data.f90 fortran/write.f90
+     libmatio_la_SOURCES   += fortran/matio_internal.c fortran/matio.f90
++$(top_builddir)/src/matio.mod: libmatio.la
+ endif
+ 
+ dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+@@ -32,7 +34,7 @@
+               -e 's,\/,\\,g'
+ 
+ doc:
+-	
++
+ 
+ print:
+ 	@list='$(libmatio_a_SOURCES)'; \
diff --git a/sci-libs/matio/matio-1.3.1.ebuild b/sci-libs/matio/matio-1.3.1.ebuild
deleted file mode 100644
index a5cc1da74..000000000
--- a/sci-libs/matio/matio-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fortran
-
-DESCRIPTION="Library for reading and writing matlab .mat files"
-HOMEPAGE="http://sourceforge.net/projects/matio/"
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc fortran"
-SRC_URI="mirror://sourceforge/matio/${P}.tar.gz"
-DEPEND="doc? ( app-doc/doxygen virtual/tetex )"
-FORTRAN="gfortran"
-
-#### Remove the following line when moving this ebuild to the main tree!
-RESTRICT="nomirror"
-
-pkg_setup() {
-	use fortran && fortran_pkg_setup
-}
-
-src_compile() {
-	addwrite /var/cache/fonts
-	addwrite /usr/share/texmf
-	econf --enable-shared \
-		--disable-test \
-		$(use_enable fortran ) \
-		$(use_enable doc docs ) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README ChangeLog
-}
diff --git a/sci-libs/matio/matio-1.3.3.ebuild b/sci-libs/matio/matio-1.3.3.ebuild
new file mode 100644
index 000000000..b2f8c2df5
--- /dev/null
+++ b/sci-libs/matio/matio-1.3.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils fortran autotools
+
+DESCRIPTION="Library for reading and writing matlab files"
+HOMEPAGE="http://sourceforge.net/projects/matio/"
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples fortran"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+DEPEND="doc? ( app-doc/doxygen virtual/latex-base )"
+RDEPEND=""
+
+#### Remove the following line when moving this ebuild to the main tree!
+RESTRICT="mirror"
+
+pkg_setup() {
+	use fortran && fortran_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--enable-shared \
+		--disable-test \
+		$(use_enable fortran) \
+		$(use_enable doc docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		install || die "emake install failed"
+	dodoc README ChangeLog
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doxygen/html
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/test*
+		insinto /usr/share/${PN}
+		doins share/test*
+	fi
+}
diff --git a/sci-libs/matio/metadata.xml b/sci-libs/matio/metadata.xml
index b229aec85..7e65648fd 100644
--- a/sci-libs/matio/metadata.xml
+++ b/sci-libs/matio/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+  matio is an ISO C library (with a limited Fortran 90 interface) for
+  reading and writing Matlab MAT files.
+</longdescription>
 </pkgmetadata>