Adding metadata

27 files changed, 229 insertions, 271 deletions

diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index fcfbef8b8b0a..1f7f86176c77 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,3 @@
-DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
 DIST black-21.10b0.tar.gz 1171813 BLAKE2B 71bf628aa3b2b0a73c53446061d07ed0074c2e136c6a4dd09feb4b7dcc2b8c8045417e2c6a049a3051bb2e8fc368037c540851384d00ec89ad943d0c8f949c40 SHA512 0e44fe6c34d75f135996bcd62768f3ea02f5ba996992f0173cd28977f6a9ed4fde975e7433439f3b724c54555867f91edcd167fc1c5273308a613a51905323c8
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
-DIST black-21.8b0.tar.gz 1167978 BLAKE2B e7df398d09b71389069991bf0872a97d8a8c0b13ddeec12ee8f08ae9d9716a3d47447727d2759d475f10d323df151b8bb2353f3fd60c99eccb1e912554ebbe7b SHA512 ed38dbf0c881fee7da74f0d6bfe4ea0f85b5bed30d37abde2fd728e33f94ceaaa27b7107cfe763c19bdaea57fcbf54bcae82ce8bdcabc29035cdc85a8e10ab00
 DIST black-21.9b0.tar.gz 1167869 BLAKE2B 31933de69cc34e23e14b0fdba33da844697816cd3917227c1a16c4d1595435d3715405f7f1df820953e83c30c3947448389a703ee662548226dfc2d278b87844 SHA512 0c8025d64ef9e5da8ad73b1f265b912bcb3d8cb00d8a426a39dd4c70505a77150e02a7f26e3d6842456eea367da9fad29d08f586b175d57d66a09cf389442ed0
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
deleted file mode 100644
index 332a82e591d6..000000000000
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 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=rdepend
-inherit distutils-r1 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="test"
-# bug #754201
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
-	dev-python/typed-ast[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/black-20.8_beta1-setuptools_scm.patch"
-)
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	local version_path
-	version_path="$(grep '"write_to"' setup.py | \
-		sed -r 's|[[:space:]]+"write_to": "([[:graph:]]+)",|\1|' \
-		|| die "could not find path to write version to")"
-
-	[[ -e ${version_path} ]] && die "could not find path to write version to"
-	printf 'version = "%s"\n' "${MY_PV}" > "${version_path}" || die "error writing version"
-	sed -e 's:setuptools_scm::' -i setup.cfg || die
-
-	# don't version lock dependencies
-	sed -r -e 's:("pathspec>.*), <[0-9.-]+:\1:' -i setup.py || die
-
-	# make sure that setup.py can read version
-	export MY_PV
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/black-21.8_beta0.ebuild b/dev-python/black/black-21.8_beta0.ebuild
deleted file mode 100644
index 94d469be9b48..000000000000
--- a/dev-python/black/black-21.8_beta0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2020-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 optfeature
-
-MY_PV="${PV//_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
-SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	<dev-python/pathspec-1[${PYTHON_USEDEP}]
-	<dev-python/tomli-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV}
-
-src_prepare() {
-	# remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases
-	sed -i -e '/setuptools_scm/s:~=:>=:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp "${S}"/src/black_primer/primer.json \
-		"${BUILD_DIR}"/lib/black_primer/primer.json || die
-	distutils_install_for_testing
-	epytest -m "not python2"
-}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
-}
diff --git a/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch b/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
deleted file mode 100644
index 368c21812e24..000000000000
--- a/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 12fde25..340d2c0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -47,10 +47,7 @@ else:
- 
- setup(
-     name="black",
--    use_scm_version={
--        "write_to": "src/_black_version.py",
--        "write_to_template": 'version = "{version}"\n',
--    },
-+    version=os.getenv("MY_PV"),
-     description="The uncompromising code formatter.",
-     long_description=get_long_description(),
-     long_description_content_type="text/markdown",
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
index 58556810e6b3..35f1ebad6498 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 72176d05f920..e60726c14a91 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,2 +1,3 @@
 DIST coverage-6.0.2.tar.gz 722511 BLAKE2B 43a860610921fd0df106cbe26ba094e5a11bf1137a795a15bc22d82d0f813e8dc67bfe660757d325f15f719429b480ca625ebe66569489ed8c4c477bac23c393 SHA512 a43a312d4668846b6f72eebac1a289d0a603303cd32624c3308cce8934f693c7d3786b36da5cea3ff1cce60f93110a2ded168304e1ca9a79053f0886b7f1bf17
 DIST coverage-6.1.1.tar.gz 715305 BLAKE2B fbd7c8e7e1737bc8be8acf0f10c66fa333a027520b5f54869080ea9e31951230442d0d7f5a5ec11201b7ca3ba65ee92c906a373c18123920abe0d3dee5a8e040 SHA512 c029ab4e0d16e4b0a395e63e96d7a8f24bdb3a46a97fbc223d59dafaa52b8522e924a13d88777f862d69e1f30d015b00e0740530e719b6a94065d285cd3dd03a
+DIST coverage-6.1.2.tar.gz 677391 BLAKE2B eb9b129282446ed536765fcbd8b31f863be315c8eb27087473608b1412014e5807a26b8bcbdeea98f7a89481198bb7475dc775e68fee53ca297d16332edb7ea8 SHA512 41b5bc881eba97308ff702024dd1873fe527c941fe1b45c36a6210819e0b6b9e6dcdf0ad31659e88ea25a3ebd84e90858694f54d2d7585c61b319edb9afbf07e
diff --git a/dev-python/coverage/coverage-6.1.2.ebuild b/dev-python/coverage/coverage-6.1.2.ebuild
new file mode 100644
index 000000000000..4d180441af18
--- /dev/null
+++ b/dev-python/coverage/coverage-6.1.2.ebuild
@@ -0,0 +1,54 @@
+# 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
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" igor.py zip_mods || die
+	"${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		"${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/debugpy/debugpy-1.5.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
index 11dfec6c9ddd..bb191c3073b5 100644
--- a/dev-python/debugpy/debugpy-1.5.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86"
 
 # There is not enough time in the universe for this test suite
 RESTRICT="test"
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index a593e1c396bf..a4a98a389e0d 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,2 +1 @@
-DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
diff --git a/dev-python/feedparser/feedparser-5.2.1-r2.ebuild b/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
deleted file mode 100644
index 5f57dda6802a..000000000000
--- a/dev-python/feedparser/feedparser-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,41 +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="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# sgmllib is licensed under PSF-2.
-LICENSE="BSD-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# Tests have issues with chardet installed, and are just kind of buggy.
-RESTRICT="test"
-
-BDEPEND="<dev-python/setuptools-58[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-sgmllib.patch"
-)
-
-python_prepare_all() {
-	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
-	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
-	cd "${BUILD_DIR}" || die
-	if [[ ${EPYTHON} == python3* ]]; then
-		2to3 --no-diffs -w -n feedparsertest.py || die
-	fi
-	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
index c7dbaae374b4..ebe5afe1008f 100644
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ b/dev-python/h5py/h5py-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1 flag-o-matic
+inherit distutils-r1
 
 DESCRIPTION="Simple Python interface to HDF5 files"
 HOMEPAGE="https://www.h5py.org"
@@ -28,7 +28,6 @@ BDEPEND="
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	test? (
 		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-		dev-python/cached-property[${PYTHON_USEDEP}]
 	)"
 #	mpi? ( virtual/mpi )
 #	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
diff --git a/dev-python/ipykernel/ipykernel-6.2.0.ebuild b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
index 69de555863b6..05b1be298be3 100644
--- a/dev-python/ipykernel/ipykernel-6.2.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/debugpy-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
index d4e10d64e19d..14009cd2f887 100644
--- a/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-7.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 sparc"
+KEYWORDS="amd64 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index ea56763f9479..dfc5910e6775 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1 +1,2 @@
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
+DIST nose-1.3.7_p20211111_p1.gh.tar.gz 327855 BLAKE2B acddcaa0718f23f281ea34a977354b3ef88c95d4ef712afd8354effe6df7883d473b50caaa3b5c79fcc4c36a9d45bee4eb5865a6ef66e371dae12ed1a0a0418a SHA512 752eb1337fd481a1b8498ead330d716cf4180c18faabde257e9a1139928b9fa38e2e145d36c1ea8e3867a36d4843134ee26e9e9f83ff84d21f0fe246d2392d15
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
new file mode 100644
index 000000000000..9e9627ab9090
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
@@ -0,0 +1,54 @@
+# 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 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+COMMIT="94fd6746619ee8728f2b8740ebf2d1582b03cb15"
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.org/project/nose/
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI="
+	https://github.com/arthurzam/nose/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
+		' python3_{8..10} pypy3)
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)"
+
+src_prepare() {
+	# failing to find configuration file
+	sed -e 's/test_cover_options_config_file/_&/' \
+		-i unit_tests/test_cover_plugin.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m nose -v -a "!network" || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pydevd/pydevd-2.7.0.ebuild b/dev-python/pydevd/pydevd-2.7.0.ebuild
index 342c00df649e..1320bc586e10 100644
--- a/dev-python/pydevd/pydevd-2.7.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.7.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86"
 
 # 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/pygit2/pygit2-1.6.1-r1.ebuild b/dev-python/pygit2/pygit2-1.6.1-r3.ebuild
index d2d78bf1af95..8dedc12eec24 100644
--- a/dev-python/pygit2/pygit2-1.6.1-r1.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.1-r3.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.1*:=
-	dev-python/cached-property[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pygit2/pygit2-1.6.1-r2.ebuild b/dev-python/pygit2/pygit2-1.6.1-r4.ebuild
index 90d7f51ddf2d..1b00bda8fd30 100644
--- a/dev-python/pygit2/pygit2-1.6.1-r2.ebuild
+++ b/dev-python/pygit2/pygit2-1.6.1-r4.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.2*:=
-	dev-python/cached-property[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pygit2/pygit2-1.7.0.ebuild b/dev-python/pygit2/pygit2-1.7.0-r1.ebuild
index ada4390c5035..f2cb32f22c0e 100644
--- a/dev-python/pygit2/pygit2-1.7.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.7.0-r1.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	=dev-libs/libgit2-1.3*:=
-	dev-python/cached-property[${PYTHON_USEDEP}]
 	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
index e0137a891b41..e69ee18fd470 100644
--- a/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
+++ b/dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/eugeniy/pytest-tornado/archive/refs/tags/v${PV}.tar.
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 sparc"
+KEYWORDS="amd64 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index afb9f28b3e72..ccbcf2aecad2 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,2 +1 @@
-DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
diff --git a/dev-python/requests/requests-2.25.1-r2.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild
deleted file mode 100644
index c9a7a5046c81..000000000000
--- a/dev-python/requests/requests-2.25.1-r2.ebuild
+++ /dev/null
@@ -1,62 +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 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/chardet-5[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# allow idna-3
-	sed -i -e '/idna/s:<3:<4:' setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# Internet
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		tests/test_requests.py::TestRequests::test_https_warnings
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index f12408c0c8a2..fdff9027f41c 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="socks5"
 
 RDEPEND="
diff --git a/dev-python/scipy/scipy-1.6.3.ebuild b/dev-python/scipy/scipy-1.6.3.ebuild
index a0051fa04899..b889de7ad188 100644
--- a/dev-python/scipy/scipy-1.6.3.ebuild
+++ b/dev-python/scipy/scipy-1.6.3.ebuild
@@ -108,6 +108,10 @@ python_prepare_all() {
 	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
 		-i scipy/stats/tests/test_continuous_basic.py || die
 
+	# Skip broken test causing segfault, bug #743295
+	sed -e 's:test_bisplev_integer_overflow:_&:' \
+		-i scipy/interpolate/tests/test_fitpack.py || die
+
 	if has_version ">=sci-libs/lapack-3.10"; then
 		sed -e 's:test_sort(:_&:' \
 			-i scipy/linalg/tests/test_decomp.py || die
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
index 24043c052cad..ce8bf2b1a172 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 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc x86"
diff --git a/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch b/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch
new file mode 100644
index 000000000000..368dca71ad38
--- /dev/null
+++ b/dev-python/zeep/files/zeep-4.1.0-cached-prop.patch
@@ -0,0 +1,100 @@
+From 25701f0b69ee46914179070b7e8906ea3e521480 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 11 Nov 2021 08:55:41 +0100
+Subject: [PATCH] Use stdlib functools.cached_property if available
+
+Python 3.8+ provides a functools.cached_property in the stdlib that is
+thread-safe, i.e. equivalent to threaded_cached_property.  Use it
+instead of adding third-party dependencies whenever available.
+---
+ setup.py                            | 2 +-
+ src/zeep/wsdl/attachments.py        | 6 +++++-
+ src/zeep/xsd/elements/indicators.py | 6 +++++-
+ src/zeep/xsd/types/any.py           | 6 +++++-
+ src/zeep/xsd/types/complex.py       | 6 +++++-
+ 5 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index cb51ac4..8ef81b6 100755
+--- a/setup.py
++++ b/setup.py
+@@ -4,7 +4,7 @@ from setuptools import setup
+ 
+ install_requires = [
+     "attrs>=17.2.0",
+-    "cached-property>=1.3.0",
++    "cached-property>=1.3.0; python_version<'3.8'",
+     "isodate>=0.5.4",
+     "lxml>=4.6.0",
+     "platformdirs>=1.4.0",
+diff --git a/src/zeep/wsdl/attachments.py b/src/zeep/wsdl/attachments.py
+index 037e439..075bee5 100644
+--- a/src/zeep/wsdl/attachments.py
++++ b/src/zeep/wsdl/attachments.py
+@@ -6,7 +6,11 @@ See https://www.w3.org/TR/SOAP-attachments
+ 
+ import base64
+ 
+-from cached_property import cached_property
++try:
++    from functools import cached_property
++except ImportError:
++    from cached_property import cached_property
++
+ from requests.structures import CaseInsensitiveDict
+ 
+ 
+diff --git a/src/zeep/xsd/elements/indicators.py b/src/zeep/xsd/elements/indicators.py
+index 40325da..e9ef2c4 100644
+--- a/src/zeep/xsd/elements/indicators.py
++++ b/src/zeep/xsd/elements/indicators.py
+@@ -16,7 +16,11 @@ import operator
+ import typing
+ from collections import OrderedDict, defaultdict, deque
+ 
+-from cached_property import threaded_cached_property
++try:
++    from functools import cached_property as threaded_cached_property
++except ImportError:
++    from cached_property import threaded_cached_property
++
+ from lxml import etree
+ 
+ from zeep.exceptions import UnexpectedElementError, ValidationError
+diff --git a/src/zeep/xsd/types/any.py b/src/zeep/xsd/types/any.py
+index b4525e4..17f244e 100644
+--- a/src/zeep/xsd/types/any.py
++++ b/src/zeep/xsd/types/any.py
+@@ -1,7 +1,11 @@
+ import logging
+ import typing
+ 
+-from cached_property import threaded_cached_property
++try:
++    from functools import cached_property as threaded_cached_property
++except ImportError:
++    from cached_property import threaded_cached_property
++
+ from lxml import etree
+ 
+ from zeep.utils import qname_attr
+diff --git a/src/zeep/xsd/types/complex.py b/src/zeep/xsd/types/complex.py
+index 8141bc1..b2ed9bf 100644
+--- a/src/zeep/xsd/types/complex.py
++++ b/src/zeep/xsd/types/complex.py
+@@ -4,7 +4,11 @@ import typing
+ from collections import OrderedDict, deque
+ from itertools import chain
+ 
+-from cached_property import threaded_cached_property
++try:
++    from functools import cached_property as threaded_cached_property
++except ImportError:
++    from cached_property import threaded_cached_property
++
+ from lxml import etree
+ 
+ from zeep.exceptions import UnexpectedElementError, XMLParseError
+-- 
+2.33.1
+
diff --git a/dev-python/zeep/zeep-4.1.0.ebuild b/dev-python/zeep/zeep-4.1.0-r1.ebuild
index af048888169f..9564399bcbba 100644
--- a/dev-python/zeep/zeep-4.1.0.ebuild
+++ b/dev-python/zeep/zeep-4.1.0-r1.ebuild
@@ -18,7 +18,6 @@ IUSE="async"
 
 RDEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.6.0[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-1.4.0[${PYTHON_USEDEP}]
@@ -27,6 +26,8 @@ RDEPEND="
 	>=dev-python/requests-toolbelt-0.7.1[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	async? ( >=dev-python/aiohttp-1.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
 	test? (
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/aioresponses[${PYTHON_USEDEP}]
@@ -41,3 +42,7 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cached-prop.patch
+)