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

(Portage version: 2.1.4_rc14)

4 files changed, 19 insertions, 59 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/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"
 }