Fixed building with new setuptools, bug #308213

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

4 files changed, 23 insertions, 85 deletions

diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog
index 4f582a13164e..aaa25b64de62 100644
--- a/sci-visualization/mayavi/ChangeLog
+++ b/sci-visualization/mayavi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2009/09/14 09:17:11 grozin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.13 2010/03/15 03:22:41 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -mayavi-3.2.0.ebuild,
+  mayavi-3.3.0.ebuild:
+  Fixed building with new setuptools, bug #308213
 
   14 Sep 2009; Andrey Grozin <grozin@gentoo.org> mayavi-3.3.0.ebuild,
   +files/mayavi-3.3.0-nodocs.patch:
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
index af5071352e22..c126384f364a 100644
--- a/sci-visualization/mayavi/Manifest
+++ b/sci-visualization/mayavi/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mayavi-1.5-tkinter_objects.patch 496 RMD160 ef1d679c918ee091f0c976c9a88cc30aa106efc6 SHA1 6ffa1c85cfa450f00e4423bd1c7c2a2db16344d2 SHA256 5b2444bdfbd12cf79cba006de15da8fe5f64257c4fc4d9cd3d93e6929aa2c378
 AUX mayavi-3.3.0-nodocs.patch 520 RMD160 093bc5c77fec4be52fd2e286900315f8a759469c SHA1 92b046d1aa6f3a61ec398a8cfc06b16308e8de05 SHA256 83cc446334913864c0f306584c3b9fadc08820c8aa1a0f7b830c73ff6bb44c78
 DIST MayaVi-1.5.tar.gz 525440 RMD160 19eb0e969c7782f57ae72847981eb961548f5aad SHA1 b4dc17cccbd9f13edd27947a971a3a250b7f6357 SHA256 3642d98e7e3b9e542401269eab2db6cbe7be4ecdccc450e8413b8372df136c91
-DIST Mayavi-3.2.0.tar.gz 10514749 RMD160 1737a91bdee9abe7ee4553ef397f3a77c931f3c2 SHA1 e2baa5b955cffbc8022babd87b2b15aee4451c68 SHA256 802b606ddc07f4a705ab74776ad0bf9447ffd42aa27f536ec05e161769d20cd9
 DIST Mayavi-3.3.0.tar.gz 8836342 RMD160 8fadb580135beefe09abc9baf0bd2e712a513f31 SHA1 81b27041020a4885c8dc605039ea0fde3e0a9995 SHA256 310796f1533222bcb1da9673f6c5254acffda2053a9c1778c3d0227f3f78d80d
 DIST mayavi-docs-3.3.0.tar.bz2 3483768 RMD160 ba862eaf02e70193b9b2833da9b48c205156d365 SHA1 3a54b73e05c581aab9ba62a9b841d19bd52ffd7e SHA256 34da65b5763c75766d6bef7da382fac45a6b063be7b8c33f98b8cad4bcc2d278
 EBUILD mayavi-1.5-r1.ebuild 1150 RMD160 2d5c055a4a61e872873e75efd02bbc3e6caf289f SHA1 f398b696b4eaef46cdd5d6480ad1a3b5d5ce2aa4 SHA256 e4f361e6b2e036143bdd70ce70b7c75a3bb3785f59033e8fc959ef2132d28292
