net-misc/gsutil: version bump to 4.20

3 files changed, 80 insertions, 0 deletions

diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index f2cbdcdc97f3..34fa19a7a417 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,3 +1,4 @@
 DIST gsutil_3.42.tar.gz 1878904 SHA256 50fc7acb7d1db8752f3eee106a3d8d65188107943e7cb30cfd3f94a9cfcdcf37 SHA512 084aaf43a44528af0cdfd9bd22beeb5d6abff240c09843cf35016d685d51b854ed5b2837eaa50c97bb44d5e1a3cdccbae6688ef27aa13f2a5db6040bf501b381 WHIRLPOOL 5b0d0fb1d2446a7b8777f368f073fdb4f7ad2d6407735976c178a2727a2548bf28522e06469dd0b7df1578d5586bc152fba3520b66f88d706417947aa3aa5578
 DIST gsutil_4.18.tar.gz 2704520 SHA256 b7f2b7fe2f14b3e5ffa0679507be8d84a0add268dff729de53d22b2f5b61ce24 SHA512 74dd2898faa1615dbd7d560a7ed9f2a78788b2f1ce6e97fa5019c55c7827d93de1923f6985f210bb334e8064bdbd7d169f805ac7add722db0f0e20ff0f85494e WHIRLPOOL 6188f1f4ae352a61e9ad4f67afa5773810519d9d96ad1a534dcd3a6ca58b914a336a4682438800bf242573a00a327f52d541810362f84a5104a165a8566dabd5
 DIST gsutil_4.19.tar.gz 2715141 SHA256 6d9ce67de274d080775ed55e3d86edeb1c8c0a942bccdf5e96bdf1eaa51dd8d2 SHA512 59e96c9855a037300feae122462ff3c9f69e46f049812e88087ae532f590e84b81d67b4e961c47bd0f725c87aa6e0360f65bd8935a95a51c61eb80da0b82dcc1 WHIRLPOOL 70ccfa6f462e536f8aee7ef27aef0e9f8ef0d73bad1493959d2a177db675324f5a872bef5c7e7c844b380cabb04d00f6b334f46bc0f021e4ed743a209b4bf677
+DIST gsutil_4.20.tar.gz 2872954 SHA256 aa468f68ef7ac570b2071de56b4ce55c829cb92b62cf10c007bcbec6e74c7997 SHA512 3fb7903f87eb18a0bece514d1cfc4030b056e47044ef0d9ffd673015358bd86cfc9dcdcf4191e0a4d8f3bae7ef70e12e6856912940d857dc7eec1b1d087026f6 WHIRLPOOL 88932a54656a6399e1c489c294a83f185bb0343e30489c105de4bb6a556e3173b9bb0d3d24e5808872ea10d50d9731ccbceeb8e43280fb0c30ada61e8d2c6c0b
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
new file mode 100644
index 000000000000..8f0de98d0d38
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.20-use-friendy-version-checks.patch
@@ -0,0 +1,25 @@
+--- 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',
+ ]
diff --git a/net-misc/gsutil/gsutil-4.20.ebuild b/net-misc/gsutil/gsutil-4.20.ebuild
new file mode 100644
index 000000000000..15361383febe
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.20.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_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 ~arm ~x86"
+IUSE=""
+
+# The oauth2client-2 dep sucks.
+# https://github.com/GoogleCloudPlatform/gsutil/issues/355
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.39.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.20-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -i \
+		-e '/SocksiPy-branch/d' \
+		setup.py || die
+}
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}