Removed doc building because buggy. Now unzip the bundled docs and link in proper directory, fixing bug #341753. Updated longdescription to reflect mayavi2

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 62 insertions, 44 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index 1c25875e6d5c..0cf71ec008bd 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/mayavi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.19 2011/02/01 01:56:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.20 2011/02/01 19:05:53 bicatali Exp $
+
+  01 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.4.1.ebuild,
+  metadata.xml:
+  Removed doc building because buggy. Now unzip the bundled docs and link in
+  proper directory, fixing bug #341753. Updated longdescription to reflect
+  mayavi2
 
   01 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -mayavi-1.5-r1.ebuild, -files/mayavi-1.5-tkinter_objects.patch:
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index e3da1841ad89..da3f9e7ffc2a 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Mayavi-3.4.1.tar.gz 9343848 RMD160 669d9c90bcc9bd67a1bd7b90bbafd314b849c20c SHA1 b4bf2e03bcea73dfb32a5e1052ff2df0ea618ab6 SHA256 9eeb26f94fbfc7ca6694a3c82ff92a8fa310c127c2d538144da7d01193995aab
-EBUILD mayavi-3.4.1.ebuild 2414 RMD160 f5ad32774db6a7087a4f97560d68567f6142d99e SHA1 c93f10df0a27ed4ec1e9bede5c892d5539545dcf SHA256 56889815a6b4180e3ac9736689fb712c164a170e00f923409af04d727d9c1576
-MISC ChangeLog 3382 RMD160 937174532371003e776869c9bb7afe61bcbc34f4 SHA1 4c2616c8c362be29690b60b4bc1389b4804a3e49 SHA256 8cef21c40f4e35a611675038bdd44b363dc6e83c37e86f57efeaeda0262b25ab
-MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
+EBUILD mayavi-3.4.1.ebuild 2122 RMD160 a45000453a666ae7a3ebb40628dc869487356839 SHA1 a8646152ae9378334f555c3a22a7a121537f92e0 SHA256 ab22b7acdcf3d78056189ff1f62cc5bc9b4d99eba25dd3d56da40a96dd95297c
+MISC ChangeLog 3637 RMD160 efb81f6fca037eb9e643af294948dce6694a477f SHA1 d4fa77c789795646c6f0e805008c5d4518478510 SHA256 8a66ecd34fb3621b04bcdc06ecd80b0cb859593c4bd2f3ea28ea6f4149ea7663
+MISC metadata.xml 1186 RMD160 f25a00b213e1bc3dde66a8cd1d228bcb5afedb06 SHA1 afdb72dc5dbeb4d1f4a66184ae63396fa9c91a1d SHA256 3a5aede8c69bc64e72dd87cd4ec524dafc8efd4cb825a45ce80d0cc15fdf0215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1IWa0ACgkQ1ycZbhPLE2AGXACeNzIKaXmwaIY21X7Jg+CWUJsO
+aNcAnAvzfG1ICe3kwn3aJ1/a8Is1j+IA
+=nCq5
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/mayavi-3.4.1.ebuild b/sci-visualization/mayavi/mayavi-3.4.1.ebuild
index a93d0768fb86..7d32946a72af 100644
--- a/sci-visualization/mayavi/mayavi-3.4.1.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.4.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.4.1.ebuild,v 1.2 2011/01/30 23:13:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.4.1.ebuild,v 1.3 2011/02/01 19:05:53 bicatali Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
-VIRTUALX_REQUIRED="manual"
 
-inherit distutils eutils virtualx
+inherit distutils eutils
 
 MY_PN="Mayavi"
 MY_P="${MY_PN}-${PV}"
@@ -33,12 +32,7 @@ RDEPEND=">=dev-python/apptools-3.4.1
 	>=sci-libs/vtk-5[python]
 	qt4? ( dev-python/PyQt4[X,opengl] )"
 DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		x11-apps/xhost
-	)"
+	doc? ( app-arch/unzip )"
 
 S="${WORKDIR}"/${MY_P}
 
@@ -50,45 +44,40 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
-	distutils_src_prepare
-
-	sed -e "s/self.run_command('build_docs')/pass/" -i setup.py || die "sed setup.py failed"
-}
-
-src_compile() {
-	distutils_src_compile
-
+src_unpack() {
+	default
 	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		doc_generation() {
-			emake html || die "Generation of documentation failed"
-		}
-		maketype="doc_generation" virtualmake
-		popd > /dev/null
+		cd "${S}"/docs
+		# building docs is buggy and requires X
+		# so use the bundled ones
+		unpack ./html.zip
+		rm -rf html/*/_sources
 	fi
 }
 
+src_prepare() {
+	distutils_src_prepare
+	sed -i \
+		-e "s/self.run_command('gen_docs')/pass/" \
+		-e "s/self.run_command('build_docs')/pass/" \
+		setup.py || die "sed setup.py failed"
+}
+
 src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
+	insinto /usr/share/doc/${PF}
 	if use doc; then
-		pushd docs/build/mayavi/html > /dev/null
-		insinto /usr/share/doc/${PF}/html/mayavi
-		doins -r [a-z]* _downloads _images _static || die "Installation of documentation failed"
-		popd > /dev/null
-
-		pushd docs/build/tvtk/html > /dev/null
-		insinto /usr/share/doc/${PF}/html/tvtk
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
+		doins -r docs/html || die "Installation of documentation failed"
+		dosym  /usr/share/doc/${PF}/html/mayavi \
+			$(python_get_sitedir)/enthought/mayavi/html
+		dosym  /usr/share/doc/${PF}/html/tvtk \
+			$(python_get_sitedir)/enthought/tvtk/html
 	fi
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		doins -r examples || die "Installation of examples failed"
 	fi
 
 	newicon enthought/mayavi/core/ui/images/m2.png mayavi2.png
diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml
index 011c81d389c6..54bc70ee9f0d 100644
--- a/sci-visualization/mayavi/metadata.xml
+++ b/sci-visualization/mayavi/metadata.xml
@@ -3,9 +3,22 @@
 <pkgmetadata>
 <herd>sci</herd>
 <longdescription lang="en">
-MayaVi is a scientific data visualizer. It is written in Python and uses the
-Visualization Toolkit (VTK) for the visualization. An easy to use GUI using
-Tkinter is provided. It is also cross platform and should run on any platform
-where both Python and VTK are available.
+  Mayavi2 is a general purpose, cross-platform tool for 3-D scientific
+  data visualization. Its features include:
+  * Visualization of scalar, vector and tensor data in 2 and 3 dimensions.
+  * Easy scriptability using Python.
+  * Easy extendibility via custom sources, modules, and data filters.
+  * Reading several file formats: VTK (legacy and XML), PLOT3D, etc.
+  * Saving of visualizations. 
+  * Saving rendered visualization in a variety of image formats.
+  * Convenient functionality for rapid scientific plotting via mlab
+
+  Mayavi2 has been designed with scriptability and extensibility in
+  mind. Mayavi2 provides a mayavi2 application which is usable by
+  itself. However, Mayavi2 may also be used as a plotting engine, in
+  scripts, like with matplotlib or gnuplot, as well as a library for
+  interactive visualizations in any other application. It may also be
+  used as an Envisage plug-in which allows it to be embedded in other
+  Envisage based applications natively.
 </longdescription>
 </pkgmetadata>