gentoo auto-resync : 03:11:2022 - 09:11:25

26 files changed, 1069 insertions, 0 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 193dcbfa18cf..18708c246aa5 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 35f0564c0cb4..ac8aeb6ba1e5 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -7,6 +7,7 @@ DIST boto3-1.25.3.gh.tar.gz 549487 BLAKE2B f0c4f2dee25dff926ce5d0699bc6ff9a876dd
 DIST boto3-1.25.4.gh.tar.gz 549950 BLAKE2B f9dfb94d2bfc3f11ac0e98b4ca1755157cf5d71b5b756a4b228bedf48b0d116de80ad1638789dcc1e44ec2d5ab2bf85923a566caf50a15141b3e04baa195b416 SHA512 77ddbd3ec3815d7fad99e918d2474ffedf2f0f5b35cd9f8fa68eaff0c1f4f7e6495c280e7fb6ef1b6f368103b2ecf11565b99636b34ca5a95038ff44a87088fa
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
 DIST boto3-1.26.0.gh.tar.gz 551306 BLAKE2B fb72315724321f1f41b7ff8f90eb5386b5361f049913ed87ac884140c405587ee0dc7acfc13300851566e96d12de16d3c6f1db52af44b27ea320c4e6deaaf2c9 SHA512 eafff7ba7792fb62d2ba93213588e1a034b6d51fcc7e8167dcf15e0276c3b499440d3ff340cb2145aedf2f432c0de563cbc69111543530c5b4a4705cd08871bf
+DIST boto3-1.26.1.gh.tar.gz 551830 BLAKE2B 85dff3350796fcb06ea927d469d5afdbe43c448cc5c267364edc2641d25aac8d33a76a3cae06cf414a52874bce626d88f15252f3273530c1a2a791791134fafa SHA512 d1ccea2a2155d22c765504597dfb185190c52f99e7b1c9210eedf9832d9a191d7bbb1205930682f906a7bf6316226836b61dbece5b54ca24dbc91073b0a41591
 EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -16,5 +17,6 @@ EBUILD boto3-1.25.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd5365
 EBUILD boto3-1.25.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.1.ebuild b/dev-python/boto3/boto3-1.26.1.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.1.ebuild
@@ -0,0 +1,68 @@
+# 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_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c9dcc845b775..a2f911cbf686 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,7 @@ DIST botocore-1.28.3.gh.tar.gz 9829079 BLAKE2B 77010a262689d99530f6cfa89d3389828
 DIST botocore-1.28.4.gh.tar.gz 9830940 BLAKE2B a4f7148ff4ef77dab59b088e241f19cf072dbf0231aac36fdf2220660e3460b08d4f50bc8be6e9eacf169997124b58b27a0f8ab52c042741dc5c1cb43837b00e SHA512 7ce121333cd25f1eb2a99dca0edae21988ab6cd9a1e073e453c633dfacb88b45f40f07fe922bf8a52356ec41d819243785091e8c002c192c17bf89a4e626a380
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
 DIST botocore-1.29.0.gh.tar.gz 10570614 BLAKE2B 08c48caba9516cb7345204d426942779dc8e2060cd3b95f634fe6293f6314c6a825c3c75371a446c22365f855f888c86ce303f50b53ecb6348f3453c5c9b9cab SHA512 b35322e8636fbf9d1743e234889dd370f8cc4853eb0318ad55e563de7a3f3be47fe0842be1ead8fa7c4eaf455264aa7bc15c0a8313fc2343f82d419b7cad781b
+DIST botocore-1.29.1.gh.tar.gz 10572059 BLAKE2B d0adb21a47ae4e4b092a7965630b599e8ad7322e11f808bc18632e7bc79afacf743e5149aecad788fe8d6479a68e99b125fd07bd48e3b3bc5901784b3ca12423 SHA512 ce9b7d2b8a2a590993a3fad259ec3a7b038cad8234cad3e8fdbb5523db278e682a391f40e59811dfda3f312f8e5a158246f8654b7e08bfafe817a7e62ee5ef04
 EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
@@ -16,5 +17,6 @@ EBUILD botocore-1.28.3.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3
 EBUILD botocore-1.28.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-1.29.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.1.ebuild b/dev-python/botocore/botocore-1.29.1.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.1.ebuild
@@ -0,0 +1,72 @@
+# 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_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 38d06fc0f3fe..df2261313318 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -3,9 +3,11 @@ DIST cfn-lint-0.68.1.gh.tar.gz 9858724 BLAKE2B 469a23daa717add95140913d85861df44
 DIST cfn-lint-0.69.0.gh.tar.gz 9862506 BLAKE2B 68e6e5e93d7f07bda3eedda71d79943ef97fd0c2e972f475380f7943f88d843effa8cd23b4534bcf4ce0918ca7a634ecf32cef7c309711f9dbc6f899324f3f97 SHA512 9972fb1be897451116e269245d7302af31a53e54c1615daa65bd6b71b9a0ff3f62c1068d86c239510737ac95a6ab3ba2746838792680f701a404008f35857c64
 DIST cfn-lint-0.69.1.gh.tar.gz 9871037 BLAKE2B a6c4d1b3b892eee01231771dfbe7831737f8f6f89cf096a4ea0c1b945aa47574a51938d4b8ecdd7e3c2cd18df87ba343c07f3e379b49b78b07d7ec676f12e0d1 SHA512 1823485a0d2273a6a1c6632944a095bc4f9b7999f4e0dc81a47cb8673a3d02f822865b08ca3dfcf518b38a9c68a0f0bc5c3235904aca5ce94919ec627b9c3ddc
 DIST cfn-lint-0.70.0.gh.tar.gz 9891445 BLAKE2B 6cdacffb2c3649203046339d088d3e41a4280197a5b23ef5b7cb837d93de62760dbe78a2b92800f11606f3e723f6c9c93d7d08e1379541a1bbbdfc302ae76633 SHA512 456acc59b30b4e4546d07426a7218b7ef2716412c82b12a9f419550d4916121fd0874dfca1725436305309165bb05875c27410a5bdf82ba462157022dc3feed1
