matio-1.3.1: version bump

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

6 files changed, 23 insertions, 103 deletions

diff --git a/sci-libs/matio/ChangeLog b/sci-libs/matio/ChangeLog
index 8e957194a..2e51a3bb3 100644
--- a/sci-libs/matio/ChangeLog
+++ b/sci-libs/matio/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*matio-1.3.1 (20 Sep 2006)
+
+  20 Sep 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
+  +matio-1.3.1.ebuild, -matio-1.3.0.ebuild, -files/matio-1.1.4.patch:
+  version bump, now at sourceforge
+
 *matio-1.3.0 (28 August 2006)
 
   28 August 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 9daf1c850..73ffac69a 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,32 +1,16 @@
-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-1.3.1.tar.gz 938713 RMD160 64e12e1774db3054ce11f6efd15686c8432a3197 SHA1 70af161a788f7f5e171f27e2655763454ec33839 SHA256 5c8e5df8500c4e444865f65e94ba2b1084a0a370733195655099f5c6f2069eb0
-DIST matio.zip 928268 RMD160 be72c66b82ad1733c305565faf3e2678f28d19f1 SHA1 353267c0fd4e751a01281f4c198ea0a43b2fc391 SHA256 3dfa2e700a3171e249a582104d328d377ac84dddd0bb704d08cc59acf4c92ae9
-EBUILD matio-1.3.0.ebuild 1074 RMD160 567083b17c4625f1ee67032c2231e1ad5a45b608 SHA1 189c3a48f10dc973e18df570f4382d1bd41627e3 SHA256 f7c114cf9561cb7f68010586d52f86f8c7b56d3ed476f46aae8553c34e8e1bd5
-MD5 b903b5ecc2a82bfbad68f21fd2dc936f matio-1.3.0.ebuild 1074
-RMD160 567083b17c4625f1ee67032c2231e1ad5a45b608 matio-1.3.0.ebuild 1074
-SHA256 f7c114cf9561cb7f68010586d52f86f8c7b56d3ed476f46aae8553c34e8e1bd5 matio-1.3.0.ebuild 1074
-EBUILD matio-1.3.1.ebuild 1018 RMD160 32c8ff45cbe7529b231fc7b4a3022e3d09db6fcd SHA1 ed864c133732e6db54930a35e2c3ace0530f23c9 SHA256 0af03b47b505e873025fa0ff82e66c1a5aeb7f572b3e9b04d19be93d535b5711
-MD5 e5bd72c716e91c727fefc847615c5773 matio-1.3.1.ebuild 1018
-RMD160 32c8ff45cbe7529b231fc7b4a3022e3d09db6fcd matio-1.3.1.ebuild 1018
-SHA256 0af03b47b505e873025fa0ff82e66c1a5aeb7f572b3e9b04d19be93d535b5711 matio-1.3.1.ebuild 1018
-MISC ChangeLog 427 RMD160 d1345071278280aae929c18e67b40b8713ff979e SHA1 a8512b0eeeadc0f92c7f90742542728cc0e1038c SHA256 6bb1b8de6bc5e427f20263a9113932a6c89b92f585430ba16f1ecda53813e602
-MD5 6cab931c9aad537fb05ddd73cbe6b3ac ChangeLog 427
-RMD160 d1345071278280aae929c18e67b40b8713ff979e ChangeLog 427
-SHA256 6bb1b8de6bc5e427f20263a9113932a6c89b92f585430ba16f1ecda53813e602 ChangeLog 427
-MISC matio-1.3.1.ebuild~ 1074 RMD160 567083b17c4625f1ee67032c2231e1ad5a45b608 SHA1 189c3a48f10dc973e18df570f4382d1bd41627e3 SHA256 f7c114cf9561cb7f68010586d52f86f8c7b56d3ed476f46aae8553c34e8e1bd5
-MD5 b903b5ecc2a82bfbad68f21fd2dc936f matio-1.3.1.ebuild~ 1074
-RMD160 567083b17c4625f1ee67032c2231e1ad5a45b608 matio-1.3.1.ebuild~ 1074
-SHA256 f7c114cf9561cb7f68010586d52f86f8c7b56d3ed476f46aae8553c34e8e1bd5 matio-1.3.1.ebuild~ 1074
+EBUILD matio-1.3.1.ebuild 934 RMD160 d016ca4368ae273ce318c0ccd760e753984ccb28 SHA1 9f3f8337ab21adcdbe7609ff1a86e1e025eefdd8 SHA256 b50c30d51e690368a8ce71592d9da3eda96fe1ae96288bf5a551f54fea85da1d
+MD5 b51e9d74d6ce5ae231baf6ceef54a048 matio-1.3.1.ebuild 934
+RMD160 d016ca4368ae273ce318c0ccd760e753984ccb28 matio-1.3.1.ebuild 934
+SHA256 b50c30d51e690368a8ce71592d9da3eda96fe1ae96288bf5a551f54fea85da1d matio-1.3.1.ebuild 934
+MISC ChangeLog 614 RMD160 4f8e87a9ab63a5a191d44506e709bb6b12b4053f SHA1 02008a45278e5c147425e2878c2edb14bb4c6b1a SHA256 b484aadb1ab72c5b263ba70a319a48e95afaff6f5e580a5c09a5d44abdc00847
+MD5 d4dd43f5bcc59a6c6044b2e19d906fb1 ChangeLog 614
+RMD160 4f8e87a9ab63a5a191d44506e709bb6b12b4053f ChangeLog 614
+SHA256 b484aadb1ab72c5b263ba70a319a48e95afaff6f5e580a5c09a5d44abdc00847 ChangeLog 614
 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 91df5ba84158011f7322db8f5038c4ef files/digest-matio-1.3.0 208
