Version bump and fixed wxwindows dependencies

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

4 files changed, 96 insertions, 11 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index aea0368f7928..a560ea5ad05a 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/mayavi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.7 2009/03/20 21:02:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.8 2009/03/27 10:55:03 bicatali Exp $
+
+*mayavi-3.2.0 (27 Mar 2009)
+
+  27 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.1.0.ebuild,
+  +mayavi-3.2.0.ebuild:
+  Version bump and fixed wxwindows dependencies
 
   20 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.1.0.ebuild:
   Introduce wxwindows and qt4 flags to enforce opengl, closing bug #261402
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index 6f124248a409..81f63219c16f 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX mayavi-1.5-tkinter_objects.patch 496 RMD160 ef1d679c918ee091f0c976c9a88cc30aa106efc6 SHA1 6ffa1c85cfa450f00e4423bd1c7c2a2db16344d2 SHA256 5b2444bdfbd12cf79cba006de15da8fe5f64257c4fc4d9cd3d93e6929aa2c378
 DIST MayaVi-1.5.tar.gz 525440 RMD160 19eb0e969c7782f57ae72847981eb961548f5aad SHA1 b4dc17cccbd9f13edd27947a971a3a250b7f6357 SHA256 3642d98e7e3b9e542401269eab2db6cbe7be4ecdccc450e8413b8372df136c91
 DIST Mayavi-3.1.0.tar.gz 10219107 RMD160 4b5ff63d5a5605e31e924c5e0657abac611530ae SHA1 b9337ba8fdd1471501e34b02057b3391720691a1 SHA256 5d76906920a5f6d81497577cd6ddfd4ad75f192ba18aad6b27b9f7aa59472b80
+DIST Mayavi-3.2.0.tar.gz 10514749 RMD160 1737a91bdee9abe7ee4553ef397f3a77c931f3c2 SHA1 e2baa5b955cffbc8022babd87b2b15aee4451c68 SHA256 802b606ddc07f4a705ab74776ad0bf9447ffd42aa27f536ec05e161769d20cd9
 EBUILD mayavi-1.5-r1.ebuild 1150 RMD160 2d5c055a4a61e872873e75efd02bbc3e6caf289f SHA1 f398b696b4eaef46cdd5d6480ad1a3b5d5ce2aa4 SHA256 e4f361e6b2e036143bdd70ce70b7c75a3bb3785f59033e8fc959ef2132d28292
-EBUILD mayavi-3.1.0.ebuild 1915 RMD160 9aa57e0ef7c2c3a6e7e8c73625d16a969ba298d7 SHA1 7b96f2cc0b090b084f258040778d3bc0f9f44787 SHA256 999a5bf55257a80da7d69499a9e4d02172aa333cb25e7dae4733b280a78b366d
-MISC ChangeLog 1392 RMD160 2fe2181884f35d812bc976b8b7b06b8097bfea06 SHA1 85c800522db2f958ec0a3d89dc1fdfd97a4d1049 SHA256 f374d9535a487d5b3aae149ef3a066a03fbf8cd34b5b39250271eaff0acb5d06
+EBUILD mayavi-3.1.0.ebuild 1904 RMD160 b2d5a8466d6aeffd12ef6df359f1d6f050688fb9 SHA1 0b7507d0e85bbca01ea79809ba9fba2737dfd60a SHA256 8ad84a0fb04347e90d190f6b79593b556833f26fc79501a7fe17947b63fee461
+EBUILD mayavi-3.2.0.ebuild 2067 RMD160 6b7d2edd86697e84164364c4e85239d6ac3545c4 SHA1 fac155aaff3ec403f5d16aa98e3c294906359d79 SHA256 9f21b424b8f84f132daed2999733ccf3e13eef7158c4fc8fcbdd9c9ff61fc447
+MISC ChangeLog 1570 RMD160 2722af045d7a06f6a37ec7050c76d9a3f016877d SHA1 3a5102cfa11a5f932e3f8a886fd266c4f7379192 SHA256 a4ba2be22048d1b68ef87c3c1d8fdb1174c3cd393c933f5c3ae433586090e202
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknEBGMACgkQ1ycZbhPLE2DhswCghDjOJYaES/u4L8CG+ehhfInl
-1scAnAm1dpsSFDuxgtRC4DgE3zDxlb3D
-=7B8Z
+iEYEARECAAYFAknMsJEACgkQ1ycZbhPLE2DjqQCeNFFyZLmOaO6l+IZ4MEUz/T1E
+X7oAmwRFdj10rA+5jxJZf9y+gb5z+Vop
+=ylOc
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/mayavi-3.1.0.ebuild b/sci-visualization/mayavi/mayavi-3.1.0.ebuild
index 641ebe995eea..8d89dbde65f4 100644
--- a/sci-visualization/mayavi/mayavi-3.1.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.1.0.ebuild,v 1.2 2009/03/20 21:02:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.1.0.ebuild,v 1.3 2009/03/27 10:55:03 bicatali Exp $
 
 EAPI=2
 inherit eutils distutils
