3 files changed, 11 insertions, 81 deletions
diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index 4f582a13164e..aaa25b64de62 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2009/09/14 09:17:11 grozin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.13 2010/03/15 03:22:41 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -mayavi-3.2.0.ebuild,
+  mayavi-3.3.0.ebuild:
+  Fixed building with new setuptools, bug #308213
 
   14 Sep 2009; Andrey Grozin <grozin@gentoo.org> mayavi-3.3.0.ebuild,
   +files/mayavi-3.3.0-nodocs.patch:
diff --git a/sci-visualization/mayavi/mayavi-3.2.0.ebuild b/sci-visualization/mayavi/mayavi-3.2.0.ebuild
deleted file mode 100644
index 5d65c8d7fb62..000000000000
--- a/sci-visualization/mayavi/mayavi-3.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.3 2009/08/12 18:17:52 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"
-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]
-	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 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
-}
diff --git a/sci-visualization/mayavi/mayavi-3.3.0.ebuild b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
index 1a07ec3d3c3b..fa418b41913a 100644
--- a/sci-visualization/mayavi/mayavi-3.3.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.3 2009/09/14 09:17:11 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.4 2010/03/15 03:22:41 bicatali Exp $
 
 EAPI="2"
 inherit distutils eutils
@@ -44,6 +44,9 @@ PYTHON_MODNAME=enthought
 src_prepare() {
 	# documentation generation requires X
 	epatch "${FILESDIR}"/${P}-nodocs.patch
+	sed -i \
+		-e "s/setupdocs>=1.0//" \
+		setup.py || die
 }
 
 src_install() {