4 files changed, 86 insertions, 2 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/Manifest b/dev-python/setuptools/Manifest
index c23a4d36df29..6de3222b1d51 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
+AUX setuptools-0.6_rc8-svn-1.5.patch 1327 RMD160 1ba64287f649182a5ab0709144987975ea721dd5 SHA1 957f2c6ea2d8822158c97ee248faa7d4a986cdff SHA256 7e2419841dcf5d541acfb6ff8136405de1dbbbd0b5d101d2f7d0c75d6203d293
 DIST setuptools-0.6c7.tar.gz 249245 RMD160 edde92ef87b1313de38ebae2a939ef9710776d9d SHA1 8baa4d11bd7380ccab5c7fbdf6f8dc12a5dacba9 SHA256 f18c30ae88025bc94e04eb8f89355742db601ea0367991a0e2b69f2bf74ec0e7
 DIST setuptools-0.6c8.tar.gz 250878 RMD160 081f49dccefae08d59f905d074ad15d348d51527 SHA1 dbc7a4955672964c1c656ae4ca736cf661409d06 SHA256 96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
 EBUILD setuptools-0.6_rc7-r1.ebuild 1003 RMD160 f092726caf92b88f045906c4021df74a89cbedeb SHA1 66e25dfe520673df4d849f4a5015038188838065 SHA256 31d02bae74efcbe428279100942860f1302ff02dc41ca9bfb8f6f3965acfcbab
+EBUILD setuptools-0.6_rc8-r1.ebuild 1083 RMD160 9b9e741cb9298af3a5eab2f318308d9b39d7c32e SHA1 9369dcb8681c6ed417a7322ef9cd68413ebb9eb1 SHA256 c36ec05b324870b160b4b833f05e33fe6f04be888ed5456d0d7cbb6dc3e4e61f
 EBUILD setuptools-0.6_rc8.ebuild 1039 RMD160 b1a06a69806d139de63b261d11cedb75f351bf8b SHA1 f2574c2dd5f5c13c21b82233d13cd97fdac55f0f SHA256 8dd6cc90bf38d7e1b8831264996ab858e2448139d3cfb57ad92b30ed77d4b661
-MISC ChangeLog 5521 RMD160 089fd31e285a1e0e6648854d32ca3a41514a3d5a SHA1 63328e636411c2d1ebd7075099bee47fc05dc0f2 SHA256 df306ab9f0614ff403ad705c2b12019c54b45be544f2b3295fb2a0ab6e16612e
+MISC ChangeLog 5803 RMD160 bb1af10d0d5239d3a1659cc6ede902a772d4a5e8 SHA1 40b7b8bf3104b847aa89b60345e93fcc6c07b4cc SHA256 391387aae985ee0112ad12956d459a23274d9b090889a19f9395e2e2392fd513
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgpZhIACgkQQU4yORhF8iCWmwCgkP/a+yeEJZ4p2Hy2AYninrvc
+2AQAn3qx+xjzBwopg3q/sO+3M+tvfBoM
+=SsP6
+-----END PGP SIGNATURE-----
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"
+}