summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-10-16 00:28:46 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-10-16 00:28:46 +0000
commit9e7c4bbc2dfae3c046721b0a7e190dded07203ee (patch)
tree3e31b599eab5b638532f4cddb01d930f49e740eb
parentVersion bump. (diff)
downloadgentoo-2-9e7c4bbc2dfae3c046721b0a7e190dded07203ee.tar.gz
gentoo-2-9e7c4bbc2dfae3c046721b0a7e190dded07203ee.tar.bz2
gentoo-2-9e7c4bbc2dfae3c046721b0a7e190dded07203ee.zip
Don't try to 2to3 some files (bug #289026).
(Portage version: 14609-svn/cvs/Linux x86_64)
-rw-r--r--dev-python/setuptools/ChangeLog6
-rw-r--r--dev-python/setuptools/setuptools-0.6.6.ebuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index d29aefa06f4c..0883698cfca3 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/setuptools
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.72 2009/10/15 23:23:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.73 2009/10/16 00:28:46 arfrever Exp $
+
+ 16 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ setuptools-0.6.6.ebuild:
+ Don't try to 2to3 some files (bug #289026).
*setuptools-0.6.6 (16 Oct 2009)
diff --git a/dev-python/setuptools/setuptools-0.6.6.ebuild b/dev-python/setuptools/setuptools-0.6.6.ebuild
index 91fee3af834b..4558147691e0 100644
--- a/dev-python/setuptools/setuptools-0.6.6.ebuild
+++ b/dev-python/setuptools/setuptools-0.6.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.1 2009/10/15 23:23:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6.6.ebuild,v 1.2 2009/10/16 00:28:46 arfrever Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -30,6 +30,8 @@ src_prepare() {
# Remove tests that access the network (bugs #198312, #191117)
rm setuptools/tests/test_packageindex.py
+
+ sed -e 's:if copied and outf.endswith(".py"):& and outf not in ("build/src/distribute_setup.py", "build/src/distribute_setup_3k.py"):' -i setup.py || die "sed failed"
}
src_test() {