bumped matio

5 files changed, 74 insertions, 74 deletions

diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog
index 6d402fd7c..37c11651a 100644
--- a/sci-libs/matio/ChangeLog
+++ b/sci-libs/matio/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sci-libs/matio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*matio-1.3.4 (10 Aug 2010)
+
+  10 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> -matio-1.3.3.ebuild,
+  -files/matio-1.3.3-makefile.patch, +matio-1.3.4.ebuild,
+  +files/matio-1.3.4-autotools.patch:
+  Version bump. Ebuild modernisation. Disabling doc generation (bug #330237)
+
 *matio-1.3.3 (22 Jan 2009)
 
   22 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 5bd6b2a63..0edd5d54d 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,5 +1,5 @@
-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
+AUX matio-1.3.4-autotools.patch 1087 RMD160 996771a8d033247fb701356a96b71ea56c5cb97f SHA1 0ae3f6e5e75ae0c211ab43ef4b7ac6d3948d107e SHA256 37a572925ae026e42b682b1a816ed0094e7e906b76bdde098e775b5d1c203f7c
+DIST matio-1.3.4.tar.gz 450343 RMD160 3a0f2fe1260e48af0fb9e501d0af1383cefe5dd3 SHA1 721b9b57f2437850dd114acca1f422622e2c47e2 SHA256 7261880b18a661e5d206b4e479d4334b47549f093130df42f7204fd05dfe0bc5
+EBUILD matio-1.3.4.ebuild 1127 RMD160 98bb6afc3c1361a100b3f392102f3ed8d618b1e5 SHA1 88d02c1c3f5a5a2de6e54f377e3f23befa584ebc SHA256 4d5c6ae5206abfb30d2831c2d53577b2ccc5b0dae41c8fd349e769e26f20ba07
+MISC ChangeLog 1144 RMD160 4d8c5db6e907cc1e57914ab22403d11cd56abdf7 SHA1 3ca196ded85f063d56f837c129d3504fdcfdba36 SHA256 a713f381d19c65654805b02e2b2e5f5699bf3aada7f07c931ca4e81d588a7f4e
 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.4-autotools.patch
index 49b192314..c9e6a0412 100644
--- a/sci-libs/matio/files/matio-1.3.3-makefile.patch
+++ b/sci-libs/matio/files/matio-1.3.4-autotools.patch
@@ -1,6 +1,17 @@
---- 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 @@
+--- configure.ac.orig	2010-08-10 20:36:52.000000000 +0100
++++ configure.ac	2010-08-10 20:39:03.000000000 +0100
+@@ -5,7 +5,7 @@
+ AC_INIT([MATIO],[1.3.4],[cch@isl-inc.com],[])
+ AC_CONFIG_SRCDIR([src/matio.h])
+ AC_CONFIG_AUX_DIR(config)
+-AC_CONFIG_MACRO_DIR([m4])
++
+ dnl AM_INIT_AUTOMAKE([-no-undefined])
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+--- src/Makefile.am.orig	2010-08-10 20:31:41.000000000 +0100
++++ src/Makefile.am	2010-08-10 20:34:44.000000000 +0100
+@@ -17,6 +17,7 @@
  lib_LTLIBRARIES     = libmatio.la
  libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \
                        mat5.c mat4.c mat.c
@@ -8,9 +19,7 @@
  
  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
+@@ -25,6 +26,7 @@
      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
@@ -18,12 +27,3 @@
  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.3.ebuild b/sci-libs/matio/matio-1.3.3.ebuild
deleted file mode 100644
index b2f8c2df5..000000000
--- a/sci-libs/matio/matio-1.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/matio-1.3.4.ebuild b/sci-libs/matio/matio-1.3.4.ebuild
new file mode 100644
index 000000000..9cd4fc1aa
--- /dev/null
+++ b/sci-libs/matio/matio-1.3.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit eutils autotools
+
+DESCRIPTION="Library for reading and writing matlab files"
+HOMEPAGE="http://sourceforge.net/projects/matio/"
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+# disabling (until fix) doxygen doc generation
+IUSE="examples fortran static-libs"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+#DEPEND="doc? ( app-doc/doxygen virtual/latex-base )"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-shared \
+		--disable-test \
+		$(use_enable fortran) \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README ChangeLog
+	#if use doc; then
+	#	insinto /usr/share/doc/${PF}
+	#	doins -r doxygen/html || die
+	#fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/test* || die
+		insinto /usr/share/${PN}
+		doins share/test* || die
+	fi
+}