diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-28 21:26:09 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-28 21:26:09 +0000 |
| commit | ba44a2b0eee0ee27bc1315ae9c430d5d8eba3f8f (patch) | |
| tree | 721066d0147993a054ab65985fe4d1409cb00c9b /dev-python/setuptools/files | |
| parent | EAPI 2 ebuild - fixes bug #241060 (CFLAGS ignored) - remove old versions (diff) | |
| download | gentoo-2-ba44a2b0eee0ee27bc1315ae9c430d5d8eba3f8f.tar.gz gentoo-2-ba44a2b0eee0ee27bc1315ae9c430d5d8eba3f8f.tar.bz2 gentoo-2-ba44a2b0eee0ee27bc1315ae9c430d5d8eba3f8f.zip | |
Don't use no longer needed patch.
(Portage version: 14458-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/setuptools/files')
3 files changed, 0 insertions, 69 deletions
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 deleted file mode 100644 index 990160238aaf..000000000000 --- a/dev-python/setuptools/files/distribute-0.6.1-USER_SITE.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 19ab1e4d9506..000000000000 --- a/dev-python/setuptools/files/distribute-0.6.1-provide_setuptools.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/files/distribute-0.6.2-provide_setuptools.patch b/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch deleted file mode 100644 index 33e60652949d..000000000000 --- a/dev-python/setuptools/files/distribute-0.6.2-provide_setuptools.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- setup.py -+++ setup.py -@@ -57,7 +57,7 @@ - before_install() - - dist = setup( -- name="distribute", -+ name="setuptools", - version=VERSION, - description="Easily download, build, install, upgrade, and uninstall " - "Python packages", ---- 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" % ( -- sys.version[:3], require('distribute')[0].version -+ sys.version[:3], require('setuptools')[0].version - ) - - |