Adding metadata

30 files changed, 191 insertions, 339 deletions

diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index aabed087e350..a25e50052cd9 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1 +1,2 @@
 DIST deprecated-1.2.12.gh.tar.gz 2969891 BLAKE2B c5fe02ff2c0588c5c6fb1e9054ad7851943c4574be633aa6ae37a466b3cac9889d8ed119962fcffc2092ab844a6d18a5d72766141e149bba2ba0c2dd4ee5131b SHA512 ff9b03a35b688474b6d5390347c4acdf5e19fcee5f7fcbb61a456c6819adbcda72ce00200d55b92c65873addad5abf9d1d5617bf477f64beb08ca23f10ebaea2
+DIST deprecated-1.2.13.gh.tar.gz 2971610 BLAKE2B 00c1fad34e869b143ad7cada2426f999f1d353d23e33076b0197a7ca6c87b0f2d240d7f4944b7c7669974c89304a6cf04f5d2b4c44e6fee22c27522ec2cc9711 SHA512 c170b086bc4e37462181a0f53edbe745aa4f4924c7fd64d9693de267e070392b74445f9cba935e85c878b755603ca6cada8b4130ac96ab071be284047aa35619
diff --git a/dev-python/deprecated/deprecated-1.2.13.ebuild b/dev-python/deprecated/deprecated-1.2.13.ebuild
new file mode 100644
index 000000000000..52fa803c7e6c
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="https://github.com/tantale/deprecated"
+SRC_URI="
+	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_deprecated.py::test_respect_global_filter
+		tests/test_deprecated_class.py::test_class_respect_global_filter
+	)
+
+	epytest
+}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 1b3bd732f904..8a79a9861759 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1 @@
-DIST humanize-3.10.0.tar.gz 65658 BLAKE2B c60aff8f5e2044c10e997f3546b30e8ac7c040ee57aea5342ccce7ea6341a8695c1b94bdc8cb2acc18c3f421667fd4090b7b110b47aa229cd10d5ac8b42d6dae SHA512 f31929ddc1055fb54294b67e25e3b41883ef4e8ff9b76082cdd4703d64a066d0a368d116a60e26465f07dd3a0df8c87bb459ff1b03153d8843d3eefb06ff6961
 DIST humanize-3.11.0.tar.gz 67034 BLAKE2B 9e10582139578e8e041d1ce60c9c5d7e071c4c093a64cf620df6ff38f0567e8b2f3134f10722cb724d13343373db0fa2a1ae5bd68700ff85fb58ee318feb0fd0 SHA512 7aa3c513c6702de0e099865f787858de4c9c65cfe95af61fd0204ff6df64e7359474b4067b4672546936beae6c8c512dd9c75f555d7075c94819e81143c21ce9
diff --git a/dev-python/humanize/humanize-3.10.0.ebuild b/dev-python/humanize/humanize-3.10.0.ebuild
deleted file mode 100644
index 86399c2098cd..000000000000
--- a/dev-python/humanize/humanize-3.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 2a5ac4136638..3a7e5ca1023e 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,2 @@
-DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
 DIST jellyfish-0.8.4.tar.gz 137001 BLAKE2B 55ffa7b7b931bf5bd0a2bee9a378fac10212d757d0e28492aac989a836c14106d37591a63a048db16b22c11e3964ad08325fe759e9ac2841722ac491a075feea SHA512 301fed3d4ba7228738b85310272970d2c666dd120a92a61b9870918ca3778bfead2b83437aced7933459f60079efcde863425a4a86077e8a0182db7d6d6c92cf
 DIST jellyfish-0.8.8.tar.gz 134461 BLAKE2B 29a4da13d248ab7916a4c9a6bd16da28bb9b4409bbc2e14660ac2a2bfad2563c7ddafb51c58968f5cac56c238de2786a5e1e64ee8d47cc668b0ab83e881b15f5 SHA512 d78f997a12ea2531e2621b3858f89a00c6c0620974a141fea6fdf6695860fa50ff4b5c21799de898944474563e6043e4d391448061501fbec078923dae21ae7c
diff --git a/dev-python/jellyfish/jellyfish-0.8.2.ebuild b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
deleted file mode 100644
index d20ac25f1c0c..000000000000
--- a/dev-python/jellyfish/jellyfish-0.8.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	cp -r testdata "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest lib/jellyfish/test.py
-}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 69c5796c2c9e..84dfa532c658 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,2 +1 @@
-DIST jwcrypto-0.9.1.tar.gz 86363 BLAKE2B d5920b9471870855bc131c171dc5515cc23fb9b94c38b33ce4894bcbe6fb5d0fa87e8b88f6470b8d1c1a1bc158d0dd09f51ace50baab03c8a8df59adc6e7e11d SHA512 245221d5e570918c1db9abdad72a0b03fb3fbdbb4db46ece441cbd75d43246b1b35bfd75e20718b8fa125bcaa85088cd776a7c204dd68e51e63818ae438848eb
 DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
