Adding metadata

28 files changed, 488 insertions, 570 deletions

diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index ae7a56d67155..005196d5adea 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1 +1,2 @@
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
+DIST ansi2html-1.8.0.tar.gz 44146 BLAKE2B 66672927a64ad38dce0b0819fabc3778f6aba82d176e992630a8db076988a21af8dd445306b8bb580f1539b35044b95de749d6bfb65c27f9b431e4cb6bd562c7 SHA512 cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4
diff --git a/dev-python/ansi2html/ansi2html-1.8.0.ebuild b/dev-python/ansi2html/ansi2html-1.8.0.ebuild
new file mode 100644
index 000000000000..93c5d07d6580
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	doc? (
+		app-text/asciidoc
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && doman man/${PN}.1
+	distutils-r1_python_install_all
+}
+
+src_compile() {
+	# Upstream https://github.com/pycontribs/ansi2html/issues/124
+	use doc && emake _MANUAL_VERSION="${PV}" man/ansi2html.1
+	distutils-r1_src_compile
+}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index ee60328d2071..77220b73cb2a 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,2 +1,3 @@
 DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
 DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
+DIST debugpy-1.6.1.gh.tar.gz 6684941 BLAKE2B 113ad9670cb9c80a28670be22265e110e5857d7093438db6ea531719de012a66c53ed9914c859c17f3bb5e03b88b11317173d261c9327e5434b5105396fac057 SHA512 28619e8e07265a8d983eccde28cc693b96ca5b94674ab0d512775a9c261f54baaa72e7bb8632b49b3715c2eb3626997cb967b5edb1b53672c6777493f0a46e50
diff --git a/dev-python/debugpy/debugpy-1.6.1.ebuild b/dev-python/debugpy/debugpy-1.6.1.ebuild
new file mode 100644
index 000000000000..1345d2b04c5a
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.6.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# This is completely broken
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.1-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
new file mode 100644
index 000000000000..c8ebe384349d
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
@@ -0,0 +1,94 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -8,7 +8,6 @@ exclude = '''
+ ( __pycache__
+ | ^/.tox
+ | ^/versioneer.py
+-| ^/src/debugpy/_vendored
+ | ^/src/debugpy/_version.py
+ )
+ '''
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,10 @@ del sys.path[0]
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
+ import debugpy
+-import debugpy._vendored
+ 
+ del sys.path[0]
+ 
+ 
+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
+ 
+ 
+@@ -33,27 +31,6 @@ def get_buildplatform():
+     return None
+ 
+ 
+-def cython_build():
+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
+-    subprocess.call(
+-        [
+-            sys.executable,
+-            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
+-            "build_ext",
+-            "-i",
+-        ]
+-    )
+-
+-
+-def iter_vendored_files():
+-    # Add pydevd files as data files for this package. They are not
+-    # treated as a package of their own, because we don't actually
+-    # want to provide pydevd - just use our own copy internally.
+-    for project in debugpy._vendored.list_all():
+-        for filename in debugpy._vendored.iter_packaging_files(project):
+-            yield filename
+-
+-
+ # bdist_wheel determines whether the package is pure or not based on ext_modules.
+ # However, all pydevd native modules are prebuilt and packaged as data, so they
+ # should not be in the list.
+@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:
+ 
+ 
+ if __name__ == "__main__":
+-    if not os.getenv("SKIP_CYTHON_BUILD"):
+-        cython_build()
+ 
+     extras = {}
+     platforms = get_buildplatform()
+@@ -179,11 +154,9 @@ if __name__ == "__main__":
+             "debugpy.common",
+             "debugpy.launcher",
+             "debugpy.server",
+-            "debugpy._vendored",
+         ],
+         package_data={
+             "debugpy": ["ThirdPartyNotices.txt"],
+-            "debugpy._vendored": list(iter_vendored_files()),
+         },
+         ext_modules=ExtModules(),
+         has_ext_modules=lambda: True,
+--- a/src/debugpy/server/__init__.py
++++ b/src/debugpy/server/__init__.py
+@@ -1,7 +1,3 @@
+ # Copyright (c) Microsoft Corporation. All rights reserved.
+ # Licensed under the MIT License. See LICENSE in the project root
+ # for license information.
+-
+-# "force_pydevd" must be imported first to ensure (via side effects)
+-# that the debugpy-vendored copy of pydevd gets used.
+-import debugpy._vendored.force_pydevd  # noqa
+--- a/src/debugpy/server/attach_pid_injected.py
++++ b/src/debugpy/server/attach_pid_injected.py
+@@ -31,7 +31,6 @@ def attach(setup):
+                 pydevd_attach_to_process_path = os.path.join(
+                     _debugpy_dir,
+                     "debugpy",
+-                    "_vendored",
+                     "pydevd",
+                     "pydevd_attach_to_process",
+                 )
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index 3f23f94ba118..08f296ab228e 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1 +1,2 @@
 DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
+DIST flit_scm-1.7.0.tar.bz2 3259 BLAKE2B 9b785f9f92b16494f6bf0c21e16ee1abf6a130ebb5c41d4e0e73f4ab1c892ec14544a4b86fe9ba22dbb43a2c28cebbe84328c172566b27c195d41e3686184b9e SHA512 a030cd2ab9d100b971ac20ad5f52f206d951fb6c88cd48db0250269a32cf0dfae70738bf3dc4d36396a3da3e09c7283eec365e12608f6f6d7be3e9076bb931d2
diff --git a/dev-python/flit_scm/flit_scm-1.7.0.ebuild b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
new file mode 100644
index 000000000000..7a623b28967a
--- /dev/null
+++ b/dev-python/flit_scm/flit_scm-1.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
+HOMEPAGE="
+	https://gitlab.com/WillDaSilva/flit_scm/
+	https://pypi.org/project/flit-scm/
+"
+SRC_URI="
+	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/tomli-3[${PYTHON_USEDEP}]
+		>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10 )
+
+"
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:~=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 7f3b2fbfbc0f..c10e4807fde1 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,2 +1,3 @@
 DIST jsonschema-4.6.0.tar.gz 269939 BLAKE2B f214f65fbb908029f221789ab3857db9cbc1a7bb355f04a46bc7798514ba73ac3ba6f78cc3eaf985c19b16607ea6cf38bf46c9a8e19b1b1aef0138ef74239a4c SHA512 82d9e0c7de867c4a53b67b9dc79a38a76e384f5d41c66b52c57d407e03eb97faf8ebf41370ef08b30966f13eca210f94916b6a40347a2a75088e33017ccc2f5f
 DIST jsonschema-4.6.1.tar.gz 278452 BLAKE2B 0b5c90b790cf7430bfbea4b38f90acec6fc256bf521d9552b463489751da3f889b43021e9d94c3ed4bd7704c462141d73d25273eea1331c85a0d2d04d5c9ad18 SHA512 5c0e2806915ef4545092b0bffe4cc1207d9a6f2a6920c10894d5b7b2a9ed665093b7a9a68114d1a05528869e7d8aed902e7569800db4393fa810c0f6853f713d