+DIST cfn-lint-0.70.1.gh.tar.gz 9891593 BLAKE2B 2ee4ba8d688c3888e11e1df52ab26f554f7d13a2f46bc56b5f0d3de7912e8cd99432e7dc174f0072966fd6a586718abe5e9ab11797c5a24480ee508f8819a7df SHA512 c2566ffadf5935b8dfd38eb690f406466aef4d1e0793691547479673bc2519acd8bd5b42ecfb666736c81e9cf3254601542b0a7d4b5257ca626e6e3b194c64da
 EBUILD cfn-lint-0.67.0.ebuild 1638 BLAKE2B a439d73d2d83ca8489c2bcbf2c1034f650ad4216d6600e2163c60976ef0133fba36316e9cb263dbb7c3d12d756d8cad188c762732952d0392371a8e74bb58743 SHA512 1426c30e2dc1d63b765a109ee707fa8d466046789694cc1d3afa111c3263b3da11560c72ec6fdd180f213bd5619d9bc5f9b23bd0e9d230eef66d24b647fd2acf
 EBUILD cfn-lint-0.68.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.69.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.69.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.70.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
+EBUILD cfn-lint-0.70.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.70.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.70.1.ebuild
new file mode 100644
index 000000000000..0916420e1790
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.70.1.ebuild
@@ -0,0 +1,54 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index 3f5fe7b927fc..585d5bd98c9b 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,5 @@
 DIST crashtest-0.4.0.gh.tar.gz 13564 BLAKE2B 9c29694f5c96a981e19cce16853460cfed7277a2a933c14be9bdefcac9f79e9d835454fd79b3da2fb5f62946f933452202eee05199dfa048b919a3fc3dd93f40 SHA512 98d9623eeef584baed7bd336a3846af9b4f3aa55662b643e915b17b0a7dce4968785052ce3d37f55fc0217dbb6662b6f5d34efeb4d45dbace876551871be4e4a
+DIST crashtest-0.4.1.gh.tar.gz 19114 BLAKE2B aa46efb2dbabfeaab54f9149da42cb033f5dca3ab1c75032ca2542018058cf16775f56450cadf3e1272e738d602f32f21b9a6668a99f2733cd53d23c1754a0bc SHA512 83faf66fb422c8fb13780ac5a8ddd4c47ebb77f248bea0eb94962caff24265b107fd8bbc0d577853969c4aecedd83977e9c74c81dc7e772b7684e09a832a0a2f
 EBUILD crashtest-0.4.0.ebuild 513 BLAKE2B 0586c53702fccb4543c527ad71787197f851520701ee975d3d20c791943bf35a7ad7ccaf487f5c044093a5067566ede9d3aabeffb928af8d63c6d98f2320826d SHA512 d72c6f5dc92274d7b57122cc8f3d2b8b87a9e62206b3ed895ffad0ebc5e47f7342182928e918b1b35564bbf6e7071bfc219c9c25275e0c71509024cff59c8305
+EBUILD crashtest-0.4.1.ebuild 556 BLAKE2B 0bff6ce64c5cc4a6a20501c9ed85ccc6bb7d66e8f2563c75ffdc4feccd6dce47c684918c4d0ca3d307215f061582f7e0ce33bcda0e8b2bfefe20dfb874cb3d33 SHA512 a59bdffe9a1c724b7980ef7e804d2b9bbd2951d0a1b47411b7cbe1d8f932e9352c6cef99c6bddf00b61179f1988a2ca63494a6d895d871c16ff787d0e27908e7
 MISC metadata.xml 416 BLAKE2B f6b8728929c04221908904b4e43f0fa00c480b193537b519558a1f9e83bd99ab131c3b28d03a624690c4891feee71b6b90bbed6fdc0aa89a4f14dabe282c8343 SHA512 55c2a10cf5611aad9461b1aef9ec28f699a46237a7616e1a834769d20a00f9e4477e2910cc3117a71acd7512ee9812b7658010234387560445c484ce3feabe84
diff --git a/dev-python/crashtest/crashtest-0.4.1.ebuild b/dev-python/crashtest/crashtest-0.4.1.ebuild
new file mode 100644
index 000000000000..a51cf7380836
--- /dev/null
+++ b/dev-python/crashtest/crashtest-0.4.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that makes exceptions handling and inspection easier"
+HOMEPAGE="
+	https://github.com/sdispater/crashtest/
+	https://pypi.org/project/crashtest/
+"
+SRC_URI="
+	https://github.com/sdispater/crashtest/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8f5b1bc5f996..7f1b47914968 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -7,7 +7,10 @@ DIST Django-4.0.8.checksum.txt 2552 BLAKE2B af7551bddb966e8e6d338b486c3d2aa5139b
 DIST Django-4.0.8.tar.gz 10427857 BLAKE2B cbbba3b3044d60fcd6d240e1a181c00d65c1122dc464c86391e39a1eaa866703f41310401f3de291e427eb075dc141fbbc503f414e3627e16715e87f2c10e5c8 SHA512 6357cfc673eb0b993d88b6bed5e43bfea8e0c71d31b141033d06cfe45e91591739ac5c6c57a82cde0216104acb7b21c8c32c1c1bfacad3f62737c8ad10ee175a
 DIST Django-4.1.2.checksum.txt 2552 BLAKE2B 3786a5824ce981fa66e4173b4fe985ccca4084c3bf2a67cce05d527768c54afec69efb2cd79578fff3dfdcf6dcf26536208dc1ae203348e0648a1d2b27373469 SHA512 01bd342832d626efc03f0704b2e7a8287830cf8ccde53b0d8b9d20c10eb10b6d799611e143196f121b43967e72e08a2db032fec81638c3d58e541ccbd598bb1e
 DIST Django-4.1.2.tar.gz 10509111 BLAKE2B a6786e214967a3a789fd42218e3422f6985efa8e0f4be807d6afb1dd293ef37a201850af1728e72ae0bf429da3aac41dbfa95926f426e9bfe4b3f7f77a6e2934 SHA512 734d782777269b714f6648509d010649e7df2790e438ab2439ba1c4fc1cc9d37626b77ea9d60806c215ab666feb4555b1360ebcdc8cb16e85da8c950b262bbd7
