net-misc/gsutil: version bump to 4.30 #643534

Closes: https://bugs.gentoo.org/643534

diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index d34f0cae4cdcf3fb3868ca5bec7e5dbb8fa482c2..9e33dd568ca64b1be1dfb248a791f36d369e1aa0 100644 (file)
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,2 +1,3 @@
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
 DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
+DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c

diff --git a/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
new file mode 100644 (file)
index 0000000..5cf7c42
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.30-use-friendy-version-checks.patch
@@ -0,0 +1,30 @@
+--- a/setup.py
++++ b/setup.py
+@@ -36,23 +36,23 @@
+ 
+ requires = [
+     'argcomplete>=1.9.4',
+-    'boto==2.48.0',
++    'boto>=2.48.0',
+     'crcmod>=1.7',
+     'fasteners>=0.14.1',
+     'gcs-oauth2-boto-plugin>=1.14',
+     'google-apitools>=0.5.22',
+     'httplib2>=0.10.3',
+     # TODO: Sync submodule with tag referenced here once #339 is fixed in mock.
+-    'mock==2.0.0',
++    'mock>=2.0.0',
+     'monotonic>=1.4',
+-    'oauth2client==4.1.2',
++    'oauth2client>=4.1.2',
+     'pyOpenSSL>=0.13',
+     'python-gflags>=2.0',
+     'retry_decorator>=1.0.0',
+     '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',
++    'PySocks>=1.01',
+ ]
+ 
+ dependency_links = [

diff --git a/net-misc/gsutil/gsutil-4.30.ebuild b/net-misc/gsutil/gsutil-4.30.ebuild
new file mode 100644 (file)
index 0000000..c956e6c
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.30.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+# Python 3 depends on google-apitools being updated.
+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=""
+
+RDEPEND="${PYTHON_DEPS}
+       >=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+       >=dev-python/boto-2.48.0[${PYTHON_USEDEP}]
+       >=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+       >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+       >=dev-python/gcs-oauth2-boto-plugin-1.14[${PYTHON_USEDEP}]
+       >=dev-python/google-apitools-0.5.22[${PYTHON_USEDEP}]
+       >=dev-python/httplib2-0.10.3[${PYTHON_USEDEP}]
+       >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+       >=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+       >=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
+       >=dev-python/pyopenssl-0.13[${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.30-use-friendy-version-checks.patch
+)
+
+python_prepare_all() {
+       distutils-r1_python_prepare_all
+
+       # Package installs 'test' package which is forbidden and likely a bug in the build system
+       rm -rf "${S}/test" || die
+       sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+       export BOTO_CONFIG=${FILESDIR}/dummy.boto
+       ${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 1343b85b6ef307ff9620dde1883b2769cd82d30d..2d76635e142915d9d00f932344728835d5093365 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -172,11 +172,6 @@ app-backup/holland-backup-mysqlhotcopy
 # Forces downgrade of mock (#643506). Removal in a month.
 dev-python/django-social-auth
 
-# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
-# Requires old dev-python/oauth2client (#643534), tests fail (#527608).
-# Removal in a month.
-net-misc/gsutil
-
 # Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
 # Requires old psycopg (#643614). Removal in a month.
 dev-python/adodb-py