Fix for tkinter object and typo, bug #255108, thanks Colin Macdonald

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 73 insertions, 5 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index d2ea2263f7b5..19cf8f804180 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2009/01/15 10:31:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.5 2009/01/16 09:44:14 bicatali Exp $
+
+*mayavi-1.5-r1 (16 Jan 2009)
+
+  16 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/mayavi-1.5-tkinter_objects.patch, +mayavi-1.5-r1.ebuild:
+  Fix for tkinter object and typo, bug #255108, thanks Colin Macdonald
 
 *mayavi-3.1.0 (15 Jan 2009)
 
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index 74426aab50c1..a244c8088371 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mayavi-1.5-tkinter_objects.patch 496 RMD160 ef1d679c918ee091f0c976c9a88cc30aa106efc6 SHA1 6ffa1c85cfa450f00e4423bd1c7c2a2db16344d2 SHA256 5b2444bdfbd12cf79cba006de15da8fe5f64257c4fc4d9cd3d93e6929aa2c378
 DIST MayaVi-1.5.tar.gz 525440 RMD160 19eb0e969c7782f57ae72847981eb961548f5aad SHA1 b4dc17cccbd9f13edd27947a971a3a250b7f6357 SHA256 3642d98e7e3b9e542401269eab2db6cbe7be4ecdccc450e8413b8372df136c91
 DIST Mayavi-3.1.0.tar.gz 10219107 RMD160 4b5ff63d5a5605e31e924c5e0657abac611530ae SHA1 b9337ba8fdd1471501e34b02057b3391720691a1 SHA256 5d76906920a5f6d81497577cd6ddfd4ad75f192ba18aad6b27b9f7aa59472b80
+EBUILD mayavi-1.5-r1.ebuild 1129 RMD160 4cf3be34932ae76a52cb5b2529e11c3e4c163866 SHA1 fbcc426f4e9190a88e473906eb57d9ea7d31baa7 SHA256 d789b463d5d2a888dbdb8875538c6c8c32e3303acd994bfc038b05f7f977deca
 EBUILD mayavi-1.5.ebuild 1052 RMD160 2cd68b8dec36346bde738f39c4930e5c8003d859 SHA1 11b4f5fce966c1b9b70fe749bd943b79d8e9fab8 SHA256 df00274dd56dd754cd84bfe12325f02103d4c728e68fbea0ffd2e6707f6edee0
 EBUILD mayavi-3.1.0.ebuild 1773 RMD160 40016e389257299ae3daaddebc26d714385a5a6e SHA1 6f9bbbae82e0b7c02a259690ac00ef0f41a4189b SHA256 16bd44cc4e908394be7dadb6c2cf1f35bb6b10915405fbd88253c9e1ec96e403
-MISC ChangeLog 889 RMD160 7cee72d3ab18ce0d793de303b6d2c586ae700eba SHA1 1e3bb2724347c3dd2630d22bc3f72f183ecebb29 SHA256 424f30f04615f89deec9e13dffeae1d8d8528f7c75afd70dc6982047473869ea
+MISC ChangeLog 1112 RMD160 783d39887631e2fae287eb22155c4dfabc394d72 SHA1 93ed657dad5c5446a7ae050b4b7192fbdd0556bc SHA256 016d1980b1cf8f4237afdd5c1c3398275501a9259d0ced208fc39981bb849f07
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklvEJ0ACgkQ1ycZbhPLE2D1TgCfSGQ2BbM+1y4Yj5inYi2/SZP/
-mAIAn2QgLqpQc8ZKSaemwKjOfzrhI1Jp
-=OJ6f
+iEYEARECAAYFAklwVvcACgkQ1ycZbhPLE2DajgCfUgHwmkl0p1RcbqNpxU3QPPJx
+WkUAn2pf8tNGCMCQal1D4BFJdo6Sa0+D
+=X4WH
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/files/mayavi-1.5-tkinter_objects.patch b/sci-visualization/mayavi/files/mayavi-1.5-tkinter_objects.patch
new file mode 100644
index 000000000000..f49a3fa03326
--- /dev/null
+++ b/sci-visualization/mayavi/files/mayavi-1.5-tkinter_objects.patch
@@ -0,0 +1,15 @@
+diff -urN MayaVi-1.5-orig/mayavi MayaVi-1.5/mayavi
+--- MayaVi-1.5-orig/mayavi	2009-01-15 15:11:43.000000000 -0800
++++ MayaVi-1.5/mayavi	2009-01-15 15:13:05.000000000 -0800
+@@ -283,6 +283,11 @@
+ 
+ 
+ import Tkinter
++# fix for python>=2.3, see:
++#   http://article.gmane.org/gmane.comp.graphics.mayavi.user/336
++#   http://www.python.org/doc/2.3/whatsnew/node18.html
++Tkinter.wantobjects = 0
++
+ 
+ # Import this here to avoid hard-to-debug errors when importing VTK
+ # fails from within mayavi.Main.
diff --git a/sci-visualization/mayavi/mayavi-1.5-r1.ebuild b/sci-visualization/mayavi/mayavi-1.5-r1.ebuild
new file mode 100644
index 000000000000..34a063576e4c
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-1.5-r1.ebuild
@@ -0,0 +1,45 @@
+# 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-1.5-r1.ebuild,v 1.1 2009/01/16 09:44:14 bicatali Exp $
+
+NEED_PYTHON=2.3
+EAPI=2
+inherit eutils distutils
+
+MY_P=MayaVi-${PV}
+DESCRIPTION="VTK based scientific data visualizer"
+HOMEPAGE="http://mayavi.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples"
+DEPEND="dev-lang/python[tk]
+	>=sci-libs/vtk-5[tk,python]"
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/mayavi-1.5-tkinter_objects.patch
+}
+
+src_install() {
+	distutils_src_install
+	dodoc doc/{README,CREDITS,NEWS,TODO}.txt
+	use doc && dohtml -r doc/guide/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+	make_desktop_entry mayavi "Mayavi1 2D/3D Scientific Visualization"
+}
+
+pkg_postinst() {
+	if ! built_with_use sci-libs/vtk patented ; then
+		elog "Mayavi may require vtk to be built with the 'patent' USE flag"
+		elog "to be fully functional"
+	fi
+}