Provide setuptools.

Package-Manager: portage-14000-svn/cvs/Linux x86_64

4 files changed, 63 insertions, 4 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/Manifest b/dev-python/setuptools/Manifest
index 47c0cd251277..c04c80d40e1c 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,10 @@
+AUX distribute-0.6-provide_setuptools.patch 1738 RMD160 aac0fd198e7607d8c5ec2c4e6cea82d44b6e6fe6 SHA1 d9c575419313561d1ef6636e349b9241de7e40f3 SHA256 2b7f5a271a71e09a2504a1adf1ad3ad64cdde7ec637101c16ca7a7f353a26a35
 AUX distribute-0.6-sandbox.patch 3141 RMD160 44ecc05e769fb87fcc6f297d1bade6abaa8de0ee SHA1 0188eae1184058d3687a2ce24a40046afe133caa SHA256 63b2e8cd06af0251a37341b43a652ecc0361470a00cd26f63310d2ca146dfa27
 AUX setuptools-0.6_rc7-noexe.patch 351 RMD160 6c978d3494b1025e8730796a923dd69f5872a823 SHA1 0f63e1a885f37aca375023ca845de3d7044e7c9d SHA256 772731de7539b71d45da2ac77062965c1ea36294781d4113a2845868b98d8b83
 DIST distribute-0.6.tar.gz 258257 RMD160 42ebd5e9e5047d5722d63cb0f7f07e351e5c6dee SHA1 c7c61ee27236980c4c734ae82e48834fb7771fdc SHA256 8f788db7e913040150387eae3333f4f82acb59858b6163c945eed127140c67f0
 DIST setuptools-0.6c9.tar.gz 252744 RMD160 bc0ee3821e76b57fd13425b16c4419dbccf95ed9 SHA1 79086433b341f0c1df45e10d586a7d3cc25089f1 SHA256 e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8
-EBUILD setuptools-0.6.ebuild 1287 RMD160 91b3ec12c6e7a79100613b4c8ace49203c970599 SHA1 0b8df9369a8d9848962c2adc0ffbcf069bb202b9 SHA256 10c9bae3547a884be5ce971743d8aa13c2d4794da879849d3291a9ba02c58a61
+EBUILD setuptools-0.6-r1.ebuild 1527 RMD160 c6b7458fc4cb1757d67781ba539571576d5c22ec SHA1 264754f80912afa4477ef57f34a0d78c3ee7e07d SHA256 65da696efe86efb51ff0e278c1aaff75d1e311dfa1f186e21fa652a798932255
 EBUILD setuptools-0.6_rc9-r1.ebuild 1131 RMD160 08fc600e6701de7357fc1e86dd6fd104ac971d16 SHA1 23bb7017a713eb944861770f4a27e85c097f81e4 SHA256 b417dbe2ad1eaa56aec3361e95b86ae9f5d6255acb02037663617eb5d125c5cb
 EBUILD setuptools-0.6_rc9.ebuild 1036 RMD160 80ca83620854feb65d94fcf37f72c732a9bcd5c8 SHA1 cfb18c9488bfb2080cfdcd9151c26584377d0840 SHA256 5b8703c3e492fbffed3503a21cf252259e82bb3c17929f092f4d3a8f6beb4a65
-MISC ChangeLog 7775 RMD160 118e3745b414abf24655d1e5edbe5a780ddd608d SHA1 91c09601277ec81dbeea2f04ed0dfd352966067a SHA256 6cb232a1a356efaba511fc8ae05c6e65aeff30aac68453408a79130a0e08193f
+MISC ChangeLog 8008 RMD160 0ec75cd604b0f5d893e217af1efd31b3361c3375 SHA1 0485c90b82e3a88553788f6484d1ed61ce6fa48f SHA256 7377a3ae182984097d9ced7cbcdd1dbe085f0a1bb34fad2c09da1fa91cbfc6fe
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
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() {