Added qt-svg dependency, switch to eapi 2

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 21 insertions, 24 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index 294498deedee..935d8c285959 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,9 @@
 # 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.14 2008/08/06 20:27:08 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.15 2009/01/29 09:51:12 bicatali Exp $
+
+  29 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> freemat-3.6.ebuild:
+  Added qt-svg dependency, switch to eapi 2
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index 81af1b99238c..dc956ddc360a 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 AUX freemat-3.6-includes.patch 12718 RMD160 81e22774a89ead773b7a7cc49dfce272014198bd SHA1 83af91282c6771cb6d7cac13fd5a2d83d1defe59 SHA256 4b9b71e1ad007f32c85b45e5ce950e552c167c9942bab91d77ba53c9a088d9d9
 AUX freemat-3.6-optional-deps.patch 2768 RMD160 53da537a8bb00e64ff887884217a7a46ccb28c05 SHA1 6b83d60570277a610f22a0e143e8afd88c44abdb SHA256 ff30ab1a5897234e91251b31bc3ef5e8acc97f8adb5b9443aebddecd83d5259c
 DIST FreeMat-3.6.tar.gz 7843736 RMD160 5af31332f42aafe952c6495b16ceee5ce4ab5d1c SHA1 2ffaac015f870409ceb07eae035efb94ab1d95cb SHA256 2cbc8b4435add159df11b734fd2736029b80f6c9712e53e5aa156eac1aac5951
-EBUILD freemat-3.6.ebuild 2049 RMD160 cd83ae08ca5d6ea5488b198fc03e56f46f18e45e SHA1 9c96ec8027f9634501e4d50de112afc5bec2317e SHA256 c2e990d6e3b9001f3f01ac0ef5d923263e4c4c5ce97c43bf7227aff4701a3e61
-MISC ChangeLog 2717 RMD160 e631398270554428006ac28fe56462ad000cf8f0 SHA1 c28644f58bed9acfbd6bc3115acbe4c3488878a3 SHA256 ada5f6821ea73462d905a3a0003a52bc8eded10ed5503d1a38ba70b609c4401e
+EBUILD freemat-3.6.ebuild 1954 RMD160 2f74effc2778b981b0fc1ed849c0403d6056b370 SHA1 b98f255c42fe75e4e836e555c2c17611093fc2f9 SHA256 9c149a3a05112c928a170a28dde843876f290b1db4368a4256e2a1d0a7b84a75
+MISC ChangeLog 2842 RMD160 43dc1b7eb7e99c5bfa7d40185dc737cb870fb605 SHA1 ed6c78d7dff62bc2e15f1f98737afbf43101c442 SHA256 bf2982d4333b56ee321a6939593302720037f53d3005a658c7b247061142179c
 MISC metadata.xml 835 RMD160 5d8fd93f94698b3342fa248378ada24c699f2ebe SHA1 3157bcd820f78c979338b18715a037ab9bc5bb6e SHA256 6a845d43fec77797c266774c6667bab9707098c1ffae00ef62626f3130214aa7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiaCSwACgkQOeoy/oIi7uwhnwCeN0pM0swag2krHNtg/xEKdXF/
-Id8AoLSvKDRlLPS99eoQm6sLGkrdyVZm
-=2F9R
+iEYEARECAAYFAkmBfBoACgkQ1ycZbhPLE2DsRgCgiYQDlU841s5Eg1/yLXNCnRYO
+VxIAn0uEa7V7vrnkg7m3T+GQ1dTIBnD/
+=snjI
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/freemat/freemat-3.6.ebuild b/sci-mathematics/freemat/freemat-3.6.ebuild
index d1c45665a175..b4109a78b838 100644
--- a/sci-mathematics/freemat/freemat-3.6.ebuild
+++ b/sci-mathematics/freemat/freemat-3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.6.ebuild,v 1.5 2008/07/27 14:22:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-3.6.ebuild,v 1.6 2009/01/29 09:51:13 bicatali Exp $
 
-EAPI="1"
+EAPI="2"
 inherit eutils autotools fdo-mime
 
 MY_PN=FreeMat
@@ -17,35 +17,31 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 )
-		 =x11-libs/qt-4.3*:4 )
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-svg:4 )
+		 x11-libs/qt:4[opengl] )
 	dev-libs/libpcre
 	virtual/lapack
 	virtual/opengl
 	ncurses? ( >=sys-libs/ncurses-5.4 )
 	umfpack? ( sci-libs/umfpack )
 	arpack? ( sci-libs/arpack )
-	fftw? ( >=sci-libs/fftw-3:3.0 )
+	fftw? ( sci-libs/fftw:3.0 )
 	portaudio? ( media-libs/portaudio )
 	ffcall? ( dev-libs/ffcall )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-QT4_BUILT_WITH_USE_CHECK="opengl"
-
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# allow enable/disable for configure
 	epatch "${FILESDIR}"/${P}-optional-deps.patch
 	epatch "${FILESDIR}"/${P}-includes.patch
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-blas="$(pkg-config --libs blas)" \
 		--with-lapack="$(pkg-config --libs lapack)" \
@@ -54,9 +50,7 @@ src_compile() {
 		$(use_enable arpack) \
 		$(use_enable fftw) \
 		$(use_enable portaudio) \
-		$(use_enable ffcall) \
-		|| die "econf failed"
-	emake || die "emake failed"
+		$(use_enable ffcall)
 }
 
 src_install() {
@@ -66,7 +60,7 @@ src_install() {
 	make_desktop_entry FreeMat FreeMat
 }
 
-pkg_postint() {
+pkg_postinst() {
 	fdo-mime_desktop_database_update
 	elog "Before using ${MY_PN}, do (as a normal user)"
 	elog "FreeMat -i /usr/share/${MY_P}"