Version bump.

Package-Manager: portage-14208-svn/cvs/Linux x86_64

3 files changed, 34 insertions, 31 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/Manifest b/sci-visualization/mayavi/Manifest
index dc300433ef5b..c6ccef1d99d6 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
+DIST Mayavi-3.3.0.tar.gz 8836342 RMD160 8fadb580135beefe09abc9baf0bd2e712a513f31 SHA1 81b27041020a4885c8dc605039ea0fde3e0a9995 SHA256 310796f1533222bcb1da9673f6c5254acffda2053a9c1778c3d0227f3f78d80d
 EBUILD mayavi-1.5-r1.ebuild 1150 RMD160 2d5c055a4a61e872873e75efd02bbc3e6caf289f SHA1 f398b696b4eaef46cdd5d6480ad1a3b5d5ce2aa4 SHA256 e4f361e6b2e036143bdd70ce70b7c75a3bb3785f59033e8fc959ef2132d28292
-EBUILD mayavi-3.1.0.ebuild 1904 RMD160 b2d5a8466d6aeffd12ef6df359f1d6f050688fb9 SHA1 0b7507d0e85bbca01ea79809ba9fba2737dfd60a SHA256 8ad84a0fb04347e90d190f6b79593b556833f26fc79501a7fe17947b63fee461
 EBUILD mayavi-3.2.0.ebuild 1985 RMD160 f03d21900609ac56f3db7b8f64821dfb5da9e6de SHA1 9561c3d5f864eedaad4c5832da65c36915f8986a SHA256 13f563d597a8069ef8b7d0ef513f5e6fe493713c35ae8ad2adca2a61081efcfe
-MISC ChangeLog 1868 RMD160 26e4204c7b5bc86420cf772f7de360b228bfbaf3 SHA1 4a23cf149938dc2616066b273c12b1f880d28065 SHA256 de9aafe5f13623edd12720b320d556c5c636ed00967012f28a109b1864a8daf7
+EBUILD mayavi-3.3.0.ebuild 2043 RMD160 c6ff8ad71f09168c72a0b6ab1910cb4b472b5bb0 SHA1 0ff0e2b433572f62bd980e9b16aa9ae8c03f208e SHA256 30525af98df704887e0fb2269d574004356819eb975975df1f705a826a165a13
+MISC ChangeLog 2033 RMD160 2221fbe974af2056e76410dcb9c8ef6cd9ff3f6f SHA1 41f2fe037c7c48e697525fb06be4f2e7b3fe8719 SHA256 1e7858ab4157d165a8f92742488b299d48ec1d1bf2f541ead9c9df656ba7af2e
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqDB3wACgkQ1ycZbhPLE2D6SQCfYYDZv2McevaePKVIWA51H04V
-7TkAnR1RZJopl+mBhMsTcLVonBlg54eM
-=J4Lp
------END PGP SIGNATURE-----
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