Fixed building with new setuptools, bug #307609

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

diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
index d8fff67058b857261eb46b31274fb5f7d6798f7e..cb6fed10d528f7aa6a0afe5bed4198b46b64223d 100644 (file)
--- a/dev-python/apptools/Manifest
+++ b/dev-python/apptools/Manifest
@@ -1,6 +1,14 @@
-DIST AppTools-3.2.0.tar.gz 1045779 RMD160 05104417ed42942eb8544e44cc35ff9f8e5ab277 SHA1 8fb564bd87015cbe110172e56017ef77d0225bdd SHA256 ec319fb0c97776fabbcc2a9048debd21a0c5903be1ecd303ebee0fc5aff8f0a7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST AppTools-3.3.0.tar.gz 1085288 RMD160 9f92229e7a19e83a50c0c455d28cdc187a50df03 SHA1 a799a2b2e6fd55caa6d7df482fc2e90e62663db2 SHA256 bdcf8b814d2a95813f3d2f09de27d038da168255d2c19fb073920a952383c254
-EBUILD apptools-3.2.0.ebuild 1413 RMD160 3139f8f97b94f8682aba85236ddca7ecd42dd5ff SHA1 609a42ebd708465a420cbb40b7c1d0b8b5f78bee SHA256 a4ec358a7191ae0f167d28d8a3f2c860b22e39f3cba5239a3a875d3077394b53
-EBUILD apptools-3.3.0.ebuild 1650 RMD160 c6ad129a4b7698f874a93f6fb3595c5cb56b4b62 SHA1 3aa1c171f680402f48648108ca07737fbb2b84d6 SHA256 ceb06f55ba41b7b68823e266e2120a9bf029361bbf45eb7d71cc524bf06cb787
-MISC ChangeLog 746 RMD160 9f9e3a8dc96fa8d90baacf78649562af31d925c9 SHA1 5b149ffb4ffb26c2ed1cd5e0075f98320c943ac6 SHA256 57ab1f14b4bd17154deaeefd0fccfaa0d4382cb876cfcec76920a2fc91dea029
+EBUILD apptools-3.3.0.ebuild 1686 RMD160 381f36fc2b277e4b375302213151ee2dfe7cb794 SHA1 bc094cc77a29fe8bd0b3f461e8ccb6312a939cb8 SHA256 09a03ffa3d04a208582130258679adde682546ea77bb843ca920213e65d6c67f
+MISC ChangeLog 901 RMD160 1bdcb510eeeea43c77e75321e31a80cee89a9625 SHA1 1f5e5352e526757faf1202de2dfab54e4755f664 SHA256 66787567b5c86b58eb09842626014a306fe8fcc53dd7b885a2d7102a7d33d18b
 MISC metadata.xml 442 RMD160 e713a3f44b1d40c6ac50c2c44860414c05ab4958 SHA1 7993b0178867ebfa46375180c6532ea79452033f SHA256 6d105831cb50bcaf0a9413a60d3b36c11df9f8fec7fe83d091ee1bc8aab5168c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkudptgACgkQ1ycZbhPLE2CHEwCfft4HNtKkKPqdmEyHjH0FbCiK
+EVYAnRiZ9XRV+zt72w//oMajLKiv3GRG
+=lAQG
+-----END PGP SIGNATURE-----

diff --git a/dev-python/traits/ChangeLog b/dev-python/traits/ChangeLog
index 2dba96ca8e3727dde4ac1bf0491f28324e830524..32b854c18e3f7495a517363501dd1086a7c39c23 100644 (file)
--- 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 (file)
index 8c68780..0000000
--- 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 3b3fc6acdb8f7e2a09305d7c24a75938a17af881..1f6d4276fbe8441052737fe07ce462ed9dd0fdf6 100644 (file)
--- 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() {

diff --git a/dev-python/traitsgui/ChangeLog b/dev-python/traitsgui/ChangeLog
index e13bb412c49089170e183d6912f65e9c40fe6a7f..7b12838fa0ad240077c4e13fcdefbe7a3abb0092 100644 (file)
--- 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 (file)
index c77d95b..0000000
--- 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 08034e4b4abc15f83612b41702a664b0ff16e7a9..d6bce945296a7dee85f713fe252090b5c7e1f8b4 100644 (file)
--- 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() {