gentoo resync : 25.08.2020

6 files changed, 17 insertions, 113 deletions

diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4e9e6a53cac0..97714d9d66a5 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,8 +1,5 @@
-DIST google-auth-1.0.1.tar.gz 133903 BLAKE2B 0a99dcdb37a195f24077162ea8191e2eb12aac0eec8e08d06f0b17aba9c4f5ed44f19ca41c737a249611ce02b98e03474d1e995909c5755222605e004d11fb1d SHA512 c10822c6b75700503a06a4b3a43a123d57605a043eb494bcb0232cc3941fc039d0803ed75be26d0da72fd4df613135c290fb3fdf82b0fa47d4fe0729462d80f4
 DIST google-auth-1.14.3.tar.gz 101964 BLAKE2B 096768066d02248a4b614e5ea1f1035c81714ef09f6fb43fdb3ecc308d7cadaf7ad821f1dca505389fd1c73eec5e0b2d233f71f54469c43a2616f64a15661f21 SHA512 e3b76907e50b4927aaa1d450a6133943ad736427a180023ea2c4639545449769136b9db89eae54456338f1cf5bbaaa5840a8cf3db92d54f9e96407ae8935a607
-DIST google-auth-1.6.3.tar.gz 80899 BLAKE2B 71e9ef4fbb8803dbea96e1b9b3183f9bae8a9bd7e29eda1c9ee042c7abb3e5011ee4f461ddafd3295119e3a5a451892b8a38cb49702c59828baba1af35403c25 SHA512 47a3e9390428ffa58946c348d4e1a1bfe1290d6e06b75924bbacb37d5af929050690ef5c13820468de805646f4686c035b00dfe947c090d53568dd85d804af5e
-EBUILD google-auth-1.0.1.ebuild 1359 BLAKE2B 58e37f1f7005b7af6c0775278d0a8220a6e3c1b2574bdfb4ad5a62dc37a2b64e1ffd52fd0b3a838e08d0275e789a521c2a84d9110a0e787c226070c3c82286c4 SHA512 ff48dd4fd546aa8bd3bb629e44c56cb91e54d0c962d1d80de24596e75d37a16eafbb611aede2b0763badf15d691dcea29e8251d9c9c30bcf31ff659dd5f7464e
-EBUILD google-auth-1.14.3-r1.ebuild 1477 BLAKE2B 5b8d5e861d452e868405f476835ea530c816e76506ca26b87cf0fda9d02aa448f10cffecb256ce776a3c59ec58f417c72162ffa2c2e414d67eb0d1cd5aa42d54 SHA512 d496baf4377203c1908d483fab5e6acebd82558ca509f0e60845afcb979ccb4048397808f69ab162b249727d2910bf5ea29005a17cacc993f7846dc8f834bf9e
-EBUILD google-auth-1.14.3.ebuild 1284 BLAKE2B 9c7fbc8767884a2ebf840b34e828ccb88dafb7d5fd2c1dbc90ea8da23668cf8b9ed53822de989eca62c9190431f37b67ee2427d8115218d7329039a2a8a2b36f SHA512 4824dcf339a3987b910a260a71320fb618339c0fc9c630f7970b7f7e41dad147093361e1be546ebf8710ce181030877dd5992cb9029a3add76447d23db70ebbd
-EBUILD google-auth-1.6.3.ebuild 1280 BLAKE2B ec8a8c550643d8f25de5a51dd1b3d502c8156c86ff863b619af5b3c5041df20891f3606fa0bcca53dc555dc6b987bec1192db979088af41dd062bd3ac3450a9f SHA512 0136a2964f1210a729e1f2a9364ecec4f5e07672cb3a1824f8b60b98dcec7a824ed9ab67db46a3926ccdc3d5dfe263f137d78c083eee9edb7e292a4460d920f8
-MISC metadata.xml 404 BLAKE2B 5a7234bdd9c08a076980997db1c4fa12d2d2ee37945ccf2308e5bbd92bd01b5cbccb195a1a567f3ab82b71a1d64bf63453b4dffb2e2d7e93fdacc322f8612896 SHA512 ba3c9a09c5bc382da4c8594011872eca305111afa671adffbd3d4c04f8d772cc37d43d83385183f38311e9549c12ccff14f44f85352c49f778766134075ff32b
+DIST google-auth-1.20.1.tar.gz 107375 BLAKE2B 2f57cd9752c46891c59ed13e2ec8c6f98e5b3cd07d329769a78872877a17580c1ff5bb9da0381ef9bd4b6b9f72f04125ef71102543cfe1dc7bc3b09a5d5d9039 SHA512 6aad44b58c71f96c686606d6e8b6f273c64ce1559737920ccc31ad761442cad7f5fab19a59daee9408b284405a00c2de769c00221ac91bcfdd48851dba6f680f
+EBUILD google-auth-1.14.3-r2.ebuild 1549 BLAKE2B 30225ede6a4d3f97a845b7c1320652613e27eccf0903c25435f3e7137fed8c3a00d94e3eb6575d3fcd226cc9d23ce2a2b341409e0a79f4fd06245f5cbabab76a SHA512 33f41d3d3faaa158806096c0fa35d8c05f015b2329feea2bbce810bb060c6ae79ee007e3bfdbf302895003a472724cb9b4377c689ce0c2c5e793a6dec5762926
+EBUILD google-auth-1.20.1.ebuild 1488 BLAKE2B 0ad01e6584cf9e73c18990d87c239bb95902905fc0b16b2d6bf889ba795db7de78422f5a21d5e34119f5dfaa2781c973727300f7eba31f888449b04a76ece350 SHA512 a1626e1bee025a92bd37e9b29b3f78677de33df7f71b95a6bbda83578b28ddae6e3d3bc5c10522011c0d1b4862b6b6363307a2557772bd0eb6f2663c54c73110
+MISC metadata.xml 428 BLAKE2B 130f36eeb8949f23ff7658277485387897cc1688205de4f5ac7acd4e8e897a5212c07fbe36b4884f4b6d4c4755cbe1e99d0f9d37529a605d0f4df01445e7045a SHA512 82c278bcbbd1329e5b002b7382f11a5bcd8419080137ad09c51db944941669cf072401210d9990d1bb2adf98fd3e60f0f77415d9f2294e1cc2c68023040b9535
diff --git a/dev-python/google-auth/google-auth-1.0.1.ebuild b/dev-python/google-auth/google-auth-1.0.1.ebuild
deleted file mode 100644
index 553ccb457d1c..000000000000
--- a/dev-python/google-auth/google-auth-1.0.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# urllib3-1.16 raised MaxRetryError, not TransportError
-	sed -e 's:test_connection_error:_\0:' -i tests/transport/compliance.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	py.test || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.14.3.ebuild b/dev-python/google-auth/google-auth-1.14.3-r2.ebuild
index 2776bf9f4da6..a61736d01286 100644
--- a/dev-python/google-auth/google-auth-1.14.3.ebuild
+++ b/dev-python/google-auth/google-auth-1.14.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,10 +13,9 @@ 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"
 IUSE="test"
