Documentation generation requires X, so docs are cached on Gentoo mirrors. Closing bug #284080.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 46 insertions, 41 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index aac86db56490..4f582a13164e 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2009/09/06 16:18:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.12 2009/09/14 09:17:11 grozin Exp $
+
+  14 Sep 2009; Andrey Grozin <grozin@gentoo.org> mayavi-3.3.0.ebuild,
+  +files/mayavi-3.3.0-nodocs.patch:
+  Documentation generation requires X, so docs are cached on Gentoo mirrors.
+  Closing bug #284080.
 
 *mayavi-3.3.0 (06 Sep 2009)
 
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index d71a67fe6be0..af5071352e22 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,9 +1,11 @@
 AUX mayavi-1.5-tkinter_objects.patch 496 RMD160 ef1d679c918ee091f0c976c9a88cc30aa106efc6 SHA1 6ffa1c85cfa450f00e4423bd1c7c2a2db16344d2 SHA256 5b2444bdfbd12cf79cba006de15da8fe5f64257c4fc4d9cd3d93e6929aa2c378
+AUX mayavi-3.3.0-nodocs.patch 520 RMD160 093bc5c77fec4be52fd2e286900315f8a759469c SHA1 92b046d1aa6f3a61ec398a8cfc06b16308e8de05 SHA256 83cc446334913864c0f306584c3b9fadc08820c8aa1a0f7b830c73ff6bb44c78
 DIST MayaVi-1.5.tar.gz 525440 RMD160 19eb0e969c7782f57ae72847981eb961548f5aad SHA1 b4dc17cccbd9f13edd27947a971a3a250b7f6357 SHA256 3642d98e7e3b9e542401269eab2db6cbe7be4ecdccc450e8413b8372df136c91
 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
+DIST mayavi-docs-3.3.0.tar.bz2 3483768 RMD160 ba862eaf02e70193b9b2833da9b48c205156d365 SHA1 3a54b73e05c581aab9ba62a9b841d19bd52ffd7e SHA256 34da65b5763c75766d6bef7da382fac45a6b063be7b8c33f98b8cad4bcc2d278
 EBUILD mayavi-1.5-r1.ebuild 1150 RMD160 2d5c055a4a61e872873e75efd02bbc3e6caf289f SHA1 f398b696b4eaef46cdd5d6480ad1a3b5d5ce2aa4 SHA256 e4f361e6b2e036143bdd70ce70b7c75a3bb3785f59033e8fc959ef2132d28292
 EBUILD mayavi-3.2.0.ebuild 1985 RMD160 f03d21900609ac56f3db7b8f64821dfb5da9e6de SHA1 9561c3d5f864eedaad4c5832da65c36915f8986a SHA256 13f563d597a8069ef8b7d0ef513f5e6fe493713c35ae8ad2adca2a61081efcfe
-EBUILD mayavi-3.3.0.ebuild 2001 RMD160 5f7915fd75f5483b474af46f656901e4c7bc0cdc SHA1 f21b4a3eaf5132e7de0cbac499d01b5ba25ff043 SHA256 16ea16183c9e721d78af781d6ec6782e2ebece01dd87adb9f74cd4e8cdbf7625
-MISC ChangeLog 2033 RMD160 2221fbe974af2056e76410dcb9c8ef6cd9ff3f6f SHA1 41f2fe037c7c48e697525fb06be4f2e7b3fe8719 SHA256 1e7858ab4157d165a8f92742488b299d48ec1d1bf2f541ead9c9df656ba7af2e
+EBUILD mayavi-3.3.0.ebuild 1579 RMD160 435a36c39657e9db6d4780f1a19294dd990f372d SHA1 f485abed4780ae38a5bf2d96183bacc4584a801d SHA256 4b2935333b2b8a3b6c178a78ad417d7d91f009efb05608f72963eacb01c748c9
+MISC ChangeLog 2238 RMD160 ef518286145b12f717d047c3751f944597d71e0f SHA1 78bdb60bb45caa46dff033868e0987c944d77a4c SHA256 b81acc675df37ceef0137ccea1cad7a0f998d52b63c55c38e355752c2bf6fd51
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
diff --git a/sci-visualization/mayavi/files/mayavi-3.3.0-nodocs.patch b/sci-visualization/mayavi/files/mayavi-3.3.0-nodocs.patch
new file mode 100644
index 000000000000..64dba32d26a3
--- /dev/null
+++ b/sci-visualization/mayavi/files/mayavi-3.3.0-nodocs.patch
@@ -0,0 +1,14 @@
+diff -r -U2 Mayavi-3.3.0.orig/setup.py Mayavi-3.3.0/setup.py
+--- Mayavi-3.3.0.orig/setup.py	2009-07-16 18:27:25.000000000 +0200
++++ Mayavi-3.3.0/setup.py	2009-09-11 17:43:20.000000000 +0200
+@@ -282,10 +282,4 @@
+         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()))
+ 
+ 
diff --git a/sci-visualization/mayavi/mayavi-3.3.0.ebuild b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
index bfa03701ba8a..1a07ec3d3c3b 100644
--- a/sci-visualization/mayavi/mayavi-3.3.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
@@ -1,21 +1,23 @@
 # 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.3.0.ebuild,v 1.2 2009/09/06 17:37:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.3 2009/09/14 09:17:11 grozin Exp $
 
 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://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-IUSE="doc examples qt4"
+LICENSE="BSD"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
+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.0
 	>=dev-python/enthoughtbase-3.0.3
@@ -32,47 +34,29 @@ RDEPEND=">=dev-python/apptools-3.3.0
 DEPEND="dev-python/setuptools
 	>=dev-python/numpy-1.1
 	>=sci-libs/vtk-5[python]"
-# doc and test need X display
-#	doc? ( dev-python/setupdocs )
-#	test? ( >=dev-python/nose-0.10.3 )
-RESTRICT="test"
 
-S="${WORKDIR}/${MY_P}"
+# tests require X
+RESTRICT=test
 
-PYTHON_MODNAME="enthought"
+S="${WORKDIR}"/${MY_P}
+PYTHON_MODNAME=enthought
 
 src_prepare() {
-	# remove docs and mlab which needs a display
-	sed -i \
-		-e "s/self.run_command('build_docs')/pass/" \
-		-e "/self.run_command('gen_docs')/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="$(ls -d build/lib*)" "${python}" setup.py test || die "tests failed"
+	# documentation generation requires X
+	epatch "${FILESDIR}"/${P}-nodocs.patch
 }
 
 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
+		dohtml -A txt,py,inv -r "${WORKDIR}"/html/*
 	fi
 	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"
+}