Adding metadata

25 files changed, 221 insertions, 310 deletions

diff --git a/dev-python/anyio/anyio-3.2.1.ebuild b/dev-python/anyio/anyio-3.2.1.ebuild
index 6775be16a936..611f9532bfdf 100644
--- a/dev-python/anyio/anyio-3.2.1.ebuild
+++ b/dev-python/anyio/anyio-3.2.1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
 		dev-python/trustme[${PYTHON_USEDEP}]
 		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
index 66ac42fde0a8..44873a6051b8 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/debugpy/debugpy-1.4.2.ebuild b/dev-python/debugpy/debugpy-1.4.2.ebuild
index e5c4d8ab7c52..cff853d4c0c1 100644
--- a/dev-python/debugpy/debugpy-1.4.2.ebuild
+++ b/dev-python/debugpy/debugpy-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/microsoft/${PN}/archive/refs/tags/v${PV}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~sparc"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 92d390d2833e..f4b90cc5d07b 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,2 +1,3 @@
 DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
 DIST flask-security-4.1.0.gh.tar.gz 406508 BLAKE2B 84da1a563630e4935fecd616ccb51b2421854b502ce9e5b1c328fef358a2c80946ec1308199cf4dffa4fd07ac65ba104bfb9cdb8956916c5ec3fc39da79472a0 SHA512 b31a48abd2f1ccbc79707b377799adcc8f5530a045437d49d28fa5b47187c98993339a05fac35e4677e46ded99df40b8d8a379f9d36c2b2020456520e99b8de6
+DIST flask-security-4.1.1.gh.tar.gz 407794 BLAKE2B 579d3c9086655c2af9bbecb70cbc33c832ba0765859a1cc32beb5aede3ef17b69eff61251235eddd8f1fb6c5a03a33d0a56c376bdf5b5e0b0d33a03147e385f0 SHA512 41f9511d735e6b80af1b1499fb310414036a644414a8093fe81c429fd9aab20b1b494de55d506325def7bb68ab14a3b53031ad7c136af2ed3e8bd406f93c878f
diff --git a/dev-python/flask-security/flask-security-4.1.1.ebuild b/dev-python/flask-security/flask-security-4.1.1.ebuild
new file mode 100644
index 000000000000..72673a2e8485
--- /dev/null
+++ b/dev-python/flask-security/flask-security-4.1.1.ebuild
@@ -0,0 +1,64 @@
+# 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} )
+inherit distutils-r1
+
+DESCRIPTION="Simple security for Flask apps"
+HOMEPAGE="
+	https://github.com/Flask-Middleware/flask-security/
+	https://pypi.org/project/Flask-Security-Too/"
+SRC_URI="
+	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
+	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
+		dev-python/bleach[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
+		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
+		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
+		amd64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+		arm64? ( >=dev-python/flask-mongoengine-0.9.5[${PYTHON_USEDEP}] )
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	esetup.py compile_catalog
+}
diff --git a/dev-python/fonttools/fonttools-4.26.2.ebuild b/dev-python/fonttools/fonttools-4.26.2.ebuild
index f795eecba533..a4589407798e 100644
--- a/dev-python/fonttools/fonttools-4.26.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.26.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 71f3438cadf5..a340db8dfba2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,3 +5,4 @@ DIST hypothesis-python-6.18.0.tar.gz 9145660 BLAKE2B 6fb47aeb134363e50944d08f065
 DIST hypothesis-python-6.19.0.tar.gz 9146087 BLAKE2B 11cf1e76735f2d57ee793c131a055c0e349bf7a39b072ac33914bcc371d44a607866ec617d2f955779fe99922f968b8da571fea87c45db72583e3ea2026000a5 SHA512 b641938c6f9b5603bb7b72ba1106da16bdcd0528de34317afdc4099bbfa1bfec90e76fbf14dc7cfc773fb02c3fa3b4bcfeea7f3788884cbefb51751f02879f9c
 DIST hypothesis-python-6.20.0.tar.gz 9146238 BLAKE2B 88009c7369209f8781644a975587d757ecf83e9e84e650fd2f8e88b5e4e1d078dd0639e49a9055c4390c0aba96a661561ff5858bf628036d097c614b7d9fc45a SHA512 6c139c78b75c5b8408345d654e6d638f4f2b0f1567bcb05c430e396d3dbf40fde7e3f6a6af4eea75b2387d395e8ee2a5eb11eabd3183c4eff0a35979aed1bcba
 DIST hypothesis-python-6.20.1.tar.gz 9146416 BLAKE2B ae3e10ffe2853009b8d698e0eae391e05632ba1a3d889dbfb498b8f46c18ec16477daefa9052dc6711f3239f9e83ffc7d52c6ad0c554492a00a55417b583afe7 SHA512 8d23bd0311cd8e81d7fd3851f4a72cc92bea4a07943475d8be9bac9dc9d5096f0d7d5e8ed8b14e64dbdb3c49b7d2c7ecc8d85dfe30d5e6f9f0ed96570ce4ddb0
+DIST hypothesis-python-6.21.0.tar.gz 9162663 BLAKE2B a5a2fbb7b377e6cf769c3454ca89615551164e1b0dae24abee15191fcdff2eb1f01b9462c7aff68a7ea801477105bdfe5f6a33f098eb506325031d3511914ae5 SHA512 7d91d83580403da3afac0f4e0a72935c63d7da2ff28429423a3001b0a19a1b6216fe36eb526e91fe9e7f0cae481aa3f446695f7407ec2201c5f8abc6e3ea19a8
diff --git a/dev-python/hypothesis/hypothesis-6.21.0.ebuild b/dev-python/hypothesis/hypothesis-6.21.0.ebuild
new file mode 100644
index 000000000000..8b48444a4699
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.21.0.ebuild
@@ -0,0 +1,62 @@
+# 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 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-p no:pytest-describe \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index eaee8a2996ed..0d4c5183c433 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,2 +1,3 @@
 DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
 DIST keyring-23.1.0.tar.gz 43668 BLAKE2B 7ef9a8858568ef8d0889b693cab55f7d2e61ebc3e6116b1f936c6b841ef3a50838b80d6315e5a04bee44a71b1e3bd1112d627603c8b9d113b12173d3442af776 SHA512 d3bd6c6c224a00f2d2aa0c22ec05a5e78707db37c62ed0e03d444ed94e2eee053f7eb1e4c387073753ca5c9b76a9f51d0bda8294f9ba2a326c84afd913a14293
+DIST keyring-23.2.0.tar.gz 44489 BLAKE2B 8d3321b71bdee6f61c3e33866d9612c2ef249613063af58767658d33975275fce72fb9c8b83cdff5881c3e20738a679f50b84c4e8979ac9f282df3331c718a88 SHA512 10aa3debfcdb8b4a7632cfdaae71d2fb5993192bb25f3acb428f23fb830b262fc69a91f5a3c936e6828182436e999b7aeab4b6510ef0b36881eab44476ddcb8d
diff --git a/dev-python/keyring/keyring-23.2.0.ebuild b/dev-python/keyring/keyring-23.2.0.ebuild
new file mode 100644
index 000000000000..25a51fe7c6bf
--- /dev/null
+++ b/dev-python/keyring/keyring-23.2.0.ebuild
@@ -0,0 +1,45 @@
+# 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
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/secretstorage[${PYTHON_USEDEP}]
+	dev-python/entrypoints[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# hangs
+	tests/backends/test_libsecret.py
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index d69a3bfeb530..a21f167444e5 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,2 +1 @@
-DIST kombu-5.0.1.tar.gz 404428 BLAKE2B 89d4c2daf70c3dcd0a990c8f045074780f2d4f13f39899c0ab3b73b473948469746cf8872aaa8565f5c4b071bf18ff510cd565e8f9b6a3735a0bf1d0af55e9b6 SHA512 aa5d35b7753f5ec8d95512c322fabf0163628b9afbd228faa2be910a1cd4ea3236a7e43485e17650e1aa9aebae59a91a2b0bdc1950e4e4c622b499a4ae29ea0e
 DIST kombu-5.1.0.tar.gz 416353 BLAKE2B 2c26aac0a8eda62475e2a9a859b2548046dfce0699a8dafce3cc6471ee3b82f82882a53903a86f69cf16f948e4d0e66f379479f7f1f46aca2bcbdd031ba87811 SHA512 62ef16e8e3fb592882b8060f29b95e7224ba635132ed688eece0c2d254e7f7fb525c778cac23f15495464c6dbcf84d7a1372fde6f55fcfe66677cf43d3e9d4de
diff --git a/dev-python/kombu/kombu-5.0.1.ebuild b/dev-python/kombu/kombu-5.0.1.ebuild
deleted file mode 100644
index e55dc97c9fd8..000000000000
--- a/dev-python/kombu/kombu-5.0.1.ebuild
+++ /dev/null
@@ -1,82 +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=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc examples mongodb msgpack redis sqs test yaml"
-RESTRICT="!test? ( test )"
-
-# zookeeper backend support possible via dev-python/kazoo
-RDEPEND="
-	>=dev-python/importlib_metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.6.0[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyro-4.76:4[${PYTHON_USEDEP}]
-	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
-	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
-	mongodb? ( >=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}] )
-	redis? ( >=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}] )
-	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
-# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		<=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}]
-	)"
-
-# kazoo is optional for tests.
-# Refrain for now, no established demand for it from users
-
-# Req'd for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	rm t/unit/transport/test_etcd.py || die
-	# allow use of new (renamed) msgpack
-	sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
-	# pytest-sugar is not packaged
-	sed -i '/pytest-sugar/d' requirements/test.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# Doc build misses and skips only content re librabbitmq which is not in portage
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index 0b39061eda99..d22eed7d0c84 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -8,13 +8,6 @@
  <upstream>
   <remote-id type="pypi">kombu</remote-id>
  </upstream>
