gentoo resync : 15.01.2020

7 files changed, 3 insertions, 279 deletions

diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index 7e312a044406..32bc44434b61 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,15 +1,7 @@
-AUX gcs-oauth2-boto-plugin-1.13-py3.patch 2606 BLAKE2B fdff321a4533b2a8df51e5af780e7ed0cd4e4adf9b1a3c61007037f92da08372dea5ebd66c7119d4a98edc3ea896fc9e22265ed7e282bb9dfb809ca221735fcd SHA512 d215e1ef13a4f513f11dce6311352b808bb3f6b991a452fca1becef56b106529606a7a0ec065292e72fb47e6b04ed854293a43cb14ff74d50102d4b43225390a
 AUX gcs-oauth2-boto-plugin-1.13-use-friendy-version-checks.patch 347 BLAKE2B 5f0062699487ce5f73a2cbba96a6e8ca30f00a3bdd73b7fd5949eac518e01fbc8912a462951b7307a4da02d6016c869e829040ba530974db579d2d16a8c73197 SHA512 b7354d7b195382213018ac4c6924a042da106affb2b9058f664ab5c57b521f0b7164a5249609ecaccfa343114fb8c47d687a861a17b31700c75ee7ca42432bfe
 AUX gcs-oauth2-boto-plugin-1.8-use-friendy-version-checks.patch 345 BLAKE2B a743a19b84ed84b2eb882da4d1885f6d931543815a48b38545b7a60f0702d8e23b16490fc1ffd9763d4540f0e2c1f83399b9a572772dcf070289d4491b5d2cb8 SHA512 cc1dc36815a4ffd42867d398f00a702c0677bcfe54ce772ea93a1e641fd9f2ea0f146b25947587c8d40f66a9b45ff1c4038002c518110bd78808565e120f6230
-DIST gcs-oauth2-boto-plugin-1.14.tar.gz 14980 BLAKE2B 1123633b419291433d7cfa9a284303a7ae2a6b407f487b45897df6945a63f6b0cce733a5940e74acb70bcd9740a7c0cbd3828abfb4163f7ab845a9ff2c652a1b SHA512 86804a599c969c63587387df21a2396a27509981cc13a3f92bc98a645757362e77c63b68956ebd2663a721bb51993c9e61679db85a67de48d017ddad7de044b7
 DIST gcs-oauth2-boto-plugin-1.8.tar.gz 13248 BLAKE2B 831a1b88035d6331ac2cb122fda5ffabd6319b7a030ae8c46dac32be571bdff034d6e60830e5e4403b65a414487c874cd4743f537a9c1d3674bcb1461e457945 SHA512 5504fc38d58ee68a78ee2b8e6c3757045494d000748382bc26888a65085cec08d2d137c63cb51afd1cef72d31b3f0cac5d40014548cca47c5322a67a7f1ef204
-DIST gcs-oauth2-boto-plugin-2.1.tar.gz 15789 BLAKE2B f98eb41d07aede9379bb256723c217be1c2fcf2cda18e555a5d7e85bb402215052ff4d7770cdb4066fd989f7e78d070ea19e1a469f5e6dec2b94a367a6dc3c19 SHA512 26b519fa2987e83a687907aa72e0c9eb8b2a2c48143bc1bf13bad79791379daaae190a23f9f35d1a570e21c6800d5860bbb94f3c3f3b2ff7bfcfec8a5a39af7c
-DIST gcs-oauth2-boto-plugin-2.4.tar.gz 16721 BLAKE2B 38816f6f3e5a857967fad6698aa9a35df8d31d42f083584c1e24c4dcb9379b5e8dd18fbbcf0533dccbc2db9f5e4f400d8cd1f8baddf582894af918a2d2d1b23c SHA512 e3e6b7ffca4405a4c41ca1408f05e3c61acc342d236dd2dd857854242694fdca68e155baadb8be64239583954297dac82a07a73d6391cfb93a53d29f9bf67c99
 DIST gcs-oauth2-boto-plugin-2.5.tar.gz 16739 BLAKE2B a8ef124670063eb19119f7ab6cfd3101f68815a61ec183b3c9ac79ac158e3e47f48349b4f3faa0cf83ce9a203ab2f350e61fdd8a87872962bc1b24a8182f741f SHA512 db6810351c8364c9b217e092aa83803cdc7831136b3fa1be4c54f978f919e2e33bdaf32b8d36db359c5a328eb57f7ad2cee219b94d7f60403f27aaa6a6fd53cc
