Version bump and fixed wxwindows dependencies

(Portage version: 2.2_rc26/cvs/Linux x86_64)

3 files changed, 89 insertions, 6 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/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
+}