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

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 91 insertions, 27 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/Manifest b/sci-visualization/mayavi/Manifest
index d198a5059da8..03df89d8ba3f 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX mayavi-4.1.0-vtkQt.patch 862 RMD160 949758a989683d099bee922baa352053d8993d65 SHA1 502a775939078d1f505168d2c41bf062d6038cb1 SHA256 46c7df9cf9971549303cd4d76848f5fd00080251c00cd962b8cb92c0f2933b25
-DIST mayavi-4.1.0.tar.gz 7764207 RMD160 db9a6bf5af9778f11ebf5c22e5c2c7f1b8dc6557 SHA1 22331a479560a2c4db6248336d60838f24f18150 SHA256 53d44cf4dcd7ebf57e197e0a72002db30a74f23e5642e34b3b8f2ebe7a71bbf9
-EBUILD mayavi-4.1.0-r1.ebuild 1664 RMD160 fd49e91e3ed88d2f1d613e04f4171ff15434940e SHA1 f7f224a4f19745a9a648d9a6b7ad72798ec71bd5 SHA256 00e0042ea7f7df0556fac8a6b9a491db76d97191e09f342bb0d4062309799a43
-EBUILD mayavi-4.1.0.ebuild 1558 RMD160 1777d88b8f61e8ca5825d4369b8a5ab5b58ba11d SHA1 6986643e70fdbd1fddac7a4aea6cc63d1edcc930 SHA256 bd057d1950097673f661265ae1aa0c85470d9d8f5f7202fd17bcfd067ac68e1c
-MISC ChangeLog 4844 RMD160 d5c2b39614e842e4764b93bd324e82b2bd04e54d SHA1 6cf363f6c0f2023087aaaad5cfe3faec79d21c8b SHA256 a878c3fd12aa8681447521c1927b48361b2aea8cade68d7f561e53c26e0d5c5c
-MISC metadata.xml 1188 RMD160 7a8775a1fd9ad8db0b2b84bca8bb54f623507a19 SHA1 a98fe92b0c80511c471b0eb5caec537d920ea9e2 SHA256 7743a7e02ebecec07a666004d9c3f4a10c404368875096caa5bb965534846151
+AUX mayavi-4.1.0-vtkQt.patch 862 SHA256 46c7df9cf9971549303cd4d76848f5fd00080251c00cd962b8cb92c0f2933b25 SHA512 f8d59f0c549378b06efc5c1beb8b1059d7c737e727b56370a3f70de464c8ba2123ca5fc6c5ecb6bddcc46f7d2b185eaed68f98fa852bdf3edfa2b38b329e9335 WHIRLPOOL d5520a80e344b7d20223c7d56a5261998f92afc80837c311dfbc2eec2fb500569542f091e0a835a0fbd796b11e27732d7aff25ed037d7ca6a1266f807f5fcaee
+AUX mayavi-4.2.0-doc.patch 1099 SHA256 084328815f4e94f7b4cbdb6422813d09eb1aa0d9a1bd2f1ea4fb8607e76438ab SHA512 7c51c59e277f1b3f06b01ed79f2293b1c90d0908020b6891c135aebcebcfe70ebbd5645a206903ea1b3f192ed84ba55dd0a5a6898208c862cbdd760c636ff1c8 WHIRLPOOL e22716929ae148736ace32581dacfd0a62f3fc1e84e5fa59479b20bd05ae81bec44ebcca56efef14ea0bc186d9c986072c5cbf84b6b63e5f46f36012dcef14a3
+DIST mayavi-4.1.0.tar.gz 7764207 SHA256 53d44cf4dcd7ebf57e197e0a72002db30a74f23e5642e34b3b8f2ebe7a71bbf9 SHA512 49b73452802c4d37b76f542e96d29bc085da712e2eda9acf1a18b1047d37efc59a23e6dfbdf2b0d32cbeca042ea51993285f56447ad080ee7f67b6a7027400ed WHIRLPOOL 6625340287eaff20adc154d3e07a9ec4564db967ac8fbc480c1fa53e3c12ff66e093cf5832f9c6ac7dfee1c224016c873c76d6584b4a3a6cb1072d4fcfb76812
+DIST mayavi-4.2.0.tar.gz 7765122 SHA256 4554fc5a5ef58c3e57bb83f8f21340d8e0b483c46d4761ece133baa162a43a9b SHA512 199fefc97b8848554c0ffb02be01867bb54be0aa735f468e9e6259557faffa2c9076c09a510587a745d39af11a08a188b0521b74ff4d083d76f1162a73c8e97f WHIRLPOOL 277ffccd7d7a62b0b592289631ae98b58332faf39cd17e57b0e508139734b4a9b98797a84ddad823a025b26f72f048b60f1e34354de6de64901fd9db9875a460
+EBUILD mayavi-4.1.0-r1.ebuild 1707 SHA256 35242fcdea37a9dab6281410b41f3cd3d6b95861f74755c1116040033c237ff6 SHA512 784bdc656ef22e058eeca1c2d11a73157ab37bc3f9408b2c330d4d6b7ef524df82b1de322590163f6b95ee8e5dbd72b949734def93f5c5ffc953c0eeb268c8f9 WHIRLPOOL 8abeec70a11964ff399aaeeaab3a3f9510773219a49f24f5e9f1096b07b6c98fc361d8e818343664191d2a68a4976debdbe9ae8ed5a79b18991c59197fbab259
+EBUILD mayavi-4.2.0.ebuild 1754 SHA256 f430ecc8ec17a732d634ca578c118a84854c9e2395daecd0a8306c036aec8b13 SHA512 3c81eeec41c52b664b89020cb02d059a8e1ac7270c26592fdb00c946805e5b90ae2a72876f9f4bf336fa835398615ff7fe9d8f75bffe1738d5e7420b095ebcf5 WHIRLPOOL 44cb21e84217e5d9d0c50512a43f83dd01f8c7a384185c621c62776c4f1fb132da84bdc6417d42f750ba3b02f8999b52bee298f608df969f2b4b9b72f7e6b586
+MISC ChangeLog 5164 SHA256 8858fc9f11c6544b807fcff4f4a7965656f925d0572dcb5b0ab425ac875c243d SHA512 448a77f64d949ab912e13444ffbc9709811ed797173f1f8fdabdfeb6555318798efa74d150a0f5ae3bbef84390272908077719f054fe6a714c078a51601439a2 WHIRLPOOL a924e0a330e48a30a3128551230aff5080cd140beb11bc6e0c29aef632f149d411a7997b66a09839bb0d02eb734c7f1629fc514b1e23dd8c410fe23a9ef9d31c
+MISC metadata.xml 1188 SHA256 7743a7e02ebecec07a666004d9c3f4a10c404368875096caa5bb965534846151 SHA512 386c5dcc2a3a2898a607dea8cea5a32b70a9411e7e7936cbef6446108e6aea890bd266df3bac2b5b810d95b59b123b74a5e04562167d837cda8fc265838a2b94 WHIRLPOOL 04ac5658c7b415245983ccea685f532ed18f88b75da07b57d3c28bae390cafa21a29d35e71122006c9d9061e5cef6ae53e988e88dfbdfdc9fd6747c8cd8aa0d5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk9UmxUACgkQgAnW8HDreRYgEQCcD5WrRKq/Zby//Te7ARzDjhKH
-GisAnjiNjnyBDExW19Q3G5TQfueVcCL7
-=xj8+
+iEYEAREIAAYFAlDAvZIACgkQgAnW8HDreRZGagCdElPLhIiawpMnr86TXlnC91f9
+XOQAn0o2ddfI/L38s/jOe1AvLrMdRh2d
+=mcEp
 -----END PGP SIGNATURE-----
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
 }