Version bump.

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

4 files changed, 100 insertions, 1 deletions

diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 52de546e8b4d..0a3ad9448a68 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.55 2009/08/11 22:06:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.56 2009/09/10 01:20:13 arfrever Exp $
+
+*setuptools-0.6.1 (10 Sep 2009)
+
+  10 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +setuptools-0.6.1.ebuild, +files/distribute-0.6.1-USER_SITE.patch,
+  +files/distribute-0.6.1-provide_setuptools.patch:
+  Version bump.
 
 *setuptools-0.6-r1 (11 Aug 2009)
 
diff --git a/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch b/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch
new file mode 100644
index 000000000000..990160238aaf
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch
@@ -0,0 +1,25 @@
+http://bitbucket.org/tarek/distribute/changeset/2545492098ff/
+
+--- distribute_setup.py
++++ distribute_setup.py
+@@ -13,7 +13,11 @@ the appropriate options to ``use_setupto
+ 
+ This file can also be run as a script to install or upgrade setuptools.
+ """
+-from site import USER_SITE
++try:
++    from site import USER_SITE
++except ImportError:
++    USER_SITE = None
++
+ import sys
+ import os
+ import time
+@@ -199,7 +203,7 @@ def _under_prefix(location):
+                 if len(args) > index:
+                     top_dir = args[index+1]
+                     return location.startswith(top_dir)
+-            elif option == '--user':
++            elif option == '--user' and USER_SITE is not None:
+                 return location.startswith(USER_SITE)
+     return True
diff --git a/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch b/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch
new file mode 100644
index 000000000000..19ab1e4d9506
--- /dev/null
+++ b/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch
@@ -0,0 +1,22 @@
+--- setup.py
++++ setup.py
+@@ -28,7 +28,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
+@@ -143,7 +143,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.1.ebuild b/dev-python/setuptools/setuptools-0.6.1.ebuild
new file mode 100644
index 000000000000..920064857dc3
--- /dev/null
+++ b/dev-python/setuptools/setuptools-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# 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.1.ebuild,v 1.1 2009/09/10 01:20:13 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+DESCRIPTION="A collection of enhancements to the Python distutils including easy install"
+HOMEPAGE="http://pypi.python.org/pypi/distribute"
+SRC_URI="http://pypi.python.org/packages/source/d/distribute/distribute-${PV}.tar.gz"
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/distribute-${PV}"
+
+DOCS="README.txt docs/easy_install.txt docs/pkg_resources.txt docs/setuptools.txt"
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${PN}-0.6_rc7-noexe.patch"
+
+	# Remove tests that access the network (bugs #198312, #191117)
+	rm setuptools/tests/test_packageindex.py
+
+	sed -e "s/additional_tests/_&/" -i setuptools/tests/__init__.py || die "sed setuptools/tests/__init__.py failed"
+	epatch "${FILESDIR}/distribute-${PV}-provide_setuptools.patch"
+	epatch "${FILESDIR}/distribute-${PV}-USER_SITE.patch"
+}
+
+src_test() {
+	tests() {
+		PYTHONPATH="." "$(PYTHON)" setup.py test
+	}
+	python_execute_function tests
+}