+DIST jsonschema-4.6.2.tar.gz 275975 BLAKE2B 7c587e8b5c5eff097390e6254ae633445ffece2bd3e9c003dca730bd332c4d3c236ea10225dc81b95ef9359a9309831290b106a07e80945574dcc2937bcd4983 SHA512 e41d6bda1bd6b12174201a70b5ad5209ab7c445faa6c947408f0fbc255839f3379ffe8b539760d993b435972936e4052300dbc420d4b87051f33180bced7efb2
diff --git a/dev-python/jsonschema/jsonschema-4.6.2.ebuild b/dev-python/jsonschema/jsonschema-4.6.2.ebuild
new file mode 100644
index 000000000000..2cdb3b0783a9
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.6.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+# formatter deps
+RDEPEND+="
+	dev-python/fqdn[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/isoduration[${PYTHON_USEDEP}]
+	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
+	dev-python/rfc3987[${PYTHON_USEDEP}]
+	dev-python/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires pip, does not make much sense for the users
+	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
+	# wtf?
+	jsonschema/tests/test_deprecations.py::TestDeprecations::test_version
+)
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index e95447b7063f..99fec7f4c64f 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1 +1,2 @@
 DIST jupyter_core-4.10.0.tar.gz 76535 BLAKE2B d224b39397fd1ee430a758b02f8c5f2116480f00b4f7c485ccbb71556522275f7aaedeaebebf7bbfb782e3fff4677b38d5d7d0ddb4d3a24b5741dccd2b43edcb SHA512 b11257aa6239d2cc51b63c4ae696b5e2862fd824f662875a9e2b663a84b86aec14aa21baae6e5c720155f2be37fd40925b913503e002401eee442d6d3258704d
+DIST jupyter_core-4.11.0.tar.gz 73671 BLAKE2B f7e8855428d77fb36728199f76299686ffe0db0738a537ce7a540dca0fd6605371a1fe9cc32cf890fa21d08895cc1249f3e10cb2491ee0ce94de9eaf6cad08ff SHA512 bdd328df8ba2f5792e3fca01b816ed8994e56886b3d260467c5fda63180552753d807383135b7f8a84274e8a16099eed3fa5a211948d6490a57a357bb3b55a71
diff --git a/dev-python/jupyter_core/jupyter_core-4.11.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.11.0.ebuild
new file mode 100644
index 000000000000..c612d833a6b8
--- /dev/null
+++ b/dev-python/jupyter_core/jupyter_core-4.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt
+distutils_enable_tests pytest
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index c3b7f271d87b..4c8176cb7443 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,3 +1 @@
-DIST lxml-4.8.0.tar.gz 959376 BLAKE2B a40be5e058153e1dc3f8501b645b0211f4498928ed71b161df54a67501356e9968064401b6d17e17dc8d62223b29e794eaa2bee7ff78ffee203d9f9a22f3e1c2 SHA512 bbcd8ea001cfa2820dcac4e00de6ded81700b2f0bd4a58bcdd4da05a19a107f57cd56280c4838fe19ee7ecd6be105878bf8c2f1c0e5111899c4ad1a2ba03537f
-DIST lxml-4.9.0.gh.tar.gz 960537 BLAKE2B c1ffa82f74ae1876c39d94fe248ab0278d30b805081fef92b9cc9ccf28dc10d239a3ee1861a5603deda1f1ae2c4eb288a66019281010459f6320b1000bea1955 SHA512 fb88b2e9d92972de69c1f8b54529ea00364b8b72475a2a88c9c509e4fb8cfbf0ced1bc093f96ae60c1d275ee9a8e5a5d2f51472ecce3d706a1cb1299789f9495
 DIST lxml-4.9.1.gh.tar.gz 960663 BLAKE2B bb464757f9188a76661732d237f3b0f9010f51dd9c5426b578ca8fdb486d28fcfec81d4dd817b2fa0601ed9d7890e01ce71e4ea4c842b92e59dd5437200bad22 SHA512 f52d54908f92997f610638a9a3054cb73723ae81a5ad9e77918b0603ec7441b0e7d2143f8a8ac66c05cd6a0b3b298d348397b7e2df19f83c21e336514c47d910