-# Test deps need keywords. See #723554 and #723912.
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
@@ -28,10 +27,16 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
 		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
@@ -39,6 +44,7 @@ distutils_enable_tests pytest
 src_prepare() {
 	# delete stray files included in the tarball
 	find "${S}"/tests -name '*.pyc' -delete || die
+	sed -e 's|"rsa>=3.1.4,<4.1"|"rsa>=3.1.4"|' -i setup.py || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-python/google-auth/google-auth-1.14.3-r1.ebuild b/dev-python/google-auth/google-auth-1.20.1.ebuild
index 91fe626a7fff..1fe0712b1c91 100644
--- a/dev-python/google-auth/google-auth-1.14.3-r1.ebuild
+++ b/dev-python/google-auth/google-auth-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-auth/google-auth-1.6.3.ebuild b/dev-python/google-auth/google-auth-1.6.3.ebuild
deleted file mode 100644
index 8ab4aa30d8ee..000000000000
--- a/dev-python/google-auth/google-auth-1.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	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}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)"
-
-src_prepare() {
-	# delete stray files included in the tarball
-	find "${S}"/tests -name '*.pyc' -delete || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
index 9ee4c6540b0e..c773411434f1 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">google-auth</remote-id>
 		<remote-id type="github">GoogleCloudPlatform/google-auth-library-python</remote-id>