gentoo resync : 21.12.2017

9 files changed, 2 insertions, 279 deletions

diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index e0f37732de17..75976225ca7a 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,15 +1,5 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
-AUX gsutil-3.37-drop-http_proxy-clearing.patch 1144 BLAKE2B 8b54829bdd8917fe0b3aca5e9b94a5a0e7cd8db298a617c3f152057776dafa5cfa07e299284c6fec9aa9b93f586c90b472cd663f1af0e02775e533131280c010 SHA512 30a1a3c2a858941201a0f0cf435cff6f9bfa22e3439e62913ed4f999fcca077c35ae7c2a0fcd90ed988d686f38d0df0fd021ba103bfa99a5931ba9dbe4a0e480
-AUX gsutil-3.42-use-friendy-version-checks.patch 473 BLAKE2B b2f4e081f742a3be2fc56c0457aa46b6fd3c2915c13a7e7e3e13884277edbfa6011010a7b6534d22e5fde05c3cabf71d418c4bda81add0791609d31b3f8f1abd SHA512 710f192953d3b0b10cfa4b2fb785d8515149a374197a51bc05e42ebc9293dd8418dcc05f38c005aeecaa87b6e6b8efc89f0c0bfb849a9c8b1741c8a22aed7374
-AUX gsutil-4.19-use-friendy-version-checks.patch 562 BLAKE2B 75390be94bbb01b19f2565d5a10706d4495d1503fe88f90ba41d97675e581c4b3d157e6d0ce5610cf83dce380bb68fb1b1935c4cde3ee3e0459a340f2fbbb6f2 SHA512 90d3845ec4f43bfddf6bc71cb31cdffc0623370f15c0621a48bd2687f62221ca2f6ad947d44602143450cb6900a83847c482e33aefda1446361e3a35666ffb92
-AUX gsutil-4.20-use-friendy-version-checks.patch 639 BLAKE2B 12fbd0f46aad409a6d073890374f1cc6e17f21d774ceed20a8e2d1f51e4121be3fde53b3d65992e3c5fefb65e0b90f5376d1d91bbb35894973460dd5ca8673fb SHA512 0446f26c1d25bdd160de849123b90b73ec63b12179f05851c83481860bcb4a259be4166b79ba1616d2ca3f001a75b1d9f7fad588d5d89e3c091f057ddf71cd0b
 AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