-EBUILD gcs-oauth2-boto-plugin-1.14.ebuild 1432 BLAKE2B 9e1041feb96197c6ae9503cf2490b24323366dfb18c00a3429c0fd38f77784529730f89b4e6f6b76230e5b099831ccf4417c1e990a58258f596ee0c280af7cda SHA512 2c91bebc4c002fe06ebf114d427a70b0e0b9fb43b7b1f7f29fd5e4682a1d0622eabae9d6b3693a0799b6ca47eee0a7ca3c058b82847e5724ce4602204ba49c7e
 EBUILD gcs-oauth2-boto-plugin-1.8-r1.ebuild 1039 BLAKE2B 861b5581f1522c8e648b1c081843071f30bc066a53d26e6826494760258a3dbafb71500ba9bc45267ca026b1e5b519ee4b17105a96b2f48a81287aabd6abd3eb SHA512 4026ecf2f8380a7371cd87dded9837632a5711cd098d4d2bfc214308c2ad687e8c0e452f120029fddbf3fd47085b9d65aca011a22d79ed520d4f0ca52eebd6cf
-EBUILD gcs-oauth2-boto-plugin-2.1-r1.ebuild 1426 BLAKE2B 574206de51835a545fc000739988caa19ef5ec1ee0f38813195ddb9fd48b85652355971d6670b3c54e5dae3ea434662fd09fd0663864ac5a4139f17af316eba0 SHA512 c421ae4414c936aa7538726876ed8c06c9e34c69819ca4f29a6b2182bdbc58227cc26142b6f0e265f583412516c8af94bf16518417464dd9d0d425a66d3c932d
-EBUILD gcs-oauth2-boto-plugin-2.1.ebuild 1371 BLAKE2B 09657eec356085f0bb06a5775ff0e0a1c2f4bd74095a01f628c3dac6edd073daaa60c3ec3eedea82d3f138a56244fcbae201429d545c736c98623922b31b7b97 SHA512 4bbdc2cff8e9389f4e88ddfa01621c8b53f9f779a83014a1033534536549132cde93daa6bb10b9b80075ba9c43a18b409d21e58590fdf40e649a6dd8d7e8fa6b
-EBUILD gcs-oauth2-boto-plugin-2.4.ebuild 1431 BLAKE2B 6246d1602f7fb6e5588535a0bda145a245681299e81e27061523aa829561d216678939ae4807423e0dee47b18a88e7a6d604ff7614c25bc93195c2284ef79eff SHA512 cfadeb0d16991cc9f897af2da1725d370c0d108d569fc1145492df2d034451c2dfce89e51a8dfa5dcdff5f1135ead75cb802ec43e786642810ecd9b6e4e800fb
-EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1432 BLAKE2B 0aaff15d3d41687ea29813eaa3396e7d78043a231da4f8b60751073d97d4c362dec593b3cd061ccd6416afa3669d861f4bba3a093a864b552a753bc395ab4256 SHA512 de1af33db83e88ad183549afe1fdca5e4d1a75f8794a9f24a4ea84c390a813638c73ef1c5b3a1c0064552a2ff774cd3ff96115472aad3ac563d579cb54a822b5
+EBUILD gcs-oauth2-boto-plugin-2.5.ebuild 1428 BLAKE2B 34e5c371f8385b09d54bd928c0089dc13b01f9bf4dfb76a173ba86c9cba54d9609cd25244ec527c446ff9f62eed0d42ba394ebad644142f3613c6d7b6a5f3852 SHA512 fe5e42268a0fa546c23001b433e6d7c2837f58d67c67317da73270fee77daf838295a0cbe1c5535aa4d84c48cab5c617b72f990ec667683b30cf868031b3e95e
 MISC metadata.xml 335 BLAKE2B 11f766d7bfb5e7ddb78ea1d749d3d2d79496d69e07b1054bede831ba7824d8705e064e5842c71206a0c35cea37e40558a6cdafd8ebf8460ee99ff8dce3f26ac5 SHA512 cb494f35eba6442585175997cb16c7d4f6eea841e56f2828386f0894e68a7d917c010264bea46d7b6ae1957633763c66a5b669606fd8b0fcba3b4555fa926807
