[gentoo-commits] gentoo-x86 commit in sci-visualization/mayavi: mayavi-3.3.1.ebuild mayavi-3.3.2.ebuild mayavi-1.5-r1.ebuild mayavi-3.3.0.ebuild ChangeLog

[Justin Lecher (jlec)]

jlec        10/05/31 07:23:16

  Modified:             mayavi-3.3.1.ebuild mayavi-1.5-r1.ebuild
                        mayavi-3.3.0.ebuild ChangeLog
  Added:                mayavi-3.3.2.ebuild
  Log:
  Version Bump, fixes incompatibility with vtk-5.6* #322117, fixes for PYTHON ABI support #316255
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-visualization/mayavi/mayavi-3.3.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild?r1=1.1&r2=1.2

Index: mayavi-3.3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mayavi-3.3.1.ebuild	23 Mar 2010 05:19:35 -0000	1.1
+++ mayavi-3.3.1.ebuild	31 May 2010 07:23:16 -0000	1.2
@@ -1,10 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild,v 1.1 2010/03/23 05:19:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.1.ebuild,v 1.2 2010/05/31 07:23:16 jlec Exp $
 
 EAPI="2"
+
+PYTHON_DEPEND="2"
+
 inherit distutils eutils
 
+PYTHON_MODNAME=enthought
+
 DESCRIPTION="VTK based scientific data visualizer"
 LICENSE="BSD"
 SLOT="2"
@@ -27,7 +32,7 @@
 	dev-python/configobj
 	dev-python/ipython
 	dev-python/numpy
-	>=sci-libs/vtk-5[python]
+	=sci-libs/vtk-5.4*[python]
 	dev-python/wxpython:2.8[opengl]
 	qt4? ( dev-python/PyQt4[X,opengl] )"
 
@@ -39,14 +44,17 @@
 RESTRICT=test
 
 S="${WORKDIR}"/${MY_P}
-PYTHON_MODNAME=enthought
 
+pkg_setup() {
+	python_set_active_version 2
+}
 src_prepare() {
 	# documentation generation requires X
 	#epatch "${FILESDIR}"/${P}-nodocs.patch
 	sed -i \
 		-e "s/setupdocs>=1.0//" \
 		setup.py || die
+	distutils_src_prepare
 }
 
 src_install() {
@@ -61,5 +69,5 @@
 }
 
 src_test() {
-	PYTHONPATH="$(ls -d build/lib*)" "${python}" setup.py test || die "tests failed"
+	PYTHONPATH="$(ls -d build/lib*)" "$(PYTHON)" setup.py test || die "tests failed"
 }



1.5                  sci-visualization/mayavi/mayavi-1.5-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-1.5-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-1.5-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-1.5-r1.ebuild?r1=1.4&r2=1.5

Index: mayavi-1.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-1.5-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mayavi-1.5-r1.ebuild	15 Mar 2010 03:26:31 -0000	1.4
+++ mayavi-1.5-r1.ebuild	31 May 2010 07:23:16 -0000	1.5
@@ -1,10 +1,15 @@
 # Copyright 1999-2010 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.4 2010/03/15 03:26:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-1.5-r1.ebuild,v 1.5 2010/05/31 07:23:16 jlec Exp $
 
-NEED_PYTHON=2.3
-EAPI=2
-inherit eutils distutils
+EAPI="2"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+
+inherit distutils eutils
+
+PYTHON_MODNAME=enthought
 
 MY_P=MayaVi-${PV}
 DESCRIPTION="VTK based scientific data visualizer"
@@ -14,18 +19,23 @@
 LICENSE="BSD"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="doc examples"
-DEPEND="dev-lang/python[tk]
-	>=sci-libs/vtk-5[tk,python]"
+
+DEPEND="
+	=sci-libs/vtk-5.4*[tk,python]"
 RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/mayavi-1.5-tkinter_objects.patch
