Specify blas/lapack with new mechanism, added opengl requirement for qt4, and some cleaning

Package-Manager: portage-2.1.4_rc14

5 files changed, 37 insertions, 75 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index b13eca34bd57..a0dd74a42322 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/freemat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.7 2008/01/11 11:22:28 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.8 2008/01/13 14:52:50 bicatali Exp $
+
+  13 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> -freemat-3.4.ebuild,
+  freemat-3.5.ebuild:
+  Specify blas/lapack with new mechanism, added opengl requirement for
+  qt4, and some cleaning.
 
   11 Jan 2008; Markus Dittrich <markusle@gentoo.org> freemat-3.5.ebuild:
   Added missing QT4 dependency (fixes bug #205259).
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index 8dbdbb0b152b..f44a03aaaf32 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -1,24 +1,26 @@
-DIST FreeMat-3.4.tar.gz 5613257 RMD160 94fc779cc5bd23721669dff6e05aad2481b93fa8 SHA1 352f100fc2b1083345f8d3ea3230b2429e87acb3 SHA256 25ef84e9b8f62b1f301a35f2e617797a68a0a7b4f6653c1400ea7c7f67293411
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST FreeMat-3.5.tar.gz 5616432 RMD160 bf1fe57208d8ec8de283c6bbf20ceb454d182b57 SHA1 73db83936c973c0819ddbcd8bf56f774ae367b68 SHA256 cd19e6734ca091cd6f32f945c3a249be377c1874a0347870c879c807ceb46e3a
-EBUILD freemat-3.4.ebuild 1274 RMD160 e9a65991f4da662ab540cc7871a4e578f9b2a4cd SHA1 0cdd0dcb80ce861de18bd91d529ecf2d379930f4 SHA256 fb873bcf9ef853e0ffda62fb0dafcb7e5a0aa93e160822528a86bdc250823ff6
-MD5 80ad5cb1ed9afef7f922e108de2f5315 freemat-3.4.ebuild 1274
-RMD160 e9a65991f4da662ab540cc7871a4e578f9b2a4cd freemat-3.4.ebuild 1274
-SHA256 fb873bcf9ef853e0ffda62fb0dafcb7e5a0aa93e160822528a86bdc250823ff6 freemat-3.4.ebuild 1274
-EBUILD freemat-3.5.ebuild 1316 RMD160 f0a3e353ad0a917f4715bbafd1251bb5ab5c03e6 SHA1 5f4c5b83532c3ca37d4c654d7e6f8b76bdf9b422 SHA256 cf86e966c932c6d4a541afc607f6579130c8888de25b2a8d63f746b25a26f8cd
-MD5 f0c12027c66111b218a2917d461b2557 freemat-3.5.ebuild 1316
-RMD160 f0a3e353ad0a917f4715bbafd1251bb5ab5c03e6 freemat-3.5.ebuild 1316
-SHA256 cf86e966c932c6d4a541afc607f6579130c8888de25b2a8d63f746b25a26f8cd freemat-3.5.ebuild 1316
-MISC ChangeLog 1445 RMD160 77662f7213c5461283e0d5ba030995297812dcda SHA1 b1d978a092d82fe06fdafbdb2714532c164c3031 SHA256 8d82e2767818f9d976e5d639f9197f458f0bd40b5424fa5b37581a305ab3e360
-MD5 b09eb13b7d2be04eda226156d8eb0d2b ChangeLog 1445
-RMD160 77662f7213c5461283e0d5ba030995297812dcda ChangeLog 1445
-SHA256 8d82e2767818f9d976e5d639f9197f458f0bd40b5424fa5b37581a305ab3e360 ChangeLog 1445
+EBUILD freemat-3.5.ebuild 1423 RMD160 546a3b3042d04a0f2d130dfb7d0d6a6eed837ee1 SHA1 431d35ddb48f627f8df46e9e24f157c45ceebdec SHA256 17b65de3ff2256dad99c9f9a8d5e0f80df719360a52fe7bd4d7f365abaabf6c2
+MD5 ff84fdf8d7488f13bceee23131fe2e3a freemat-3.5.ebuild 1423
+RMD160 546a3b3042d04a0f2d130dfb7d0d6a6eed837ee1 freemat-3.5.ebuild 1423
+SHA256 17b65de3ff2256dad99c9f9a8d5e0f80df719360a52fe7bd4d7f365abaabf6c2 freemat-3.5.ebuild 1423
+MISC ChangeLog 1641 RMD160 d17fdf5c69f57777a1b9a57777032583bfc6ba72 SHA1 92499d999acf80e3d29283e7856945a45c7c3d5c SHA256 a7479c917d9d7d143bcb8cd8504a477952552a32b63af68855931156dd5a8164
+MD5 9ff9f0b648d6156dbafde15fe9544ce8 ChangeLog 1641
+RMD160 d17fdf5c69f57777a1b9a57777032583bfc6ba72 ChangeLog 1641
+SHA256 a7479c917d9d7d143bcb8cd8504a477952552a32b63af68855931156dd5a8164 ChangeLog 1641
 MISC metadata.xml 633 RMD160 85beda9c9c5e814b2496e58d130395eea57c95c6 SHA1 056f84c52f0127037301cd1c9eeb2e6cb4f78e0b SHA256 849579f8debbef517f3b1c8f8de502d08c062d8011ef99231459d8cf2388bcb4
 MD5 538566e4f46a298ba249d645a1e8eeeb metadata.xml 633
 RMD160 85beda9c9c5e814b2496e58d130395eea57c95c6 metadata.xml 633
 SHA256 849579f8debbef517f3b1c8f8de502d08c062d8011ef99231459d8cf2388bcb4 metadata.xml 633
-MD5 2fef59e6e7d5db29667cfb0187bdc1aa files/digest-freemat-3.4 238
-RMD160 f36f7c86bc6e19c0cf9686b1029f08ecd8d58b27 files/digest-freemat-3.4 238
-SHA256 436a5f209ad9aa0f013162addf28dfe2cfd86e9e7046fde4faed3a13d96da28f files/digest-freemat-3.4 238
 MD5 a894bf591190468c8acebb4410966f10 files/digest-freemat-3.5 238
 RMD160 1774b3bcf71f47ad1b2cd18bce7df67f3b4bdf89 files/digest-freemat-3.5 238
 SHA256 72cae75b428e72b4ef990f27407a9c54425f77ed5b173fdc44ca8d3e53a6c8f3 files/digest-freemat-3.5 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHiiXL1ycZbhPLE2ARApJ8AJ90ipD550RsrgdZxH4ihA1KsfnwegCeMQ5U
+hMx1rQWFDEBifEC1k+5naaI=
+=YUG3
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/freemat/files/digest-freemat-3.4 b/sci-mathematics/freemat/files/digest-freemat-3.4
deleted file mode 100644
index 7c7f1fcc534d..000000000000
--- a/sci-mathematics/freemat/files/digest-freemat-3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b781dac6e4b0dd284631bacdbbfb00d8 FreeMat-3.4.tar.gz 5613257
-RMD160 94fc779cc5bd23721669dff6e05aad2481b93fa8 FreeMat-3.4.tar.gz 5613257
-SHA256 25ef84e9b8f62b1f301a35f2e617797a68a0a7b4f6653c1400ea7c7f67293411 FreeMat-3.4.tar.gz 5613257
diff --git a/sci-mathematics/freemat/freemat-3.4.ebuild b/sci-mathematics/freemat/freemat-3.4.ebuild
deleted file mode 100644
index a239b33dc4a7..000000000000
--- a/sci-mathematics/freemat/freemat-3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.4.ebuild,v 1.3 2007/09/26 10:10:34 bicatali Exp $
-
-inherit eutils flag-o-matic 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 portaudio"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/libpcre
-	virtual/lapack
-	dev-util/pkgconfig
-	ncurses? ( >=sys-libs/ncurses-5.4 )
-	umfpack? ( sci-libs/umfpack )
-	arpack? ( sci-libs/arpack )
-	fftw? ( >=sci-libs/fftw-3 )
-	portaudio? ( media-libs/portaudio )"
-
-RDEPEND="${DEPEND}
-	ffcall? ( dev-libs/ffcall )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# -O3 won't compile for freemat-3.2
-	replace-flags "-O3" "-O2"
-	econf $(use_with ncurses) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog
-}
-
-pkg_postint() {
-	einfo "Initializing freemat data directory"
-	FreeMat -i "${ROOT}"/usr/share/${MY_P}
-}
diff --git a/sci-mathematics/freemat/freemat-3.5.ebuild b/sci-mathematics/freemat/freemat-3.5.ebuild
index f0bf43309f63..abd47db43b42 100644
--- a/sci-mathematics/freemat/freemat-3.5.ebuild
+++ b/sci-mathematics/freemat/freemat-3.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.5.ebuild,v 1.3 2008/01/11 11:22:28 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.5.ebuild,v 1.4 2008/01/13 14:52:50 bicatali Exp $
 