+DIST Django-4.1.3.checksum.txt 2547 BLAKE2B d4a0c921360871495c16c9f44c0b7fef43729d30c2f4fbdb83c73bafd91532734ec597ff67190df4b4c6a66f2c61967a4fd4a8a51d24a3509550db46f1afec49 SHA512 3271a7cf74d457fb740c27f0c162789d40c9e443d92cf5a63d5fc2c1d2080221732aa74a1b896ac06106d5e625f1d2f0b764f72be05062977c9aeb8fa7932497
+DIST Django-4.1.3.tar.gz 10476258 BLAKE2B 9c4865ba86f846a017a7f382320c965fa67f56dbe660a1bf0e974d5cbde21f6c8a88f80675d884d03424e9cd4f1d89af0c9f76be135e875e003f45b1cff5b604 SHA512 3bc77444f22b9dc029d5f45b6481224b99afe41f43d6306db69d01ca5ba24ed05f6c3bd7b3f5320dd96e6d79a47ac1c8f45a86cd8d3822432be4e73b006026ca
 EBUILD django-3.2.16.ebuild 3064 BLAKE2B 6f517e6b230b0a2c716f6995339a6da00e248718fd64cf4875b8e636f8979605d8192e0c4051e450b8013fad408083e37fea614c4e9dbd511d61c2ace4a12953 SHA512 6067e931920ba1bbd52da5bf569cc1c4ffc07b18672278987a696e80e1ca43f3743790b0fd10615fe11728bff85ea902a924acbc7ccbfed25561ca109ea9c55d
 EBUILD django-4.0.8.ebuild 3028 BLAKE2B dc67d9756d4c47bafc4a5e68a4047d58b865747211bcb8752a5cc5918d860370ffa16d457bbd521be2e2af57ab66ac063d4c2905418fe4501a16edf851e9ebbb SHA512 337304299836b8cc9aa16a19f164d536a0c80baa4caa193abc120ea39a183b64e0e71e7181a2301773955d6188b97ac4851a73ff9097b701101aa1fce4f727f7
 EBUILD django-4.1.2.ebuild 2874 BLAKE2B c61f2a896389eb8d3184d127ecbf3aa9d4aa4e67e006f7f697515ed46adfce56a9c645da74577ccaa78b327583aa9e0aeaed9c5738026648eb1e89cbb4d56532 SHA512 4ab4f6e95294c33f673eeeab0424d0a07eb24987236fcc448bda0125ba43362014df512861a0f7798a3ff037846029ff01138a37a273703b275d7c0adfdf12f2
+EBUILD django-4.1.3.ebuild 2878 BLAKE2B ca7797c252fe2f223636799fad83d2f09a7fc962482c39110aabcf65c731fc99d807a4fd4a0974bc8a86c6acd8d1a2f21813d7724d0afb4fdbaaa594ad7000a3 SHA512 1e08cc3a259db0be803f358994900f4bb319a610b9143020a5f05845eb8484e14ad75d44a6203107fb6af7e5a58da7d6556c0ef30e37b3916e268ef875f0ee4a
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.1.3.ebuild b/dev-python/django/django-4.1.3.ebuild
new file mode 100644
index 000000000000..5a30981b4f33
--- /dev/null
+++ b/dev-python/django/django-4.1.3.ebuild
@@ -0,0 +1,103 @@
+# 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_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index a0d599546b37..0004157f03bc 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,3 +1,5 @@
 DIST filetype-1.0.10.tar.gz 804374 BLAKE2B 51735e8810be7f4fe9aaac1ec5305ea85146b5c540a1aaad795a287a4570abb22d131a5fd1444c83e3e747424938242dc8733d2076019a963f6947e4f5981db7 SHA512 a6455b8d11ec56dd3d041b95e1226a5d0ecdee21ef590997e93611d10184ed29137c9f3bd578313a25455010da8f21950420b29ecd9e6ddb5e363051a9fbacc6
+DIST filetype-1.2.0.tar.gz 998020 BLAKE2B 7fdd7e16a8a4d1cdffdd02c5d540d4290de7410a44185875a279c38a4d18c7f67a8bd8ce863efbae2c71c84e93dd1a5621f9fb9e6bde5ac0c611bd5bea939254 SHA512 09ed462d2a82437a58a28aa0315559afbf2e1b30176720254cc2a25fc67ff25e5e99988182e5e748e4e6ccb7ef3fde47cec96ebe20c937ab658bfcfe703ad20c
 EBUILD filetype-1.0.10.ebuild 519 BLAKE2B c87754c71d4d0597e1e4f85d16d833d5782167a1cab998e2430e1506cf27947f9242fe8bde986ee3ffa1bdd7bad2b87887ac580cef2da727062ab6f54a124019 SHA512 91209956eb9f16e2a2e47eeb3b4307ea15a17b77526967dc2866fcbfec2ff24f248aa517034c0aa83079f703fe820feb5f86f5c643dd29b744189264b70e73f7
