gentoo resync : 03.11.2021

5 files changed, 11 insertions, 109 deletions

diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4804f85fe389..8d3276f24a4f 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,11 +1,7 @@
-DIST google-auth-2.1.0.tar.gz 181817 BLAKE2B 806f3541163bd2f66a533730eb0064b4697716ab58595dc678fdef106dd49dd328378710650e77efc962547834808124eda934b69cc4ef18931624822710d90f SHA512 1460ad02c6ac549245433567583f76eea680ea941b2917887f7fda3f2f6d04c5b16e536368a2f2c0016acd2bacf894d1eafa9b26f148f66b212590eb0388d181
-DIST google-auth-2.2.0.tar.gz 183667 BLAKE2B ac71dfe657126f96fd78f4fde110630dd5e1fc2864579a199309725795ba337fa7a2771cccbaba9d12fd35639ef67a78cb71bfd2e1a8e963cfc62507b2513ec3 SHA512 00a2a28f5237bba58a578726ac6d3290eec37486343a0f2c1c1764c14db137cd68db776890cd2556516579b54ddbb7516c08782959f87867a1e30756821e489c
-DIST google-auth-2.2.1.tar.gz 183909 BLAKE2B 4c18f332f068573567af5100828b3902db17e46c47087569386ad3b012e45ecb841709376fae7f14920e3dfdb0124b9fd002b670b565b9c641dc9ff4ef5cc507 SHA512 245e6b8d27ff49e47093dc2f50e97a57031c93090900b5578a91ab335560b7fec1aced1faf822826263a00dfaf282eb147a4e389c13546f2e34d09f1ef1ca285
 DIST google-auth-2.3.0.tar.gz 184993 BLAKE2B ac1392ca61e092e3e53c9e936e2d0bd11aeb8f33cace2458e80055734a96a05294335a9273acfcc3f385f423ed537d544404e41599cb6a75b21a10998fd72562 SHA512 cf0040d238880ea4bbad64f0a47311f2ed3922a7301a0d5287319b39ea8e76dca66dc78fd860cc12386b078bd2147a1cba01de97381420ef94cc44fca0c90ad1
 DIST google-auth-2.3.2.tar.gz 186112 BLAKE2B df2321252984ea43def8ec703590d153ecbd144f385a4915ce8f52e4cb71d66e31929f95a1ac783c4c4436a454b81a71d13517d38454892203c8ef19dbd80822 SHA512 1a7c828ecf529e8e64f946a5ee1923bed1544d4828b00449d027b0898af47e99b90be1a490b60e19a133fb59397f8860265306cd3dbaa8600bef823da1e4a215
-EBUILD google-auth-2.1.0.ebuild 1402 BLAKE2B bf03a7cb9afde8426698dffd25489e15fcdd7c684399315792af049f6a48bf71847ff6999cf14ceb739f936f90e8419632606877f6810dc05ca1ea0fb82a6c12 SHA512 05b7ae4008dba3220014d345c474eba12be81e707200799e74637b254efa67e7dc6528cdd9f4fc78e4adf83dd262f714346c299bfde0e0bf4f2564fefa4519e1
-EBUILD google-auth-2.2.0.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.2.1.ebuild 1404 BLAKE2B 781f5d9696660bf2b744ea2ee00d0cbe80904368e732323a01fa1584d00fa44974411b796d394f7fb608f397c1847391efaa59e4caf3a96086b311b2454e349a SHA512 5b094ca5d9b58e62b876ee70fd1563566050b6d9e1b97095f854f3c4399553c5ff681d42d31ca77c612c23fabbb662cbfaf49f31591cb921c2d0c860dfc99f34
-EBUILD google-auth-2.3.0.ebuild 1511 BLAKE2B dd2d44fef1ae00bc8024c4728a5de48dbeb2e69ebeece7e17b64414808a32b26aef1c9ce947e18027e5c522c69ccbd51c834b6077812a679db4ea3f42f1b1b2f SHA512 efb97e825bbf48719194d35750600f72689fb2c9ea00d6f8cf1aa231ec32b30c67df4b9575942e6a8470c52b90e5e2fa5c507e9a0009cc572e2504f19239c0ed
+DIST google-auth-2.3.3.tar.gz 186600 BLAKE2B 52b1269b88d27fafafcb053219c93c7f180cac11cdf32b140531553dda547d02087b0418d44edc6497eb37793859d86d4beaad1a7a128c86839202785584c9ab SHA512 3ab6d97e71988ef5e338e0a643545f8fa504f5ea04f4176afd9417ecf0e9a3fa45333f0c2c7ea5bf32423df32c48ec59ac9d16ef8bfc35a1aa4c0fcc114fef63
+EBUILD google-auth-2.3.0.ebuild 1509 BLAKE2B fbff7143162485d0246563df76ae32f66ff717780f42964e4aedaa09c0028fcd968d3301dc6bd42b8fa308326d77ebe3212f0dbb90cf97692993518e325609d8 SHA512 14a478f56a307c9241842226e157112ef56114990f8e5eb352b342bbf854c6ca4a9e74313398592fbdfd0e1ccf2e75f3473adbab4c11a0d388b83dde7dda67d2
 EBUILD google-auth-2.3.2.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
+EBUILD google-auth-2.3.3.ebuild 1545 BLAKE2B 335205543367e55ac4c3d7730133e82952d6bd855576b98cd52053237daecf27536134fa58ff1490aada839acc15746fa16dc559aa7a0127a304030a6c0c1be8 SHA512 3e0963371c15ae4b00332a1f3d9ff47db4f0486e495d3dbf29d8ae4efedeb185d1eded75369ead64dd166ba714fe5fcd921e76c2f20777fbef4cd70532a3d2dd
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.1.0.ebuild b/dev-python/google-auth/google-auth-2.1.0.ebuild
deleted file mode 100644
index 20d8750d0310..000000000000
--- a/dev-python/google-auth/google-auth-2.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.2.1.ebuild b/dev-python/google-auth/google-auth-2.2.1.ebuild
deleted file mode 100644
index cd44f928efdd..000000000000
--- a/dev-python/google-auth/google-auth-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.3.0.ebuild b/dev-python/google-auth/google-auth-2.3.0.ebuild
index a0d95fea9961..986bf858869a 100644
--- a/dev-python/google-auth/google-auth-2.3.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.2.0.ebuild b/dev-python/google-auth/google-auth-2.3.3.ebuild
index cd44f928efdd..01d1b603755a 100644
--- a/dev-python/google-auth/google-auth-2.2.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.3.3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
 	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	"
 BDEPEND="
 	test? (
@@ -33,7 +34,6 @@ BDEPEND="
 		dev-python/grpcio[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
 		dev-python/pyu2f[${PYTHON_USEDEP}]
@@ -44,6 +44,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die