-RMD160 9caefee5f717c212805d84380363404f5b748282 files/digest-matio-1.3.0 208
-SHA256 a1db3b7591bd9fb491bc7d625ec5d9a4385959118b41d4c6f6c923190727c9de files/digest-matio-1.3.0 208
 MD5 049329071be9c28be0591789249e663d files/digest-matio-1.3.1 235
 RMD160 bed79bf8046c81d670eae9195f9b1b53cff8b1c1 files/digest-matio-1.3.1 235
 SHA256 1040dbe93b503f579998679242ce50479f9093208f11dd06c436c90deab04254 files/digest-matio-1.3.1 235
diff --git a/sci-libs/matio/files/digest-matio-1.3.0 b/sci-libs/matio/files/digest-matio-1.3.0
deleted file mode 100644
index d477a17b9..000000000
--- a/sci-libs/matio/files/digest-matio-1.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 571cb9a3489f32b2c20731e7a231482a matio.zip 928268
-RMD160 be72c66b82ad1733c305565faf3e2678f28d19f1 matio.zip 928268
-SHA256 3dfa2e700a3171e249a582104d328d377ac84dddd0bb704d08cc59acf4c92ae9 matio.zip 928268
diff --git a/sci-libs/matio/files/digest-matio-1.3.1 b/sci-libs/matio/files/digest-matio-1.3.1
new file mode 100644
index 000000000..7413cf9d8
--- /dev/null
+++ b/sci-libs/matio/files/digest-matio-1.3.1
@@ -0,0 +1,3 @@
+MD5 8fd9a3a6c2587deade56b0846642ebd3 matio-1.3.1.tar.gz 938713
+RMD160 64e12e1774db3054ce11f6efd15686c8432a3197 matio-1.3.1.tar.gz 938713
+SHA256 5c8e5df8500c4e444865f65e94ba2b1084a0a370733195655099f5c6f2069eb0 matio-1.3.1.tar.gz 938713
diff --git a/sci-libs/matio/files/matio-1.1.4.patch b/sci-libs/matio/files/matio-1.1.4.patch
deleted file mode 100644
index 4f0adca65..000000000
--- a/sci-libs/matio/files/matio-1.1.4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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 @@
- 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 -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-1.0
- doc_DATA = $(top_builddir)/doxygen/latex/libmatio.pdf
- 
-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 23:36:48.000000000 +0200
-@@ -29,7 +29,4 @@
-               -e 's,\/,\\,g'
- 
--doc:
--	
--
- print:
- 	@list='$(libmatio_a_SOURCES)'; \
-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 @@
- 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.3.0.ebuild b/sci-libs/matio/matio-1.3.1.ebuild
index 9dc0bc40d..baf1f2d49 100644
--- a/sci-libs/matio/matio-1.3.0.ebuild
+++ b/sci-libs/matio/matio-1.3.1.ebuild
@@ -5,15 +5,15 @@
 inherit eutils
 
 DESCRIPTION="Library for reading and writing matlab .mat files"
-HOMEPAGE="http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=8187&objectType=file"
+HOMEPAGE="http://sourceforge.net/projects/matio/"
 SLOT="0"
 LICENSE="LGPL"
 KEYWORDS="~x86"
 IUSE="doc fortran"
-SRC_URI="http://www.mathworks.com/matlabcentral/files/8187/${PN}.zip"
+RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/matio/${P}.tar.gz"
 DEPEND="doc? ( app-doc/doxygen virtual/tetex )
 	fortran? ( >=gcc-4.1 )"
-S="${WORKDIR}/${PN}"
 
 pkg_setup() {
 	if use fortran ; then
@@ -24,18 +24,12 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/matio-1.1.4.patch"
-}
-
 src_compile() {
 	addwrite /var/cache/fonts
 	addwrite /usr/share/texmf
-	aclocal
-	automake || true
-	econf --enable-shared $(use_enable fortran ) $(use_enable doc docs ) \
+	aclocal -I config
+	automake
+	econf --enable-shared --disable-test $(use_enable fortran ) $(use_enable doc docs ) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }