gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 110 deletions

diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 3495427fc8df..4aef5676e9fb 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,7 +1,4 @@
 AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
-DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-EBUILD pyjwt-1.5.3.ebuild 1289 BLAKE2B f949371337531c7d6f7ff8a2c06587667d50440442959aaeba7c6897106fd54413475250b6f262d37437f53161636d54ddbecb2ac98b93792d49d3ee266bc86b SHA512 836c48af9bdfd92062efb542d459d9c2fbbc1ddfaae4fd89ea60fdf82572e535c4144c7e4ce17ea39845001ae5b5ff7673c28d68ad6cc779a9f749ca31915020
-EBUILD pyjwt-1.7.1-r1.ebuild 1403 BLAKE2B 9ff040b70c8e7ad00fe46bfa6ee916d5be3eb63a99e91319712dc9698e1f45e27a15b0d974ab62679124e22c24fa2846cf31144c209957ef7377109e6b4decc5 SHA512 f3e666cb50b4a53333f4ae96b4de0d1ce496bfb911c08b0338b84f2b00500ab1fb8030e46fac66d8aaf996d8799d41dace92a317b696005ce4f460b3576c190b
-EBUILD pyjwt-1.7.1.ebuild 1313 BLAKE2B c6fb3d75a4af0f3bea0d91aeba245d290f491613b092d4c947a5777df6b2a19517847ec5badfc20d230dcabf24e5c57b068585432c8879461142286eea73ae24 SHA512 b83bdab9905d9a685342c229699ef8e252a77294d1a8f25886adc73e1904c24ba633eec39f79b25945bdd446250c34bd2b4955859a5f5f89500232d649131d40
+EBUILD pyjwt-1.7.1-r1.ebuild 1395 BLAKE2B 3328a8ec7d6f9bf5caef7721a8592769882383653d9f73cb69a93dcd941226a770f1bc97aa08a1d0240c2b4bc4ce3d720061dd05e6cb3d894fb8c4a3c0155f79 SHA512 f53362ca15d2cefd867f54cc61cbc7cdf9fc51434612cc5a769d2784e59736446ec0894e538ca69ab93782242a999c08554c43f6472eeb4397afdd4fcd2f0b6d
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.5.3.ebuild b/dev-python/pyjwt/pyjwt-1.5.3.ebuild
deleted file mode 100644
index 670b05ec00c5..000000000000
--- a/dev-python/pyjwt/pyjwt-1.5.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-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"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index b9fd937ec374..8713bbc66e0e 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1 eutils
 
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pyjwt/pyjwt-1.7.1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1.ebuild
deleted file mode 100644
index 54a9e37af111..000000000000
--- a/dev-python/pyjwt/pyjwt-1.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit distutils-r1 eutils
-
-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"
-
-LICENSE=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} \; || die "Cleaning __pycache__ failed"
-	find . -name '*.pyc' -exec rm -f {} \; || die "Cleaing *.pyc failed"
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Available optional features:"
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8
-
-	ewarn "flake8 feature requires 'flake8-import-order' and 'pep8-naming', which are not in portage yet"
-}