Simplify dependencies. Delete useless src_test().

(Portage version: HEAD/cvs/Linux x86_64)

1 files changed, 22 insertions, 30 deletions

diff --git a/sci-visualization/mayavi/mayavi-3.3.2.ebuild b/sci-visualization/mayavi/mayavi-3.3.2.ebuild
index 453f2b19174f..a29af9769e1c 100644
--- a/sci-visualization/mayavi/mayavi-3.3.2.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.2.ebuild
@@ -1,50 +1,43 @@
 # 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.2.ebuild,v 1.1 2010/05/31 07:23:16 jlec Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.2.ebuild,v 1.2 2010/07/07 16:41:15 arfrever Exp $
 
+EAPI="3"
 PYTHON_DEPEND="2"
 
 inherit distutils eutils
 
-PYTHON_MODNAME=enthought
+MY_PN="Mayavi"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="VTK based scientific data visualizer"
+HOMEPAGE="http://code.enthought.com/projects/mayavi/ http://pypi.python.org/pypi/Mayavi"
+SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
+#	doc? ( mirror://gentoo/${PN}-docs-${PV}.tar.bz2 )"
+
 LICENSE="BSD"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc qt4"
 
-MY_PN="Mayavi"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="http://code.enthought.com/projects/${PN}/"
-
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-#	doc? ( mirror://gentoo/${PN}-docs-${PV}.tar.bz2 )"
-
 RDEPEND=">=dev-python/apptools-3.3.2
+	dev-python/configobj
 	>=dev-python/enthoughtbase-3.0.5
 	>=dev-python/envisagecore-3.1.2
 	>=dev-python/envisageplugins-3.1.2
-	>=dev-python/traitsgui-3.4.0[qt4?,wxwidgets]
-	dev-python/configobj
 	dev-python/ipython
 	dev-python/numpy
-	>=sci-libs/vtk-5[python]
+	>=dev-python/traitsgui-3.4.0[qt4?,wxwidgets]
 	dev-python/wxpython:2.8[opengl]
+	>=sci-libs/vtk-5[python]
 	qt4? ( dev-python/PyQt4[X,opengl] )"
-
-DEPEND="dev-python/setuptools
-	dev-python/numpy
-	>=sci-libs/vtk-5[python]"
-
-# tests require X
-RESTRICT=test
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
 
 S="${WORKDIR}"/${MY_P}
 
+PYTHON_MODNAME="enthought"
+
 pkg_setup() {
 	python_set_active_version 2
 }
@@ -52,14 +45,17 @@ pkg_setup() {
 src_prepare() {
 	# documentation generation requires X
 	#epatch "${FILESDIR}"/${P}-nodocs.patch
-	sed -i \
-		-e "s/setupdocs>=1.0//" \
-		setup.py || die
+
+	sed \
+		-e "s/self.run_command('build_docs')/pass/" \
+		-e "/setupdocs>=1.0/d" \
+		-i setup.py || die "sed setup.py failed"
+
 	distutils_src_prepare
 }
 
 src_install() {
-	find "${S}" -name \*LICENSE\*.txt -delete
+	find "${S}" -name "*LICENSE*.txt" -delete
 	distutils_src_install
 	dodoc docs/*.txt
 	if use doc; then
@@ -68,7 +64,3 @@ src_install() {
 	newicon enthought/mayavi/core/ui/images/m2.png mayavi2.png
 	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
 }
-
-src_test() {
-	PYTHONPATH="$(ls -d build/lib*)" "$(PYTHON)" setup.py test || die "tests failed"
-}