Revbump. Added patch from distutils mailing list by Augie Fackler for subversion-1.5. Thanks to Darren Dale, #220389.

(Portage version: 2.1.5_rc10)

3 files changed, 73 insertions, 1 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 7fa0a804c9de..3df3d5119486 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.38 2008/02/23 09:18:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.39 2008/05/13 09:57:31 hawking Exp $
+
+*setuptools-0.6_rc8-r1 (13 May 2008)
+
+  13 May 2008; Ali Polatel <hawking@gentoo.org>
+  +files/setuptools-0.6_rc8-svn-1.5.patch, +setuptools-0.6_rc8-r1.ebuild:
+  Revbump. Added patch from distutils mailing list by Augie Fackler for
+  subversion-1.5. Thanks to Darren Dale, #220389.
 
 *setuptools-0.6_rc8 (23 Feb 2008)
 
diff --git a/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch b/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch
new file mode 100644
index 000000000000..05aaa158d38b
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-0.6_rc8-svn-1.5.patch
@@ -0,0 +1,30 @@
+Index: setuptools/command/egg_info.py
+===================================================================
+--- setuptools/command/egg_info.py	(revision 61076)
++++ setuptools/command/egg_info.py	(working copy)
+@@ -217,9 +217,9 @@
+             data = f.read()
+             f.close()
+ 
+-            if data.startswith('8'):
++            if data.startswith('8') or data.startswith('9'):
+                 data = map(str.splitlines,data.split('\n\x0c\n'))
+-                del data[0][0]  # get rid of the '8'
++                del data[0][0]  # get rid of the '8' or '9'
+                 dirurl = data[0][3]
+                 localrev = max([int(d[9]) for d in data if len(d)>9 and d[9]]+[0])
+             elif data.startswith('<?xml'):
+Index: setuptools/command/sdist.py
+===================================================================
+--- setuptools/command/sdist.py	(revision 61076)
++++ setuptools/command/sdist.py	(working copy)
+@@ -86,7 +86,7 @@
+     f = open(filename,'rU')
+     data = f.read()
+     f.close()
+-    if data.startswith('8'):    # subversion 1.4
++    if data.startswith('8') or data.startswith('9'):  # subversion 1.4 or 1.5
+         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
+             if not record or len(record)>=6 and record[5]=="delete":
+                 continue    # skip deleted
+
diff --git a/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild b/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild
new file mode 100644
index 000000000000..e3f5b8e430f3
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_rc8-r1.ebuild,v 1.1 2008/05/13 09:57:31 hawking Exp $
+
+NEED_PYTHON="2.4"
+
+inherit distutils eutils
+
+MY_P="${P/_rc/c}"
+
+DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
+HOMEPAGE="http://peak.telecommunity.com/DevCenter/setuptools"
+SRC_URI="http://cheeseshop.python.org/packages/source/s/setuptools/${MY_P}.tar.gz"
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="EasyInstall.txt api_tests.txt pkg_resources.txt setuptools.txt README.txt"
+
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
+	epatch "${FILESDIR}/${P}-svn-1.5.patch"
+
+	# Remove tests that access the network (bugs #198312, #191117)
+	rm setuptools/tests/test_packageindex.py
+}
+
+src_test() {
+	PYTHONPATH="." "${python}" setup.py test || die "tests failed"
+}