-inherit eutils flag-o-matic autotools qt4
+inherit flag-o-matic qt4
 
 MY_PN=FreeMat
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="Environment for rapid engineering and scientific prototyping and data processing"
+DESCRIPTION="Environment for rapid engineering and scientific processing"
 HOMEPAGE="http://freemat.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freemat/${MY_P}.tar.gz"
 
@@ -16,10 +16,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="$(qt4_min_version 4)
+DEPEND="$(qt4_min_version 4.2)
 	dev-libs/libpcre
 	virtual/lapack
-	dev-util/pkgconfig
 	ncurses? ( >=sys-libs/ncurses-5.4 )
 	umfpack? ( sci-libs/umfpack )
 	arpack? ( sci-libs/arpack )
@@ -29,12 +28,19 @@ DEPEND="$(qt4_min_version 4)
 RDEPEND="${DEPEND}
 	ffcall? ( dev-libs/ffcall )"
 
-S=${WORKDIR}/${MY_P}
+DEPEND="dev-util/pkgconfig"
+
+QT4_BUILT_WITH_USE_CHECK="opengl"
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	# -O3 still doesn't compile freemat-3.5
 	replace-flags -O3 -O2
-	econf $(use_with ncurses) || die "econf failed"
+	econf \
+		--with-blas="(pkg-config --libs blas)" \
+		--with-lapack="(pkg-config --libs lapack)" \
+		$(use_with ncurses) \
+		|| die "econf failed"
 	emake || die "emake failed"
 }