Version bump.

(Portage version: 14208-svn/cvs/Linux x86_64)

2 files changed, 31 insertions, 18 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index d99985fbc2e4..aac86db56490 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.10 2009/08/12 18:17:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.11 2009/09/06 16:18:09 arfrever Exp $
+
+*mayavi-3.3.0 (06 Sep 2009)
+
+  06 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -mayavi-3.1.0.ebuild, +mayavi-3.3.0.ebuild:
+  Version bump.
 
   12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.2.0.ebuild:
   Removed wxwindows flag, since it is mandatory even with qt
diff --git a/sci-visualization/mayavi/mayavi-3.1.0.ebuild b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
index 8d89dbde65f4..3fd42d978219 100644
--- a/sci-visualization/mayavi/mayavi-3.1.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
@@ -1,39 +1,41 @@
 # 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.3 2009/03/27 10:55:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.1 2009/09/06 16:18:09 arfrever Exp $
 
-EAPI=2
-inherit eutils distutils
+EAPI="2"
+
+inherit distutils eutils
 
 MY_PN="Mayavi"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="VTK based scientific data visualizer"
 HOMEPAGE="http://code.enthought.com/projects/mayavi"
-SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
-IUSE="doc examples qt4 wxwindows"
+IUSE="doc examples qt4"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
 
-RDEPEND="dev-python/apptools
-	dev-python/enthoughtbase
-	dev-python/envisagecore
-	dev-python/envisageplugins
-	dev-python/traitsgui
+RDEPEND=">=dev-python/apptools-3.3.0
+	>=dev-python/enthoughtbase-3.0.3
+	>=dev-python/envisagecore-3.1.1
+	>=dev-python/envisageplugins-3.1.1
+	>=dev-python/traitsgui-3.1.0
 	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] ) )"
+	dev-python/wxpython:2.8[opengl]
+	qt4? ( dev-python/PyQt4[X,opengl] )"
 
 DEPEND="dev-python/setuptools
 	>=dev-python/numpy-1.1
 	>=sci-libs/vtk-5[python]"
-# doc needs X display
-#	doc? ( dev-python/setupdocs )"
+# doc and test need X display
+#	doc? ( dev-python/setupdocs )
+#	test? ( >=dev-python/nose-0.10.3 )
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -42,9 +44,10 @@ 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" \
+		-e "s/self.run_command('build_docs')/pass/" \
+		-e "/self.run_command('gen_docs')/d" \
 		setup.py || die
+#		-e "/self.run_command('mlab_ref')/d" \
 }
 
 src_compile() {
@@ -55,6 +58,10 @@ src_compile() {
 	#fi
 }
 
+src_test() {
+	PYTHONPATH="$(ls -d build/lib*)" "${python}" setup.py test || die "tests failed"
+}
+
 src_install() {
 	find "${S}" -name \*LICENSE\*.txt -delete
 	distutils_src_install