-DIST gsutil_3.42.tar.gz 1878904 BLAKE2B 50690e295c1bbe16bda84b774ff309c8ec6cc31facfb1e70a0ed817b0cb7ea8350036fec533e1bdf56e32578a5bbdb7f0c08341e16026b4afb274414278287d6 SHA512 084aaf43a44528af0cdfd9bd22beeb5d6abff240c09843cf35016d685d51b854ed5b2837eaa50c97bb44d5e1a3cdccbae6688ef27aa13f2a5db6040bf501b381
-DIST gsutil_4.19.tar.gz 2715141 BLAKE2B c479ab9e8f7b5963b0fba9b253bfb37e4abb6ede2fe6bbbdbfdc38c99bfe73331fe351aeb8147efa8b85924c5107c901a10796b37d95978ad034cacd29d919a0 SHA512 59e96c9855a037300feae122462ff3c9f69e46f049812e88087ae532f590e84b81d67b4e961c47bd0f725c87aa6e0360f65bd8935a95a51c61eb80da0b82dcc1
-DIST gsutil_4.20.tar.gz 2872954 BLAKE2B e4210d560a3643cf0b24589aeaaedffdc17aa058c2ad22b922c794316931e797d63435f227f65abf347f1cc9b89a9f0472f2617ca06deb64d58709094cfbc1b0 SHA512 3fb7903f87eb18a0bece514d1cfc4030b056e47044ef0d9ffd673015358bd86cfc9dcdcf4191e0a4d8f3bae7ef70e12e6856912940d857dc7eec1b1d087026f6
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
-EBUILD gsutil-3.42.ebuild 1311 BLAKE2B 8526fbc21bcc24245e47d091a5244202cc029a8725ea6c3b6c964b02d2360cc14033e665e1922872f8b99a08acd3bfbf73c6ddb15d433bc6f4f75e1a3ca94fd9 SHA512 3e25a65f6946ae050569435431eeff8004bb42f1e57dcfc9bf6ac6e60dbd7c22b011a0f3e78c13b7d1406c76f793a84b3f7cec01fa6ec3c9d158c20f820c6ab3
-EBUILD gsutil-4.19.ebuild 1542 BLAKE2B 85691df4b13840de890b2ebc01c10b09a51c67b94e7d226cacddf33b31ac6514ac254f9b4d351a152551c4b8602c9c5863b418dd44191ac5a8813654600f98e4 SHA512 2dc39b7f7967d33652547d8bddcddd1b43b8114a8279a3408c3ed3cc0143847908f2fd9a51e5b89524e61fbf90f83fb85d337fd5e0bd6994720b96eee6ac4e4f
-EBUILD gsutil-4.20.ebuild 1514 BLAKE2B 5d0a6bdb253cca4d9de7c362bcdcacfe0df74e07752e56b7a8663a6d9ff537cf01cbdef329d599d267b9e519f2cbfa5c99d3d3b9d66beeb13d4776b9a9038d6e SHA512 fa6f9b69f9e15f369e442aa7b430d87f9b662efb86ea0673297f0d69fa6706db717341510b14a6d72d44b9e0937428eaa6b1df856cb1806d0774be93d7baea82
 EBUILD gsutil-4.27.ebuild 1740 BLAKE2B c3e503d3d77e86fd0b1348c8874e77d6dc98a13f4eb2800dac4af762fdfc46e1ccafe2ec18a90ab5977dbfd3fc4b77bea90c3b1ad6fd1cbaf8b626c80dd93dbf SHA512 bcdd47cd2b3a021b47e16a783e6ef805bdf89bddb08df894f0919972a801fa2a09eee724ca55ce15c316b7be371c643a17955eef4570701b4d4939bd41e20595
-MISC metadata.xml 359 BLAKE2B 2e26fcf6cf9d09caeae99f13d78a2ddb82c177e6308657c2aba57da6ad921cefa6fa56eb2939cce78b9bd539594162c676d29fd97ad39e9808eb8bea8b7cca56 SHA512 cc3c00dcd60084af77cae6428f522b05fdd95a38b986bbf174be3e1a0dbbffb5d7e448b8eb481b645edf8dc588b8a5d0beed42d6b07e6771fcf5e7e62ad942a0
+MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
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 <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.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',
- ]
diff --git a/net-misc/gsutil/gsutil-3.42.ebuild b/net-misc/gsutil/gsutil-3.42.ebuild
deleted file mode 100644
index 35ad072fb781..000000000000
--- a/net-misc/gsutil/gsutil-3.42.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 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=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/boto-2.22.1[${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-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-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_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed \
-		-e '/SocksiPy-branch/d' \
-		-i setup.py || die
-}
-
-python_test() {
-	export BOTO_CONFIG=${FILESDIR}/dummy.boto
-	${PYTHON} gslib/__main__.py test -u || die "tests failed"
-}
diff --git a/net-misc/gsutil/gsutil-4.19.ebuild b/net-misc/gsutil/gsutil-4.19.ebuild
deleted file mode 100644
index 99c17123dd51..000000000000
--- a/net-misc/gsutil/gsutil-4.19.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.12[${PYTHON_USEDEP}]
-	>=dev-python/google-apitools-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-2
-	>=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.19-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"
-}
diff --git a/net-misc/gsutil/gsutil-4.20.ebuild b/net-misc/gsutil/gsutil-4.20.ebuild
deleted file mode 100644
index 15361383febe..000000000000
--- a/net-misc/gsutil/gsutil-4.20.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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"
-}
diff --git a/net-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
index df60255c433f..6625c00f3193 100644
--- a/net-misc/gsutil/metadata.xml
+++ b/net-misc/gsutil/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vapier@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">gsutil</remote-id>
 		<remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>