+	distutils_src_prepare
 }
 
 src_install() {



1.6                  sci-visualization/mayavi/mayavi-3.3.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild?r1=1.5&r2=1.6

Index: mayavi-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mayavi-3.3.0.ebuild	15 Mar 2010 03:42:46 -0000	1.5
+++ mayavi-3.3.0.ebuild	31 May 2010 07:23:16 -0000	1.6
@@ -1,10 +1,15 @@
 # Copyright 1999-2010 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.5 2010/03/15 03:42:46 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.6 2010/05/31 07:23:16 jlec Exp $
 
 EAPI="2"
+
+PYTHON_DEPEND="2"
+
 inherit distutils eutils
 
+PYTHON_MODNAME=enthought
+
 DESCRIPTION="VTK based scientific data visualizer"
 LICENSE="BSD"
 SLOT="2"
@@ -27,7 +32,7 @@
 	dev-python/configobj
 	dev-python/ipython
 	>=dev-python/numpy-1.1
-	>=sci-libs/vtk-5[python]
+	=sci-libs/vtk-5.4*[python]
 	dev-python/wxpython:2.8[opengl]
 	qt4? ( dev-python/PyQt4[X,opengl] )"
 
@@ -39,14 +44,17 @@
 RESTRICT=test
 
 S="${WORKDIR}"/${MY_P}
-PYTHON_MODNAME=enthought
 
+pkg_setup() {
+	python_set_active_version 2
+}
 src_prepare() {
 	# documentation generation requires X
 	epatch "${FILESDIR}"/${P}-nodocs.patch
 	sed -i \
 		-e "s/setupdocs>=1.0//" \
 		setup.py || die
+	distutils_src_prepare
 }
 
 src_install() {
@@ -61,5 +69,5 @@
 }
 
 src_test() {
-	PYTHONPATH="$(ls -d build/lib*)" "${python}" setup.py test || die "tests failed"
+	PYTHONPATH="$(ls -d build/lib*)" "$(PYTHON)" setup.py test || die "tests failed"
 }



1.16                 sci-visualization/mayavi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	23 Mar 2010 05:19:35 -0000	1.15
+++ ChangeLog	31 May 2010 07:23:16 -0000	1.16
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/mayavi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.15 2010/03/23 05:19:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.16 2010/05/31 07:23:16 jlec Exp $
+
+*mayavi-3.3.2 (31 May 2010)
+
+  31 May 2010; Justin Lecher <jlec@g.o> mayavi-1.5-r1.ebuild,
+  mayavi-3.3.0.ebuild, mayavi-3.3.1.ebuild, +mayavi-3.3.2.ebuild:
+  Version Bump, fixes incompatibility with vtk-5.6* #322117, fixes for
+  PYTHON ABI support #316255
 
 *mayavi-3.3.1 (21 Mar 2010)
 



1.1                  sci-visualization/mayavi/mayavi-3.3.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.2.ebuild?rev=1.1&content-type=text/plain

Index: mayavi-3.3.2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.2.ebuild,v 1.1 2010/05/31 07:23:16 jlec Exp $

EAPI="2"

PYTHON_DEPEND="2"

inherit distutils eutils

PYTHON_MODNAME=enthought

DESCRIPTION="VTK based scientific data visualizer"
LICENSE="BSD"
SLOT="2"
KEYWORDS="~amd64 ~x86"
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.2
	>=dev-python/enthoughtbase-3.0.5
	>=dev-python/envisagecore-3.1.2
	>=dev-python/envisageplugins-3.1.2
	>=dev-python/traitsgui-3.4.0[qt4?,wxwidgets]
	dev-python/configobj
	dev-python/ipython
	dev-python/numpy
	>=sci-libs/vtk-5[python]
	dev-python/wxpython:2.8[opengl]
	qt4? ( dev-python/PyQt4[X,opengl] )"

DEPEND="dev-python/setuptools
	dev-python/numpy
	>=sci-libs/vtk-5[python]"

# tests require X
RESTRICT=test

S="${WORKDIR}"/${MY_P}

pkg_setup() {
	python_set_active_version 2
}

src_prepare() {
	# documentation generation requires X
	#epatch "${FILESDIR}"/${P}-nodocs.patch
	sed -i \
		-e "s/setupdocs>=1.0//" \
		setup.py || die
	distutils_src_prepare
}

src_install() {
	find "${S}" -name \*LICENSE\*.txt -delete
	distutils_src_install
	dodoc docs/*.txt
	if use doc; then
		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"
}