Drop old, #322191; restrict multiabi installation, #405541; include backport patch from upstream, fixes compilation with newer vtk, #399537

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 93 insertions, 125 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index fe30a98f4b5c..7a643d8e95a9 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,14 @@
 # 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.25 2012/02/15 19:13:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.26 2012/03/05 10:26:35 jlec Exp $
+
+*mayavi-4.1.0-r1 (05 Mar 2012)
+
+  05 Mar 2012; Justin Lecher <jlec@gentoo.org> -mayavi-3.4.1.ebuild,
+  -mayavi-4.0.0.ebuild, mayavi-4.1.0.ebuild, +mayavi-4.1.0-r1.ebuild,
+  +files/mayavi-4.1.0-vtkQt.patch:
+  Drop old, #322191; restrict multiabi installation, #405541; include backport
+  patch from upstream, fixes compilation with newer vtk, #399537
 
   15 Feb 2012; Justin Lecher <jlec@gentoo.org> mayavi-3.4.1.ebuild,
   metadata.xml:
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index ccf52c22318a..07650d78ee98 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST Mayavi-3.4.1.tar.gz 9343848 RMD160 669d9c90bcc9bd67a1bd7b90bbafd314b849c20c SHA1 b4bf2e03bcea73dfb32a5e1052ff2df0ea618ab6 SHA256 9eeb26f94fbfc7ca6694a3c82ff92a8fa310c127c2d538144da7d01193995aab
-DIST mayavi-4.0.0.tar.gz 7670159 RMD160 45c69fffb7dd27acf4f8e076da798bcc85b65850 SHA1 58466f3111b441475d1bd97d3e71c46e37fad993 SHA256 c17dfb1ba1cdad536a1e2c23fe3d073d48a9d7b7879d86adacda30be272f15ad
+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-3.4.1.ebuild 2133 RMD160 2ece826b4aa2942233b64e76ba56d01c593e7c55 SHA1 0bacb32adbeb36b9408072cc1c9567bcc074fb6c SHA256 2554bfa518a0a57f6da444203ef5087df36f5597600f32b08a060025cc401545
-EBUILD mayavi-4.0.0.ebuild 1471 RMD160 bfc2ccd943a71f69f710b1ad12b485e8993d5891 SHA1 6c013eacccb842df50de222862484944d01421cb SHA256 9985731f0e02ee51540661d5dc4718db0aee896d65a6358c8b5d491e31f2f628
-EBUILD mayavi-4.1.0.ebuild 1522 RMD160 8aac277b6692b46c5dcf8c9fb010961a73f06595 SHA1 7deb047048a7d3f5b6bfef4016ba92c2468dab34 SHA256 9ab74c90a808518b597e032cff707173376e425154aced05fe0bbfea6e77f58b
-MISC ChangeLog 4247 RMD160 fdab0f78ec4c0effb97e9bc0c9a9ffc436a9da6d SHA1 da01796a0afbb790417ee6379415cbb506516cfb SHA256 e46d265402fc2894fc2bc897a8e002452f734c4126133ea8a603ac24561ee15b
+EBUILD mayavi-4.1.0-r1.ebuild 1623 RMD160 de25964461b5666656d76725444c39e208a88c64 SHA1 581c4f1358f7a0cd5bea201931af3a077f659485 SHA256 57a795f7d0d9bcc443d1227e8c7d8a2677f18c61970043739eed37f2ade18577
+EBUILD mayavi-4.1.0.ebuild 1517 RMD160 0d39db322d85507c1f57f800351c825a78ee928f SHA1 7e7335534c20724645ac4c2ed1d1aabc7a0588c4 SHA256 92390e21be98bc0e5a9cf9e06356f27920e2b4a02154d1bf88574b0c92474ef7
+MISC ChangeLog 4598 RMD160 821f30b0cc298e00dbe2143df474c91ec8fc0add SHA1 8b0dd579fa93dd75bff5bd663aa4b97207211d0e SHA256 53615ab424eb9fd17d2e1dff8909df2eb5d3be952c154d5522194b61c685638c
 MISC metadata.xml 1188 RMD160 7a8775a1fd9ad8db0b2b84bca8bb54f623507a19 SHA1 a98fe92b0c80511c471b0eb5caec537d920ea9e2 SHA256 7743a7e02ebecec07a666004d9c3f4a10c404368875096caa5bb965534846151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk88A8MACgkQgAnW8HDreRY4BACeLNaUctmyeOWnBhLJ8MWEotC3
