Provide setuptools.

(Portage version: 14000-svn/cvs/Linux x86_64)

3 files changed, 60 insertions, 2 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 3a8829085803..52de546e8b4d 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.54 2009/08/09 21:51:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.55 2009/08/11 22:06:47 arfrever Exp $
+
+*setuptools-0.6-r1 (11 Aug 2009)
+
+  11 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -setuptools-0.6.ebuild, +setuptools-0.6-r1.ebuild,
+  +files/distribute-0.6-provide_setuptools.patch:
+  Provide setuptools.
 
 *setuptools-0.6 (09 Aug 2009)
 
diff --git a/dev-python/setuptools/files/distribute-0.6-provide_setuptools.patch b/dev-python/setuptools/files/distribute-0.6-provide_setuptools.patch
new file mode 100644
index 000000000000..974d44369463
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6-provide_setuptools.patch
@@ -0,0 +1,47 @@
+--- distribute_setup.py
++++ distribute_setup.py
+@@ -78,11 +78,11 @@
+     except ImportError:
+         return do_download()
+     try:
+-        pkg_resources.require("distribute>="+version); return
++        pkg_resources.require("setuptools>="+version); return
+     except pkg_resources.VersionConflict, e:
+         if was_imported:
+             print >>sys.stderr, (
+-            "The required version of distribute (>=%s) is not available, and\n"
++            "The required version of setuptools (>=%s) is not available, and\n"
+             "can't be installed while this script is running. Please install\n"
+             " a more recent version first, using 'easy_install -U distribute'."
+             "\n\n(Currently using %r)"
+@@ -116,7 +116,7 @@
+             if delay:
+                 log.warn("""
+ ---------------------------------------------------------------------------
+-This script requires distribute version %s to run (even to display
++This script requires setuptools version %s to run (even to display
+ help).  I will attempt to download it for you (from
+ %s), but
+ you may need to enable firewall access for this script first.
+--- setup.py
++++ setup.py
+@@ -21,7 +21,7 @@
+     before_install()
+ 
+ dist = setup(
+-    name="distribute",
++    name="setuptools",
+     version=VERSION,
+     description="Download, build, install, upgrade, and uninstall Python "
+         "packages -- easily!",
+--- setuptools/package_index.py
++++ setuptools/package_index.py
+@@ -142,7 +142,7 @@
+                 yield urlparse.urljoin(url, htmldecode(match.group(1)))
+ 
+ user_agent = "Python-urllib/%s distribute/%s" % (
+-    urllib2.__version__, require('distribute')[0].version
++    urllib2.__version__, require('setuptools')[0].version
+ )
+ 
+ 
diff --git a/dev-python/setuptools/setuptools-0.6.ebuild b/dev-python/setuptools/setuptools-0.6-r1.ebuild
index 8c06344a4064..01ea8f43ff32 100644
--- a/dev-python/setuptools/setuptools-0.6.ebuild
+++ b/dev-python/setuptools/setuptools-0.6-r1.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.ebuild,v 1.1 2009/08/09 21:51:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6-r1.ebuild,v 1.1 2009/08/11 22:06:47 arfrever Exp $
 
 EAPI="2"
 
@@ -32,8 +32,12 @@ src_prepare() {
 	# Remove tests that access the network (bugs #198312, #191117)
 	rm setuptools/tests/test_packageindex.py
 
+#	sed -e 's/name="distribute"/name="setuptools"/' -i setup.py || die "sed setup.py failed"
+#	sed -e '/name="distribute"/a \
+#    provides=["setuptools (0.6)"],' -i setup.py
 	sed -e "s/additional_tests/_&/" -i setuptools/tests/__init__.py || die "sed setuptools/tests/__init__.py failed"
 	epatch "${FILESDIR}/distribute-${PV}-sandbox.patch"
+	epatch "${FILESDIR}/distribute-${PV}-provide_setuptools.patch"
 }
 
 src_test() {