diff options
author | Mike Frysinger <vapier@gentoo.org> | 2013-12-09 07:08:06 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2013-12-09 07:08:06 +0000 |
commit | 601b91b5ba989bd167f74fb3b4a6d1a5e873ec53 (patch) | |
tree | 6141104621feeef671e391d80048b1b641e03d9a /net-misc/gsutil | |
parent | New package needed by newer gsutil #468080 by Ben Sagal. (diff) | |
download | gentoo-2-601b91b5ba989bd167f74fb3b4a6d1a5e873ec53.tar.gz gentoo-2-601b91b5ba989bd167f74fb3b4a6d1a5e873ec53.tar.bz2 gentoo-2-601b91b5ba989bd167f74fb3b4a6d1a5e873ec53.zip |
Version bump #468080 by Ben Sagal.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-misc/gsutil')
-rw-r--r-- | net-misc/gsutil/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/gsutil/files/dummy.boto | 6 | ||||
-rw-r--r-- | net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch | 35 | ||||
-rw-r--r-- | net-misc/gsutil/files/gsutil-3.37-use-friendy-version-checks.patch | 20 | ||||
-rw-r--r-- | net-misc/gsutil/gsutil-3.37.ebuild | 44 |
5 files changed, 113 insertions, 1 deletions
diff --git a/net-misc/gsutil/ChangeLog b/net-misc/gsutil/ChangeLog index f94410f90856..123a1a4d87b6 100644 --- a/net-misc/gsutil/ChangeLog +++ b/net-misc/gsutil/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/gsutil # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gsutil/ChangeLog,v 1.11 2013/01/25 05:49:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gsutil/ChangeLog,v 1.12 2013/12/09 07:08:06 vapier Exp $ + +*gsutil-3.37 (09 Dec 2013) + + 09 Dec 2013; Mike Frysinger <vapier@gentoo.org> +files/dummy.boto, + +files/gsutil-3.37-drop-http_proxy-clearing.patch, + +files/gsutil-3.37-use-friendy-version-checks.patch, +gsutil-3.37.ebuild: + Version bump #468080 by Ben Sagal. *gsutil-3.21 (25 Jan 2013) diff --git a/net-misc/gsutil/files/dummy.boto b/net-misc/gsutil/files/dummy.boto new file mode 100644 index 000000000000..93e9dd2f8c77 --- /dev/null +++ b/net-misc/gsutil/files/dummy.boto @@ -0,0 +1,6 @@ +# dummy .boto file for testing + +[Credentials] +gs_oauth2_refresh_token = 1/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +[GSUtil] 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 new file mode 100644 index 000000000000..4c36035d21c5 --- /dev/null +++ b/net-misc/gsutil/files/gsutil-3.37-drop-http_proxy-clearing.patch @@ -0,0 +1,35 @@ +http://crbug.com/318478 + +From 0067df5b08ebab29b88bbb7e6c1cd79dc4d96100 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +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.37-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-3.37-use-friendy-version-checks.patch new file mode 100644 index 000000000000..5da56d476a99 --- /dev/null +++ b/net-misc/gsutil/files/gsutil-3.37-use-friendy-version-checks.patch @@ -0,0 +1,20 @@ +--- a/setup.py ++++ b/setup.py +@@ -33,15 +33,13 @@ management tasks, including: + """ + + requires = [ +- 'boto==2.13.0', ++ 'boto>=2.13.0', + '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>=0.1.0', + ] + diff --git a/net-misc/gsutil/gsutil-3.37.ebuild b/net-misc/gsutil/gsutil-3.37.ebuild new file mode 100644 index 000000000000..73eafe731d7e --- /dev/null +++ b/net-misc/gsutil/gsutil-3.37.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/gsutil/gsutil-3.37.ebuild,v 1.1 2013/12/09 07:08:06 vapier Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit distutils-r1 + +DESCRIPTION="command line tool for interacting with cloud storage services" +HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil" +SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + >=dev-python/boto-2.13[${PYTHON_USEDEP}] + >=dev-python/crcmod-1.7 + >=dev-python/httplib2-0.8[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + dev-python/google-api-python-client[${PYTHON_USEDEP}] + dev-python/python-gflags[${PYTHON_USEDEP}] + dev-python/retry-decorator[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/socksipy-1.01[${PYTHON_USEDEP}] + " + +S=${WORKDIR}/${PN} + +DOCS=( README.md CHANGES.md ) + +PATCHES=( + "${FILESDIR}/${P}-use-friendy-version-checks.patch" + "${FILESDIR}/${PN}-3.37-drop-http_proxy-clearing.patch" +) + +python_test() { + export BOTO_CONFIG=${FILESDIR}/dummy.boto + ${PYTHON} gslib/__main__.py test -u || die "tests failed" +} |