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

(Portage version: 2.2_rc22/cvs/Linux 2.6.25-gentoo-r7 x86_64)

3 files changed, 67 insertions, 1 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/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
+}