gentoo resync : 29.12.2022

4 files changed, 17 insertions, 94 deletions

diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index a96d12717ab5..5f522ac79b51 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,3 @@
-AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
-DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-DIST PyJWT-2.3.0.tar.gz 62279 BLAKE2B 0f4cea0cee2461e5f829b2bba40fb6d2646d5bccaa8e6b2d26ba7379386a64dc9f5204ea607edec98fc0102facf3cc5595e5e97523e9a567e0cf0b072542a3f5 SHA512 c6a1d8c3ce87d2122aa4ce4e19c5d2683aeffae6fb29b20fa17e2dfb1a07faf721beb8ca390d3acdeb85a1476025ca5af4fcdb1019f84c8c1bf229246a7aafe3
-EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
-EBUILD pyjwt-2.3.0.ebuild 739 BLAKE2B e29b5ace1499a758ce0f7479f0c59110cd2751ff48d679f8576cb8b770f707d86c46f4a51a2585fc026c107704473338e2cc6f4bf362529d890168a3401cc265 SHA512 2b2cbdb8de7e8ef71c43c1e65ce199cd2ea1f7b47e38be13527c0ea4c0e63f0c52017ae03b3a0aa54876f867b0c9a13ccf24990a36f22712f97ca2e6e782978e
+DIST PyJWT-2.4.0.tar.gz 66327 BLAKE2B bc78ceebe3fedd4216420c34034de96dc6af488b4b50d20a03073753cfe94d059cda3e118f79cc3718253f56bb977b5b86543d1cd1ab7346a4095d0c2c6855b2 SHA512 6c60afe62f9341c0fd889be227cd9e44260bc88696a93d0c3398547e159001f04e402d207d2230641f0f3d37cfd7e6f9e50a42dadfb011d7087c32a864c792a4
+EBUILD pyjwt-2.4.0.ebuild 777 BLAKE2B 18cfe4313cc9b70ffb51b92284d5c4c2a31f6f1c1af4c365574448301ad84a8cf3a4eca6060df3fa2a2f5922e04151b409639ce72a6ffec11b0304a47d72df6f SHA512 23cbeef83d2e3ce13f37e4bbe42dba14eac0f80b512accd2aaa77de8a127f10fcc2affe66fea980267f9bb67e9f09548b2c8f6755bf0931def33a074668a624b
 MISC metadata.xml 450 BLAKE2B e0a5244140aed7eb1dbc7d1bedf41b64f999ada11a82d5a7c3720501d824c789590e5339d5855fa4d0f96ff1b572e86af41859f8f14105f2f9b1a715d9d71d87 SHA512 83bce7997e724867cf1962ce75d8bb8e7a4e7a8dcdb42b95d9d323ca3a3ea4584020d4b700885e1afcb753d4fcacee23ec7b25066e93c0ac5eb614f65d140f29
diff --git a/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch b/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch
deleted file mode 100644
index ebd9236c7994..000000000000
--- a/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36a3f9bd0cc7029e5150b1931efbd62da975e8b9 Mon Sep 17 00:00:00 2001
-From: StefanBruens <stefan.bruens@rwth-aachen.de>
-Date: Mon, 21 Oct 2019 02:07:19 +0200
-Subject: [PATCH] Catch BadSignatureError raised by ecdsa 0.13.3 on
- verification errors (#448)
-
-The new ecdsa no longer uses AssertionError when the signature is too long.
-This happens in the test suite, where "123" is appended to the signature.
-
-Fixes #447
----
- jwt/contrib/algorithms/py_ecdsa.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/jwt/contrib/algorithms/py_ecdsa.py b/jwt/contrib/algorithms/py_ecdsa.py
-index bf0dea5..f1170a6 100644
---- a/jwt/contrib/algorithms/py_ecdsa.py
-+++ b/jwt/contrib/algorithms/py_ecdsa.py
-@@ -56,5 +56,7 @@ def verify(self, msg, key, sig):
-         try:
-             return key.verify(sig, msg, hashfunc=self.hash_alg,
-                               sigdecode=ecdsa.util.sigdecode_string)
--        except AssertionError:
-+        # ecdsa <= 0.13.2 raises AssertionError on too long signatures,
-+        # ecdsa >= 0.13.3 raises BadSignatureError for verification errors.
-+        except (AssertionError, ecdsa.BadSignatureError):
-             return False
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
deleted file mode 100644
index 1849483dffc3..000000000000
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1 optfeature
-
-MY_PN="PyJWT"
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} + || die
-	find . -name '*.pyc' -delete || die
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-	# kill tests using pycrypto that break with pycryptodome
-	sed -i -e '/has_pycrypto/s:True:False:' \
-		tests/contrib/test_algorithms.py || die
-
-	local PATCHES=(
-		"${FILESDIR}"/pyjwt-1.7.1-ecdsa-fix.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8{,-import-order}
-
-	ewarn "flake8 feature requires 'pep8-naming' which is not packaged yet"
-}
diff --git a/dev-python/pyjwt/pyjwt-2.3.0.ebuild b/dev-python/pyjwt/pyjwt-2.4.0.ebuild
index 6b5ead763d7d..5168c40ed0d3 100644
--- a/dev-python/pyjwt/pyjwt-2.3.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.4.0.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1 optfeature
 
 MY_PN="PyJWT"
 DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+HOMEPAGE="
+	https://github.com/jpadilla/pyjwt/
+	https://pypi.org/project/PyJWT/
+"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${PV}
+S=${WORKDIR}/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="!dev-python/python-jwt"
+RDEPEND="
+	!dev-python/python-jwt
+"
 BDEPEND="
 	test? (
 		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest