Fixed building with new setuptools, bug #307609

(Portage version: 2.2_rc66/cvs/Linux x86_64)

3 files changed, 11 insertions, 63 deletions

diff --git a/dev-python/traits/ChangeLog b/dev-python/traits/ChangeLog
index 2dba96ca8e37..32b854c18e3f 100644
--- a/dev-python/traits/ChangeLog
+++ b/dev-python/traits/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/traits
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/ChangeLog,v 1.6 2009/11/08 19:57:11 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/ChangeLog,v 1.7 2010/03/15 03:10:37 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -traits-3.1.0.ebuild,
+  traits-3.2.0.ebuild:
+  Fixed building with new setuptools, bug #307609
 
   08 Nov 2009; nixnut <nixnut@gentoo.org> traits-3.2.0.ebuild:
   ppc stable #290607
diff --git a/dev-python/traits/traits-3.1.0.ebuild b/dev-python/traits/traits-3.1.0.ebuild
deleted file mode 100644
index 8c68780c584d..000000000000
--- a/dev-python/traits/traits-3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-3.1.0.ebuild,v 1.2 2009/10/05 21:32:25 volkmar Exp $
-
-EAPI=2
-inherit distutils
-
-MY_PN="Traits"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Enthought Tool Suite explicitly typed attributes for Python"
-HOMEPAGE="http://code.enthought.com/projects/traits"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-IUSE="doc examples test"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="BSD"
-
-RDEPEND=">=dev-python/numpy-1.1
-	>=dev-python/enthoughtbase-3.0.2"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/setupdocs )
-	test? ( >=dev-python/nose-0.10.3
-			>=dev-python/numpy-1.1 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="enthought"
-
-src_prepare() {
-	sed -i -e "/self.run_command('build_docs')/d" setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		"${python}" setup.py build_docs --formats=html \
-			|| 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 || die
-		doins docs/*.pdf || die
-	fi
-	if use examples; then
-		doins -r examples || die
-	fi
-}
diff --git a/dev-python/traits/traits-3.2.0.ebuild b/dev-python/traits/traits-3.2.0.ebuild
index 3b3fc6acdb8f..1f6d4276fbe8 100644
--- a/dev-python/traits/traits-3.2.0.ebuild
+++ b/dev-python/traits/traits-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-3.2.0.ebuild,v 1.6 2010/02/06 14:53:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traits/traits-3.2.0.ebuild,v 1.7 2010/03/15 03:10:37 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -33,7 +33,10 @@ PYTHON_MODNAME="enthought"
 DOCS="CHANGELOG.txt"
 
 src_prepare() {
-	sed -i -e "s/self.run_command('build_docs')/pass/" setup.py || die
+	sed -i \
+		-e "s/self.run_command('build_docs')/pass/" \
+		-e "s/setupdocs>=1.0//" \
+		setup.py || die
 }
 
 src_compile() {