Fixed building with new setuptools, bug #307609

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

3 files changed, 12 insertions, 57 deletions

diff --git a/dev-python/traitsgui/ChangeLog b/dev-python/traitsgui/ChangeLog
index e13bb412c490..7b12838fa0ad 100644
--- a/dev-python/traitsgui/ChangeLog
+++ b/dev-python/traitsgui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/traitsgui
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/ChangeLog,v 1.4 2009/09/05 21:43:27 arfrever Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/ChangeLog,v 1.5 2010/03/15 03:13:38 bicatali Exp $
+
+  15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -traitsgui-3.0.4.ebuild, traitsgui-3.1.0.ebuild:
+  Fixed building with new setuptools, bug #307609
 
 *traitsgui-3.1.0 (05 Sep 2009)
 
diff --git a/dev-python/traitsgui/traitsgui-3.0.4.ebuild b/dev-python/traitsgui/traitsgui-3.0.4.ebuild
deleted file mode 100644
index c77d95ba499a..000000000000
--- a/dev-python/traitsgui/traitsgui-3.0.4.ebuild
+++ /dev/null
@@ -1,52 +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/traitsgui/traitsgui-3.0.4.ebuild,v 1.1 2009/03/27 10:49:37 bicatali Exp $
-
-EAPI=2
-inherit distutils
-
-MY_PN="TraitsGUI"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Traits-capable windowing framework"
-HOMEPAGE="http://code.enthought.com/projects/traits_gui"
-SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
-
-IUSE="doc examples qt4 test wxwindows"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-
-RDEPEND=">=dev-python/traits-3.1
-	qt4? ( >=dev-python/traitsbackendqt-3.1 )
-	wxwindows? ( >=dev-python/traitsbackendwx-3.1 )
-	!wxwindows? ( !qt4? ( >=dev-python/traitsbackendwx-3.1 ) )"
-
-DEPEND="dev-python/setuptools"
-# test needs X display
-#	test? ( >=dev-python/nose-0.10.3
-#			>=dev-python/traitsbackendwx-3.1 )
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="enthought"
-
-src_prepare() {
-	sed -i -e "/self.run_command('build_docs')/d" setup.py || die
-}
-
-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 docs/*.pdf || die
-	fi
-	if use examples; then
-		doins -r examples || die
-	fi
-}
diff --git a/dev-python/traitsgui/traitsgui-3.1.0.ebuild b/dev-python/traitsgui/traitsgui-3.1.0.ebuild
index 08034e4b4abc..d6bce945296a 100644
--- a/dev-python/traitsgui/traitsgui-3.1.0.ebuild
+++ b/dev-python/traitsgui/traitsgui-3.1.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/dev-python/traitsgui/traitsgui-3.1.0.ebuild,v 1.2 2009/09/05 22:55:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsgui/traitsgui-3.1.0.ebuild,v 1.3 2010/03/15 03:13:38 bicatali Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -37,7 +37,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_test() {