+EBUILD filetype-1.2.0.ebuild 566 BLAKE2B 061a36df6cde5087b1266ecf77e8de8539eff9683a13246b09fca5227e3390334f303d4655673a273bd83bf7287d8f831e4f77d749a5b50ff52a7a98e13f352c SHA512 bc2d4dd2933d14e59a03f504c2f237725750c387ec2b637410634970a0b363e8a0cb55af4b35a4ee803cf4f3cbcc873b8f2c1369a0fe155f87fca615a8eb6508
 MISC metadata.xml 502 BLAKE2B bd79ec6c9e78732f89f64aed99872f5b31a7e75ba4dae7dc184be3e38937e90ea5366cedbd348cb878fd3e604a255559069d33f060ad788d9ba4e3b3c11c2eb7 SHA512 56fd6f66510f365f4111813f64abe9c9bb63f0354ad6e5919ed7c6597665ab9c1ef42f08d207144d16c3c68ad2ad59db06acdce7f3473f6818162efdb0291c67
diff --git a/dev-python/filetype/filetype-1.2.0.ebuild b/dev-python/filetype/filetype-1.2.0.ebuild
new file mode 100644
index 000000000000..deff2d2a388b
--- /dev/null
+++ b/dev-python/filetype/filetype-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
+HOMEPAGE="
+	https://github.com/h2non/filetype.py/
+	https://pypi.org/project/filetype/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index a3e4155a579c..4bdd64459c75 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,3 +1,5 @@
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
+DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1
 EBUILD jsonmerge-1.8.0-r1.ebuild 515 BLAKE2B 8064cd6ac06f5da9698129f939bb8521e070d911ce1176c80b2aba2d7720ee20b33f4525c78aaa0be8c593d8a6858cfcec395149beac466821f331c3c6dc3423 SHA512 ab45da0bfa4cb3df1e668f2fe9508c4254ae4344c117b0c30bf902ee0479aa9f0dbdcbbd182dd51557d0c5c9cb4ffa0339808f644bf0ef1cbb78aaf7854e5c40
+EBUILD jsonmerge-1.9.0.ebuild 523 BLAKE2B f533166694b738e5b7ee1a9d386bf0cc0ab3403fbe2b5ec0bf3ad3fc1bd62f603a56ea187c891f51cd316c6f55d374a0499a8970ad878595f901fa14c6b629df SHA512 fee62ae9b546a6847b5350fb6e4237968b78bbf56c485a5d89ee96d34b8e2d8a71c803513736c0530c8ee0a377b0f13aab60fd756002495e3c8ce1e680612635
 MISC metadata.xml 474 BLAKE2B 327d36cf4218fec42a42872bfea7ce268423df751aef57dba5ec92eb80a5e72a66462f5161df26ca7d58193db8f0c79406b98d572968cacf15ee8052b6fbc3d4 SHA512 a1f9f14e6804a1b74f278e1e72659e1e32c8e60c31c42db186d1e51f9979c16697b1714b7ed6e6fb7a591d68e0408cf3071d4dd29b9a938071c42d7f32dfa09e
diff --git a/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
new file mode 100644
index 000000000000..01b11ec9adb6
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.9.0.ebuild
@@ -0,0 +1,26 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="
+	https://github.com/avian2/jsonmerge/
+	https://pypi.org/project/jsonmerge/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 73138cf08b9d..d22345ab018c 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,9 +1,12 @@
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed819c0fd832a7e4d5104020250f207bb87186a95815e2357379b2dc3bc87ae2f37387c7c423bdf41122ec330712ad53f SHA512 551d3ec3fb2bb14ccecee8056d78511e9b739af8b00f41d60be9a840b661725ff2eb4b22d72d8a9ccafa22e61c99db8dff216d7fb8ce537446a95056abea4d93
 AUX matplotlib-3.6.0-test.patch 10781 BLAKE2B 797fe4c86d94ecbfa5b7699c63f68e663ab842cb0a5bdedb059103bd62bc91e73bf135d3fca49ba93bf246e0fc68012b8ee85a20c83582823cf210d238ec8d0c SHA512 195fdf5f6af23ba5eb72fbd65ded1066c7e400af73e5c64fe989a231c6a3a32f0eb8a2196b48a7ba39079e3815d4a6c346dcc41175b80a673c7beefaa85bbb53
+AUX matplotlib-3.6.2-test.patch 8245 BLAKE2B 12fbf6e5f68521e2dd91b577ec44da288ca84453a751687cbf3bba416ae0a0ba3a92a4577636f1b1455f6c1c9dd5064eea19ef18194005bf8ef758c4d48bd8f2 SHA512 eb21cd4e81a0a560a766fa6b47754011f388f0f5a677815326f49fcd9c22ef117aac1cb23445e3cd2c70aa52b00a4f298dff85d01692cfb4020bc38c37cee9d7
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.5.3.tar.gz 35236343 BLAKE2B 0d3f4e15295afe2c737e441325206e77c520a514bc87ab1eebef624f89896a2cf609e8d57b8fa8ef28ecf8c836e20cb296adaa95f81dbfcf3f2a45631e3dd02c SHA512 f431d3046e9c5fbe5d44a16a762e9a178ba34380974964660eaf3681671178866a63b3bad9aad8d3ad423926f7db2965d514e9b1489e3a824a4532a01f0e0670
 DIST matplotlib-3.6.1.tar.gz 35826557 BLAKE2B b30710436a773298dcdf233e592656d9815f55f0daab0cc28811b9adbfd3b2ede08f4c13e0dfa43c5fb283bc1ba96ea793084f3d65ba13b9697d14ffa406a273 SHA512 40b148fe4574eea88e7e74c2844a4811c71651602bd7e0a863482571bfa216c01d4f5fcd36add14af82c5cacdb6ae9d441ed251ee5239d06bcc8d40c9ee8841b