diff --git a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch b/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
deleted file mode 100644
index 15f6fc373779..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/files/gcs-oauth2-boto-plugin-1.13-py3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/GoogleCloudPlatform/gcs-oauth2-boto-plugin/pull/18
-
---- a/gcs_oauth2_boto_plugin/oauth2_client.py
-+++ b/gcs_oauth2_boto_plugin/oauth2_client.py
-@@ -122,7 +122,7 @@ except ImportError:
-           retval.token_expiry = datetime.datetime.strptime(
-               data['token_expiry'], EXPIRY_FORMAT)
-         return retval
--      except KeyError, e:
-+      except KeyError as e:
-         raise Exception('Your JSON credentials are invalid; '
-                         'missing required entry %s.' % e[0])
-   # pylint: enable=protected-access
-@@ -274,7 +274,7 @@ class FileSystemTokenCache(TokenCache):
-       flags |= os.O_BINARY
- 
-     try:
--      fd = os.open(cache_file, flags, 0600)
-+      fd = os.open(cache_file, flags, 0o0600)
-     except (OSError, IOError) as e:
-       LOG.warning('FileSystemTokenCache.PutToken: '
-                   'Failed to create cache file %s: %s', cache_file, e)
-@@ -633,7 +633,7 @@ class OAuth2UserAccountClient(OAuth2Client):
-       return AccessToken(
-           credentials.access_token, credentials.token_expiry,
-           datetime_strategy=self.datetime_strategy)
--    except AccessTokenRefreshError, e:
-+    except AccessTokenRefreshError as e:
-       if 'Invalid response 403' in e.message:
-         # This is the most we can do at the moment to accurately detect rate
-         # limiting errors since they come back as 403s with no further
-@@ -669,7 +669,7 @@ class OAuth2GCEClient(OAuth2Client):
-       http = httplib2.Http()
-       response, content = http.request(META_TOKEN_URI, method='GET',
-                                        body=None, headers=META_HEADERS)
--    except Exception, e:
-+    except Exception as e:
-       raise GsAccessTokenRefreshError(e)
- 
-     if response.status == 200:
-@@ -695,7 +695,7 @@ def _IsGCE():
-     # this approach, we'll avoid having to enumerate all possible non-transient
-     # socket errors.
-     return False
--  except Exception, e:  # pylint: disable=broad-except
-+  except Exception as e:  # pylint: disable=broad-except
-     LOG.warning("Failed to determine whether we're running on GCE, so we'll"
-                 "assume that we aren't: %s", e)
-     return False
---- a/gcs_oauth2_boto_plugin/test_oauth2_client.py
-+++ b/gcs_oauth2_boto_plugin/test_oauth2_client.py
-@@ -248,7 +248,7 @@ class FileSystemTokenCacheTest(unittest.TestCase):
-     # Assert that the cache file exists and has correct permissions.
-     if not IS_WINDOWS:
-       self.assertEquals(
--          0600,
-+          0o0600,
-           stat.S_IMODE(os.stat(self.cache.CacheFileName(self.key)).st_mode))
- 
-   def testPutGet(self):
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
deleted file mode 100644
index 14f5c9c593a7..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-# The tests only work with py2 atm.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-	"${FILESDIR}/${PN}-1.13-py3.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild
deleted file mode 100644
index aebf3525f13a..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild
deleted file mode 100644
index ccc056b649f9..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild
deleted file mode 100644
index f4f84a4ebab2..000000000000
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13-use-friendy-version-checks.patch"
-)
-
-# Keep versions in sync with setup.py.
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
-	dev-python/google-reauth-python[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	!=dev-python/oauth2client-2.0*
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i \
-		-e '/SocksiPy-branch/d' \
-		setup.py || die
-	# Make sure the unittests aren't installed.
-	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
-}
-
-python_test() {
-	${EPYTHON} "${S}"/test_oauth2_client.py -v || die
-}
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
index 598e50b72a0e..1801721341a1 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1