Version Bump, fixes incompatibility with vtk-5.6* #322117, fixes for PYTHON ABI support #316255

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 133 insertions, 24 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index 9af6613b64a7..9ca63e865dbd 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -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@gentoo.org> 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)
 
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index 42597ff8a68a..9fee9c997c70 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -6,16 +6,18 @@ AUX mayavi-3.3.0-nodocs.patch 520 RMD160 093bc5c77fec4be52fd2e286900315f8a759469
 DIST MayaVi-1.5.tar.gz 525440 RMD160 19eb0e969c7782f57ae72847981eb961548f5aad SHA1 b4dc17cccbd9f13edd27947a971a3a250b7f6357 SHA256 3642d98e7e3b9e542401269eab2db6cbe7be4ecdccc450e8413b8372df136c91
 DIST Mayavi-3.3.0.tar.gz 8836342 RMD160 8fadb580135beefe09abc9baf0bd2e712a513f31 SHA1 81b27041020a4885c8dc605039ea0fde3e0a9995 SHA256 310796f1533222bcb1da9673f6c5254acffda2053a9c1778c3d0227f3f78d80d
 DIST Mayavi-3.3.1.tar.gz 8899086 RMD160 1967235567e0e96d80cfccbe9ec2a7b2ac49f93d SHA1 eaeb64489f3dac2735c32d45c6e86314497a0bc4 SHA256 e3595380b901557bc35084cc99a11b50e4d2a1c8ed7667d079dc112ec4c57fdc
+DIST Mayavi-3.3.2.tar.gz 9085089 RMD160 5a14fbbb5299435a0c3da99d673e04049ee60ea0 SHA1 649a4ddd1cb27baf4a982f95d257b4d8e7abe9da SHA256 87691a54e556598bd5fdaa6a11e9c43f70fa8ab4def61f9751ee4006ac1759ef
 DIST mayavi-docs-3.3.0.tar.bz2 3483768 RMD160 ba862eaf02e70193b9b2833da9b48c205156d365 SHA1 3a54b73e05c581aab9ba62a9b841d19bd52ffd7e SHA256 34da65b5763c75766d6bef7da382fac45a6b063be7b8c33f98b8cad4bcc2d278
-EBUILD mayavi-1.5-r1.ebuild 1147 RMD160 297ebfe125337b7984e6bbe44b9df12d6feea057 SHA1 8eede0130b3572cc5cee867711cbc5ef0cb9db3d SHA256 c13b44c1ea4c4f23019eec3bd799b208f71197f3e0e0abbb178a2a9be4f1aaef
-EBUILD mayavi-3.3.0.ebuild 1653 RMD160 f65bf60a2856f0cb24a6ef51536700aa78a96628 SHA1 3318b3f84253cbb100fbe5abb785c8a545cdf5c1 SHA256 632da50200445b2ada5f4b7692693dc5a8a27c2a76b439a4e948f81054df9f7b
-EBUILD mayavi-3.3.1.ebuild 1644 RMD160 4b5447a7b9ee98a13e3b7f4c20a68758da985c49 SHA1 d84c3a0ac24e56ffff69aee26251ce84398ad6b7 SHA256 913b2642bc22ed2884a2eb3d280bf75bf2b51485eb86df9f8611fa67c58956e8
-MISC ChangeLog 2637 RMD160 88dc986d6529eb66c161f2c88a18fb7c00e2b9ad SHA1 efbe76acf7acb836efbf933ce4dccceda943fb02 SHA256 0d2e7b6efce5eeaf259a0fc5a17cbc5dd3eb2a3634f3f50fc6805c21c8fab577
+EBUILD mayavi-1.5-r1.ebuild 1248 RMD160 eb3eff5af1a61008f3a2c74e844a667a550cd0f5 SHA1 b57be6cf7cd44b80bee1bb8394aee7a7aa019152 SHA256 54e6e72ff7b88e8b78f6b39faf248c5335081363eeebecca967e6c976014526c
+EBUILD mayavi-3.3.0.ebuild 1740 RMD160 b463f40fe0f760f6b30b5769e1542a6231a9cc6a SHA1 1820e8594e09309849d65a67e4a3d6843bb1f3c5 SHA256 bebc0dda61b6de6eb24f5dfe9a63c929653370eb7bce864ec2589f3ac3065c51
+EBUILD mayavi-3.3.1.ebuild 1731 RMD160 62f888f3ff85fe334ff2f3cfcddc2d601cb024d0 SHA1 78fd2457aa95b2d1149e416c5823880558888e2f SHA256 641f7af895422d784343cf425dea5085fa2ab3c30b6c5ea53629bf958e3911b4
+EBUILD mayavi-3.3.2.ebuild 1730 RMD160 e972172f312ed75f3188ed488d537843f6d692a5 SHA1 cf1e58f120c46052978b1c047cc4adc61e00abb8 SHA256 a6f4de8071ab898240525e256940b929a0b9304fd55c8651271d6a4b03f4fc5d
+MISC ChangeLog 2898 RMD160 c331d363e5a415ff477118a514eed700591a15a3 SHA1 1cc01dd2dcc7525aa3c89ba12befe543472ef015 SHA256 6271a1495b94dbe7700a25e15307e4a39f0516995dbe7cfe9d9076827c352a96
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuoT3AACgkQ1ycZbhPLE2CqmgCeLTFpa2Bcs4rvXKN82hAvzq3x
-1ZEAoLRgMwHU3uPFJxu313zzdtS3AgqL
-=4UZY
+iEYEARECAAYFAkwDY+oACgkQgAnW8HDreRZr3gCfX5CyUNw7lg+ygthTR8bVcxY7
+jmsAnRmaebETpVqAugRU4KfJOdFiNyvJ
+=HumQ
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/mayavi-1.5-r1.ebuild b/sci-visualization/mayavi/mayavi-1.5-r1.ebuild
index 78dd6b83b353..1dee8598b3dc 100644
--- a/sci-visualization/mayavi/mayavi-1.5-r1.ebuild
+++ b/sci-visualization/mayavi/mayavi-1.5-r1.ebuild
@@ -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 @@ 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]"
+
+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() {
diff --git a/sci-visualization/mayavi/mayavi-3.3.0.ebuild b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
index 61613f0fe798..944dd4bc895b 100644
--- a/sci-visualization/mayavi/mayavi-3.3.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
@@ -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 @@ RDEPEND=">=dev-python/apptools-3.3.0
 	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 @@ DEPEND="dev-python/setuptools
 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_install() {
 }
 
 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"
 }
diff --git a/sci-visualization/mayavi/mayavi-3.3.1.ebuild b/sci-visualization/mayavi/mayavi-3.3.1.ebuild
index e4fd1ca99b8d..c6415ca3d55a 100644
--- a/sci-visualization/mayavi/mayavi-3.3.1.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.1.ebuild
@@ -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 @@ RDEPEND=">=dev-python/apptools-3.3.1
 	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 @@ DEPEND="dev-python/setuptools
 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_install() {
 }
 
 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"
 }
diff --git a/sci-visualization/mayavi/mayavi-3.3.2.ebuild b/sci-visualization/mayavi/mayavi-3.3.2.ebuild
new file mode 100644
index 000000000000..453f2b19174f
--- /dev/null
+++ b/sci-visualization/mayavi/mayavi-3.3.2.ebuild
@@ -0,0 +1,74 @@
+# 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"
+}