diff --git a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild b/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
deleted file mode 100644
index c7769bd64cc1..000000000000
--- a/dev-python/jwcrypto/jwcrypto-0.9.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 2887b129c7cc..9ea5c8f7a1b4 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,2 +1 @@
-DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
 DIST libarchive-c-3.1.tar.gz 11145 BLAKE2B 80d8918423ec23065cfd7dc391f458bdd44ade765c5e16c23f6cd1ff760e750551d1ff16ccd524a409f466512cb4caed9d25716d12021eafc915a9904bfd0f63 SHA512 1863e2981475839aebce50aa649f603dae7d54772fb864a83613e1d94ead48b64e0edfa0046fb91d1fc985a351911dcd13a24cddfefbb5b7403da1107dc3353c
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
deleted file mode 100644
index 36d62f61614c..000000000000
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python interface to libarchive"
-HOMEPAGE="https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND="app-arch/libarchive"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 598ea3a1090d..3a2f5c094e4b 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,4 +1,3 @@
-DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
 DIST mkdocs-material-7.2.2.tar.gz 6777834 BLAKE2B 09c5ee5e0e0cef76ca66c8d86941fa044f2650d621a194991f279c09dd64c81c96bdfbe7d37eee5fe0e3837fc6461e7abad3537d92f3fdd178078485665088b5 SHA512 5332246103eb3007df3d2fd7ead4f2f60ce29c0e8a2bef6249db3e14a8e0ce1b2cdaffe4f48f57701d07a1771e275c69a79006ec53cfacff1a885894076188fb
 DIST mkdocs-material-7.2.4.tar.gz 6803091 BLAKE2B 377adcdaa2d24248f0430327a2a4b23fdae6f379ac23f6f609d50dc9c1699e13a92e925d9df24ec8298384228abd8c66c487afafc357edfc83da9c0e2897f422 SHA512 ba5c3a2e95eb32d2f2a3027a1cec7a54c9bdf655b51308e519e57d06fc8475ab74e2905dfeaef9bd1029e7814e5bc6c7610cce0526773bfcd3a92a995ba25c40
 DIST mkdocs-material-7.2.6.tar.gz 6804732 BLAKE2B 908a076d032a251baa9bde0255a1f8bbf12799cda3e0cec5bf332ad824f9e5bbc920c579b12f80d491488e01b6547f324c9617aaacdcdff573c49c61f5c54ffb SHA512 9b871ef8cd1d27e50df62f8de428d59bd4fec27dc76401fac36cb1ff6961416a25ddd2f133ab6eef80297e43359014ab7b482a93295650e5cf21e1b6fd2e4b1e
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.1.9.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.1.9.ebuild
deleted file mode 100644
index ee19b481aa0a..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-7.1.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
index 4ad67982a696..3fe044057a23 100644
--- a/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
+++ b/dev-python/mmtf-python/mmtf-python-1.1.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit distutils-r1
@@ -13,9 +13,16 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
+RDEPEND="dev-python/msgpack[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/msgpack[${PYTHON_USEDEP}]"
-RDEPEND="
-	${BDEPEND}"
+	test? (
+		${RDEPEND}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" mmtf/tests/codec_tests.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index c02ce58deb5a..2a4124489d0b 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,2 +1 @@
-DIST Pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
 DIST Pyphen-0.11.0.tar.gz 1967507 BLAKE2B 0bea108e78894082f59693a4ffa6c7f9f6aaec5fc10d0ecf4dc9b6c12fbcfde2cdd835e813b1041797cbc30d5e6e33f5626a517e8cc0535a7a001c8ac779fa4c SHA512 cdb4ee065698e27a4662984b76ee5c494c0d8e7d6b377667399f40d0dffc2b1d730956f3fa1fe73a08c17601152c99321b6fd5dd4d48361c54e9a6b635f02f0d
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 26fa79537957..b393f346a49d 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -10,7 +10,7 @@
   <name>Python</name>
  </maintainer>
  <upstream>
-  <remote-id type="pypi">Pyphen</remote-id>
+  <remote-id type="pypi">pyphen</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pyphen/pyphen-0.10.0.ebuild b/dev-python/pyphen/pyphen-0.10.0.ebuild
deleted file mode 100644
index 2adc746877fd..000000000000
--- a/dev-python/pyphen/pyphen-0.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-HOMEPAGE="https://github.com/Kozea/Pyphen"
-SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest test.py
-}
diff --git a/dev-python/python-daemon/python-daemon-2.3.0.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
index b7827bacdf6c..4ace3642ef5c 100644
--- a/dev-python/python-daemon/python-daemon-2.3.0.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
@@ -29,4 +29,11 @@ BDEPEND="
 	)
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fix for >=testtools-2.5.0
+	sed -e 's/testtools.helpers.safe_hasattr/hasattr/' \
+		-i test/test_metadata.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index f9f51a0c327e..b3f0c8c66035 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,3 +1,2 @@
-DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
 DIST python-lsp-server-1.2.1.tar.gz 61448 BLAKE2B 28294bf1f62a4fd0bf7b32b51a34b6206551614523130d7bb11f7f2e0175d4c061decada8c4f7713dc6c775f09f423d2c622d17354307faa557a48f5db2cdad3 SHA512 7a82af96508db943699ae63c90576205fca78e2ff47093934f26d9c5547199753acbc83ac0bdddb00d373761bebb31b5b869a9a02f734a5a4e033e7f024bf2d1
 DIST python-lsp-server-1.2.2.tar.gz 61742 BLAKE2B d0886549d9ebf79bf97be30abb361be1fdee243abf9ed4707e27857122e9721dcc59f968c4ad7d2904ba11f06e6e6dc34593e5255ce0c9c528defdab7b6e3b7e SHA512 afeb0798fef151ab7cb79b3a0b294a30111d4bb409a4a8ad5148f9cb3dfb9a56e0033541b44a2b683bf043fcb31a8d83a788b0c9c22587b6ae532abb288542a6
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
deleted file mode 100644
index 8a7c1e06144d..000000000000
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python Language Server for the Language Server Protocol"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-IUSE="all-plugins"
-
-BDEPEND="
-	test? (
-		dev-python/autopep8[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	all-plugins? (
-		dev-python/autopep8[${PYTHON_USEDEP}]
-		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-		dev-python/yapf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	# This test is continuously breaking
-	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
-	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
-	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
-	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
-	optfeature "Python docstring style checker" dev-python/pydocstyle
-	optfeature "Passive checker for Python programs" dev-python/pyflakes
-	optfeature "Python code static checker" dev-python/pylint
-	optfeature "Python refactoring library" dev-python/rope
-	optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/requests-kerberos/metadata.xml b/dev-python/requests-kerberos/metadata.xml
index bee142842165..96cbdf315700 100644
--- a/dev-python/requests-kerberos/metadata.xml
+++ b/dev-python/requests-kerberos/metadata.xml
@@ -9,4 +9,5 @@
   <remote-id type="pypi">requests-kerberos</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index 176b46c5d95a..b64c067ad2a1 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -14,19 +14,14 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	|| (
-		<dev-python/pykerberos-2[${PYTHON_USEDEP}]
-		>=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}]
-	)"
+	<dev-python/pykerberos-2[${PYTHON_USEDEP}]
+	>=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-python_test() {
-	"${EPYTHON}" tests/test_requests_kerberos.py -v || die
-}
+distutils_enable_tests unittest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d54c265cd19c..d1dc27892fc5 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,2 +1,3 @@
 DIST python-gentoo-patches-3.10.0rc1.tar.xz 8112 BLAKE2B d6f9b44c5a231f447ffe3533afbcaffe0f3b8bdd5a6690f1854bd7e1199d036d11a4cf4abfae345a88c42740ccbd4b72e53cbe28aea1a5db39dda1e5bfd47229 SHA512 bba7045f56369ca0354a539f8478a1afed77dc89a9faf548a0cf8959d644360b0afc4f84b95151ebfc2a6553078322c7445073f7a4104e9cd639ccc86ad0f792
 DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
+DIST setuptools-57.5.0.tar.gz 2141727 BLAKE2B 54c065e0bdcb0c3a0a76026d78ab26615e07ee013e684ef18c3731757a38efe38d21d4c99b687595873679d77ab8381cccc483847467c98eb7086d9cac5bd8ec SHA512 9dae7cbddcca0859d128f528232c2ab6baca2b4447bba129a7bbc014c98a8ecc866cc71c7e93900bb93ea4bbbe5e398c1c3b4a4867afb2caf2c38a2d5a46d67c
diff --git a/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch b/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch
new file mode 100644
index 000000000000..6df794022224
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-57.5.0-syntaxerror.patch
@@ -0,0 +1,37 @@
+From ad05b5dfebbc9025b631d6afffa25cdda8079d25 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 6 Sep 2021 07:41:24 +0200
+Subject: [PATCH] Fix syntax error in test_build_meta's pyproject.toml files
+
+Fix missing closing quotes in pyproject.toml files used
+in test_build_meta's tests.  This fixes the test failures due
+to TOMLDecodeError.
+---
+ setuptools/tests/test_build_meta.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setuptools/tests/test_build_meta.py b/setuptools/tests/test_build_meta.py
+index ab75a189..0f4a1a73 100644
+--- a/setuptools/tests/test_build_meta.py
++++ b/setuptools/tests/test_build_meta.py
+@@ -167,7 +167,7 @@ class TestBuildMetaBackend:
+             'pyproject.toml': DALS("""
+                 [build-system]
+                 requires = ["setuptools", "wheel"]
+-                build-backend = "setuptools.build_meta
++                build-backend = "setuptools.build_meta"
+             """),
+         }
+ 
+@@ -260,7 +260,7 @@ class TestBuildMetaBackend:
+             'pyproject.toml': DALS("""
+                 [build-system]
+                 requires = ["setuptools", "wheel"]
+-                build-backend = "setuptools.build_meta
++                build-backend = "setuptools.build_meta"
+                 """),
+         }
+         path.build(files)
+-- 
+2.33.0
+
diff --git a/dev-python/setuptools/setuptools-57.5.0.ebuild b/dev-python/setuptools/setuptools-57.5.0.ebuild
new file mode 100644
index 000000000000..780db352d911
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.5.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.0rc1"
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/setuptools-57.5.0-syntaxerror.patch
+)
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# apply distutils patches to the bundled distutils
+	pushd setuptools/_distutils >/dev/null || die
+	# TODO: distutils C++ patch?
+	eapply -p3 "${WORKDIR}/${CPY_PATCHSET}/0006-distutils-make-OO-enable-both-opt-1-and-opt-2-optimi.patch"
+	popd >/dev/null || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
index 76eb025f0e76..7a084884a7d3 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Run system terminals inside Spyder"
 HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-python/spyder-terminal/spyder-terminal-1.1.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-1.1.0.ebuild