+DIST matplotlib-3.6.2.tar.gz 35843927 BLAKE2B 22b933b2ca2bfb156ee1592f522da6e7566f279fd6c7ef2d2f5aeb8697fc04085b57ba6bb5f7948572b3e671687b74d6ba9f7def2728b6224fbc98b121281a3c SHA512 51b84a4328a85f674cb44728955fca8bb5b8b702c788158b8bcfc13a44206a5a658ac12ed8f9a5f6ec53ef543395fab4f3871f91013ba1432f3e2b848c36976f
 EBUILD matplotlib-3.5.3.ebuild 7442 BLAKE2B d836df9fd184d6f55100527f9ff037e8707e2dd23c76b69beeafcff68c78d1bbbfc3de803b1a7ccdb6e4231d56fd97366495f162f2f9d1142979febf282f4eb3 SHA512 524ced6de727064ed0d2171dc410af864621842d189436941d90761abd3e7318d1704c7f8801ced1049235ab61c0548107805d3d6342f0dd3d085fe4fe657ced
 EBUILD matplotlib-3.6.1.ebuild 7340 BLAKE2B f4bb2e08203ab5bd159198e64292e508af8f135ff9ab58572e0fb86505a5edc66a021e545e4921f01db143cf0d8bd572a1ce1dcd4fbb0648262b3d6ca0ad400f SHA512 709b38bd54a6287cdc5b4ae6b96920dc02ffa6054c7ed9b2666b0b61e88f558af23cb2b43934777f8504a4aa4bb83753ee965b65428af0eda2bba89d12fbd360
+EBUILD matplotlib-3.6.2.ebuild 7403 BLAKE2B 97073b4784acd4f6bfbf29a47c0f7de20d15c668fde6681edb73b89d82894599fbc20bc9506ef706047908486f39b2f08ad747ae3f0d7762772740aaff496f74 SHA512 3608ece62aef3123add20c8f54722a5206800d94fda304c577abab656cff544d6406dd80cf22cde14aa4033ce94f049f9c2739e8baef867f0cedb17484247257
 MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch b/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch
new file mode 100644
index 000000000000..b90b3d029ed2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.6.2-test.patch
@@ -0,0 +1,171 @@
+From 889e0a965c40207340e458f72279aa996a21f96e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 3 Nov 2022 05:19:14 +0100
+Subject: [PATCH] Fix tests
+
+---
+ lib/matplotlib/tests/test_arrow_patches.py | 6 +++---
+ lib/matplotlib/tests/test_axes.py          | 6 +++---
+ lib/matplotlib/tests/test_backend_pgf.py   | 2 +-
+ lib/matplotlib/tests/test_colorbar.py      | 2 +-
+ lib/matplotlib/tests/test_contour.py       | 2 +-
+ lib/matplotlib/tests/test_figure.py        | 2 +-
+ lib/matplotlib/tests/test_image.py         | 2 +-
+ lib/matplotlib/tests/test_legend.py        | 6 +++---
+ lib/matplotlib/tests/test_lines.py         | 3 ++-
+ lib/matplotlib/tests/test_units.py         | 4 ++--
+ lib/matplotlib/tests/test_usetex.py        | 3 ++-
+ lib/mpl_toolkits/tests/test_axes_grid1.py  | 2 +-
+ 12 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
+index 8d573b4adb..dfc42efcb9 100644
+--- a/lib/matplotlib/tests/test_arrow_patches.py
++++ b/lib/matplotlib/tests/test_arrow_patches.py
+@@ -69,3 +69,3 @@ def __prepare_fancyarrow_dpi_cor_test():
+ @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=100))
+@@ -84,3 +84,3 @@ def test_fancyarrow_dpi_cor_100dpi():
+ @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02,
++                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
+                   savefig_kwarg=dict(dpi=200))
+@@ -117,3 +117,3 @@ def test_fancyarrow_dash():
+ @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.005)
++                  tol=0.005)
+ def test_arrow_styles():
+diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
+index 8d6466c749..15ec51e95c 100644
+--- a/lib/matplotlib/tests/test_axes.py
++++ b/lib/matplotlib/tests/test_axes.py
+@@ -1033,3 +1033,3 @@ def test_imshow():
+ 
+-@image_comparison(['imshow_clip'], style='mpl20')
++@image_comparison(['imshow_clip'], style='mpl20', tol=1.24)
+ def test_imshow_clip():
+@@ -2342,3 +2342,3 @@ def test_contour_hatching():
+ 
+-@image_comparison(['contour_colorbar'], style='mpl20')
++@image_comparison(['contour_colorbar'], style='mpl20', tol=0.015)
+ def test_contour_colorbar():
+@@ -4625,3 +4625,3 @@ def test_vertex_markers():
+ @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
+ def test_eb_line_zorder():
+diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
+index 482bc073a7..faa8cfa5ce 100644
+--- a/lib/matplotlib/tests/test_backend_pgf.py
++++ b/lib/matplotlib/tests/test_backend_pgf.py
+@@ -81,3 +81,3 @@ def create_figure():
+ @pytest.mark.backend('pgf')
+-@image_comparison(['pgf_xelatex.pdf'], style='default')
++@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
+ def test_xelatex():
+diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
+index 4336b761f6..421d4455a7 100644
+--- a/lib/matplotlib/tests/test_colorbar.py
++++ b/lib/matplotlib/tests/test_colorbar.py
+@@ -235,3 +235,3 @@ def test_colorbar_single_ax_panchor_east(constrained):
+ 
+-@image_comparison(['contour_colorbar.png'], remove_text=True)
++@image_comparison(['contour_colorbar.png'], remove_text=True, tol=0.01)
+ def test_contour_colorbar():
+diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
+index 8bf77f0d54..aa9e9cbb7c 100644
+--- a/lib/matplotlib/tests/test_contour.py
++++ b/lib/matplotlib/tests/test_contour.py
+@@ -321,3 +321,3 @@ def test_contourf_log_extension():
+ @image_comparison(['contour_addlines.png'],
+-                  remove_text=True, style='mpl20', tol=0.03)
++                  remove_text=True, style='mpl20', tol=0.2)
+ # tolerance is because image changed minutely when tick finding on
+diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
+index cc5a3b9ae2..3426d180b4 100644
+--- a/lib/matplotlib/tests/test_figure.py
++++ b/lib/matplotlib/tests/test_figure.py
+@@ -28,3 +28,3 @@ import matplotlib.dates as mdates
+ @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_align_labels():
+diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
+index 46dbe4cfe8..cb171e83f8 100644
+--- a/lib/matplotlib/tests/test_image.py
++++ b/lib/matplotlib/tests/test_image.py
+@@ -1325,3 +1325,3 @@ def test_nonuniform_and_pcolor():
+ @image_comparison(["rgba_antialias.png"], style="mpl20",
+-                  remove_text=True)
++                  remove_text=True, tol=0.005)
+ def test_rgba_antialias():
+diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
+index 16847e0be6..80159952c1 100644
+--- a/lib/matplotlib/tests/test_legend.py
++++ b/lib/matplotlib/tests/test_legend.py
+@@ -120,3 +120,3 @@ def test_multiple_keys():
+ @image_comparison(['rgba_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rgba():
+@@ -129,3 +129,3 @@ def test_alpha_rgba():
+ @image_comparison(['rcparam_alpha.png'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_alpha_rcparam():
+@@ -155,3 +155,3 @@ def test_fancy():
+ @image_comparison(['framealpha'], remove_text=True,
+-                  tol=0 if platform.machine() == 'x86_64' else 0.02)
++                  tol=0.02)
+ def test_framealpha():
+diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
+index e7002df8a5..e83a90ccb1 100644
+--- a/lib/matplotlib/tests/test_lines.py
++++ b/lib/matplotlib/tests/test_lines.py
+@@ -167,3 +167,4 @@ def test_set_drawstyle():
+ 
+-@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20')
++@image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20',
++                  tol=0.62)
+ def test_set_line_coll_dash_image():
+diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
+index d3b8c5a716..56a1d0a0a4 100644
+--- a/lib/matplotlib/tests/test_units.py
++++ b/lib/matplotlib/tests/test_units.py
+@@ -81,3 +81,3 @@ def quantity_converter():
+ @image_comparison(['plot_pint.png'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
+ def test_numpy_facade(quantity_converter):
+@@ -108,3 +108,3 @@ def test_numpy_facade(quantity_converter):
+ @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_plot_masked_units():
+diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
+index 0f01ebaffb..5e44dc8d22 100644
+--- a/lib/matplotlib/tests/test_usetex.py
++++ b/lib/matplotlib/tests/test_usetex.py
+@@ -16,2 +16,3 @@ pytestmark = needs_usetex
+ 
++@pytest.mark.skip(reason="TODO: broken")
+ @image_comparison(
+@@ -66,3 +67,3 @@ def test_mathdefault():
+ 
+-@image_comparison(['eqnarray.png'])
++@image_comparison(['eqnarray.png'], tol=23)
+ def test_multiline_eqnarray():
+diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
+index 374b8c721f..77b1d5f4a1 100644
+--- a/lib/mpl_toolkits/tests/test_axes_grid1.py
++++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
+@@ -337,3 +337,3 @@ def test_zooming_with_inverted_axes():
+ @image_comparison(['anchored_direction_arrows.png'],
+-                  tol=0 if platform.machine() == 'x86_64' else 0.01)
++                  tol=0.02)
+ def test_anchored_direction_arrows():
+-- 
+2.38.1
+
diff --git a/dev-python/matplotlib/matplotlib-3.6.2.ebuild b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
new file mode 100644
index 000000000000..d2ab7240ae53
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.6.2.ebuild
@@ -0,0 +1,280 @@
+# 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_{8..11} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
+	virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+	https://matplotlib.org/
+	https://github.com/matplotlib/matplotlib/
+	https://pypi.org/project/matplotlib/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/contourpy-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,webp,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		$(python_gen_cond_dep '
+			dev-python/wxpython:*[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools_scm-7[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.6.2-test.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+	sed -i -e '/setuptools_scm/s:,<7::' setup.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+
+	unset DISPLAY # bug #278524
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = True
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	mkdir build || die
+	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by -Wdefault
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+		tests/test_testing.py::test_warn_to_fail
+		# TODO?
+		tests/test_backend_qt.py::test_fig_sigint_override
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/matplotlib/matplotlib/issues/23384
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtagg', 'QT_API': 'PyQt5'}]"
+		"tests/test_backends_interactive.py::test_figure_leak_20490[time_mem1-{'MPLBACKEND': 'qtcairo', 'QT_API': 'PyQt5'}]"
+	)
+
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	# speed tests up
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest --pyargs matplotlib -m "not network" \
+		-p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/notebook_shim/Manifest b/dev-python/notebook_shim/Manifest
index abec81a65d18..ffc3fa9a7477 100644
--- a/dev-python/notebook_shim/Manifest
+++ b/dev-python/notebook_shim/Manifest
@@ -1,5 +1,7 @@
 DIST notebook_shim-0.1.0.tar.gz 12275 BLAKE2B 47e975cd91b9ee1e6436db099b13ff664b25c96f3fd7fa39b54d5daad5154976bdf877607156688d118c6bfc458f941151fc9763c596458432e70e17de77eb59 SHA512 7814b5bb4d4c4dd39b1ce3629e77513bdc3069a553208ee5a2bb6432fda5d20dcf48bbf5d8f61b9bc1f2ea666abd8706a8e8ba627b27ff4561eb4982ba04b1dc
 DIST notebook_shim-0.2.0.tar.gz 12063 BLAKE2B 78c8bdc54cbfe93b5ad0801eef59b4e5b27b243c3f04619bd625960b99a98e02961eff59d1b085dd4fba0930ad10664568b53dd013df7d37922ccf2b0ea9b2c2 SHA512 78ae082fbd04e611af3bac75600cba7cc98f40019d9ed49981dacb5106687310b04f67810e4a35b96800d94b04b7ddca1fcd115a380f4c39847c6b4178bd9500
+DIST notebook_shim-0.2.2.tar.gz 12947 BLAKE2B 5a04944be3f8de7bd7b1c10f59d73869b7aed670c3afebf79e7780d5992f9af2929529498604c1a5c0d164467681ffa0e8924e1c9a7945e52ae353bdb710c7bc SHA512 42cf9153495e4ab8230ef560d36381a5aa1d9bbd583ed140e04e9850f4a82bab06ecf36e45b88595e8686d8122c9a52eee8133a7f1b622d75d326ebf36519d30
 EBUILD notebook_shim-0.1.0.ebuild 963 BLAKE2B 0350f66265a980d4f30efb50fd832ca498497f40bef9ff0e95df9b9cd4f5e11597facbe18461fc01c334b847e2f5f9dd319e8ebf42f256883acbb6d2de13a750 SHA512 51c4c1d523c396425ef105b820c4992d8327797d17ede1f7bfb06c9a8f760f1284bdfa1f16388855d4d58dc19aede7785dbe52727d43ddb5902f4c05a4b9c466
 EBUILD notebook_shim-0.2.0.ebuild 970 BLAKE2B 3adc0f53c8a5b6d8a21628ac634c3deb9ae5209f37abb8dabec509dc240566be7417bd89f5c04fb811fa0d6e96d4511c4518364bc1174709ffb5a0914c8649a0 SHA512 94f980543278074e1be4a7ae5c8f4531e0f6318812a67f500fa3534c02c6a6bafe8428c4095348c35c02e464aa31ad5ec53a295540a79d376d26286dd19e0b86
+EBUILD notebook_shim-0.2.2.ebuild 790 BLAKE2B d372728063f7bc0e095d66522cf71a3310defdc343769a015a0595a56f930ed09394ca7f4384dcf38d9d8584ea3b7e9138821dd3d2fb2027d7a367b444deab1d SHA512 c7b59ed8e2571a4bc77c5597c09632579c401742fbb19e2467d189fc31d5da8d2ea86115f653351630ed766ec2ee1224eb0f79c29cdede38fc6c62e9ca694bac
 MISC metadata.xml 535 BLAKE2B 074e2bbcdd15078aaba2c65641a16ca7ce27e0c412d48f2a48a4cd80459a948abc478baa28b3e7417dde2bf13717040dc083711b114d61dfd2a7f7aaac1295ca SHA512 9ff7408848878f74eb9f10ec5aded639a749635851385b6679a72112c253a7427f65ac3e3c41f21f9e8551a439a7c00c4e28a5d70b3529ab9e687a5d0e7abeb9
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2.ebuild
new file mode 100644
index 000000000000..17126685a250
--- /dev/null
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1
+
+DESCRIPTION="A shim layer for notebook traits and config"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/notebook_shim/
+	https://pypi.org/project/notebook-shim/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 45321252f07b..b8884354b719 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
 DIST pyglet-1.5.26.tar.gz 6534434 BLAKE2B a4366390f4ed92ed9e6c2d362fd8a009adf0e8a21ca00e1b9fead3cba99d192bb007413eca36892433f3bc4e2bf3258c550b2827262fc70e87b20566d46acb15 SHA512 819b2bbf71c9c632c1cefbb31e2a7186905c1475a1e978cd75dd6c019e5a53e6af79bceb57c68b61a3bb5692e04091c89c67b9168bb76ee19009c1ab719b8530
 DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c5de2dadede706df7abac9eb6fb1729ea030c7053f0149926f3ffdd12985d9abea4afac65de3b6b7541fe871eda369 SHA512 98896dab06873cbf3cdd0d4015cb0b9e062cffb1110908bd422ecdc4f0e16943adc8a4986e7dbfdae4392e82ac115bad6f937896e166989ad2c4d73a0f45c8be
+DIST pyglet-2.0.0.gh.tar.gz 6201132 BLAKE2B e72436804688e9022f0efc7da7fac5eb31ed2d35632612149b52431167db98f1d2e8bc3824ef6bd69851a8bf609d5098ea5f5c77aa7bcf5a527457c62ed47586 SHA512 2dde724f0b5f284d0094109a7077464ac4ec76ea905c91ddc096032ac849ee9720ee36926e9f11969169906c7e45580789001dfc657edc2e737ad116c48c588a
 EBUILD pyglet-1.5.26.ebuild 1574 BLAKE2B a701c65476ff75e74611efe43d8401929e10ab4d73aee621664ed0c1772cc153d02799578a08f9f07fab8fde8033abca3b367ad705f71956c7242f9eb441e8ad SHA512 9c6cfd4b55ffb1f876dfa3b268f27a812b263ca92a428aec34885a9288c1aaee9a8cab15c073536da01fb54fa8db8710469c6bddbe543c4e54376b930055a610
 EBUILD pyglet-1.5.27.ebuild 1637 BLAKE2B 6efd733bc087223404b4a775e04983a90dff33106d385253ad79ac1fd7dd496ee79942ab342ee2c539b79ad24b693a5f4f6bc0b3f867397e6c40856b2f4e777e SHA512 1bfbd09e7997e7961db7105e06225b2978ce57595d7cd35c05b5d31be78eda72a56a8fb05657efc0b0e3686e194ce49fe58e9cb2b5d505166289ec0baca58f03
+EBUILD pyglet-2.0.0.ebuild 1853 BLAKE2B c9c149fac929b6f5fbd429e2fdc9a7b6bdea0ec6fe27f236743a68306a6ec9bc5d302771c72ce57d9c841487a8b548db2abd33109b46ac6c8e2a53ff6483e33f SHA512 4de24b2a762f846fa201fcd57c41f2a82c1e740da096b2b93fb58b169d23f5f6e482a63663cbffce62c96d54f65d091851ac232efae1f359fa4f395da3b664af
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-2.0.0.ebuild b/dev-python/pyglet/pyglet-2.0.0.ebuild
new file mode 100644
index 000000000000..04ea35c2986c
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.0.0.ebuild
@@ -0,0 +1,81 @@
+# 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_{8..11} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to load
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+	if [[ ${EPYTHON} == python3.11 ]]; then
+		EPYTEST_DESELECT+=(
+			# broken test
+			# https://github.com/pyglet/pyglet/issues/606
+			tests/unit/test_events.py::test_push_handlers_instance
+		)
+	fi
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index d8e92547db00..79863cc37a22 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,7 @@
 DIST pyrsistent-0.18.1.tar.gz 100522 BLAKE2B 75632d254993666076a68d81b8b5a7aced8601146fed5cd63f1d56c5e0578650a197aca7630855de32a8447eab972203aa7d83009398f96e6f374c0a4b2cc1ba SHA512 353ad6e9165e1afdde37730a9289cf8dde28491abb688d702a8c8f5279e24f5ce387a5d00ac4a077322299f9c1a535781bcacdcd1cb914ddb317b3ca9641778b
 DIST pyrsistent-0.19.1.tar.gz 102135 BLAKE2B 02756ae7c6172b2ee383508f896ae01ee4abc71b68b6b7135d08422959ef4a821f8e7464547d8a65802d0cac5663ff98d6102870f86fcb37d86d2ea7fa7e871f SHA512 d7bf09298f2713b3e741a02f34efeb0d083f5ff85d7c19e3c7a13e5051d3e0e120f2831190595a764722fe733ba8e105f820c833b5c59638e92eb4c14604e788
+DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 EBUILD pyrsistent-0.18.1-r1.ebuild 653 BLAKE2B a0e141f6e4cc27b30ffa4d7fc77d91b2a62c0b21ed6d098b6aafb9243bda9ad0bfea46b3ad866dc4b369baad8d09552b7f2578b56bf4b4214de6eec4477f5da0 SHA512 38a60e54664c6865abcec9f02931cc92b4ed4427fcd6c278faa9b9d6acf39674a4487ba636e0587927ca39a353297bb86a686a1763183c941eb049411862c551
 EBUILD pyrsistent-0.19.1.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
+EBUILD pyrsistent-0.19.2.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
new file mode 100644
index 000000000000..7a4e9ef1fc6d
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
@@ -0,0 +1,28 @@
+# 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_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="
+	https://github.com/tobgu/pyrsistent/
+	https://pypi.org/project/pyrsistent/
+"
+SRC_URI="mirror://pypi/${P: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 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 54e31b88077f..a682eacbf1b5 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-2.3.3.gh.tar.gz 91175 BLAKE2B 351852cd0eae2186f799ac329d2840ca1d427876b987a5eb0a5965020b1be38f1bf82ddd771648aa7d8e6027a1c1b1f3596fbe792fbf8e4b868bba8cbd6190db SHA512 764b935d3dffa531afc092e40aecc3d456261704703744e692a54ddf4ae22b80729912845dcc5c1b5546156efbacdc50aba84c19f9a8aa03435166cd4a4621e6
+DIST spyder-kernels-2.4.0.gh.tar.gz 92247 BLAKE2B 7dd5a5c6f43de36f23ebac2707e9dc06ced20bb965325b0a31657d03b49cdd993aafe6f1d52d7108dbd2aa8fddf3ae7a6e2da4c2b75eabf05f8302b2119cd3cd SHA512 6744cd05f4cbe452b0b8fa4f416055b8a69f75e49a10b9de3f2781b11f63c84ed7a6686e1a00bbc2020ba015a0cb7f350a6e85665270629a0e714ffe80bcb08d
 EBUILD spyder-kernels-2.3.3.ebuild 2347 BLAKE2B b77555bb0aed56fa85c7982e606173247b7873dc7acf5526b1c0db343500dc77e6f8f86be5fdbefcd60216d8d9e95ff67db10ddd7edc82ef8e234eb962968239 SHA512 af1bd8ff9097ef7b4af2c521bfd49429145d89b3c9e42e675b9969281280605bf494eccdf23594464c5ff774d713767acc9250725b63031d173bdfcdb52a82ed
+EBUILD spyder-kernels-2.4.0.ebuild 2386 BLAKE2B 0822d4783480108dc7820aa7524dea89c095b5c10a4073814a3353136a539d824e40a56dd5e574d25d72a1d853339ae5f6e1ff67c655f6ff084e1f5d27435b6d SHA512 b9377235ff606f2f737f3b04cea3348ee07bda70d3669ddf7e23215c7a5befb9c07a7e99ed54467ef54e97afd023942fd2195ae1b84c33ea6e061f443cf84e46
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild
new file mode 100644
index 000000000000..2fd1e3b3012b
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.4.0.ebuild
@@ -0,0 +1,75 @@
+# 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_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/
+"
+SRC_URI="
+	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.16.1[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# we no longer package distributed
+	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+	# RuntimeError: There is no current event loop in thread 'MainThread'.
+	# https://bugs.gentoo.org/834893
+	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
+	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
+	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
+	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
+	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
+)
+
+python_prepare_all() {
+	# No additional test failures with ipython-8: 843251
+	sed -i -e "/ipython/s:,<8::" setup.py || die
+
+	distutils-r1_python_prepare_all
+}