-hNwAoMcMaWFWkp1kPg/tcjJs4NAEAiOd
-=fNw1
+iEYEAREKAAYFAk9UlOEACgkQgAnW8HDreRaBmACfcAxMEnoneCaxMO3gTNer8K9b
+BRIAn27QGY6sObrQbqqR++SZ2DoXIJNW
+=LBN6
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/files/mayavi-4.1.0-vtkQt.patch b/sci-visualization/mayavi/files/mayavi-4.1.0-vtkQt.patch
new file mode 100644
index 000000000000..6f5834ce1317
--- /dev/null
+++ b/sci-visualization/mayavi/files/mayavi-4.1.0-vtkQt.patch
@@ -0,0 +1,25 @@
+From 2fece6b29c9f3eefa523c8131cce02f724e437f3 Mon Sep 17 00:00:00 2001
+Message-Id: <2fece6b29c9f3eefa523c8131cce02f724e437f3.1330934918.git.jlec@gentoo.org>
+From: martin <martin@think.(none)>
+Date: Sun, 19 Feb 2012 10:43:39 -0500
+Subject: [PATCH] FIX: don't wrap vtkQt classes
+
+---
+ tvtk/code_gen.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tvtk/code_gen.py b/tvtk/code_gen.py
+index f0b0b60..377801e 100644
+--- a/tvtk/code_gen.py
++++ b/tvtk/code_gen.py
+@@ -92,6 +92,7 @@ class TVTKGenerator:
+         #classes = dir(vtk)
+         classes = [x.name for x in wrap_gen.get_tree() \
+                    if x.name.startswith('vtk') and \
++                   not x.name.startswith('vtkQt') and \
+                    not issubclass(getattr(vtk, x.name), object) ]
+         for nodes in tree:
+             for node in nodes:
+-- 
+1.7.8.5
+
diff --git a/sci-visualization/mayavi/mayavi-3.4.1.ebuild b/sci-visualization/mayavi/mayavi-3.4.1.ebuild
deleted file mode 100644
index d816938b07fb..000000000000
--- a/sci-visualization/mayavi/mayavi-3.4.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-3.4.1.ebuild,v 1.4 2012/02/15 19:13:02 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-MY_PN="Mayavi"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enthought Tool Suite: scientific data 3-dimensional 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"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples qt4"
-
-RDEPEND="
-	>=dev-python/apptools-3.4.1
-	dev-python/configobj
-	>=dev-python/enthoughtbase-3.1.0
-	>=dev-python/envisagecore-3.2.0
-	>=dev-python/envisageplugins-3.2.0
-	dev-python/ipython
-	dev-python/numpy
-	dev-python/setuptools
-	>=dev-python/traitsgui-3.6.0[qt4?,wxwidgets]
-	dev-python/wxpython:2.8[opengl]
-	>=sci-libs/vtk-5[python]
-	qt4? ( dev-python/PyQt4[X,opengl] )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="docs/*.txt"
-PYTHON_MODNAME="enthought"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	default
-	if use doc; then
-		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
-		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
-		doins -r examples || die "Installation of examples failed"
-	fi
-
-	newicon enthought/mayavi/core/ui/images/m2.png mayavi2.png
-	make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2
-}
diff --git a/sci-visualization/mayavi/mayavi-4.0.0.ebuild b/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild
index 1461fd00b475..a8c65f32fe8b 100644
--- a/sci-visualization/mayavi/mayavi-4.0.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0.0.ebuild,v 1.3 2011/08/09 04:22:22 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0-r1.ebuild,v 1.1 2012/03/05 10:26:35 jlec Exp $
+
+EAPI=4
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 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"
+DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
+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"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
+IUSE="doc examples test"
 
-RDEPEND="dev-python/configobj
+RDEPEND="
+	dev-python/configobj
 	dev-python/ipython
-	>=dev-python/pyface-4.0
-	>=dev-python/traitsui-4.0
-	>=dev-python/envisage-4.0
-	>=dev-python/apptools-4.0
-	>=dev-python/traitsui-4.0
+	dev-python/pyface
+	dev-python/traitsui
+	dev-python/envisage
+	dev-python/apptools
 	dev-python/numpy
-	>=sci-libs/vtk-5[python]"
+	sci-libs/vtk[python]"
 
-DEPEND="dev-python/setuptools
+DEPEND="
+	dev-python/setuptools
 	test? (
 		${RDEPEND}
 		dev-python/wxpython[opengl]
@@ -39,6 +39,22 @@ DEPEND="dev-python/setuptools
 
 DOCS="docs/*.txt"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# upstream backport
+	epatch "${FILESDIR}"/${P}-vtkQt.patch
+	distutils_src_prepare
+}
+
+src_compile() {
+	distutils_src_compile
+	use doc && virtualmake -C docs html
+}
+
 src_test() {
 	VIRTUALX_COMMAND="distutils_src_test" virtualmake
 }
@@ -46,9 +62,12 @@ src_test() {
 src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
+
+	use doc && dohtml -r docs/build/mayavi/html/*
+
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 
 	newicon mayavi/core/ui/images/m2.png mayavi2.png
diff --git a/sci-visualization/mayavi/mayavi-4.1.0.ebuild b/sci-visualization/mayavi/mayavi-4.1.0.ebuild
index ff9cf818e250..4668d8cbe52b 100644
--- a/sci-visualization/mayavi/mayavi-4.1.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-4.1.0.ebuild
@@ -1,10 +1,9 @@
 # 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.1 2012/01/17 06:26:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-4.1.0.ebuild,v 1.2 2012/03/05 10:26:35 jlec Exp $
 
 EAPI=4
 
-SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 DISTUTILS_SRC_TEST="nosetests"
 
@@ -19,17 +18,18 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-RDEPEND="dev-python/configobj
+RDEPEND="
+	dev-python/configobj
 	dev-python/ipython
-	>=dev-python/pyface-4
-	>=dev-python/traitsui-4
-	>=dev-python/envisage-4
-	>=dev-python/apptools-4
-	>=dev-python/traitsui-4
+	dev-python/pyface
+	dev-python/traitsui
+	dev-python/envisage
+	dev-python/apptools
 	dev-python/numpy
-	>=sci-libs/vtk-5[python]"
+	sci-libs/vtk[python]"
 
-DEPEND="dev-python/setuptools
+DEPEND="
+	dev-python/setuptools
 	test? (
 		${RDEPEND}
 		dev-python/wxpython[opengl]
@@ -39,6 +39,11 @@ DEPEND="dev-python/setuptools
 
 DOCS="docs/*.txt"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_compile() {
 	distutils_src_compile
 	use doc && virtualmake -C docs html