-EBUILD mayavi-3.2.0.ebuild 1985 RMD160 f03d21900609ac56f3db7b8f64821dfb5da9e6de SHA1 9561c3d5f864eedaad4c5832da65c36915f8986a SHA256 13f563d597a8069ef8b7d0ef513f5e6fe493713c35ae8ad2adca2a61081efcfe
-EBUILD mayavi-3.3.0.ebuild 1579 RMD160 435a36c39657e9db6d4780f1a19294dd990f372d SHA1 f485abed4780ae38a5bf2d96183bacc4584a801d SHA256 4b2935333b2b8a3b6c178a78ad417d7d91f009efb05608f72963eacb01c748c9
-MISC ChangeLog 2238 RMD160 ef518286145b12f717d047c3751f944597d71e0f SHA1 78bdb60bb45caa46dff033868e0987c944d77a4c SHA256 b81acc675df37ceef0137ccea1cad7a0f998d52b63c55c38e355752c2bf6fd51
+EBUILD mayavi-3.3.0.ebuild 1637 RMD160 e245afc22d9c603dd6f414aba9555f931da5f615 SHA1 08fe78e3f2277d348c347ea0105c8c5bea34fcbb SHA256 930496ebd840dada0d93864926cecd0c9fd34ccd4fdac1014e0513d4e59a3e4a
+MISC ChangeLog 2391 RMD160 dbd1144ee922671080fba10afd219df9ba61a452 SHA1 72f148fdfa0cccb6c1cf721e39e6a8d05e5f7b88 SHA256 f28ce728e7ed21a45efe2df73227a85baae8b9f68b2d94d3e7d34fe1b257beaf
 MISC metadata.xml 475 RMD160 bf38725e5c3ed1b28aa5fd698322ab1e597cd65a SHA1 da743b046f934082ddb06ccc30e1f2a9539b673f SHA256 283ad36fc41d374c28ca204274252890e655fb6e908fd3b0b12c6f7a8d385615
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkudqAkACgkQ1ycZbhPLE2Df7gCfSUbyKCdR9P8P3K/XFbouKhSu
+nNgAn08FGKshwDHWCR31U2ObqDi3Umme
+=xZFa
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/mayavi/mayavi-3.2.0.ebuild b/sci-visualization/mayavi/mayavi-3.2.0.ebuild
deleted file mode 100644
index 5d65c8d7fb62..000000000000
--- a/sci-visualization/mayavi/mayavi-3.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-3.2.0.ebuild,v 1.3 2009/08/12 18:17:52 bicatali Exp $
-
-EAPI=2
-inherit eutils distutils
-
-MY_PN="Mayavi"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="VTK based scientific data visualizer"
-HOMEPAGE="http://code.enthought.com/projects/mayavi"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-IUSE="doc examples qt4"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="dev-python/apptools
-	>=dev-python/enthoughtbase-3.0.2
-	>=dev-python/envisagecore-3.1.0
-	>=dev-python/envisageplugins-3.1.0
-	>=dev-python/traitsgui-3.0.4
-	dev-python/configobj
-	dev-python/ipython
-	>=dev-python/numpy-1.1
-	>=sci-libs/vtk-5[python]
-	dev-python/wxpython:2.8[opengl]
-	qt4? ( dev-python/PyQt4[X,opengl] )"
-
-DEPEND="dev-python/setuptools
-	>=dev-python/numpy-1.1
-	>=sci-libs/vtk-5[python]"
-# doc and test needs  display
-#	doc? ( dev-python/setupdocs )"
-#	test? ( >=dev-python/nose-0.10.3 ){{
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="enthought"
-
-src_prepare() {
-	# remove docs and mlab which needs a display
-	sed -i \
-		-e "/self.run_command('build_docs')/d" \
-		-e "/self.run_command('mlab_ref')/d" \
-		setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-	#if use doc; then
-	#	${python} setup.py build_docs --formats=html,pdf \
-	#		|| die "doc building failed"
-	#fi
-}
-
-src_test() {
-	PYTHONPATH=$(dir -d build/lib*) "${python}" setup.py test || die "tests failed"
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE\*.txt -delete
-	distutils_src_install
-	dodoc docs/*.txt
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		#doins -r build/docs/html build/docs/latex/*/* || die
-		doins docs/pdf/*.pdf docs/pdf/*/*.pdf || die
-	fi
-	if use examples; then
-		doins -r examples || die
-	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-3.3.0.ebuild b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
index 1a07ec3d3c3b..fa418b41913a 100644
--- a/sci-visualization/mayavi/mayavi-3.3.0.ebuild
+++ b/sci-visualization/mayavi/mayavi-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.3 2009/09/14 09:17:11 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.3.0.ebuild,v 1.4 2010/03/15 03:22:41 bicatali Exp $
 
 EAPI="2"
 inherit distutils eutils
@@ -44,6 +44,9 @@ PYTHON_MODNAME=enthought
 src_prepare() {
 	# documentation generation requires X
 	epatch "${FILESDIR}"/${P}-nodocs.patch
+	sed -i \
+		-e "s/setupdocs>=1.0//" \
+		setup.py || die
 }
 
 src_install() {