From 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Dec 2017 20:47:17 +0000 Subject: gentoo resync : 21.12.2017 --- .../gsutil-3.37-drop-http_proxy-clearing.patch | 35 ---------------------- .../gsutil-3.42-use-friendy-version-checks.patch | 20 ------------- .../gsutil-4.19-use-friendy-version-checks.patch | 25 ---------------- .../gsutil-4.20-use-friendy-version-checks.patch | 25 ---------------- 4 files changed, 105 deletions(-) delete mode 100644 net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch delete mode 100644 net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch delete mode 100644 net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch delete mode 100644 net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch (limited to 'net-misc/gsutil/files') diff --git a/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch deleted file mode 100644 index 4c36035d21c5..000000000000 --- a/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch +++ /dev/null @@ -1,35 +0,0 @@ -http://crbug.com/318478 - -From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 27 Nov 2013 14:57:05 -0500 -Subject: [PATCH] drop http_proxy clearing - -The boto logic takes care of merging the env vars and the settings in its -boto config file, so there shouldn't be a need to clear things. ---- - gslib/__main__.py | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/gslib/__main__.py b/gslib/__main__.py -index 82a69c1..a18db42 100644 ---- a/gslib/__main__.py -+++ b/gslib/__main__.py -@@ -247,14 +247,6 @@ def main(): - else: - command_name = args[0] - -- # Unset http_proxy environment variable if it's set, because it confuses -- # boto. (Proxies should instead be configured via the boto config file.) -- if 'http_proxy' in os.environ: -- if debug > 1: -- sys.stderr.write( -- 'Unsetting http_proxy environment variable within gsutil run.\n') -- del os.environ['http_proxy'] -- - return _RunNamedCommandAndHandleExceptions( - command_runner, command_name, args[1:], headers, debug, - parallel_operations) --- -1.8.4.3 - diff --git a/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch deleted file mode 100644 index 5d8bbbc7635e..000000000000 --- a/net-misc/gsutil/files/gsutil-3.42-use-friendy-version-checks.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -33,15 +33,13 @@ management tasks, including: - """ - - requires = [ -- 'boto==2.22.1', -+ 'boto>=2.22.1', - 'httplib2>=0.8', - 'python-gflags>=2.0', - 'google-api-python-client>=1.1', - 'pyOpenSSL>=0.13', - 'crcmod>=1.7', -- # Not using 1.02 because of: -- # https://code.google.com/p/socksipy-branch/issues/detail?id=3 -- 'SocksiPy-branch==1.01', -+ 'SocksiPy-branch>=1.01', - 'retry_decorator>=1.0.0', - ] - diff --git a/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch deleted file mode 100644 index 66d8144329f2..000000000000 --- a/net-misc/gsutil/files/gsutil-4.19-use-friendy-version-checks.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -35,10 +35,10 @@ - """ - - requires = [ -- 'boto==2.39.0', -+ 'boto>=2.39.0', - 'crcmod>=1.7', - 'gcs-oauth2-boto-plugin>=1.12', -- 'google-apitools==0.5.2', -+ 'google-apitools>=0.5.2', - 'httplib2>=0.8', -- 'oauth2client==1.5.2', -+ 'oauth2client>=1.5.2', - 'pyOpenSSL>=0.13', -@@ -48,7 +48,7 @@ - 'six>=1.9.0', - # Not using 1.02 because of: - # https://code.google.com/p/socksipy-branch/issues/detail?id=3 -- 'SocksiPy-branch==1.01', -+ 'SocksiPy-branch>=1.01', - ] - - dependency_links = [ diff --git a/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch deleted file mode 100644 index 8f0de98d0d38..000000000000 --- a/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -35,10 +35,10 @@ - """ - - requires = [ -- 'boto==2.39.0', -+ 'boto>=2.39.0', - 'crcmod>=1.7', - 'gcs-oauth2-boto-plugin>=1.14', -- 'google-apitools==0.5.3', -+ 'google-apitools>=0.5.3', - 'httplib2>=0.8', -- 'oauth2client==2.2.0', -+ 'oauth2client>=2.2.0', - 'pyOpenSSL>=0.13', -@@ -48,7 +48,6 @@ - 'six>=1.9.0', - # Not using 1.02 because of: - # https://code.google.com/p/socksipy-branch/issues/detail?id=3 -- 'SocksiPy-branch==1.01', -+ 'SocksiPy-branch>=1.01', - # TODO: Sync submodule with tag referenced here once #339 is fixed in mock. -- 'mock==2.0.0', - ] -- cgit v1.2.3