- <use>
-  <flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
-  <flag name="mongodb">Enables MongoDB backend</flag>
-  <flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
-  <flag name="redis">Enables Redis backend</flag>
-  <flag name="yaml">Enables yaml backend</flag>
- </use>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 8ba7a442e114..9c1aaa0f6cc7 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,2 +1 @@
-DIST amqp-2.6.1.tar.gz 119956 BLAKE2B a575637ca3d39ef8577035ae156f09b87dfb053757cb78b058fcb4f23759707084297e12941c766783e99898c486ea8eca968842464223ea46f42a4e4495c0a4 SHA512 e2c628cfe8075a3014a9fe991ae3e6f49198db2ecd46dd48f980730da692e4d25d9f055b1ccd4743917fc38a8afa69a5902a64275f8f45ef68113c6756f3a17b
 DIST amqp-5.0.6.tar.gz 126856 BLAKE2B 3eae4d0f97477dc7b72eba65ee95ab74afa051bf2d745f86944c4236b4a90ff6c2a38f18a5bdc8441215f4607ed4e8eb867144695619eb08e0f1065e7a624415 SHA512 bf15fad413bedb2f57dfaa03986f4abfc8fb169d5e324d5741b94a1e3776f2590e7686774c69dfdda848b484dbc1e6d0fa78a4a3125cf08ab20eaf7192885252