@@ -23,12 +23,11 @@ RDEPEND="dev-python/apptools
 	dev-python/traitsgui
 	dev-python/configobj
 	dev-python/ipython
-	dev-python/wxpython:2.8
 	>=dev-python/numpy-1.1
 	>=sci-libs/vtk-5[python]
-	qt4? ( x11-libs/qt-opengl )
-	wxwindows? ( dev-python/wxpython[opengl] )
-	!wxwindows? ( !qt4? ( dev-python/wxpython[opengl] ) )"
+	qt4? ( dev-python/PyQt4[opengl] )
+	wxwindows? ( dev-python/wxpython:2.8[opengl] )
+	!wxwindows? ( !qt4? ( dev-python/wxpython:2.8[opengl] ) )"
 
 DEPEND="dev-python/setuptools
 	>=dev-python/numpy-1.1
diff --git a/sci-visualization/mayavi/mayavi-3.2.0.ebuild b/sci-visualization/mayavi/mayavi-3.2.0.ebuild
new file mode 100644
index 000000000000..93659d8774ea
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-3.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.2.0.ebuild,v 1.1 2009/03/27 10:55:03 bicatali Exp $
+
+EAPI=2
+inherit eutils distutils
+
+MY_PN="Mayavi"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="VTK based scientific data visualizer"
+HOMEPAGE="http://code.enthought.com/projects/mayavi"
+SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
+
+IUSE="doc examples qt4 wxwindows"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+
+RDEPEND="dev-python/apptools
+	>=dev-python/enthoughtbase-3.0.2
+	>=dev-python/envisagecore-3.1.0
+	>=dev-python/envisageplugins-3.1.0
+	>=dev-python/traitsgui-3.0.4
+	dev-python/configobj
+	dev-python/ipython
+	>=dev-python/numpy-1.1
+	>=sci-libs/vtk-5[python]
+	qt4? ( dev-python/PyQt4[opengl] )
+	wxwindows? ( dev-python/wxpython:2.8[opengl] )
+	!wxwindows? ( !qt4? ( dev-python/wxpython:2.8[opengl] ) )"
+
+DEPEND="dev-python/setuptools
+	>=dev-python/numpy-1.1
+	>=sci-libs/vtk-5[python]"
+# doc and test needs  display
+#	doc? ( dev-python/setupdocs )"
+#	test? ( >=dev-python/nose-0.10.3 ){{
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_MODNAME="enthought"
+
+src_prepare() {
+	# remove docs and mlab which needs a display
+	sed -i \
+		-e "/self.run_command('build_docs')/d" \
+		-e "/self.run_command('mlab_ref')/d" \
+		setup.py || die
+}
+
+src_compile() {
+	distutils_src_compile
+	#if use doc; then
+	#	${python} setup.py build_docs --formats=html,pdf \
+	#		|| die "doc building failed"
+	#fi
+}
+
+src_test() {
+	PYTHONPATH=$(dir -d build/lib*) "${python}" setup.py test || die "tests failed"
+}
+
+src_install() {
+	find "${S}" -name \*LICENSE\*.txt -delete
+	distutils_src_install
+	dodoc docs/*.txt
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		#doins -r build/docs/html build/docs/latex/*/* || die
+		doins docs/pdf/*.pdf docs/pdf/*/*.pdf || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+	newicon enthought/mayavi/core/ui/images/m2.png mayavi2.png
+	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
+}