diff --git a/dev-python/lxml/lxml-4.8.0-r1.ebuild b/dev-python/lxml/lxml-4.8.0-r1.ebuild
deleted file mode 100644
index e37e79a817fb..000000000000
--- a/dev-python/lxml/lxml-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml
-"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.9.0-r1.ebuild b/dev-python/lxml/lxml-4.9.0-r1.ebuild
deleted file mode 100644
index f26f4cc3a748..000000000000
--- a/dev-python/lxml/lxml-4.9.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="
-	https://lxml.de/
-	https://pypi.org/project/lxml/
-	https://github.com/lxml/lxml
-"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-DEPEND="
-	>=dev-libs/libxml2-2.9.12-r2
-	>=dev-libs/libxslt-1.1.28"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/docutils[${PYTHON_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_check_deps() {
-	use doc || return 0
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	cp -al "${BUILD_DIR}"/{install,test} || die
-	cp -al src/lxml/tests "${dir}/" || die
-	cp -al src/lxml/html/tests "${dir}/html/" || die
-	ln -rs "${S}"/doc "${dir}"/../../ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup4
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.9.1.ebuild b/dev-python/lxml/lxml-4.9.1.ebuild
index f26f4cc3a748..f892f1e56090 100644
--- a/dev-python/lxml/lxml-4.9.1.ebuild
+++ b/dev-python/lxml/lxml-4.9.1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
index a5038546c334..d08832353983 100644
--- a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index f997a7765a3e..7c350974ac7e 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1 +1,2 @@
 DIST mongomock-4.0.0.tar.gz 145478 BLAKE2B fad07cd15f250f81dd483814d6a3c15e69a86f4ee9a27308a3a08961f11a38c1abfc3bfa0a36dd81e14c902946c9aefd6ac29a9dde95dbf3e5b0781e7f9c8aca SHA512 e489dd9f312762f0322dfcc34b85912b5e47fa838bd48561aab9c195f19002c8e5f3617a1cc45929e9476aede7733286b5f6246f54be7396c422da5920bd89d5
+DIST mongomock-4.1.2.tar.gz 133271 BLAKE2B cd13b4b671f4e5ea4b12af939947be38629dd64bf9af0e9d5dd9d2035b8ac3d4c727666f8ecca663db370750d5a75bcbeeddf32c26b80bbe103c94c5b7e76992 SHA512 677f4bd1050da43785a0de542be7cbb67ea195d1191ccad1c1caa4aebae2fcb24e2a26cc3d2d8db64fa6ebceeed0fc79250c8c1defd16ccf16690aa048602ef3
diff --git a/dev-python/mongomock/mongomock-4.1.2.ebuild b/dev-python/mongomock/mongomock-4.1.2.ebuild
new file mode 100644
index 000000000000..f24d030f0df2
--- /dev/null
+++ b/dev-python/mongomock/mongomock-4.1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock
+	https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/nltk-data/Manifest b/dev-python/nltk-data/Manifest
index 3a61ebbf461e..4b5a3ffbec68 100644
--- a/dev-python/nltk-data/Manifest
+++ b/dev-python/nltk-data/Manifest
@@ -22,6 +22,7 @@ DIST nltk-crubadan-20200312.zip 5288655 BLAKE2B 2f5103c9801b965ce5d893b690dedc5f
 DIST nltk-dependency_treebank-20200312.zip 457429 BLAKE2B a60a95f9bcbb72b4ee19a91c380eb620261687f23bd867ae4cf2d7937b60b8dacafb52c09d7bcbcb9fbbbda4e57954ee55a900d70e69e7e290e53c668dd0775f SHA512 b225ace2e2413f0b9ae0e142d81052e64a1bcacb71caf7b07a577c18dec45dc429116abfd12edd3bb1442a111f4fa6e3e33e2b5f113e26dfc4e917268d821736
 DIST nltk-dolch-20200312.zip 2116 BLAKE2B a79b5d5de2ab03be43e5fdb1b34c70a458af6efce0e35f42f3c4d748c84cd950c98981f969fea2b0507ee405438f84b50e526aa94a93f99de7567ccb5c462215 SHA512 29254c95d11fd2001f486a5c682f7ab7f23fa13472ac4142db3702e2fa994f74ffabc2f571f1feb94a2e65fcb8da97c57a519f24504379b0e369fd27f9f867f0
 DIST nltk-europarl_raw-20200312.zip 12594977 BLAKE2B 295e274880ae34c9618a70cabc1b1075e35c442158aabe437972caebbf36d09c4f5f5b66d8ae7ac953f4312f9dac8f5e0c6d3346a444afe98ac700fb3e622539 SHA512 47dcd5420df6ab294f75204355cf346257a821d491f65b856c41a77237df1d7aeb352ed1353da55bfb68fa9f0d8782b9aac9c33bd49af3b395cc780dc421e26d
+DIST nltk-extended_omw-20220704.zip 11251284 BLAKE2B 11dafcc49c3608e5178b2cf82a943a95afd900f80308bf40d56b29a4518029832fe52241df728f6c38114e60b9c03617337717d987221918a11810b77b1b33ea SHA512 b1f53bef1cc43a5bf9996cc037364f4668e1055385d43e3276a1c58e4345b6ee09d8b577ccdebe8e65bf3367b8da37c05c6dabd282e469808143805303bfeec5
 DIST nltk-floresta-20200312.zip 1882021 BLAKE2B 092886cb15c6215b4fe979ce62a1a137de97c4749c372426211d36117d367697d19ebe6a9337f702ee9dfc133318b1e7de51393c5a41afc31a960e10ebe7c498 SHA512 1a71453b9629d622c3468b1e00501683e0415996a62a30c498486354b82f0b3be76080dddc60117c8c9f29de3b34a2166a5de87376a0daeaf8b92bfe5dac668a
 DIST nltk-framenet_v15-20200312.zip 69337891 BLAKE2B 046087cb20013f3a597034458dd09b4cb7378b19f91f5ebf7196a92a02741a67b671f094262ac5d8e0e376743048c56dd1d65e6c37efb3b254bb3f8f6434addf SHA512 4b55a435f17afbb9cf5fb59691a03776784830cfa6f1f7b9c9c64770fa6dbb640bb3256a099328e44a0a6692ed52703b9f253e5229ef71ee300ace34027ba462
 DIST nltk-framenet_v17-20200312.zip 99207152 BLAKE2B b1a32c535d37fddba5c77922f3a6097859d8bf59a4bcf37dca4ff394fcf027fc68d781b3b6c0a8d5cd9a423a944687994ec6a2023dd45808dc697b4c90f28286 SHA512 3696c5bb0fdd59058a8723ba3ca962a0d6422b36d8dcfad0427caa21dae9579b85f2f9af431aa1fc1cb76e823676a996c5a26aca99782017270d03ef3bd77f0d