diff --git a/dev-python/py-amqp/py-amqp-2.6.1.ebuild b/dev-python/py-amqp/py-amqp-2.6.1.ebuild
deleted file mode 100644
index 5bdb7b020f73..000000000000
--- a/dev-python/py-amqp/py-amqp-2.6.1.ebuild
+++ /dev/null
@@ -1,67 +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,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_PN="amqp"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
-HOMEPAGE="https://github.com/celery/py-amqp https://pypi.org/project/amqp/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc extras test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_celery[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
-		<=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-rerunfailures-6.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# pytest-sugar is not packaged
-	sed -e '/pytest-sugar/d' -i requirements/test.txt || die
-
-	# requires a rabbitmq instance
-	rm t/integration/test_rmq.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use extras; then
-		insinto /usr/share/${PF}/extras
-		doins -r extra
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydevd/pydevd-2.5.0-r1.ebuild b/dev-python/pydevd/pydevd-2.5.0-r1.ebuild
index 9185615e2bfc..2245a169069d 100644
--- a/dev-python/pydevd/pydevd-2.5.0-r1.ebuild
+++ b/dev-python/pydevd/pydevd-2.5.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/PyDev.Debugger-pydev_debugger_${PV//./_}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~sparc"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index 3b5372a25474..782d8185b0a9 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,2 +1 @@
-DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4da03f0f5c4ea1e8601b16ed1a211c33150bcc0eaac5b47786040f571ceb266300bcb5142e2a8d977aeb69f89bd0ecefec4c3 SHA512 23146b1c0965e66ac201cae82192f3833daad2563f2177d916050df14b532a3eb78f2dd3b888cec3d28121b334ee86c9b762c5aadb8fb624c9a4288fbad693a5
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
deleted file mode 100644
index 2f468e8c97a2..000000000000
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-1.6.0.ebuild
+++ /dev/null
@@ -1,35 +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="Pytest plugin that activates the fault handler module for tests"
-HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
-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/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	>=dev-python/pytest-4.0[${PYTHON_USEDEP}]
-	<dev-python/pytest-5.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 37f3f97d8410..2c7f84ba17cb 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,4 +1,3 @@
-DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
 DIST pytest-6.2.4.tar.gz 1118084 BLAKE2B 611db50e7432dfb6f8d212621a3803871fd8f6c05ec3cdefeb3958d0886f754326fc358a9a67bdb3f516388aab901b169c951471bf304adfb78fe457dc59d6c5 SHA512 43adc9a78e16a05f07e689e4557b63f2e0f4de5a1cdea6f24272b6a658a6b0a18721713cf46b5102cf2726ddbc4ffe131c39e652bd2511d285f40cbfcccc2289
diff --git a/dev-python/pytest/pytest-4.6.11-r1.ebuild b/dev-python/pytest/pytest-4.6.11-r1.ebuild
deleted file mode 100644
index f8ef77342c86..000000000000
--- a/dev-python/pytest/pytest-4.6.11-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# When bumping, please check setup.py for the proper py version
-PY_VER="1.5.0"
-
-# pathlib2 has been added to stdlib before py3.6, but pytest needs __fspath__
-# support, which only came in py3.6.
-RDEPEND="
-	>=dev-python/atomicwrites-1.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)
-	$(python_gen_cond_dep '
-		dev-python/pathlib2[${PYTHON_USEDEP}]
-		dev-python/funcsigs[${PYTHON_USEDEP}]
-	' -2)
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	<dev-python/pluggy-1
-	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-# flake cause a number of tests to fail
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		!!dev-python/flaky
-		!!dev-python/pytest-aiohttp
-		!!dev-python/pytest-asyncio
-		!!dev-python/pytest-django
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pytest-4.5.0-strip-setuptools_scm.patch"
-	"${FILESDIR}/pytest-4.6.10-timeout.patch"
-)
-
-python_prepare_all() {
-	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
-
-	# Something in the ebuild environment causes this to hang/error.
-	# https://bugs.gentoo.org/598442
-	rm testing/test_pdb.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	# In v4.1.1, pytest started being picky about its own verbosity options.
-	# running pytest on itself with -vv made 3 tests fail. This is why we don't
-	# have it below.
-	"${EPYTHON}" "${BUILD_DIR}"/lib/pytest.py --lsof -rfsxX \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 54bc23aa3235..837a70d29701 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
 DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
 DIST setuptools_scm-6.3.0.tar.gz 57117 BLAKE2B c0190e4d8f10f05fb6413d651ca15133cef4474bd460ab3bdda4b81d3410078cf9cf20e40de042bda29fe0b99c409b6d934c3d6a648350688f5b4496eabecefc SHA512 c3751d27345b9423b9fe7eec15fbf6c3e3bc19679b7960a589bdcb729a53b5dba40be27878f87dc0d908fae190ef8db76ee19379e0d6dd5cb00b44950cae3896
+DIST setuptools_scm-6.3.2.tar.gz 57207 BLAKE2B 4291f3810dc5ea111a6bad1bf37c8704a7eb6cdd112ea476d629d6175c43cc7d8f78d450181c0e588a5f3fc0fc092fedb41fcb6e198a42f730f9fc6b8d96e343 SHA512 9a16552803ef92367ad71007cf322737b5baa58b924083f04c860875bf6cb2e2bb4f43a7f89778b040c2eb55c5d32de479a918056519339820c6d0f1a6a386f0
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
new file mode 100644
index 000000000000..f1cf140269af
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-6.3.2.ebuild
@@ -0,0 +1,40 @@
+# 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
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	!!<dev-python/setuptools_scm-2
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-vcs/git
+		!sparc? ( dev-vcs/mercurial )
+	)"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+)
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index ee6d965e438c..1e921dcf882f 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,3 +1,2 @@
-DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 DIST sqlparse-0.4.1.tar.gz 67228 BLAKE2B 677b592af263e94e1f6d36242f4bf75d28d0466636c0c578b83f472acf05c357b6899150ce01b594db89f2844c1b85220429857583c79e6dbba34a75bdf54e47 SHA512 49f02a63ef490c2e900cea6a0882891cd1381e0f398c4e38688444300b0f0e961c91c4f1a2355704bba7f170083594bd9e26c2a6cac934da9d87ab291accd27c
 DIST sqlparse-0.4.2.tar.gz 67771 BLAKE2B 790ba224ed04ce1952602e7d01a2f0bd7e830e62a38c35d69c3fcd2b5b1016560a1e23c24ec82ff4b2e7021cbeab17968b9cff01acc8674fa18a05ab88efb84b SHA512 8136e5c14650b5286616958bfb19039a6981e4c84bf955b0f668053f5427202eff9a6472f71820293ddbe55c0f793fb690d42d0e0134135aed7eb6e13edca01e
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
deleted file mode 100644
index 01eae7a0ff42..000000000000
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ /dev/null
@@ -1,25 +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_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_PN="${PN##python-}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A non-validating SQL parser module for Python"
-HOMEPAGE="https://github.com/andialbrecht/sqlparse"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${P#python-}
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD-2"
-
-BDEPEND="
-	test? ( <dev-python/pytest-6[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
index 0619ad74f019..01fb4b344496 100644
--- a/dev-python/untangle/untangle-1.1.1.ebuild
+++ b/dev-python/untangle/untangle-1.1.1.ebuild
@@ -13,4 +13,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv ~sparc"