sci-mathematics/freemat: freemat version bump

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

13 files changed, 65 insertions, 208 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index c6ca0f9fc..7127eb0d4 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-mathematics/freemat
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org> -freemat-2.0.ebuild,
+  -freemat-3.0.ebuild, -files/freemat-3.0.patch, +freemat-3.2.ebuild,
+  -files/Inspect.cpp.patch, -files/acinclude.m4.patch, -files/matio.patch,
+  metadata.xml:
+  version bump, adapted to sparse libraries in main tree.
+
 *freemat-3.0 (26 Feb 2007)
 
   26 Feb 2007; Andrey Grozin <A.G.Grozin@inp.nsk.su>
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index 003380184..fab2d2a03 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -1,40 +1,16 @@
-AUX Inspect.cpp.patch 459 RMD160 7d1d7e69f6e7e58f335b1882b39f143898c1d8eb SHA1 b070b831144f2c12b69cffb6be39f11bff12cdfb SHA256 b4253ddc6814acf3a33816846d283a94a3984c8570430f1e5cb6a0b3d5712f5d
-MD5 90a2b60b8408147ac9cc9dfa2b6a778b files/Inspect.cpp.patch 459
-RMD160 7d1d7e69f6e7e58f335b1882b39f143898c1d8eb files/Inspect.cpp.patch 459
-SHA256 b4253ddc6814acf3a33816846d283a94a3984c8570430f1e5cb6a0b3d5712f5d files/Inspect.cpp.patch 459
-AUX acinclude.m4.patch 461 RMD160 f4e59bb30b9702dd1ccbe9def2117b337dc604c9 SHA1 bbe36ef90056ad2f9a88b369e7877c2864ab6196 SHA256 67737de94dadfb35dc31654ab71104bdd84ee1a3459ba967884267608a1e2a4f
-MD5 bb5d03bdbb1d773db6fdea7d69d10d3d files/acinclude.m4.patch 461
-RMD160 f4e59bb30b9702dd1ccbe9def2117b337dc604c9 files/acinclude.m4.patch 461
-SHA256 67737de94dadfb35dc31654ab71104bdd84ee1a3459ba967884267608a1e2a4f files/acinclude.m4.patch 461
-AUX freemat-3.0.patch 1171 RMD160 4e253ee4242b81c662d953f052a3bdcf31e2daaa SHA1 04b5825a72069d5cf4dd0cf151002fd67b025dca SHA256 01708f04566a1bc346b5e5a4033a389940f8921a7860053145a9c3cdc44f121e
-MD5 ea7a69d13cb6ae354caace4d4a1c2896 files/freemat-3.0.patch 1171
-RMD160 4e253ee4242b81c662d953f052a3bdcf31e2daaa files/freemat-3.0.patch 1171
-SHA256 01708f04566a1bc346b5e5a4033a389940f8921a7860053145a9c3cdc44f121e files/freemat-3.0.patch 1171
-AUX matio.patch 592 RMD160 967550001207bc9ad89a221504a051ac1c247d54 SHA1 5798fb74726f82399066924e05506e84c7c3ccc8 SHA256 1531018215f7464cfdc17eff8169699d88e3f290d3752aed7becee3d7ce44c24
-MD5 90043c9223231d8cbf05fe319d396fe6 files/matio.patch 592
-RMD160 967550001207bc9ad89a221504a051ac1c247d54 files/matio.patch 592
-SHA256 1531018215f7464cfdc17eff8169699d88e3f290d3752aed7becee3d7ce44c24 files/matio.patch 592
-DIST FreeMat-2.0.tar.gz 16338697 RMD160 16a4e72a72cce9c7eae26b944fa904ac0b4c05c1 SHA1 d56540137c67215c3466366d7e37962f52003023 SHA256 52a82a06258267fed9a5a4a87ef5efe1dffd6b434eb9d1c6313d7a023faefb05
-DIST FreeMat-3.0.tar.gz 4592674 RMD160 43d14276fb43fe1127d284cbc932d6e47de8d9dc SHA1 8e4aa8a0f41034028fec0e5fe702e60d88123be8 SHA256 c49ddfe590ebc8497a5d8191dd76c459c2bf9420556c8bdb93ce2f77a28a08cd
-EBUILD freemat-2.0.ebuild 1002 RMD160 16cfbb020d34ab819e9e67fd43b728d039f7ff0d SHA1 025c5b9eb80ef58cc5237812bc69a16cc2e04d72 SHA256 1a638868ce9f7645dc48125f82449ace428ae937d021305faeb09104d25acaa4
-MD5 a83c462b457ea0a09635429fba4a6c47 freemat-2.0.ebuild 1002
-RMD160 16cfbb020d34ab819e9e67fd43b728d039f7ff0d freemat-2.0.ebuild 1002
-SHA256 1a638868ce9f7645dc48125f82449ace428ae937d021305faeb09104d25acaa4 freemat-2.0.ebuild 1002
-EBUILD freemat-3.0.ebuild 953 RMD160 11c3863c3f4ae993565298ff787d38a41c1d1e68 SHA1 b046c6c7f844c6d4f553f5629fcc10b45242723c SHA256 61218420c431e622e472881f5d2f4d40e2dcfe173b1c9fdd784174e2d0c0ad3e
-MD5 8badc31a42d3e701ee7e5ed85d96068e freemat-3.0.ebuild 953
-RMD160 11c3863c3f4ae993565298ff787d38a41c1d1e68 freemat-3.0.ebuild 953
-SHA256 61218420c431e622e472881f5d2f4d40e2dcfe173b1c9fdd784174e2d0c0ad3e freemat-3.0.ebuild 953
-MISC ChangeLog 680 RMD160 5af7994b9941a1bbb52c0d9144e6bca380739276 SHA1 68e6ad0b8be29503f59dad1de140122f8176f3a9 SHA256 f872f1891932d5e9a0d274f02f8d297a542622092f1cdae96343b70344bb4bda
-MD5 f7fca6037d33567b3cf0458d18180812 ChangeLog 680
-RMD160 5af7994b9941a1bbb52c0d9144e6bca380739276 ChangeLog 680
-SHA256 f872f1891932d5e9a0d274f02f8d297a542622092f1cdae96343b70344bb4bda ChangeLog 680
-MISC metadata.xml 712 RMD160 a142da8c64755da0d4dc45d1b0d5c3811fe159fa SHA1 dc9c3a828d4c7331fede1ede93e822992c6936ce SHA256 f9d0640b22cf6108fa24ee570c08711de6557691b860faad2ef33d5135802f38
-MD5 7e2ade75b6fa81df0d9a518a653a1c72 metadata.xml 712
-RMD160 a142da8c64755da0d4dc45d1b0d5c3811fe159fa metadata.xml 712
-SHA256 f9d0640b22cf6108fa24ee570c08711de6557691b860faad2ef33d5135802f38 metadata.xml 712
-MD5 fed9b5e29d99597813b256e0af65ad74 files/digest-freemat-2.0 241
-RMD160 19a572adb5d75cb933aac44b6ad879e8b01c9edf files/digest-freemat-2.0 241
-SHA256 1cb929cd39a788f4c69deb8fb2df5b382877d4dc30b5d62400812900426e33f9 files/digest-freemat-2.0 241
-MD5 c24f9fa4ab7182cbd09488af84c3655f files/digest-freemat-3.0 238
-RMD160 de2195e6233c0f3b07a90dea147cff344b108aaf files/digest-freemat-3.0 238
-SHA256 ee4caa6efccc5c33426fadb09bd5021d300af9332b8b849d547b5d2d2982444f files/digest-freemat-3.0 238
+DIST FreeMat-3.2.tar.gz 5265284 RMD160 5c7031ad8a4ea49c0f5f1b6e8cb2ae58094e4c1e SHA1 69bae1a08034d0624d2fb0bff76a3644fd256328 SHA256 59496c7275d704149f2f19584c63f0abf38d48b1a143b3665e4553d1bd81e545
+EBUILD freemat-3.2.ebuild 912 RMD160 266c63a6cf2a01bc7bb80dd18e86dd1bd4193d57 SHA1 67a9a51e15909eae95ef02282e4024be76c5c9c4 SHA256 3d7f62dea97707c4d6a4576776394885a47e98069f08705d4ceea13b1ce280e5
+MD5 ddf6676949e9d8cc86bdce6e9a91926d freemat-3.2.ebuild 912
+RMD160 266c63a6cf2a01bc7bb80dd18e86dd1bd4193d57 freemat-3.2.ebuild 912
+SHA256 3d7f62dea97707c4d6a4576776394885a47e98069f08705d4ceea13b1ce280e5 freemat-3.2.ebuild 912
+MISC ChangeLog 976 RMD160 4609543b019f5838de3f04fbaded24b48c36e690 SHA1 c7a7f5b3c8955c5b1c9d8de635500d536d636ec3 SHA256 df909349df9902b3aa6d69b051796bfbf6815eeb4fcc90b45378d842ce6824a2
+MD5 f397a362536acb389d764406b9879859 ChangeLog 976
+RMD160 4609543b019f5838de3f04fbaded24b48c36e690 ChangeLog 976
+SHA256 df909349df9902b3aa6d69b051796bfbf6815eeb4fcc90b45378d842ce6824a2 ChangeLog 976
+MISC metadata.xml 621 RMD160 fba47ba48355587f8b4324a18fbb7048151af08d SHA1 7b28d312c4b4f24cb1b9d4759faceae02fae9849 SHA256 55aaef3e78e14a762b33a8566a61e7377785abd30c08eb40116c3e152a66a60d
+MD5 e91351e2119da03b541df6998cab5e5a metadata.xml 621
+RMD160 fba47ba48355587f8b4324a18fbb7048151af08d metadata.xml 621
+SHA256 55aaef3e78e14a762b33a8566a61e7377785abd30c08eb40116c3e152a66a60d metadata.xml 621
+MD5 7f6f5e3ef15f17eb234872a1a0293913 files/digest-freemat-3.2 238
+RMD160 1a28584c0bdd2cc194954b5fbe41124938832ec1 files/digest-freemat-3.2 238
+SHA256 eac98ad4cc5133c36bdc4e5fbbdb4015e60c1ea4fb96bfb642c6ad809c5fd69d files/digest-freemat-3.2 238
diff --git a/sci-mathematics/freemat/files/Inspect.cpp.patch b/sci-mathematics/freemat/files/Inspect.cpp.patch
deleted file mode 100644
index 17440a8c2..000000000
--- a/sci-mathematics/freemat/files/Inspect.cpp.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- libs/libCore/Inspect.cpp.orig	2006-06-06 01:31:17.000000000 +0200
-+++ libs/libCore/Inspect.cpp	2006-06-30 22:47:25.000000000 +0200
-@@ -150,5 +150,5 @@
-       dir = QDir(QString(io->getAppPath().c_str()) + "/../Resources/help/html");
-     } else {
--      dir = QDir(QString(BASEPATH)+"/html");
-+      dir = QDir(QString(io->getAppPath().c_str())+"/"+QString(BASEPATH)+"/help/html");
-     }
-     HelpWindow *m_helpwin = new HelpWindow(dir.canonicalPath());
diff --git a/sci-mathematics/freemat/files/acinclude.m4.patch b/sci-mathematics/freemat/files/acinclude.m4.patch
deleted file mode 100644
index 6e5e54c81..000000000
--- a/sci-mathematics/freemat/files/acinclude.m4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- acinclude.m4.orig	2006-11-06 00:00:56.000000000 +0100
-+++ acinclude.m4	2006-11-06 02:40:51.000000000 +0100
-@@ -279,3 +279,3 @@
- need_extern="no"
--LIBS="$LIBS $FLIBS"
-+LIBS="-lblas $LIBS $FLIBS"
- 
-@@ -293,2 +293,7 @@
- fi
-+AC_CHECK_HEADERS(umfpack/umfpack.h)
-+if $HAVE_UMFPACK_UMFPACK_H; then
-+  CFLAGS="$CFLAGS -I/usr/include/umfpack"
-+  CXXFLAGS="$CXXFLAGS -I/usr/include/umfpack"
-+fi
- AC_CHECK_LIB(fftw3f,fftwf_malloc,found_fftw3f="yes",found_fftw3f="no")
diff --git a/sci-mathematics/freemat/files/digest-freemat-2.0 b/sci-mathematics/freemat/files/digest-freemat-2.0
deleted file mode 100644
index 1b032d6de..000000000
--- a/sci-mathematics/freemat/files/digest-freemat-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9325893a4babe0b4912c475afd9729e6 FreeMat-2.0.tar.gz 16338697
-RMD160 16a4e72a72cce9c7eae26b944fa904ac0b4c05c1 FreeMat-2.0.tar.gz 16338697
-SHA256 52a82a06258267fed9a5a4a87ef5efe1dffd6b434eb9d1c6313d7a023faefb05 FreeMat-2.0.tar.gz 16338697
diff --git a/sci-mathematics/freemat/files/digest-freemat-3.0 b/sci-mathematics/freemat/files/digest-freemat-3.0
deleted file mode 100644
index b3955096a..000000000
--- a/sci-mathematics/freemat/files/digest-freemat-3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d972d9393227fce4925e810034f02538 FreeMat-3.0.tar.gz 4592674
-RMD160 43d14276fb43fe1127d284cbc932d6e47de8d9dc FreeMat-3.0.tar.gz 4592674
-SHA256 c49ddfe590ebc8497a5d8191dd76c459c2bf9420556c8bdb93ce2f77a28a08cd FreeMat-3.0.tar.gz 4592674
diff --git a/sci-mathematics/freemat/files/digest-freemat-3.2 b/sci-mathematics/freemat/files/digest-freemat-3.2
new file mode 100644
index 000000000..ab3bb880b
--- /dev/null
+++ b/sci-mathematics/freemat/files/digest-freemat-3.2
@@ -0,0 +1,3 @@
+MD5 61c99ce56fcc244a4108b26b3ecb6d9b FreeMat-3.2.tar.gz 5265284
+RMD160 5c7031ad8a4ea49c0f5f1b6e8cb2ae58094e4c1e FreeMat-3.2.tar.gz 5265284
+SHA256 59496c7275d704149f2f19584c63f0abf38d48b1a143b3665e4553d1bd81e545 FreeMat-3.2.tar.gz 5265284
diff --git a/sci-mathematics/freemat/files/freemat-3.0.patch b/sci-mathematics/freemat/files/freemat-3.0.patch
deleted file mode 100644
index ddd5e69a1..000000000
--- a/sci-mathematics/freemat/files/freemat-3.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -U2 --recursive FreeMat-3.0.orig/acinclude.m4 FreeMat-3.0/acinclude.m4
---- FreeMat-3.0.orig/acinclude.m4	2006-12-28 15:03:20.000000000 +0100
-+++ FreeMat-3.0/acinclude.m4	2007-02-25 18:47:37.000000000 +0100
-@@ -297,5 +297,4 @@
- 
- AC_CHECK_LIB(amd,amd_postorder,found_amd="yes",found_amd="no")
--AC_CHECK_HEADER(amd.h,[],found_amd="no")
- 
- if test x"$found_amd" == xyes; then
-@@ -303,9 +302,11 @@
- fi
- 
-+LIBS="-lblas $LIBS"
- AC_CHECK_LIB(umfpack,umfpack_zl_solve,found_umfpack="yes",found_umfpack="no")
--AC_CHECK_HEADER(umfpack.h,[],found_umfpack="no")
- 
- if test x"$found_umfpack" == xyes; then
-   LIBS="-lumfpack $LIBS"
-+  CFLAGS="-I/usr/include/umfpack $CFLAGS"
-+  CXXFLAGS="-I/usr/include/umfpack $CXXFLAGS"
- fi
- if test x"$found_amd" == xyes; then
-diff -U2 --recursive FreeMat-3.0.orig/configure.in FreeMat-3.0/configure.in
---- FreeMat-3.0.orig/configure.in	2007-01-09 05:32:57.000000000 +0100
-+++ FreeMat-3.0/configure.in	2007-02-25 18:50:29.000000000 +0100
-@@ -65,5 +65,5 @@
-    FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'`
-    AC_MSG_NOTICE([Extra lib flags added $FOO])
--   LDFLAGS="$LDFLAGS $FOO"
-+   LDFLAGS="$LDFLAGS $QT_LIBS"
- fi
- 
diff --git a/sci-mathematics/freemat/files/matio.patch b/sci-mathematics/freemat/files/matio.patch
deleted file mode 100644
index b5a1748ad..000000000
--- a/sci-mathematics/freemat/files/matio.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libs/libCore/IO.cpp.orig	2006-08-29 02:50:09.000000000 +0200
-+++ libs/libCore/IO.cpp	2006-08-29 02:52:10.000000000 +0200
-@@ -1785,5 +1785,5 @@
-       char header[116];
-       time_t t = time(NULL);
--      mat_snprintf(header, 116, 
-+      snprintf(header, 116, 
- 		   "MATLAB 5.0 MAT-file, Platform: %s, Created on: %s by %s", 
- 		   MATIO_PLATFORM, ctime(&t), 
-@@ -2190,5 +2190,5 @@
-       mat_t *mat = Mat_Open(fname, MAT_ACC_RDONLY);
-       if (!mat) {
--	mat = Mat_Open(fname, MAT_ACC_RDONLY | MAT_V4);
-+	mat = Mat_Open(fname, MAT_ACC_RDONLY | MAT_FT_MAT4);
-       }
-       if (mat) {
diff --git a/sci-mathematics/freemat/freemat-2.0.ebuild b/sci-mathematics/freemat/freemat-2.0.ebuild
deleted file mode 100644
index 76720bdfd..000000000
--- a/sci-mathematics/freemat/freemat-2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools
-
-DESCRIPTION="Freemat is a free environment for rapid engineering and scientific prototyping and data processing"
-HOMEPAGE="http://freemat.sourceforge.net/"
-
-MY_PN=FreeMat
-MY_P="${MY_PN}-${PV}"
-
-RESTRICT="nomirror"
-SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-libs/ncurses-5.4-r5 virtual/blas virtual/lapack dev-libs/ffcall\
-	sci-libs/umfpack sci-libs/arpack >=sci-libs/matio-1.3.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	find -name '*.moc.cpp' | xargs rm -f
-	epatch "${FILESDIR}/acinclude.m4.patch"
-	epatch "${FILESDIR}/Inspect.cpp.patch"
-	epatch "${FILESDIR}/matio.patch"
-}
-
-src_compile() {
-	eautoconf
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}
diff --git a/sci-mathematics/freemat/freemat-3.0.ebuild b/sci-mathematics/freemat/freemat-3.0.ebuild
deleted file mode 100644
index cd200bb6a..000000000
--- a/sci-mathematics/freemat/freemat-3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils autotools
-
-DESCRIPTION="Freemat is a free environment for rapid engineering and scientific prototyping and data processing"
-HOMEPAGE="http://freemat.sourceforge.net/"
-
-MY_PN=FreeMat
-MY_P="${MY_PN}-${PV}"
-
-#### delete the next line when moving this ebuild to the main tree!
-RESTRICT="nomirror"
-
-SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND=">=sys-libs/ncurses-5.4-r5 virtual/blas virtual/lapack dev-libs/ffcall\
-	sci-libs/umfpack sci-libs/arpack >=x11-libs/qt-4.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-${PV}.patch"
-}
-
-src_compile() {
-	eautoconf
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README AUTHORS ChangeLog
-}
diff --git a/sci-mathematics/freemat/freemat-3.2.ebuild b/sci-mathematics/freemat/freemat-3.2.ebuild
new file mode 100644
index 000000000..2ed17b796
--- /dev/null
+++ b/sci-mathematics/freemat/freemat-3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils autotools qt4
+
+MY_PN=FreeMat
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Environment for rapid engineering and scientific prototyping and data processing"
+HOMEPAGE="http://freemat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
+
+IUSE="ncurses ffcall fftw umfpack arpack"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libpcre
+	virtual/lapack
+	ncurses? ( >=sys-libs/ncurses-5.4 )
+	umfpack? ( sci-libs/umfpack )
+	arpack? ( sci-libs/arpack )
+	fftw? ( >=sci-libs/fftw-3 )"
+
+RDEPEND="${DEPEND}
+	ffcall? ( dev-libs/ffcall )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf $(use_with ncurses) || "econf failed"
+	emake || "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS ChangeLog
+}
diff --git a/sci-mathematics/freemat/metadata.xml b/sci-mathematics/freemat/metadata.xml
index e236cf5d3..14feb0518 100644
--- a/sci-mathematics/freemat/metadata.xml
+++ b/sci-mathematics/freemat/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<maintainer>
-<email>A.G.Grozin@inp.nsk.su</email>
-<name>Andrey Grozin</name>
-</maintainer>
 <longdescription lang="en">
 FreeMat is a free environment for rapid engineering and scientific prototyping
 and data processing. It is similar to commercial systems such as MATLAB from Mathworks,