@@ -82,7 +83,7 @@ DIST nltk-smultron-20200312.zip 166207 BLAKE2B d0c3e75dd108965e260d913e0c02137da
 DIST nltk-snowball_data-20200312.zip 6785405 BLAKE2B 44c10439b142540ac7eece967efa1431fd8f45342f0a90875dacf29ad374fe4c7d30af11d42ba45e0f1ec1836d56b2ff684ee352c5e8536cfb5db5eb7632285b SHA512 6c8a9259d88f6f7f499867d83b731de99d7fa4e8827ecedf836f653fc1a810efa9f6c5c6e2720a9e6610bc00978956b6a119bd08b70e3e241c4e9faccddd81d8
 DIST nltk-spanish_grammars-20200312.zip 4047 BLAKE2B d8a8dbb558850a6a60f1fe5ab0f617f3a0f3c64bc7d49980cf793d374c6679d1bd42afb7e61776737b5eec162f2520abf2ee3acc92ea9ee0f397c3089b3b5b28 SHA512 4513347156e9351c259c0e2448198d68354bbc95e0a54561c31a88f13f333ebcba3e294c820cb62036665f2904eb6a7137546cd580e361c0423c30a8aed950b2
 DIST nltk-state_union-20200312.zip 808757 BLAKE2B 2d352af0ced736d3c11a821eaba0b035b3b5b6b0f20db3bd5d4ac2451f99daf68bffd3ad984bd404ecc4a1e67ca9281c529af2cc9e295a3a7330f36ee9640bc8 SHA512 a6fc83e6230e57ba66a7af62f0d2a5d44a14530ed1e0e914590b3f8b5bf939967c126a5e6f6899ba9134843893f65212e836d311109393c1200191a5c3163485
-DIST nltk-stopwords-20211023.zip 26220 BLAKE2B 50219508c5fb24c1392064ea0546ca9060829f51689c0d626bb99e3fa8f712df98ed475fc0d27d99f934fb156ce65df91a8e7c22e1b4f16833339fb0aea34a9e SHA512 8308623953560281288b64e695638ca3fa28e1b6201b538d01650d6dfd08e821687217c8d012e93adfa2a48afebdda11af1bb86d638358c2931f36754d1e15ef
+DIST nltk-stopwords-20220704.zip 34276 BLAKE2B 529a26163c01123bb9b800cfc8f7f5a23701246194c0b55012b418384ca48c56eb5c27a5f104e81ba974cec845e7025829e9d396a384d331903982cd29c98623 SHA512 8b76207f53d05c251aac078d9b8537f100a202cc2a43892af0c79da8d99ae8335225a1bc8a56f1be4cd1ef45c9c987b6c9c334e0f9fa59746bb33694c58a556b
 DIST nltk-subjectivity-20200312.zip 521628 BLAKE2B 0a8777a5b91b1b825fbde41cc927d496480129f0a810349bddde2036ed16f37611f2bc3b007e74fe36523612529a92433d32d094be72d247f5faef8220c3c491 SHA512 a3cc4d2d20f26c5eabd86fbced2c013e69d46e607013278eb35831a62e57523a17aec1b580ba62c7a867e61a561e1b222d8430f0c1e2d429a9479e12b008c5b7
 DIST nltk-swadesh-20200312.zip 22828 BLAKE2B 1cd9d5355c6b53694ec545ca001b0807b4912a7878ba075b0f81ce8b9b22a5c7a18cf52cf2449483a1c89cd20d8d86986dc3d827fa93a7ef5824fddbc0922025 SHA512 90cb32532a5378d05ce34b84b5f8363dbb32f24afac58b0dcc5cdccba98fd7d37def7f4fbe76b11c8c64059bd19df745562bfbf5f4c721d65ce9f4be1348ab76
 DIST nltk-switchboard-20200312.zip 791161 BLAKE2B 211116a751ae246fa31b6aca96b396d3642d89ad112588a09f8d91a5b76dc41c7fb4d36c16c6358cd8e0da8056bc83598ed0dc635cf7b1fd8469a0e80b5f1761 SHA512 690e5392dc082c4ac550bde2848aa65117e7a25cbc4bce0887581c531d03be64e21f044ac0a3286648255f0edd7766b1161f5575ad5fd680c7303b34c3226b8f
@@ -94,7 +95,7 @@ DIST nltk-twitter_samples-20200312.zip 16007673 BLAKE2B dc100181ff129c2e9774c643
 DIST nltk-udhr-20200312.zip 1170177 BLAKE2B cab5f8b4ffa9c0c303620a499f61bbe654545a5689aaa710df743054836a7843e826d97ee91f7b84ba2dcd32ffce432f1932c53797e791de2776eaf183870988 SHA512 730f83cb663974edc099427fad0a3c1cd16769f5ef82446a78aa0e12f01b68a4c52037bdb5e3717dd6b08c42655b03d9d0f2f5869c01b117ae2ab8a428df0dcc
 DIST nltk-udhr2-20200312.zip 1653975 BLAKE2B 43ee8c9c490a6a8ee5f0d9273bab83f77ba3d977da7eaeded3239b8c16f3432ef36478d0d290b1df9fe9af4e0c5de1902b8fe699788b7681003e5c8c426574e3 SHA512 eda644aedba1d0b9d2605dc6b1c8c77943692b4404c4a9c904c82956432c9ba7e27bb0f496e63d3eef7f29b4b34eb929f8d9228b4fd56613d5d4f743fa1d87e0
 DIST nltk-unicode_samples-20200312.zip 1212 BLAKE2B 715c6030baf56d766dce7b920500c29dc98ce4edc9b41fb4c858960a4630469fe5a269be6d0b2d33b54ee0208014b1e43f5d9ec49b878442963ea21e4e3acda6 SHA512 88cac1ef0f43fc491285c0638807f88f52d1baba8964cb2cf37c4ee3e8cd8c080071f108fb553fdc14ed17cb0e80343097c08ac7c1613b0abbd84f559e38fba8
