sci-visualization/mayavi: Drop old; restrict tests as they are broken, #422951; only build docs with USE=doc and only once, #445782; Version Bump; Add missing Deps

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 78 insertions, 16 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index bdec2b063d4e..e48d70221d87 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/mayavi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.28 2012/03/05 10:53:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.29 2012/12/06 15:45:21 jlec Exp $
+
+*mayavi-4.2.0 (06 Dec 2012)
+
+  06 Dec 2012; Justin Lecher <jlec@gentoo.org> -mayavi-4.1.0.ebuild,
+  mayavi-4.1.0-r1.ebuild, +mayavi-4.2.0.ebuild, +files/mayavi-4.2.0-doc.patch:
+  Drop old; restrict tests as they are broken, #422951; only build docs with
+  USE=doc and only once, #445782; Version Bump; Add missing Deps
 
   05 Mar 2012; Justin Lecher <jlec@gentoo.org> mayavi-4.1.0.ebuild,
   mayavi-4.1.0-r1.ebuild:
diff --git a/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch b/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
new file mode 100644
index 000000000000..1cdb129871e3
--- /dev/null
+++ b/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
@@ -0,0 +1,37 @@
+ setup.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0177c44..58d13b0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -300,14 +300,14 @@ class MyBuild(build.build):
+     """
+ 
+     def run(self):
+-        build_tvtk_classes_zip()
++#        build_tvtk_classes_zip()
+         build.build.run(self)
+-        self.run_command('gen_docs')
+-        try:
+-            self.run_command('build_docs')
+-        except:
+-            log.warn("Couldn't build documentation:\n%s" %
+-                     traceback.format_exception(*sys.exc_info()))
++#        self.run_command('gen_docs')
++#        try:
++#            self.run_command('build_docs')
++#        except:
++#            log.warn("Couldn't build documentation:\n%s" %
++#                     traceback.format_exception(*sys.exc_info()))
+ 
+ 
+ 
+@@ -494,6 +494,6 @@ numpy.distutils.core.setup(
+     license = "BSD",
+     long_description = '\n'.join(DOCLINES[3:]),
+     platforms = ["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"],
+-    zip_safe = False,
++    zip_safe = True,
+     **config
+ )
diff --git a/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild b/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild
index 34fa4c7d16ea..1328a6fc6273 100644
--- a/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild,v 1.3 2012/03/05 10:53:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild,v 1.4 2012/12/06 15:45:21 jlec Exp $
 
 EAPI=4
 
@@ -31,8 +31,10 @@ CDEPEND="sci-libs/vtk[python]"
 DEPEND="
 	${CDEPEND}
 	dev-python/setuptools
+	doc? ( dev-python/sphinx )
 	test? (
 		${RDEPEND}
+		dev-python/nose
 		dev-python/wxpython[opengl]
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
@@ -40,6 +42,11 @@ DEPEND="
 
 DOCS="docs/*.txt"
 
+# Its broken, run
+# mayavi2 --test
+# instead
+RESTRICT="test"
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -56,10 +63,6 @@ src_compile() {
 	use doc && virtualmake -C docs html
 }
 
-src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
-}
-
 src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
@@ -72,5 +75,6 @@ src_install() {
 	fi
 
 	newicon mayavi/core/ui/images/m2.png mayavi2.png
-	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
+	make_desktop_entry ${PN}2 \
+		"Mayavi2 2D/3D Scientific Visualization" ${PN}2
 }
diff --git a/sci-visualization/mayavi/mayavi-4.1.0.ebuild b/sci-visualization/mayavi/mayavi-4.2.0.ebuild
index 74f029e96664..b682ecc62dac 100644
--- a/sci-visualization/mayavi/mayavi-4.1.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0.ebuild,v 1.4 2012/03/05 10:53:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.2.0.ebuild,v 1.1 2012/12/06 15:45:21 jlec Exp $
 
 EAPI=4
 
@@ -10,7 +10,9 @@ DISTUTILS_SRC_TEST="nosetests"
 inherit distutils eutils virtualx
 
 DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
-HOMEPAGE="http://code.enthought.com/projects/mayavi/ http://pypi.python.org/pypi/mayavi"
+HOMEPAGE="
+	http://code.enthought.com/projects/mayavi/
+	http://pypi.python.org/pypi/mayavi/"
 SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -31,8 +33,10 @@ CDEPEND="sci-libs/vtk[python]"
 DEPEND="
 	${CDEPEND}
 	dev-python/setuptools
+	doc? ( dev-python/sphinx )
 	test? (
 		${RDEPEND}
+		dev-python/nose
 		dev-python/wxpython[opengl]
 		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
@@ -40,22 +44,31 @@ DEPEND="
 
 DOCS="docs/*.txt"
 
+# Its broken, run
+# mayavi2 --test
+# instead
+RESTRICT="test"
+
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
 
-src_compile() {
-	distutils_src_compile
-	use doc && virtualmake -C docs html
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-doc.patch
+	distutils_src_prepare
 }
 
-src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		$(PYTHON) setup.py gen_docs || die
+		$(PYTHON) setup.py build_docs || die
+	fi
 }
 
 src_install() {
-	find -name "*LICENSE*.txt" -delete
+	find . -name "*LICENSE*.txt" -delete || die
 	distutils_src_install
 
 	use doc && dohtml -r docs/build/mayavi/html/*
@@ -66,5 +79,6 @@ src_install() {
 	fi
 
 	newicon mayavi/core/ui/images/m2.png mayavi2.png
-	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
+	make_desktop_entry ${PN}2 \
+		"Mayavi2 2D/3D Scientific Visualization" ${PN}2
 }