Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-01-24 01:37:58 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2022-01-24 01:37:58 +0000
commit: 45fcf85ae746b58f3263ca596b62c916f6860817 (patch)
tree: 36502c190e38bbbe13a0ff92573e9e4938b601b7 /dev-python
parent: a0d324d0ef33cd7630b90e7c187b0691941f8eea (diff)
download: baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.tar.gz
baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.tar.xz
baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.zip
64 files changed, 892 insertions, 741 deletions
diff --git a/dev-python/Rx/Rx-3.2.0.ebuild b/dev-python/Rx/Rx-3.2.0.ebuild
index 8e86455dfda5..b673136ba04a 100644
--- a/dev-python/Rx/Rx-3.2.0.ebuild
+++ b/dev-python/Rx/Rx-3.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx
 
 MY_P="RxPY-${PV}"
 DESCRIPTION="Reactive Extensions for Python"
-HOMEPAGE="http://reactivex.io/"
+HOMEPAGE="https://reactivex.io/"
 SRC_URI="
 	https://github.com/ReactiveX/RxPY/archive/v${PV}.tar.gz
 		-> ${MY_P}.tar.gz"
diff --git a/dev-python/black/black-21.12_beta0-r1.ebuild b/dev-python/black/black-21.12_beta0-r1.ebuild
new file mode 100644
index 000000000000..11f0366c2c16
--- /dev/null
+++ b/dev-python/black/black-21.12_beta0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+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/pathspec-1[${PYTHON_USEDEP}]
+	<dev-python/tomli-3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_{8,9})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Merged in master
+	"${FILESDIR}/${P}-support-tomli-2.patch"
+)
+
+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:~=:>=:' \
+		-e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' 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-21.12_beta0-support-tomli-2.patch b/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch
new file mode 100644
index 000000000000..5374dc6e82a9
--- /dev/null
+++ b/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch
@@ -0,0 +1,40 @@
+From 389e9c23a9e622ee6090d902cc5f56c5f76cdee9 Mon Sep 17 00:00:00 2001
+From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com>
+Date: Tue, 21 Dec 2021 18:03:07 +0200
+Subject: [PATCH] Disable universal newlines when reading TOML (#2408)
+
+--- a/Pipfile
++++ b/Pipfile
+@@ -42,7 +42,7 @@ platformdirs= ">=2"
+ click = ">=8.0.0"
+ mypy_extensions = ">=0.4.3"
+ pathspec = ">=0.8.1"
+-tomli = ">=0.2.6, <2.0.0"
++tomli = ">=1.1.0, <3.0.0"
+ typed-ast = "==1.4.3"
+ typing_extensions = {markers = "python_version < '3.10'", version = ">=3.10.0.0"}
+ black = {editable = true,extras = ["d"],path = "."}
+--- a/setup.py
++++ b/setup.py
+@@ -99,7 +99,7 @@ def find_python_files(base: Path) -> List[Path]:
+     install_requires=[
+         "click>=7.1.2",
+         "platformdirs>=2",
+-        "tomli>=0.2.6,<2.0.0",
++        "tomli>=1.1.0,<3.0.0",
+         "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'",
+         "pathspec>=0.9.0, <1",
+         "dataclasses>=0.6; python_version < '3.7'",
+--- a/src/black/files.py
++++ b/src/black/files.py
+@@ -95,8 +95,8 @@ def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
+ 
+     If parsing fails, will raise a tomli.TOMLDecodeError
+     """
+-    with open(path_config, encoding="utf8") as f:
+-        pyproject_toml = tomli.loads(f.read())
++    with open(path_config, "rb") as f:
++        pyproject_toml = tomli.load(f)
+     config = pyproject_toml.get("tool", {}).get("black", {})
+     return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
+ 
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index d8bd665d8db2..06842a82c653 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -13,6 +13,7 @@
 	</longdescription>
  <upstream>
   <remote-id type="pypi">cvxopt</remote-id>
+  <remote-id type="cpe">cpe:/a:cvxopt_project:cvxopt</remote-id>
  </upstream>
  <use>
   <flag name="dsdp">Use interior point library
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index d0eea7315e1e..c41048b6d2ad 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -3,3 +3,4 @@ DIST identify-2.4.1.tar.gz 101282 BLAKE2B e7c04480159062ec25063d956dda6d904031bb
 DIST identify-2.4.2.tar.gz 101279 BLAKE2B f70bc1d493fb1fd94f95ea7cedfba6c522fb79ad9d94e1bc3c8937ff728e82fd450ea7b64f5769811dea4788eeac0e0b5fcbddd0c817443bf6005d59de1d9b83 SHA512 73b139effb62ec047aa3285a5e0e9b196b459e9e8efd5dfb82090dbdd8f020055680fbc381778a1c7a298e72ed6c1778fc74213812b2f30abe9b18b401e053e3
 DIST identify-2.4.3.tar.gz 101282 BLAKE2B 5ae76ac22ca462ae3dc7d71ed8d07344729ee54692cce52e1269057451733fab9c02647a51deed98cfa569b7758f37b4cc07353eb418314901b1eed2333eabdc SHA512 2c82cc90d98a149dc211680c96d8c3bfcdbf955fd61eb207ae4a62d9bdb8f159707a7578838582bd16f45c300d9a8e7c5e7009a9daecb6b334b27fd160cc0d40
 DIST identify-2.4.4.tar.gz 101270 BLAKE2B d5e31a8b74a724cfd0c169def52b434bd2b722aa7dfb9d92636a8eb28b1b1a7ccd9c9544d97d5fd359fb995b44b6d8a6428f484ee033f70292717053b1f5825f SHA512 34a93640ca96483599e0cfdb1d69f37f8f4cb659b68ee84824079ee177e93aeb259ebc654f5fb39d5a0b68d267ba3c963870c9c55b6676e12c21b7f7573438a4
+DIST identify-2.4.5.gh.tar.gz 101319 BLAKE2B 78e17e88ad5c463a8bca5cdc2e66433f38e41ad67fbabe60706d7154841ba6fefa52658550107760d521257366806999ffc24b9eb0ebbd37d3a94581df573b12 SHA512 f2c6ac86ad88431e835c723a83c7b8d0578166ab620e2681f5c16e9634592f58761551a1360491edc4863538c967b793fe8e0730cbf4c92bf1690e50c5669ac9
diff --git a/dev-python/identify/identify-2.4.5.ebuild b/dev-python/identify/identify-2.4.5.ebuild
new file mode 100644
index 000000000000..0a07d27d9a1a
--- /dev/null
+++ b/dev-python/identify/identify-2.4.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="https://github.com/pre-commit/identify"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-python/ukkonen[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index 2dbe84361386..5d28ac37ef36 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,6 +1,4 @@
-DIST jupyter_server-1.11.1.tar.gz 420035 BLAKE2B 0676b0e126752ebeaa45e2325c34fe787756265f5ad35e356660485e5e7fd98a9ecaa029badf4c45815f25425e5a8a44133b6595698dca212f871b898c6ef76c SHA512 537bb9dbacabe396761a17be3280ecc0d28d63116a72386a7ff69bd8467f38909b7c2491eeb1f6b8bb7618b7fe661cd583d9efb8597ecbe88941c35096e0b1a8
-DIST jupyter_server-1.12.0.tar.gz 422318 BLAKE2B 9aa4843d02bfd918b0df13d94fc0058e6a6dee74f634dac359f7f6b4ca85e6cd4f91e8ddafb873647cd672284fb3eff087e05c3fcb6eff1621c7beb4b99030ee SHA512 28de049051852ae5d2bc10f2a0643a1441c2df3c229348e8d45e7031cc1c85a118124bc0b3bf7f101fd912ee25cd9cbf3e9b1b633fee20d70f43152e1e03e12c
-DIST jupyter_server-1.12.1.tar.gz 422410 BLAKE2B 611f17fe9804b0279c60ecc4fc1c23e6548643e4f7aa8e120580e167dc58a1f2d98ed7f07b90927bf07a71a89829d5701bd296a8f5ad3e954e4e8ee20c95bd5f SHA512 b199be8b0590c4bd14e995e6c9933f6da4d33e1796203cc157fd42b111db5ec6e860ef321d8311c30995d8aba6f1803dd0fec9148ae9a1cf427b7e38924f5357
 DIST jupyter_server-1.13.1.tar.gz 423717 BLAKE2B 9524e6648365e9c4158a8af4a4b277b4673ca320fc8e2c101ef2797ad89ebe8f93d25b1e74193ed88b06d151621a2ab9d9622cd06d67d5bea3a9ba96a95eb8e0 SHA512 e42a93930d16adb3952a0f98e3ae399a50881c32ef78205922511ea702dc24ffbeae30058fb1445897c4cf52873af0c03be16276398581a3eff52b58739ed2ba
 DIST jupyter_server-1.13.2.tar.gz 422777 BLAKE2B b263831ea27b5628c01f6c0897b213b8e97d60d234e6843817750eb41cf23cc27160841d3e65ccf210648571b8a0532c921bc9cd01ec56d78b4d1cad70cec91d SHA512 93a78a7b47c570e4bee80ef51fb0e35027caf414bfbd3c1bdf1f65d166d9756fade984070605f617912144b043c099c63812f7ba6b2be64c6524f5b8c6f24d7f
 DIST jupyter_server-1.13.3.tar.gz 423083 BLAKE2B 74bc31f0a853559a5368fc48ce9c9991147c76a13f4598cd0973ce27a4417a0320b157f83ce6f6c2450005f0d5668140175ee4d37d77160bb721ed27e9030372 SHA512 01c7a353b4890b4b9f33e4fec4d8ea141d60145d106cf21f9ba2372ee14e45433a0d83d78efa0ae7160f2fc22f7be0b4822992e9d135b3dfdc9bfb01a538f491
+DIST jupyter_server-1.13.4.tar.gz 423176 BLAKE2B a1a3e2f57eb0c570649ead2b03328258575f04fe32c0ee4afc0758fffa8804cdbae24b2aa9e8785a81f287d6f5c197bf2f0a18803f9a65cef441b46950a3597d SHA512 c15ddf92a8f7cede8d2c45a9c1cee0f70373083f61f970794b88b8c7cd12b56e0ac0e451446392ed93db8944bfff0910046c163a088cd639a9bc9bdcdc4c597c
diff --git a/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild
deleted file mode 100644
index 596aceab5b3f..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.12.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild
deleted file mode 100644
index 596aceab5b3f..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.12.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv jupyter_server/conftest.py . || die
-
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
index 8fbc1a127b44..a597df7e3e89 100644
--- a/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.13.3.ebuild
@@ -42,9 +42,13 @@ BDEPEND="
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
 	)"
 
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib_github_alt \
+	dev-python/sphinxcontrib-openapi
 distutils_enable_tests --install pytest
 
 python_prepare_all() {
diff --git a/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.13.4.ebuild
index ef0220e1a748..77e8681850b2 100644
--- a/dev-python/jupyter_server/jupyter_server-1.11.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.13.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,17 +20,18 @@ RDEPEND="
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/send2trash[${PYTHON_USEDEP}]
 	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
 	dev-python/prometheus_client[${PYTHON_USEDEP}]
-	dev-python/anyio[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
 	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/requests-unixsocket[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -41,20 +42,25 @@ BDEPEND="
 		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
 	)"
 
-# TODO: Package 'myst_parser'
-# distutils_enable_sphinx docs/source
-# 	dev-python/pydata-sphinx-theme
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib_github_alt \
+	dev-python/sphinxcontrib-openapi
 distutils_enable_tests --install pytest
 
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	jupyter_server/tests/test_terminal.py::test_terminal_create_with_cwd
+	jupyter_server/tests/test_terminal.py::test_culling_config
+	jupyter_server/tests/test_terminal.py::test_culling
+)
+
 python_prepare_all() {
 	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
 	mv jupyter_server/conftest.py . || die
 
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	sed -i \
-		-e 's:est_terminal_create_with_cwd:_&:' \
-		-e 's:test_culling:_&:' \
-		jupyter_server/tests/test_terminal.py || die
-
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
new file mode 100644
index 000000000000..f6fc23e4fb2c
--- /dev/null
+++ b/dev-python/markdown-it-py/Manifest
@@ -0,0 +1 @@
+DIST markdown-it-py-2.0.0.gh.tar.gz 265346 BLAKE2B f509c3fdc82a2665bb9bca862118c544cf203afbb8454cdbb5f58c58aeadcd1fbd66ef98615ac6501e4fe8ce83d2e668de29d2e67301ddda06d1cbbaf6cf7422 SHA512 226111a8d0e57d9def2076053abfba1b7533bb0cdee569b8e1c7ece2b61ebce49daa263aee673683b83974b7597df0e6d62c1723860af684fe306c55619357ca
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.0.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.0.0.ebuild
new file mode 100644
index 000000000000..97ad5be29096
--- /dev/null
+++ b/dev-python/markdown-it-py/markdown-it-py-2.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python port of markdown-it, Markdown parser"
+HOMEPAGE="https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py"
+SRC_URI="
+	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/attrs-22[${PYTHON_USEDEP}]
+	dev-python/mdurl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Unimportant tests needing a new dep linkify
+	tests/test_linkify.py::test_token_levels
+	tests/test_port/test_fixtures.py::test_linkify
+)
+
+EPYTEST_IGNORE=(
+	# No need to benchmark
+	benchmarking/
+)
diff --git a/dev-python/markdown-it-py/metadata.xml b/dev-python/markdown-it-py/metadata.xml
new file mode 100644
index 000000000000..46f40ee63af3
--- /dev/null
+++ b/dev-python/markdown-it-py/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">markdown-it-py</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
new file mode 100644
index 000000000000..c04b4ab0815a
--- /dev/null
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -0,0 +1 @@
+DIST mdit-py-plugins-0.3.0.gh.tar.gz 50654 BLAKE2B e84842e7cada1d9239f1d449c1a21ed654ab13017ea92f82190053b37371bc7e06d7afb65f6f56f7fa935666d24d05dca99628121bd4092a1143c289588ddfa4 SHA512 dd6aa738c6d93e45437326b1be52e0a9fc411aa3beacb61690919c272979c97ac1b38116b1ebb01c7d8fe724d4af9621c81ccd45131a690df8a2c0c325eef0e8
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
new file mode 100644
index 000000000000..431e2c38f83e
--- /dev/null
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Collection of plugins for markdown-it-py"
+HOMEPAGE="https://pypi.org/project/mdit-py-plugins/
+	https://github.com/executablebooks/mdit-py-plugins"
+SRC_URI="
+	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/metadata.xml b/dev-python/mdit-py-plugins/metadata.xml
new file mode 100644
index 000000000000..7aa15b6b8ca2
--- /dev/null
+++ b/dev-python/mdit-py-plugins/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">mdit-py-plugins</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/mdurl/Manifest b/dev-python/mdurl/Manifest
new file mode 100644
index 000000000000..f08088af0233
--- /dev/null
+++ b/dev-python/mdurl/Manifest
@@ -0,0 +1 @@
+DIST mdurl-0.1.0.gh.tar.gz 16148 BLAKE2B d7b64313b346b5af550165fb7cb2f6af0575db3b0a9e1450097e30c6bc4e411affd62d5b40d6b335cc6491f826fbe5133cf229436acc5449d120f9847ff8d840 SHA512 773f868702276c05e635f8ccae1238cb0836107dccf0a9c179929acc008645e09c92e07bc102dd66e2df98e637665444ffe77860066eefbc5c747ebbb70cd595
diff --git a/dev-python/mdurl/mdurl-0.1.0.ebuild b/dev-python/mdurl/mdurl-0.1.0.ebuild
new file mode 100644
index 000000000000..314b465d8581
--- /dev/null
+++ b/dev-python/mdurl/mdurl-0.1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=flit
+inherit distutils-r1
+
+DESCRIPTION="Markdown URL utilities"
+HOMEPAGE="https://pypi.org/project/mdurl/ https://github.com/hukkin/mdurl"
+SRC_URI="https://github.com/hukkin/mdurl/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mdurl/metadata.xml b/dev-python/mdurl/metadata.xml
new file mode 100644
index 000000000000..213dc05efef1
--- /dev/null
+++ b/dev-python/mdurl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">mdurl</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 4a99c379b6dc..fd59d4a848b0 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-material-8.1.4.tar.gz 7892710 BLAKE2B 3e986279bc93be4599568b431818313e01fe036420a1654a2883f5d855818a7fde64ef04bdf81a9688873a66ecb1e9692147e18a56292071ffbad93157ff06ac SHA512 9298400feb21d9d0027dc22f363f8bdff160b00623ebf09886add90359f739b69c3ee79c3bfc9a4dc18eb2d4cdb5544897aae6a807b0a379cca0dc9df82d16fc
 DIST mkdocs-material-8.1.7.tar.gz 7939617 BLAKE2B 67727822e492dba780539b27290e41fe78b48b47e1c55b0d9b0a0d820685b096ac636b8d2a9ab54a7785390689087a651d833d2f609fbdb4d2ff3702896a1b90 SHA512 2580d046960e76253d0312b677538914fe62f1e58d894d956a3a6932e0bad185a24447fde011f4982b128744429e65bf4383562a62c0ea2601790f22e84f20d1
+DIST mkdocs-material-8.1.8.gh.tar.gz 7942776 BLAKE2B 368f922f4b8b4723db36354697131a7055fcad4af0db015ef7e9c43b37431a8e7e64635241232b845bf73ab5a45a738f7741dc6d5e47d364c54be61df6a0a314 SHA512 9e3bc19d9c23b484c4c9dcd7f357efd151d351e1ab15be70a44607b4a6b59e367e93d3ccf4c31e5975cb41cb63939614cf26ca9ba6788abf000ad94b3a920b7b
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
new file mode 100644
index 000000000000..a9f7c36486c8
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index eb8231897044..94ba06255627 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,11 +1,4 @@
-DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d647673443a8a335bb907f8601098540b032d6c9a8ced3e1fc490c49ad70c877547d905cece05bbb742d05976 SHA512 70e64ab98873d480e776a2139a4d351665c6c2f98faf90e2871c6b9998571d1bd239757bc90bbc6ab6e1ed510598bfce77157ad522953efe40c884068885c57d
-DIST moto-2.2.12.tar.gz 1941427 BLAKE2B d1f85e46f4072b0e1c48e727d9e99eec12001a5397e738a5ab2e776c59e273a887c72dc5e5fdf2e6b61028f4eddb4b6fa809288bf7b087502192139eae170127 SHA512 a55e96bfe1f1c4a4523be30040350fc2929fb4385a62cc5a96a8fb34febed54d442be0e169f836f813e956c9e388fce8b9c405c59ad023011f9c7c76362c3729
-DIST moto-2.2.14.tar.gz 1962233 BLAKE2B 2e61a2a946bdb51280fc16a2efd47e88e9643a04cebec1fc117a984b3bb8be366523fb202fe558137c4bf5c6a9e8b2e035adceda6fd37712b004d650d3d042fd SHA512 2f6c5a498f95760e910174c91562aa4f5a223d691efc1db65b66508c407641473b5b94512e67f48ed02e3733421cc51eba7aa569b19e92cf58ffa6bbcb81b362
-DIST moto-2.2.15.tar.gz 1962356 BLAKE2B 469f9c0eb36552b475b5e76fe286a6e50ae6379a9b0436a40eb290fd033123b2b400b6b85a1dd66b01176f1795a0211831acf10efac1a44a09f17efe325fad3b SHA512 2fffb3d095cd7274891d1d9ff5eee07550773eb06d1410205db39c75234e37833bda12aca7c29fda5b1d415145e55e7c7d59f8a03f3163c8f752e968fc273d3a
-DIST moto-2.2.16.tar.gz 1982590 BLAKE2B 016760c1eebd418ddb281f9cf438d9e13c868409ca1465a2a8b8292c714b7a3e4a6d47bef7a506e5c8d4128282f4f68cfea30eb61940464be4a5e27e0749e035 SHA512 bca5d5a8efa6ba204caf0cfcae700ee4079ac0a1aca22eb4adfa09f3e81f0bb43daa24088a55578022fc7b25ae14c9f41701d9557f2dd09b818fdd25ba4c3e78
 DIST moto-2.2.17.tar.gz 2013217 BLAKE2B 6fe6dd23e96fe8ba210fc9bbb400ced7c27aa6626097c523579482d58709fbf2d22e217bdab604017ee17c45b4093c8106e15e5894484face28c07bba85d42ea SHA512 73dfa0f15afd299e2c5b4c7833a73b1a7537248b8b332258868bac01890c1861e9a62b6fb634d795d4e37e5505cc51008f1048154044a8238049de5b21f31251
-DIST moto-2.2.18.tar.gz 2077837 BLAKE2B acb4c428e6cc00711e186a209d61e00366954dabf9ad750f7d639d822daaf7e35399ab8a317fa32756113d41bff27d236be79b7c99b4f2ddbd8fb415144cd985 SHA512 5d416b59b9a3bd97b98ea5196bcfc25accb2bed83e9782cda48acf8ec52a9e304e9fe5edfdd5dda60376df06b7a9c0709acec08d058a99127cc34ef2905ba5b3
-DIST moto-2.2.19.tar.gz 2083677 BLAKE2B e8471c4acccd213a80b4636a1da2a404f1ea2c10750a80059999212f8ab721ab900c08e29ebb069c271063bf2b67dd837fd311ff25f304956a8551bbc7eb936e SHA512 cd549fad44820900efc28e8d6834c588dac57c44a09214f6f5e51894207e9b1f88300975d60390c14252be29d66696dbe13d484ede87c23c6d16f4c39ba7f2a2
 DIST moto-2.2.20.tar.gz 2077649 BLAKE2B 595d9536b21ba442fcf0b9b40e61cc9d3105e220661f67d842cd5e9660ed4ff561e0ea742083e167ef11312b762b204e82381550845a06d6b5a694793adc0c67 SHA512 ac853989ec4822a72139ed62f7bc8b01a91ef2a424b4e622fd0cc6828b3dd21d3a433ba8d50cda5e5b4c03859653d71f9431b7ce2416255be3cf129b1a02e200
 DIST moto-2.3.1.tar.gz 2088810 BLAKE2B 9e1b50bec4e0a7a0bb7496fe90e8caf0b80900e35120aae931e99e0e251bd4905c7bfed670a78d230abd987d3400f93fbbaf0bcdece9d6b5e35c4b63916e72c3 SHA512 122311e549b034b0a45a1cbfbc4fd96e0c846272d460c72279a7991b967720e1732662e623acf6a5f1cbaf874f5755bcfa9dfbf8a0ac31da780de44d42e6f1be
 DIST moto-2.3.2.tar.gz 2095242 BLAKE2B 17b98e09c410e48cac60ca494d6d0a6264657e8df994c0395be15b072dbc998a59b25d017b2897cd2e05429959baa427358b4f11cc3b7a517f4f4ddb88d2f2c5 SHA512 f58b9cf3f0a88964776fc92e4982408f0826a2d0149cc84cc21752030d8c9d3de3ea1a07cb529ea4d77b0d2a5ac5222a6ec24f6b88e9d7d70cc82257b883bd10
diff --git a/dev-python/moto/moto-2.0.5-r1.ebuild b/dev-python/moto/moto-2.0.5-r1.ebuild
deleted file mode 100644
index d09bc2216fab..000000000000
--- a/dev-python/moto/moto-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unping indirect dep on ecdsa that's supposed to workaround pip
-	# bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.12.ebuild b/dev-python/moto/moto-2.2.12.ebuild
deleted file mode 100644
index 78d834d56268..000000000000
--- a/dev-python/moto/moto-2.2.12.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.14.ebuild b/dev-python/moto/moto-2.2.14.ebuild
deleted file mode 100644
index f9548678aa18..000000000000
--- a/dev-python/moto/moto-2.2.14.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.15.ebuild b/dev-python/moto/moto-2.2.15.ebuild
deleted file mode 100644
index f9548678aa18..000000000000
--- a/dev-python/moto/moto-2.2.15.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.16.ebuild b/dev-python/moto/moto-2.2.16.ebuild
deleted file mode 100644
index f9548678aa18..000000000000
--- a/dev-python/moto/moto-2.2.16.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.17.ebuild b/dev-python/moto/moto-2.2.17.ebuild
index 12d2aac31fae..f505731705e5 100644
--- a/dev-python/moto/moto-2.2.17.ebuild
+++ b/dev-python/moto/moto-2.2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-2.2.18.ebuild b/dev-python/moto/moto-2.2.18.ebuild
deleted file mode 100644
index 92b60c6b79b0..000000000000
--- a/dev-python/moto/moto-2.2.18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	<dev-python/boto3-1.20.24[${PYTHON_USEDEP}]
-	<dev-python/botocore-1.23.24[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-2.2.19.ebuild b/dev-python/moto/moto-2.2.19.ebuild
deleted file mode 100644
index 6f4203c9b010..000000000000
--- a/dev-python/moto/moto-2.2.19.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unpin indirect dep on ecdsa that's supposed to workaround pip bugs
-	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 41f8f5cafdee..d6a267671bf7 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,2 +1,2 @@
 DIST multidict-5.2.0.tar.gz 56984 BLAKE2B 3580e3f53b3ec581d338676647f2e8dd78387fdad5730fe703c02b3cd4182d69e3b6896d71bd969413dd27974e07272cc541701a2145a517d9bacea45000e9c8 SHA512 508b6db9219c3dae76da5e89a398f4541beff2a875030c2f11da9aaa1e001324d069d7a291148c510fe555cb3a33288ef297c9baa863e42d3d09d60588bebd7e
-DIST multidict-6.0.0.tar.gz 56006 BLAKE2B 886e7e02da1eb80ca2a7106dd127d0164155fa400125f4fa0c880d508407ad1b436e52d77f331843f908d5ab5497aac002d72445615666b0621a8e436397598f SHA512 9f258795166fd3c6f56286fd98da8cf7ce9bc5d7a974174865164f0955c71263234307733c0edcc5d0142c1356d681e24c93c3be6f5dbee67f01dee6a39b32d2
+DIST multidict-6.0.1.tar.gz 56227 BLAKE2B f5038b2e11df1bd605837a66d64e0bb42a03274fc07a3a9b10772fba6e903e8543a9d6eff575f4f177edbd03f830113b0c3aeff10be3df2902efb429f3275b41 SHA512 ab90deeba36806223d1813dd4348833e5938eb46b807e921308e93eb6e48ddcd9af4a17e049ae448ae199d6e2c99c76aea52745b7bb8746cd1b47e5fab8f9279
diff --git a/dev-python/multidict/multidict-6.0.0.ebuild b/dev-python/multidict/multidict-6.0.1.ebuild
index 6d450186242d..6d450186242d 100644
--- a/dev-python/multidict/multidict-6.0.0.ebuild
+++ b/dev-python/multidict/multidict-6.0.1.ebuild
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
new file mode 100644
index 000000000000..9c7d6302ca8b
--- /dev/null
+++ b/dev-python/myst_parser/Manifest
@@ -0,0 +1 @@
+DIST myst_parser-0.16.1_p20220119.gh.tar.gz 876622 BLAKE2B 4cac39ec9935a1f97d5f1484eed3fcfe6d2ff5013290ea93c1fc6f9894c363d83ddaf9af5f088ba5e1284bb1f28c2e0b4cf935860c5641953baaae39c5f6bdbe SHA512 a9460501651d598bb9ed3d108a47ef27554cf7a52589a0ef8ddcb1fa2b94a25bb24cb8b51a9a367b58eef5c6d8d96f8170ad924f105d5dffe9bc4f6557e701c7
diff --git a/dev-python/myst_parser/metadata.xml b/dev-python/myst_parser/metadata.xml
new file mode 100644
index 000000000000..41856cedfde1
--- /dev/null
+++ b/dev-python/myst_parser/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">myst-parser</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/myst_parser/myst_parser-0.16.1_p20220119.ebuild b/dev-python/myst_parser/myst_parser-0.16.1_p20220119.ebuild
new file mode 100644
index 000000000000..25132c80adae
--- /dev/null
+++ b/dev-python/myst_parser/myst_parser-0.16.1_p20220119.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+# one time use of snapshot for some changes from master
+# next bump, just use github tarballs for tests
+COMMIT="7654462dc8521c0090478efa4dcfba6227e97a84"
+
+DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
+HOMEPAGE="https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser"
+SRC_URI="
+	https://github.com/executablebooks/MyST-Parser/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/MyST-Parser-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/sphinx-5[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Unimportant tests needing a new dep linkify
+	tests/test_renderers/test_myst_config.py::test_cmdline
+	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+)
diff --git a/dev-python/picobox/Manifest b/dev-python/picobox/Manifest
new file mode 100644
index 000000000000..b99d37fb1e9c
--- /dev/null
+++ b/dev-python/picobox/Manifest
@@ -0,0 +1 @@
+DIST picobox-2.2.0.tar.gz 30231 BLAKE2B 9911e2e41a850b57d4a642aa454e55703e0546bdb3a5b95aa4a15747388413babaec7dc3a3f7fcb7ecae7ecd0f81dc203161975ca393f87353987825e0413355 SHA512 d127ea71637105285701ae5252e59e0c940077fbbe044ba1f42f80134ea08291344ebb6bc8bce240112a7efe0be8561c8040b43d20912f1fbd121098578a1795
diff --git a/dev-python/picobox/files/picobox-2.2.0-fix-py3.10.patch b/dev-python/picobox/files/picobox-2.2.0-fix-py3.10.patch
new file mode 100644
index 000000000000..74c6f9b2193f
--- /dev/null
+++ b/dev-python/picobox/files/picobox-2.2.0-fix-py3.10.patch
@@ -0,0 +1,26 @@
+diff --git a/tests/test_box.py b/tests/test_box.py
+index c1c1ca2..d576086 100644
+--- a/tests/test_box.py
++++ b/tests/test_box.py
+@@ -402,7 +402,7 @@ def test_box_pass_unexpected_argument(boxclass):
+     with pytest.raises(TypeError) as excinfo:
+         fn(1, 2)
+ 
+-    assert str(excinfo.value) == "fn() got an unexpected keyword argument 'd'"
++    assert "fn() got an unexpected keyword argument 'd'" in str(excinfo.value)
+ 
+ 
+ def test_box_pass_keyerror(boxclass):
+diff --git a/tests/test_stack.py b/tests/test_stack.py
+index 725d378..10129b3 100644
+--- a/tests/test_stack.py
++++ b/tests/test_stack.py
+@@ -472,7 +472,7 @@ def test_box_pass_unexpected_argument(boxclass, teststack):
+         with pytest.raises(TypeError) as excinfo:
+             fn(1, 2)
+ 
+-    assert str(excinfo.value) == "fn() got an unexpected keyword argument 'd'"
++    assert "fn() got an unexpected keyword argument 'd'" in str(excinfo.value)
+ 
+ 
+ def test_box_pass_keyerror(boxclass, teststack):
diff --git a/dev-python/picobox/metadata.xml b/dev-python/picobox/metadata.xml
new file mode 100644
index 000000000000..5b639e8f87fc
--- /dev/null
+++ b/dev-python/picobox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">picobox</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/picobox/picobox-2.2.0.ebuild b/dev-python/picobox/picobox-2.2.0.ebuild
new file mode 100644
index 000000000000..f3a318e682ba
--- /dev/null
+++ b/dev-python/picobox/picobox-2.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Dependency injection framework designed with Python in mind"
+HOMEPAGE="https://pypi.org/project/picobox/
+	https://github.com/ikalnytskyi/picobox"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
index de9015e61c66..fb1e94964b4f 100644
--- a/dev-python/pipenv/metadata.xml
+++ b/dev-python/pipenv/metadata.xml
@@ -11,6 +11,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">pipenv</remote-id>
+  <remote-id type="cpe">cpe:/a:pypa:pipenv</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index eedeeb413396..e530c7250b25 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1 +1,2 @@
 DIST pycryptodome-3.12.0.tar.gz 15130980 BLAKE2B 5eb34a03523652d990ddfdd1eebcbbacea30bffbe4838289c195b07658a98814ebec322aaffbed7b3fa564bc005d52ea1e483dedcb9f40b65d00e50c28d78582 SHA512 67f2a814d74305614fdf9dfb633c4fd9d80d2064119d0ecab24ae52fd8ce4b6de1a1e82c6ba7bcf22fb7db1a5a850adf078e22317b4c07229cd7cb8cb7f1ffd4
+DIST pycryptodome-3.13.0.tar.gz 15306369 BLAKE2B 97ef26868fb2be2f3240960d8debd897cb82c4a6f1ea1c179fc790693eb2e37de14cbf16bd7deafe0ca1d28983e9bee8583cbe8adde2fa50533cf2bd1274108c SHA512 daafdc80ae8df7f5f282adbdd3fbd9f848b03a3de0c21739b3bb973368daf721c9cd306e56c16baceeda4a0ebc3470abbc0cddc4e8409b5e4fe4255f3d62ec2e
diff --git a/dev-python/pycryptodome/pycryptodome-3.13.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.13.0.ebuild
new file mode 100644
index 000000000000..b5457786df89
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.13.0.ebuild
@@ -0,0 +1,46 @@
+# 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_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+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=""
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
new file mode 100644
index 000000000000..b44326d8b60d
--- /dev/null
+++ b/dev-python/pytest-cov/files/pytest-cov-3.0.0-coverage-6.2.patch
@@ -0,0 +1,30 @@
+From 6d06678a76d9275beb48917d7653ea6a610c7717 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 23 Jan 2022 15:03:35 +0100
+Subject: [PATCH] Update test_invalid_coverage_source for coverage-6.2
+
+Update test_invalid_coverage_source to make the "No data was collected"
+less strict, as the output has changed in coverage-6.2.  This solution
+was suggested by Tom Callaway (@spotrh) on the linked bug.
+
+Fixes #509
+---
+ tests/test_pytest_cov.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index f93d352..6d97949 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -981,7 +981,7 @@ def test_invalid_coverage_source(testdir):
+         '*10 passed*'
+     ])
+     result.stderr.fnmatch_lines([
+-        'Coverage.py warning: No data was collected.*'
++        '*No data was collected.*'
+     ])
+     result.stdout.fnmatch_lines([
+         '*Failed to generate report: No data to report.',
+-- 
+2.34.1
+
diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0-r1.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..7b65be2c5a2c
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-3.0.0-r1.ebuild
@@ -0,0 +1,60 @@
+# 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_{6,7,8,9,10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-py3doc-enhanced-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/pytest-dev/pytest-cov/pull/518
+	"${FILESDIR}"/${P}-coverage-6.2.patch
+)
+
+python_test() {
+	# NB: disabling all plugins speeds tests up a lot
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
+
+	local EPYTEST_DESELECT=(
+		# attempts to install packages via pip (network)
+		tests/test_pytest_cov.py::test_dist_missing_data
+	)
+
+	# TODO: why do we need to do that?!
+	# https://github.com/pytest-dev/pytest-cov/issues/517
+	ln -s "${BROOT}$(python_get_sitedir)/coverage" \
+		"${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
+
+	epytest -x
+
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/coverage" || die
+}
diff --git a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
index d7bed964cc19..ca6d7d895d27 100644
--- a/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,20 @@ distutils_enable_sphinx docs \
 	dev-python/sphinx-py3doc-enhanced-theme
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# attempts to install packages via pip (network)
-	tests/test_pytest_cov.py::test_dist_missing_data
+PATCHES=(
+	# https://github.com/pytest-dev/pytest-cov/pull/518
+	"${FILESDIR}"/${P}-coverage-6.2.patch
 )
+
+python_test() {
+	# NB: disabling all plugins speeds tests up a lot
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
+
+	local EPYTEST_DESELECT=(
+		# attempts to install packages via pip (network)
+		tests/test_pytest_cov.py::test_dist_missing_data
+	)
+
+	epytest
+}
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
new file mode 100644
index 000000000000..1654e8c02308
--- /dev/null
+++ b/dev-python/pytest-param-files/Manifest
@@ -0,0 +1 @@
+DIST pytest-param-files-0.3.3.gh.tar.gz 6858 BLAKE2B 6614b00dcfab63241daee0951bea442afb885942c4ab1ce0b2f6b4c3fe1e0a6048955d79cb1bd703f31ffedaede19b36f40caded98e0c8dc014b64e847110a00 SHA512 d52d0aa44088879ee5cd55f8af56ed649a1a82420bed357be043fdcc0df4899002cae36d95c6864126eaaa97877a21aedabb00dd12a8730d6aee3bcaecdcee62
diff --git a/dev-python/pytest-param-files/metadata.xml b/dev-python/pytest-param-files/metadata.xml
new file mode 100644
index 000000000000..52ed979170cb
--- /dev/null
+++ b/dev-python/pytest-param-files/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">pytest_param_files</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.3.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.3.ebuild
new file mode 100644
index 000000000000..0e6b79fc31f0
--- /dev/null
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=flit
+inherit distutils-r1
+
+DESCRIPTION="Pytest parametrize decorators from external files."
+HOMEPAGE="https://pypi.org/project/pytest_param_files/
+	https://github.com/chrisjsewell/pytest-param-files"
+SRC_URI="
+	https://github.com/chrisjsewell/pytest-param-files/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
new file mode 100644
index 000000000000..03a69a475880
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -0,0 +1 @@
+DIST sphinxcontrib-httpdomain-1.8.0.gh.tar.gz 38228 BLAKE2B 46cbe5ef0689777ef560c167c49af5830e38c7efa3a536dd36702114eb87f3c0f2f1c0c9de808738ef081e09c7d47754bc49a039b04184696ee4389acbf18454 SHA512 64d916d58282e94a4fa2b2d0e8abad5c50106b739e6e15015d347af339f517c2c7457c9bc8dc74258cfc371910d1a02b582a2c94f6f98c195a366f68c5b108c4
diff --git a/dev-python/sphinxcontrib-httpdomain/metadata.xml b/dev-python/sphinxcontrib-httpdomain/metadata.xml
new file mode 100644
index 000000000000..7e85fd9cb86e
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
new file mode 100644
index 000000000000..182d2c839bbc
--- /dev/null
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Sphinx domain for documenting HTTP APIs"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-httpdomain/
+	https://github.com/sphinx-contrib/httpdomain"
+SRC_URI="
+	https://github.com/sphinx-contrib/httpdomain/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/httpdomain-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/bottle[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib-openapi/Manifest b/dev-python/sphinxcontrib-openapi/Manifest
new file mode 100644
index 000000000000..ff4f63cc2f1f
--- /dev/null
+++ b/dev-python/sphinxcontrib-openapi/Manifest
@@ -0,0 +1 @@
+DIST sphinxcontrib-openapi-0.7.0.tar.gz 193897 BLAKE2B c0f1c46c6e8c67ddf95d163a68f5e22e6f2dff6622a3c21651b301dc1266b53b088d1b882e5e3347fad6347b86392bc9428b56f537c1d2320e7d9cd113c478f7 SHA512 36a7b6473b43af8d6fe2cf1bf22fb90848343911f69414cd742b942ff2ea33ac5ffba79c516dbb076b87c2a6e7e44d6958796daf06c9245a7184bfb6fdb53569
diff --git a/dev-python/sphinxcontrib-openapi/metadata.xml b/dev-python/sphinxcontrib-openapi/metadata.xml
new file mode 100644
index 000000000000..ab70af6768e6
--- /dev/null
+++ b/dev-python/sphinxcontrib-openapi/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">sphinxcontrib-openapi</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
new file mode 100644
index 000000000000..e3777b5b3c2e
--- /dev/null
+++ b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI (fka Swagger) spec renderer for Sphinx"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-openapi/
+	https://github.com/sphinx-contrib/openapi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/m2r[${PYTHON_USEDEP}]
+	dev-python/picobox[${PYTHON_USEDEP}]
+	dev-python/deepmerge[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphinxcontrib_github_alt/Manifest b/dev-python/sphinxcontrib_github_alt/Manifest
new file mode 100644
index 000000000000..c3831670c955
--- /dev/null
+++ b/dev-python/sphinxcontrib_github_alt/Manifest
@@ -0,0 +1 @@
+DIST sphinxcontrib_github_alt-1.2.tar.gz 4015 BLAKE2B 3d3c70124bbb57dbdba5657e28afa88b8576de1a93e28f283cc546134cf326a9c5205d1e68868b0915ddfbfecafbccd5bd2a5e6c0db9938553ad4e31412eec08 SHA512 846139bddd1d12469f7f1564ec3c7c679cf05c79d5c29e2cd5ab23ae4282b084876e09386c3980ec057bf74590f002e50998cb64c84cfd13042ad095b51f9a60
diff --git a/dev-python/sphinxcontrib_github_alt/metadata.xml b/dev-python/sphinxcontrib_github_alt/metadata.xml
new file mode 100644
index 000000000000..87b91efae5c8
--- /dev/null
+++ b/dev-python/sphinxcontrib_github_alt/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">sphinxcontrib_github_alt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/sphinxcontrib_github_alt/sphinxcontrib_github_alt-1.2.ebuild b/dev-python/sphinxcontrib_github_alt/sphinxcontrib_github_alt-1.2.ebuild
new file mode 100644
index 000000000000..eee2451d53a5
--- /dev/null
+++ b/dev-python/sphinxcontrib_github_alt/sphinxcontrib_github_alt-1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=flit
+inherit distutils-r1
+
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib_github_alt/
+	https://github.com/jupyter/sphinxcontrib_github_alt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sphinxemoji/Manifest b/dev-python/sphinxemoji/Manifest
new file mode 100644
index 000000000000..b56e6a067b7c
--- /dev/null
+++ b/dev-python/sphinxemoji/Manifest
@@ -0,0 +1 @@
+DIST sphinxemoji-0.2.0.tar.gz 44431 BLAKE2B 18c9a7b4c97bc6081216cac98cecf41fef0bfc90122bd24f7d11d96f5db71437ee4e80675464fcaf9bc4c6e89c2511392600e043d4fb1904cfc57ce4efbed824 SHA512 974fcfad13f326265c679a3c97fd251b0348499fc9a72b65547b2548ddb2eb895a96f71d4b212f619287ac7c759df22fbb66f1a8cfa160287f8b25878c0f0515
diff --git a/dev-python/sphinxemoji/metadata.xml b/dev-python/sphinxemoji/metadata.xml
new file mode 100644
index 000000000000..1b426dde5e0d
--- /dev/null
+++ b/dev-python/sphinxemoji/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">sphinxemoji</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild b/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
new file mode 100644
index 000000000000..cd3a6647db31
--- /dev/null
+++ b/dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Extension to use emoji codes in your Sphinx documentation"
+HOMEPAGE="https://pypi.org/project/sphinxemoji/
+	https://github.com/sphinx-contrib/emojicodes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index bdd1afa4880c..2074c61a17cc 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1 +1,2 @@
 DIST starlette-0.17.1.tar.gz 403781 BLAKE2B 75de462afc507d89159f17002eb2acc5453520ad312573d5697f5da8fc7d76fcb2407bf41086c923a60a59766f5ac02de1b003962a4d1031c062bd80a0d50e6c SHA512 a8f8cee0dc40d19eab62996f4ef1230fa758375fa9b51e15eae5c906a89b76519ebe4e423aa567d73e4c055cef63e9bbae11b47d4372e28b615f6edaf22a06a7
+DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
diff --git a/dev-python/starlette/starlette-0.18.0.ebuild b/dev-python/starlette/starlette-0.18.0.ebuild
new file mode 100644
index 000000000000..7139e9fd19fc
--- /dev/null
+++ b/dev-python/starlette/starlette-0.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="https://www.starlette.io/"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/anyio[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_{8,9} )
+"
+BDEPEND="test? ( dev-python/trio[${PYTHON_USEDEP}] )"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ujson/metadata.xml b/dev-python/ujson/metadata.xml
index f67a31571332..d0cff61b84e2 100644
--- a/dev-python/ujson/metadata.xml
+++ b/dev-python/ujson/metadata.xml
@@ -11,6 +11,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">ujson</remote-id>
+  <remote-id type="cpe">cpe:/a:ultrajson_project:ultrajson</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-01-24 01:37:58 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2022-01-24 01:37:58 +0000
commit	45fcf85ae746b58f3263ca596b62c916f6860817 (patch)
tree	36502c190e38bbbe13a0ff92573e9e4938b601b7 /dev-python
parent	a0d324d0ef33cd7630b90e7c187b0691941f8eea (diff)
download	baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.tar.gz baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.tar.xz baldeagleos-repo-45fcf85ae746b58f3263ca596b62c916f6860817.zip