-DIST nltk-universal_tagset-20200312.zip 19095 BLAKE2B 179297dac3a6a30a4a55e8affb480cc95a7a1dd1ee0ac6a0d4381c655c5dbf065e16f750ebd28846299f114d3355a9edf6cbed72242ebf5fd257f339fcd8f40d SHA512 ca8915e8c3bcb8515ffe0da21fb7066d213683ff702bf247d9fa9f7c966c66d06facafef1d600b7223d7aa1e4dfba1a2a75e1bb05b2c5d78beb312b8551d3fed
+DIST nltk-universal_tagset-20220704.zip 19095 BLAKE2B 829bb169ec42005fd5c0bc827d0820eab49acce562240b942dcccc4d3bd96b3f17d24fe46f21d528264ebe976df79e2bb00da33a889759cc20cbb06f40a6ac41 SHA512 2a0094744c0e697e0cbc2c49002f41d52973a87dc940636b5edb1a162f7ac4f165911555be590c5b66d69cede918ed9cf2d3ccd59f91286eba274ef44c8df28c
 DIST nltk-universal_treebanks_v20-20200312.zip 25908853 BLAKE2B 20f8a6c0e759ab15560e71f48527e26a0dac554b8996dcebcacd2c5d5e3cea8947481734a03680843176025fde6d5e484e9414dd239043dca380c79053d71d8f SHA512 3dcabe02ff8bb1044f7d9e1c5af294af05291ff33a6c8dc16d3a3c855ccbf3a8261d92ea926e15e0d7f9228ae81e7863a283b156812ad30575c9ea947ecbcc55
 DIST nltk-vader_lexicon-20200312.zip 90486 BLAKE2B aaa4a07a600d6ef53373250afd62a1a5e76cbeb28b56c06879d07a6cea593d7041300e6eaf2ce39b87dc0c04a536fae111df80604e7f517878e680fb9db16019 SHA512 55d41757736806a2a0dbcaedef28000b4461eb44dce308c9e06315feb55f843914f743c37b6cf220fc9e61c04f8f7f41dd338438059e2e803fc2b4e91f739923
 DIST nltk-verbnet-20200312.zip 323661 BLAKE2B af5b26a63853d1bc3fc99c9cba3c50a82bc148cb6d95a26045c9aa29ba83408db76b098354e99f07696d5e2373ed9d8a35ed8504ac9b20e1b4d16252a238bc85 SHA512 00368fb2d5cf1bf818f1d72762d2c40a98067937d71a65ece2ca0f4bfab6f8957b32ba66741901af34258cf3309d00dae433b1092d0b7adb145a791dc3bf859b
diff --git a/dev-python/nltk-data/nltk-data-20211221.ebuild b/dev-python/nltk-data/nltk-data-20220704.ebuild
index 4eb1cac63622..fdbb6fd0da4e 100644
--- a/dev-python/nltk-data/nltk-data-20211221.ebuild
+++ b/dev-python/nltk-data/nltk-data-20220704.ebuild
@@ -18,6 +18,8 @@ RESTRICT="bindist mirror"
 
 BDEPEND="app-arch/unzip"
 
+# https://github.com/nltk/nltk_data/commits/gh-pages
+
 PACKAGES_ZIP_2020=(
 	# wget -O - https://www.nltk.org/nltk_data/ | xml sel -t -m '//package[@unzip=0]' -v @subdir -o "/" -v @id -n - | sort
 	corpora/comtrans
@@ -109,20 +111,20 @@ PACKAGES_UNPACK_2020=(
 	stemmers/rslp
 	taggers/averaged_perceptron_tagger
 	taggers/averaged_perceptron_tagger_ru
-	taggers/universal_tagset
 	tokenizers/punkt
 )
 
-PACKAGES_UNPACK_2021=(
-	corpora/stopwords
-)
-
 PACKAGES_UNPACK_2021_12=(
 	corpora/inaugural
 	corpora/omw-1.4
-	corpora/sinica_treebank
 	corpora/wordnet2021
 	corpora/wordnet31
+	corpora/sinica_treebank
+)
+
+PACKAGES_UNPACK_2022=(
+	corpora/stopwords
+	taggers/universal_tagset
 )
 
 PACKAGES_UNPACK_EXTRA_2020=(
@@ -145,6 +147,10 @@ PACKAGES_UNPACK_EXTRA_2020=(
 	taggers/maxent_treebank_pos_tagger
 )
 
+PACKAGES_ZIP_EXTRA_2022=(
+	corpora/extended_omw
+)
+
 add_data() {
 	local x version=${1}
 	shift
@@ -157,11 +163,12 @@ add_data() {
 }
 
 add_data 20200312 "${PACKAGES_ZIP_2020[@]}" "${PACKAGES_UNPACK_2020[@]}"
-add_data 20211023 "${PACKAGES_UNPACK_2021[@]}"
 add_data 20211221 "${PACKAGES_UNPACK_2021_12[@]}"
+add_data 20220704 "${PACKAGES_UNPACK_2022[@]}"
 SRC_URI+="
 	extra? ("
 add_data 20200312 "${PACKAGES_UNPACK_EXTRA_2020[@]}"
+add_data 20220704 "${PACKAGES_ZIP_EXTRA_2022[@]}"
 SRC_URI+="
 	)"
 
@@ -186,7 +193,10 @@ src_unpack() {
 	unpack_data 20200312 "${PACKAGES_UNPACK_2020[@]}"
 	unpack_data 20211023 "${PACKAGES_UNPACK_2021[@]}"
 	unpack_data 20211221 "${PACKAGES_UNPACK_2021_12[@]}"
-	use extra && unpack_data 20200312 "${PACKAGES_UNPACK_EXTRA_2020[@]}"
+	unpack_data 20220704 "${PACKAGES_UNPACK_2022[@]}"
+	if use extra; then
+		unpack_data 20200312 "${PACKAGES_UNPACK_EXTRA_2020[@]}"
+	fi
 }
 
 install_zips() {
@@ -207,4 +217,7 @@ src_install() {
 	mv * "${ED}/usr/share/nltk_data/" || die
 
 	install_zips 20200312 "${PACKAGES_ZIP_2020[@]}"
+	if use extra; then
+		install_zips 20220704 "${PACKAGES_ZIP_EXTRA_2022[@]}"
+	fi
 }
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index cbdc36c11b5e..fef27f7b5aff 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,3 +1,2 @@
-DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e939160f751c4ccc94b8e023aaa4cdca426f584e05dae8b1326333660e216d7cb3edd820e24a931dddfa5160f SHA512 b521cfce51e90fdf87ba19bf8069877e3210aede92c17460ea0b00324a36e133168e4bff550462d07ab6d93c597c6560d68954340031ff43168d54a8e5d4c4e7
 DIST psutil-5.9.1-tests-r2.patch.xz 3516 BLAKE2B 6a16d6f89fdeb06c7aa0d9d986eba84deae5f8d2bb829c2509744f954f9b274d8a70a00f94127f1880cea71f8d7e7b85097517f8516ee6ef14f17522ee9297b2 SHA512 b69efb32cd0229056ff9fbbde963f0f01f6bf1d0820f028527f464e38a9bd4211a55bd725cc8962a20608c12c28edb24b2063f5f58b53fdb6b001fe2f95da103
 DIST psutil-5.9.1.tar.gz 479090 BLAKE2B 88f35a9134d942fa56b5fbc79753e82245c3bfdb1f640dbf3b56815b89d872517f9ee3a3945532ebd1a399c3307e160ac80394766c3b2cc7e3fb36ffdd555eef SHA512 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27
diff --git a/dev-python/psutil/files/psutil-5.9.0-tests.patch b/dev-python/psutil/files/psutil-5.9.0-tests.patch
deleted file mode 100644
index 6dcf6f240e41..000000000000
--- a/dev-python/psutil/files/psutil-5.9.0-tests.patch
+++ /dev/null
@@ -1,298 +0,0 @@
-diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
-index 21bb3e61..6c45c9e0 100644
---- a/psutil/tests/__init__.py
-+++ b/psutil/tests/__init__.py
-@@ -88,6 +88,7 @@ __all__ = [
-     "HAS_IONICE", "HAS_MEMORY_MAPS", "HAS_PROC_CPU_NUM", "HAS_RLIMIT",
-     "HAS_SENSORS_BATTERY", "HAS_BATTERY", "HAS_SENSORS_FANS",
-     "HAS_SENSORS_TEMPERATURES", "HAS_MEMORY_FULL_INFO",
-+    "GENTOO_TESTING",
-     # subprocesses
-     'pyrun', 'terminate', 'reap_children', 'spawn_testproc', 'spawn_zombie',
-     'spawn_children_pair',
-@@ -128,6 +129,7 @@ PYPY = '__pypy__' in sys.builtin_module_names
- APPVEYOR = 'APPVEYOR' in os.environ
- GITHUB_ACTIONS = 'GITHUB_ACTIONS' in os.environ or 'CIBUILDWHEEL' in os.environ
- CI_TESTING = APPVEYOR or GITHUB_ACTIONS
-+GENTOO_TESTING = "GENTOO_TESTING" in os.environ
- # are we a 64 bit process?
- IS_64BIT = sys.maxsize > 2 ** 32
- 
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index 20e28d29..c21d0aec 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -14,6 +14,7 @@ import errno
- import glob
- import io
- import os
-+import platform
- import re
- import shutil
- import socket
-@@ -28,6 +29,7 @@ from psutil._compat import PY3
- from psutil._compat import FileNotFoundError
- from psutil._compat import basestring
- from psutil._compat import u
-+from psutil.tests import GENTOO_TESTING
- from psutil.tests import GITHUB_ACTIONS
- from psutil.tests import GLOBAL_TIMEOUT
- from psutil.tests import HAS_BATTERY
-@@ -688,6 +690,7 @@ class TestSystemCPUCountLogical(PsutilTestCase):
-         num = len([x for x in out.split('\n') if not x.startswith('#')])
-         self.assertEqual(psutil.cpu_count(logical=True), num)
- 
-+    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
-     def test_emulate_fallbacks(self):
-         import psutil._pslinux
-         original = psutil._pslinux.cpu_count_logical()
-@@ -735,6 +738,7 @@ class TestSystemCPUCountCores(PsutilTestCase):
-                 core_ids.add(fields[1])
-         self.assertEqual(psutil.cpu_count(logical=False), len(core_ids))
- 
-+    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
-     def test_method_2(self):
-         meth_1 = psutil._pslinux.cpu_count_cores()
-         with mock.patch('glob.glob', return_value=[]) as m:
-@@ -755,6 +759,7 @@ class TestSystemCPUCountCores(PsutilTestCase):
- class TestSystemCPUFrequency(PsutilTestCase):
- 
-     @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
-     def test_emulate_use_second_file(self):
-         # https://github.com/giampaolo/psutil/issues/981
-         def path_exists_mock(path):
-@@ -769,6 +774,7 @@ class TestSystemCPUFrequency(PsutilTestCase):
-             assert psutil.cpu_freq()
- 
-     @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
-     def test_emulate_use_cpuinfo(self):
-         # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
-         # exist and /proc/cpuinfo is used instead.
-@@ -896,11 +902,13 @@ class TestSystemCPUFrequency(PsutilTestCase):
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemCPUStats(PsutilTestCase):
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_ctx_switches(self):
-         vmstat_value = vmstat("context switches")
-         psutil_value = psutil.cpu_stats().ctx_switches
-         self.assertAlmostEqual(vmstat_value, psutil_value, delta=500)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_interrupts(self):
-         vmstat_value = vmstat("interrupts")
-         psutil_value = psutil.cpu_stats().interrupts
-@@ -929,6 +937,7 @@ class TestLoadAvg(PsutilTestCase):
- @unittest.skipIf(not LINUX, "LINUX only")
- class TestSystemNetIfAddrs(PsutilTestCase):
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_ips(self):
-         for name, addrs in psutil.net_if_addrs().items():
-             for addr in addrs:
-@@ -1316,6 +1325,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
-         findmnt_value = sh("findmnt -o SOURCE -rn /")
-         self.assertEqual(psutil_value, findmnt_value)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_disk_partitions_mocked(self):
-         with mock.patch(
-                 'psutil._pslinux.cext.disk_partitions',
-@@ -1491,6 +1501,7 @@ class TestMisc(PsutilTestCase):
-             psutil.PROCFS_PATH = "/proc"
- 
-     @retry_on_failure()
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_issue_687(self):
-         # In case of thread ID:
-         # - pid_exists() is supposed to return False
-@@ -1596,6 +1607,8 @@ class TestSensorsBattery(PsutilTestCase):
-             self.assertEqual(psutil.sensors_battery().power_plugged, False)
-             assert m.called
- 
-+    @unittest.skipIf(GENTOO_TESTING,
-+                     "mocking doesn't work with non-BAT0 battery")
-     def test_emulate_power_undetermined(self):
-         # Pretend we can't know whether the AC power cable not
-         # connected (assert fallback to False).
-@@ -1614,6 +1627,8 @@ class TestSensorsBattery(PsutilTestCase):
-             self.assertIsNone(psutil.sensors_battery().power_plugged)
-             assert m.called
- 
-+    @unittest.skipIf(GENTOO_TESTING,
-+                     "mocking doesn't work with non-BAT0 battery")
-     def test_emulate_energy_full_0(self):
-         # Emulate a case where energy_full files returns 0.
-         with mock_open_content(
-@@ -1621,6 +1636,8 @@ class TestSensorsBattery(PsutilTestCase):
-             self.assertEqual(psutil.sensors_battery().percent, 0)
-             assert m.called
- 
-+    @unittest.skipIf(GENTOO_TESTING,
-+                     "mocking doesn't work with non-BAT0 battery")
-     def test_emulate_energy_full_not_avail(self):
-         # Emulate a case where energy_full file does not exist.
-         # Expected fallback on /capacity.
-@@ -1634,6 +1651,8 @@ class TestSensorsBattery(PsutilTestCase):
-                         "/sys/class/power_supply/BAT0/capacity", b"88"):
-                     self.assertEqual(psutil.sensors_battery().percent, 88)
- 
-+    @unittest.skipIf(GENTOO_TESTING,
-+                     "mocking doesn't work with non-BAT0 battery")
-     def test_emulate_no_power(self):
-         # Emulate a case where /AC0/online file nor /BAT0/status exist.
-         with mock_open_exception(
-@@ -2220,6 +2239,7 @@ class TestProcessAgainstStatus(PsutilTestCase):
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
-index d946eb62..a53de565 100755
---- a/psutil/tests/test_misc.py
-+++ b/psutil/tests/test_misc.py
-@@ -32,6 +32,7 @@ from psutil._compat import PY3
- from psutil._compat import redirect_stderr
- from psutil.tests import APPVEYOR
- from psutil.tests import CI_TESTING
-+from psutil.tests import GENTOO_TESTING
- from psutil.tests import HAS_BATTERY
- from psutil.tests import HAS_MEMORY_MAPS
- from psutil.tests import HAS_NET_IO_COUNTERS
-@@ -401,6 +402,7 @@ class TestMisc(PsutilTestCase):
-                 reload_module(psutil)
-             self.assertIn("version conflict", str(cm.exception).lower())
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_debug(self):
-         if PY3:
-             from io import StringIO
-diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
-index 31b81926..53b17953 100755
---- a/psutil/tests/test_posix.py
-+++ b/psutil/tests/test_posix.py
-@@ -23,6 +23,7 @@ from psutil import OPENBSD
- from psutil import POSIX
- from psutil import SUNOS
- from psutil.tests import CI_TESTING
-+from psutil.tests import GENTOO_TESTING
- from psutil.tests import HAS_NET_IO_COUNTERS
- from psutil.tests import PYTHON_EXE
- from psutil.tests import PsutilTestCase
-@@ -193,6 +194,7 @@ class TestProcess(PsutilTestCase):
-         vsz_psutil = psutil.Process(self.pid).memory_info()[1] / 1024
-         self.assertEqual(vsz_ps, vsz_psutil)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_name(self):
-         name_ps = ps_name(self.pid)
-         # remove path if there is any, from the command
-@@ -271,6 +273,7 @@ class TestProcess(PsutilTestCase):
-             adjusted_ps_pathname = ps_pathname[:len(ps_pathname)]
-             self.assertEqual(ps_pathname, adjusted_ps_pathname)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_cmdline(self):
-         ps_cmdline = ps_args(self.pid)
-         psutil_cmdline = " ".join(psutil.Process(self.pid).cmdline())
-@@ -326,6 +329,7 @@ class TestSystemAPIs(PsutilTestCase):
-                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
-                         nic, output))
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-     @retry_on_failure()
-     def test_users(self):
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index c9059e33..0050c42a 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -38,6 +38,7 @@ from psutil._compat import long
- from psutil._compat import super
- from psutil.tests import APPVEYOR
- from psutil.tests import CI_TESTING
-+from psutil.tests import GENTOO_TESTING
- from psutil.tests import GITHUB_ACTIONS
- from psutil.tests import GLOBAL_TIMEOUT
- from psutil.tests import HAS_CPU_AFFINITY
-@@ -292,6 +293,7 @@ class TestProcess(PsutilTestCase):
-         time.strftime("%Y %m %d %H:%M:%S", time.localtime(p.create_time()))
- 
-     @unittest.skipIf(not POSIX, 'POSIX only')
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_terminal(self):
-         terminal = psutil.Process().terminal()
-         if terminal is not None:
-@@ -341,6 +343,7 @@ class TestProcess(PsutilTestCase):
-             self.assertGreaterEqual(io2[i], 0)
-             self.assertGreaterEqual(io2[i], 0)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "fails if builder is ioniced already")
-     @unittest.skipIf(not HAS_IONICE, "not supported")
-     @unittest.skipIf(not LINUX, "linux only")
-     def test_ionice_linux(self):
-@@ -1406,6 +1409,7 @@ class TestProcess(PsutilTestCase):
-         if not OSX and GITHUB_ACTIONS:
-             self.assertEqual(d1, d2)
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken by Gentoo sandbox")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index db2cb348..d719c59e 100755
---- a/psutil/tests/test_system.py
-+++ b/psutil/tests/test_system.py
-@@ -10,6 +10,7 @@ import contextlib
- import datetime
- import errno
- import os
-+import platform
- import pprint
- import shutil
- import signal
-@@ -33,6 +34,7 @@ from psutil._compat import long
- from psutil.tests import ASCII_FS
- from psutil.tests import CI_TESTING
- from psutil.tests import DEVNULL
-+from psutil.tests import GENTOO_TESTING
- from psutil.tests import GITHUB_ACTIONS
- from psutil.tests import GLOBAL_TIMEOUT
- from psutil.tests import HAS_BATTERY
-@@ -199,6 +201,7 @@ class TestMiscAPIs(PsutilTestCase):
-         self.assertGreater(bt, 0)
-         self.assertLess(bt, time.time())
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
-     def test_users(self):
-         users = psutil.users()
-@@ -426,6 +429,7 @@ class TestCpuAPIs(PsutilTestCase):
-                 if difference >= 0.05:
-                     return
- 
-+    @unittest.skipIf(GENTOO_TESTING, "flaky")
-     def test_cpu_times_comparison(self):
-         # Make sure the sum of all per cpu times is almost equal to
-         # base "one cpu" times.
-@@ -512,6 +516,7 @@ class TestCpuAPIs(PsutilTestCase):
-                 self.assertGreater(value, 0)
- 
-     @unittest.skipIf(not HAS_CPU_FREQ, "not suported")
-+    @unittest.skipIf(GENTOO_TESTING and platform.machine().startswith("sparc"), "broken on Gentoo/SPARC")
-     def test_cpu_freq(self):
-         def check_ls(ls):
-             for nt in ls:
-@@ -580,6 +585,7 @@ class TestDiskAPIs(PsutilTestCase):
-     def test_disk_usage_bytes(self):
-         psutil.disk_usage(b'.')
- 
-+    @unittest.skipIf(GENTOO_TESTING, "broken in Gentoo test env")
-     def test_disk_partitions(self):
-         def check_ntuple(nt):
-             self.assertIsInstance(nt.device, str)
diff --git a/dev-python/psutil/psutil-5.9.0.ebuild b/dev-python/psutil/psutil-5.9.0.ebuild
deleted file mode 100644
index 6d9d86d46881..000000000000
--- a/dev-python/psutil/psutil-5.9.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/psutil-5.9.0-tests.patch
-)
-
-python_test() {
-	# since we are running in an environment a bit similar to CI,
-	# let's skip the tests that are disable for CI
-	local -x TRAVIS=1
-	local -x APPVEYOR=1
-	local -x GITHUB_ACTIONS=1
-	local -x GENTOO_TESTING=1
-	"${EPYTHON}" psutil/tests/runner.py ||
-		die "tests failed with ${EPYTHON}"
-}
-
-python_compile() {
-	# force -j1 to avoid .o linking race conditions
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/psutil/psutil-5.9.1.ebuild b/dev-python/psutil/psutil-5.9.1.ebuild
index 86f6420ff3d1..b2400065f7ad 100644
--- a/dev-python/psutil/psutil-5.9.1.ebuild
+++ b/dev-python/psutil/psutil-5.9.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 9d240d95d458..89c76d5d90f8 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-bdd-5.0.0.gh.tar.gz 61174 BLAKE2B 6dd1d53614226d3515b0f61f71822363b559aa45789bab7f3416c75e603e87a1fe48627f36862f44bfa7ac6ec5023ad8afde6054ec67fc9a2e756be7de729fd1 SHA512 827e57d410b05207b6c646062ddb54b677e22441311820d3bd406df202b6e9344dedf59cd4868e89cfbf8606fe3f15559e4cc3958d100e4fa74f9b864e6faada
 DIST pytest-bdd-6.0.0.gh.tar.gz 60475 BLAKE2B 48d09d5f5a4f274a27239a33f354aa52b1ebafc904ddc1dbb331d830f8cfabe0ba748d1fe6dadaf32f5b4848e1761d2dea1a06ac5b9d5f0c0e15e3248586cf42 SHA512 5223190a1b1d80761059cc34893b64eeca6c4d35b3a81aed186b5d1b4214ac67660cfa6cd39e1953a445c8ca7ceea74cb32b224435193febad35433c2eaf3266
+DIST pytest-bdd-6.0.1.gh.tar.gz 60932 BLAKE2B 67e0dbc251ce94da40033641f37e6c9ad70ca947f71db1a78907a6890d96d8d3112d57a2a63dda526c8f846010d39a575cb5d93a102f4653705d4229ee14ab07 SHA512 30bc697ae177e3f311af0c781e99bde5b491dfef28109359c0d80f33feb8b0b170ffe15c288fe73a624144a1d1c3223b220d591b4acc30d1ad53600482bef87d
diff --git a/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild b/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild
new file mode 100644
index 000000000000..1d5048dc4da2
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pypi.org/project/pytest-bdd/"
+SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/glob2[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+src_test() {
+	# terminal_reporter test needs exact wrapping
+	local -x COLUMNS=80
+
+	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_bdd.plugin
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 252dbfc04fdd..ca1a0bac9178 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1 +1,2 @@
+DIST urllib3-1.26.10.tar.gz 297854 BLAKE2B 2523bc197ed9720e2bd011ffa46a46605cab902d66b245cb5229e15e90ac5bac990851d6cb9b6aa2dd5682da2639af7cd8e3c8c27f1210e5ca0c7c10498babd3 SHA512 76c1cc9420c267986c7775a9d9eadfd08e980643c2da16602f755e11a274ffbbf1813f30245fb0d84ee3a99bb3aa33b98893f285cabec8dd4aee1304420cb15b
 DIST urllib3-1.26.9.tar.gz 295258 BLAKE2B 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f SHA512 ac384291b02516dee781c98182625356ac7bc03972612577de5286e159cf161b541cc610b103e0eec1c9f40503049b41e972a9e0998fcd834efe2f40af0e7394
diff --git a/dev-python/urllib3/urllib3-1.26.10.ebuild b/dev-python/urllib3/urllib3-1.26.10.ebuild
new file mode 100644
index 000000000000..5eaf76c6344b
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{7..10})
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle urllib3
+	rm src/urllib3/packages/six.py || die
+	find -name '*.py' -exec sed -i \
+		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
+		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
+		{} + || die
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..11}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# unstable (relies on warning count)
+		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
+	)
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}