Fixed building with new setuptools, bug #308193

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

3 files changed, 11 insertions, 62 deletions

diff --git a/dev-python/apptools/ChangeLog b/dev-python/apptools/ChangeLog
index 0239b8fa4e50..68d879bae76c 100644
--- a/dev-python/apptools/ChangeLog
+++ b/dev-python/apptools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/apptools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.4 2009/09/06 15:36:49 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.5 2010/03/15 03:17:35 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -apptools-3.2.0.ebuild, apptools-3.3.0.ebuild:
+  Fixed building with new setuptools, bug #308193
 
 *apptools-3.3.0 (06 Sep 2009)
 
diff --git a/dev-python/apptools/apptools-3.2.0.ebuild b/dev-python/apptools/apptools-3.2.0.ebuild
deleted file mode 100644
index 895eea49f74c..000000000000
--- a/dev-python/apptools/apptools-3.2.0.ebuild
+++ /dev/null
@@ -1,58 +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/apptools/apptools-3.2.0.ebuild,v 1.1 2009/03/27 10:37:30 bicatali Exp $
-
-EAPI=2
-inherit distutils
-
-MY_PN="AppTools"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Enthought Tool Suite application tools"
-HOMEPAGE="http://code.enthought.com/projects/app_tools.php"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-IUSE="doc examples test"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="dev-python/configobj
-	>=dev-python/numpy-1.1
-	>=dev-python/envisagecore-3.1
-	>=dev-python/traitsgui-3.0.4"
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/setupdocs )
-	test? ( >=dev-python/nose-0.10.3
-			>=dev-python/enthoughtbase-3.0.2 )"
-
-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,pdf \
-			|| die "doc building failed"
-	fi
-}
-
-src_test() {
-	PYTHONPATH=build/lib ${python} setup.py test || die "tests failed"
-}
-
-src_install() {
-	find "${S}" -name \*LICENSE.txt -delete
-	distutils_src_install
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins -r build/docs/html || die
-		doins build/docs/latex/*.pdf || die
-	fi
-	if use examples; then
-		doins -r examples || die
-	fi
-}
diff --git a/dev-python/apptools/apptools-3.3.0.ebuild b/dev-python/apptools/apptools-3.3.0.ebuild
index 481bcb83cafe..c4a4c44fabd9 100644
--- a/dev-python/apptools/apptools-3.3.0.ebuild
+++ b/dev-python/apptools/apptools-3.3.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/apptools/apptools-3.3.0.ebuild,v 1.2 2010/02/06 14:37:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-3.3.0.ebuild,v 1.3 2010/03/15 03:17:35 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -36,7 +36,10 @@ S="${WORKDIR}/${MY_P}"
 PYTHON_MODNAME="enthought"
 
 src_prepare() {
-	sed -e "s/self.run_command('build_docs')/pass/" -i setup.py || die
+	sed -i \
+		-e "s/self.run_command('build_docs')/pass/" \
+		-e "s/setupdocs>=1.0//" \
+		setup.py || die
 }
 
 src_compile() {