index b2c8ff6c33a2..8f0df285792c 100644
--- a/dev-python/spyder-terminal/spyder-terminal-1.1.0.ebuild
+++ b/dev-python/spyder-terminal/spyder-terminal-1.1.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Run system terminals inside Spyder"
 HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MIT BSD Apache-2.0 BSD-2 ISC CC-BY-4.0 ZLIB WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index ddffab74db5f..8b1debb09127 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,4 +1 @@
-DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
-DIST XlsxWriter-RELEASE_1.4.5.tar.gz 34383001 BLAKE2B 9a00ef80aec818e3b1c80000bdf0fe9dbb5b99ac04a5508ca23c6d76c56e31c94db0b5a38ef6d8345c6a5dc83175e4c79381877415f982fc7ec66d42efe8c80e SHA512 e3b969ef27ef24ce371c0a789a8cac6da4e8245ec349ca23ba9e04d5c2adf0a141f51596bd15117fc400efb9354a6730c4668f51218f0a08b312d25519a492e8
-DIST XlsxWriter-RELEASE_2.0.0.tar.gz 34246203 BLAKE2B 46f649851c2fe849d65d9a9b86954c92771aa6e7334bf97b7313f45a00d35b3a879d2a2dc715e1d2d68be90e54aa63f9e73755134242e079ef57c14ff7681f10 SHA512 e857118fd996d81b6d6d4e3eb26e353aa81230f728ed684fa025a3d4401988b3bc34714fddcaac804605fd1405fc98870e7260e1b81843a0ad2d18271ccfecc9
 DIST XlsxWriter-RELEASE_3.0.1.tar.gz 34350396 BLAKE2B 441d9969df932ebe636474ca10eb260cea160b71b8bc46a78964ffcb752acdaeccd69703ca80a2af4c5284c5555f49c62cfefeb5fb8cdb9f0c305be44848815d SHA512 425e86acd8e54e89393931e5c698c244721ad16fe4bcb13aa9038ad7ba279803f8cf5c3b35170b274a0386ada03ba94ac385d039b3b8aa97c86f0abff4a20e58
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
deleted file mode 100644
index 5e7cf4ec9040..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
deleted file mode 100644
index b3e9f43ee04b..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild
deleted file mode 100644
index b3e9f43ee04b..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-2.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest