gentoo auto-resync : 29:08:2022 - 22:47:16

30 files changed, 447 insertions, 236 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 63046a87e983..7bab3d479176 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 03fde870bd06..8af72bf862d0 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -2,8 +2,10 @@ DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907
 DIST astroid-2.12.2.gh.tar.gz 430857 BLAKE2B 8b34366368718cd4329298bdff3b761cab59b6bf8b856660912ef44bf1766136573145630b5193481454a4bf897ae950c5b6f7bb3611d3d343dc4f3adb2e5906 SHA512 3ba484bbd98b196b4241fb8bb9405b48a1e6aafaf318a67fc9264c8c1679f9d6b6788b8139077b60c751b0a26732b905196b3bb48671da2aa15e1c323bf396d6
 DIST astroid-2.12.3.gh.tar.gz 432731 BLAKE2B 276537b9a97bfbba2177538c6546a8e55fd1a144dde2fc2104460b0867d5439433e10be58bdac4f7da17a22e61c9484045ee979b8de11dcb485b9979a50f1e30 SHA512 5927c54d2ae000a96615a7b81f83b39bd8ce4b15e6652b494d18cf085ed455fb9e59b9c0c35ba8de7e2ea12c036e06ceb741dacdf882158cfd7e9ed3750dad88
 DIST astroid-2.12.4.gh.tar.gz 432812 BLAKE2B 1efd0af2b8695411aba0c1db21c464c742058c662d14b2a338c577f41f13c582f24dd5445ee2e2aa51f63096ce086d601750b2894280fb9f054f734165755dff SHA512 55a585dad9fcd319845fc2b16536867a5c0552b7f3a87b5ac40cc069a43a25a1de2862ec6cd2b6cd8e9dbd78efd508995152012399722056949ce460c23f57a0
+DIST astroid-2.12.5.gh.tar.gz 433354 BLAKE2B dfe643ebe77200664bd630c1c5795809c8bca5ff0ad01d9361b6df302c33ab42529f33148649fada34ed6dc768c63f49c2eb2abc771ff0e13404146bee5e0fa6 SHA512 4bae868e21ef4751fd195b2990ffb3c9781e51654e9f327ee5bc220b53d553fb13744a2d683e30f1cb929ce1ec4cfd31382a4a42e867dd7a75a118202ccf377b
 EBUILD astroid-2.11.6.ebuild 1786 BLAKE2B 56b20263f11843ff7b511229e3cf7af3cf61b0ae95ae0a12409fe6895b7f232bb85ba9286940b80291c4264223b9bbbcd406ffd2f7f88a029205fe195dedf50f SHA512 90e3ede82dfd55199b56671640c30adb0252df7deb49257a730a7ca13b8186425dde611b1b2539a8c5bee076bcf9dc0b96bb160276036033277022b2d516d28f
 EBUILD astroid-2.12.2.ebuild 1808 BLAKE2B 40ae0cdd718a0e862da50b8ff0d01081ea02b75c2725cd1cb5b18aac82c0472d9357ed135e1b5d3c3ae7a2311ad51a22edcd5d0510e3ea8a6b97da1c15e6104d SHA512 92747d9cc013de6177180c065cb1f5e92d206245d544d4f630e44592ae000cea1b15d887ea0ec02b1b6c0567b9c43a938fc91fdf14c82417c90b7f41536c2b29
 EBUILD astroid-2.12.3.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 EBUILD astroid-2.12.4.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
+EBUILD astroid-2.12.5.ebuild 1816 BLAKE2B a01fa3bf6df8cf612e145178e7f6925223f38b51895bb3a5bcfe9032887de8b86fd57cecca439a1b2ae86a8bdcb542bb9932b6045979425bc39a1aea69797eb1 SHA512 6ab8b78285f781ced5cb70973f6a11d80db11acbe25f37941ca58014cf6d27f593d7fdb1a7a1497417af8c0fdf0b6c79e970e834e0be5f5c4eaaae2994d4ec43
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.12.5.ebuild b/dev-python/astroid/astroid-2.12.5.ebuild
new file mode 100644
index 000000000000..de2148b20e43
--- /dev/null
+++ b/dev-python/astroid/astroid-2.12.5.ebuild
@@ -0,0 +1,59 @@
+# 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="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in pyproject.toml
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_brain.py::SixBrainTest::test_from_imports
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index d0b1c11b31fd..010fc9f06a8d 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,3 +1,5 @@
 DIST colorlog-6.6.0.tar.gz 30712 BLAKE2B 21c297d08a53bb67184bdd40f9bfae859f0bfd8ae63a27df570b316f85aa4904b8323c78a9706abbceb36ae1b76aae66150f86e8e25612caa5fe0dd4df5f25d8 SHA512 8c8bdfcfe537dc34c145fbfb9ebd0399184e3a8ab0e4bccc2e61d52a323c1372c60757cac2b023c9d39eb3c9fcf191b50c8cd4d089941aa484b30170a3cd1389
+DIST colorlog-6.7.0.tar.gz 29920 BLAKE2B b4240f3fd17b17ead968293e54d5f4e589515d333a6cdf157a6d913c7457deff67d320ee87270ce05b853616134901c8ac47c4a542ef74158e1174d92de00b3c SHA512 19b3c04beb8ac26d3db69f78bc1e7db40288c95ba7edc7c1d2495d592262dea9a1bf91e42dce0e575341eb2a572f0050866970f23d3be8c5adae518c4115787d
 EBUILD colorlog-6.6.0-r1.ebuild 482 BLAKE2B 7f5e0e2d44f775cb270bcf893664b99f40df6ea9dfb95071106beb8a8d9a0386fbeb331021e3f30e3756d5321ebd81b33b727197612069220598d7dfe23f9443 SHA512 9eedf142cda76101f638dd96d8ea9c729e83669c8de4f12e95f21acf32bd43e4d0d2b4821768a24a8a0800a959c8c74fb580037d2114a17c7cc5bee310ed8c51
+EBUILD colorlog-6.7.0.ebuild 485 BLAKE2B ba32a7b12b2899b34acf4f64db001ceda2605e47953dff45f9ecbe83d9392e4874d8bbcee90fe99f768163f6298859ba6a1de16dcd506ff4e388060d1cf3999f SHA512 96f2064330d5a3863d03bfe63d0a1e43dead25c09988a29a5ab3d41d0f845054744e5ff9bea92736d5ec29930dd278ff9892cf7b24c4d53d9f140a125060d4ab
 MISC metadata.xml 415 BLAKE2B 4b7aecb1bfde4142a6d3f090e5aa93245e98a5ad63238e141666d1b4ea621a8cde4a9b642b44ff8792fa3bea6d50107b084bf07f9eeb41074f34746be934c0f0 SHA512 66bb051d87b620dc5f04dfacb5abc9a67b87bc28f9cb60f99ace58731c8e23576d061bc16a84942d4c69eb04563a3effa7a21f10392e58256bc73e3414ae798d
diff --git a/dev-python/colorlog/colorlog-6.7.0.ebuild b/dev-python/colorlog/colorlog-6.7.0.ebuild
new file mode 100644
index 000000000000..0420c8bb387c
--- /dev/null
+++ b/dev-python/colorlog/colorlog-6.7.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/
+	https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/curtsies/Manifest b/dev-python/curtsies/Manifest
index ba4b79840102..b5b858dbddef 100644
--- a/dev-python/curtsies/Manifest
+++ b/dev-python/curtsies/Manifest
@@ -1,3 +1,5 @@
 DIST curtsies-0.3.10.tar.gz 53340 BLAKE2B 376258a71c1e89b241c2fb9439b7f094b72cdc19f50c075debfba019effed5b3b5286603b44f11e37420d4e0be0dce0cb69fc6e11dab332c6f1c109c1b7a098a SHA512 59dfae36a43f7cdb272f94900da81bc7a1033a6482df5ac5babb329659e16d740f98b9538146f2fe7c79aa2723ec3db10c8ec658539db7d462b02953a33cb4ca
+DIST curtsies-0.4.0.tar.gz 53652 BLAKE2B da6b982b8c4bf5430fc31ca2b6eab996a4660403538e73eba253b1e4476f8f4355a0acb9b4ad89c0c3ef3d379b89f1532d8946cc2c716ff5a2f7a4d4ce60a6af SHA512 fea577e356ddee7f2f3c55e405405af835b84a5f00d998a702396f8f40827b18ee88a46cd98607a1c8e33068f040a092c8d9f17463366fb88fcb3cb8cd6f2158
 EBUILD curtsies-0.3.10.ebuild 598 BLAKE2B 08f3997fcc0a3aead9b71c8372e19ffe6958821786b0217769bb102b198b28d410fdcbf3159ca05569b2554e0ff103f787da0eaa3ac20b1541de855e119b4c17 SHA512 fd713af1e015ae4fcf879a859a558de7f9b3ee8930653736ab77519d0dd22ac7f12c50c38f907009b528ce8ec2e1e3854bde32e4f924a494cb27b37aff6610d3
+EBUILD curtsies-0.4.0.ebuild 591 BLAKE2B 188f28cba034ad9812250d588b3f3285f5e0a9672d31776ad649a229fd7fe9fd49f0ee689ede00bf3d3f26752cbe6d1e370300ed8a282fef2054b66a47608b61 SHA512 4d2d6775c6bc83b833dae957f34576f1c62494d5a9dba8d1049f229ba2fff62592769a475e68c2313201530f0b4a2ff49a1f45fdc4f9d0ce3cdc6bf275863167
 MISC metadata.xml 405 BLAKE2B 7c57f4c632fddcb41ee10c615862a68010cc66fce074a430f5cf2e0aa82e008d47b10da7fe6c30f39b86bae57019f2db6f7a65c3c1731643b465aad17047073e SHA512 32a4bcd62ffc656cacd01c3f86a06206f643a23e1d44bb760b1ac0b36e01363a491722084f1f7836f218b0637087d7067f33c86dd4cd636c8b258cb0e1731c38
diff --git a/dev-python/curtsies/curtsies-0.4.0.ebuild b/dev-python/curtsies/curtsies-0.4.0.ebuild
new file mode 100644
index 000000000000..0a15e0dba3ac
--- /dev/null
+++ b/dev-python/curtsies/curtsies-0.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Curses-like terminal wrapper, with colored strings"
+HOMEPAGE="https://github.com/bpython/curtsies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/blessed-1.5[${PYTHON_USEDEP}]
+	dev-python/cwcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyte[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 4500bf525918..51766e68d0d1 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,11 +1,7 @@
-DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
-DIST imageio-2.19.5.gh.tar.gz 389832 BLAKE2B a4455f97d2607d215ba4797e076487f4648ae6b21bf7b5207df8f337b52319ba4dd415d6e351289b588a049c800e8c541fcdaefe064cb4c83de12e63c492cf83 SHA512 481f14116961927946a71a7448ecf38f9781172969ab4e35c05360d758f7273be22262d4cd774a76b2089be3b7f0af6cf0a67d40814504e7a65db7075428966c
-DIST imageio-2.20.0.gh.tar.gz 390281 BLAKE2B 745364f98e3835c428e89abbfbeeb657d10cd730cd61283e5859b10a6e48b63a5b9771860fce75aa8dd770ab77671979847b34bbffe17d215fac5ceb8eb2c7d1 SHA512 fc1c41559cc15b76bfacbf4866717c200889661787de4baa49d69fab189ff7d00e376afdeeaaf74b5581e1ffc96da2f02566dfa9c0953518b98a4c4b695ddf02
 DIST imageio-2.21.0.gh.tar.gz 391056 BLAKE2B 90fbacf7b396ab2b422d8694274ddc3642c92cfd325bce2861100f5bd28d82120cef6819b53b8ed82ba474d5e287765b63da9a7edfbfab5a026790a39d4edc1e SHA512 5bb070da560ba3a2e10bdb288ad539274ee14f8cf0543847859f0bae052b3d1782777d823435b74120bcfdff0b6cb15a6c80b2a9bf729439bbb3802f15cf5684
 DIST imageio-2.21.1.gh.tar.gz 391159 BLAKE2B 4c569ec81255d1f5985d2d30f303a978f9cb22e0d7368845648ddab9e5734adba52173d42ad73c94c424ce1a5806c3a10ae31381b04949f7f8c30fd327b585b4 SHA512 61fd4a1a64fb152fa5c419cac9a69ea979ac762fbaed81076ddd13602db98f71f31825615111958f21b021213d55be060197417159022bba84d631618f5bb286
-EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.19.5.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.20.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+DIST imageio-2.21.2.gh.tar.gz 392425 BLAKE2B 959c89627188aca0072f519f0f9c3a9fcf2da96883f95760375bea503efd96ff6a198ad7e8bc12dfffe6aecf42f4b07176c8d273c6d349b5e2581053ddefecb6 SHA512 69922f05457f050083e92dbce34992911d5fb04f283d6784a8e1fd7f10e7887ffeef343d8f4162efaa55690f363ed6ceb5d2cdc5ee712ae9b276f072fdc45d37
 EBUILD imageio-2.21.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 EBUILD imageio-2.21.1.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+EBUILD imageio-2.21.2.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.19.5.ebuild b/dev-python/imageio/imageio-2.19.5.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.19.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.20.0.ebuild b/dev-python/imageio/imageio-2.20.0.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.20.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.19.3.ebuild b/dev-python/imageio/imageio-2.21.2.ebuild
index 6770d9759db9..6770d9759db9 100644
--- a/dev-python/imageio/imageio-2.19.3.ebuild
+++ b/dev-python/imageio/imageio-2.21.2.ebuild
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 6dfc724cda01..5cf111c70c75 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,5 @@
 DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
+DIST ipykernel-6.15.2.tar.gz 133297 BLAKE2B 05b92074dba2324a2bbbe58fb459f455e47236fcbed711b63c3bfd83978b1e80a7fe079c08fbfb031d9f182d2b24a265705f6540b6c87ee933b641beaee53f9d SHA512 14f1f819d67f16e9c5ea5705ce9c1827bd1ae44f742ca809c4402ef64b229e902f9a724c0609cbf225da595f4ed48cd14348f3c887d70bc18c4b017ec01de720
 EBUILD ipykernel-6.15.1.ebuild 2059 BLAKE2B 7f50716baf152faeda1bf42ac76e3078ccee939c10632e4b7b55193c745e209a79fca5babc4c680806a533f2380679afc8c4de5671c1b3ad317f1ce59b9c13e2 SHA512 e6c775f4b47cc3802a43ab8b35c08ca7b4c8f76dc84a4797d5d77ad6438779f10020987bc447eb40e8fd9aeec448c7a6b2e33a120aab5e720e93d089bf305ddd
+EBUILD ipykernel-6.15.2.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.15.2.ebuild b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
new file mode 100644
index 000000000000..5526cde6276c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.15.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 12879db9ccc8..ce767a0cde17 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,5 +1,5 @@
-DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
 DIST jaraco.logging-3.1.1.gh.tar.gz 10804 BLAKE2B 32d978ae8e9105986926649dcccd710aea44e2b8ea2f4b41dfdb6cb6512cc8597951909c4e217d608245fb37b29ced544429b4f960d080f5a3436f454d042826 SHA512 80cca221c713b3868ac06332451c2bf31cb3c95e27b82275a8cd70533cd790b4e420a5851c0a5ba067a85aa4efa266e38e2b5792e2a0e97fde158357b16b1794
-EBUILD jaraco-logging-3.1.0-r1.ebuild 880 BLAKE2B fada073312b4879907072a0d50f8a501270b2f74af659a58774035b47df604db81505c479e47077ec96ad2a8333de29aad5f264582437cc1605f83081a821cc7 SHA512 64f87d268fccc8af8568e41c86fdf1e5a6b53915e28fa1da6e47116d158d8f2e30f05ee698482cbc355ca9a45f2136e40211d393f6a621a5ef4814474cc9b7a2
+DIST jaraco.logging-3.1.2.gh.tar.gz 7193 BLAKE2B fab2b65f2cc40d96df1a145bd047aecfca9af8c54c438ec40f965c8698d5db328591c7857390638b6bb48d2faae5cd1ad4541f6eb7c3b85a7ca06d257ad15c98 SHA512 deebf628dd62b6948cdf12931018407de1fb653279e57efce0df1acdf11e4ebab33840ef1e1e452b711ddc70b62fe925ebaf49e065d3450a96f8f6c8bbb0120c
 EBUILD jaraco-logging-3.1.1.ebuild 1023 BLAKE2B 86d5027e571186c345af6339a5b98cc6ecac339b18280c9fd664aaf6221f536d5170586529ff5c9015b4d60c69d34929753d8af64df20afb241e2be0ed1aa4ba SHA512 6dbbf991f0a27d1f847a2d730c51d90f352e9e2746872025193c2b752555bf3de08028e255635877e972c879e1a105148a9749c3a4d95a4854cbe60a0bb6bd42
+EBUILD jaraco-logging-3.1.2.ebuild 1025 BLAKE2B e995dcda723f49556c24be168960ed294278ff17bd2395730d72d0cf50546c1f9c48f52c0f229c4274f75240229fcc6d71bf5027e77a6cc8087071146e6b3445 SHA512 988df2e286a80b79aaf7c2f6c60902f408a46506caf6a58ba070e49667a0ad78b3900bed7ce8b389b747707caa7e6d0c569ea3cd61b70183e1c313461d0e998a
 MISC metadata.xml 578 BLAKE2B 1d5b2ffc158ad19270346831bfad35fb36b8cdbd73d6175b0e007ab4dcc7872f09acca21897f9261669a7bb5633abbb2b19fa4018960bf094018f4e31e20f05e SHA512 387e591d4ea4dbb900d7e06f67a8cbf95d99adaa80da80620751eba04ac28ba8b0c5695ce9f7e246b3ebb03a855cc2ba86c8793acbabacb95403255fb8d03905
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
deleted file mode 100644
index 70cb1e6c3b0e..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)"/jaraco/__init__.py || die
-}
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild
new file mode 100644
index 000000000000..7c8eaa3c8628
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="${P/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.logging/
+	https://pypi.org/project/jaraco.logging/
+"
+SRC_URI="
+	https://github.com/jaraco/jaraco.logging/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# create a pkgutil-style __init__.py in order to fix pytest's
+	# determination of package paths
+	cat > jaraco/__init__.py <<-EOF || die
+		__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+	EOF
+	epytest --doctest-modules
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 9d3aaaaccd33..9f510052c6e8 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,9 +1,5 @@
-DIST jc-1.20.1.gh.tar.gz 10342360 BLAKE2B fe7eb94e53a78e6d2c1f13403ac529e4e0c0251a9e5f8270e88a94c7d086b7b1eca5cf8bd51ab6b514923ac2de95b7365b8ee29eeae5a1bb861e911f70be81d8 SHA512 d066b30089fce8bb7aff6db0b278f258a91bbef73bc49abb0b086b1cce5253a0ba07efa9e3680ee6ee333ea4a2b6afcfe4028eee58d0ec16411f7c257a54a9b5
-DIST jc-1.20.2.gh.tar.gz 10468681 BLAKE2B 185937c277989536bfed42ee27717a2dee1c4672565b7c2dbe6c3146ca6520e7952aef98d67b94c15b1cc3a2bac3eeafe7353644d8379cedc5c657c2ff9255d1 SHA512 80e851eaef0a3159d7ec8c295d8118692b45799359b131396319489ef9aa3d1567cfea4f1382ec857a82707857977b70d11166426cc1a92fb81186ee68bd017e
-DIST jc-1.20.4.gh.tar.gz 11842360 BLAKE2B 8c1358d4567510b705843efb7da9ccb02a55049c8a0dc1570661f3648a99405c692ea8493381f324c3517841757c9545527e151fbdf550e12a5fa13cf9c33bf8 SHA512 5f5bcf03c155a56132c66ada38bb6b570e6050d75e0bd90b966cfefb99351adf0249d968077a08714eb9ff8c7d7403d1888bc6687830e13fe05a68a63af661ad
 DIST jc-1.21.0.gh.tar.gz 11910267 BLAKE2B 7d02f6b574dc2171daca9682ef5cfe2ccdba6230320fc331c086c47b147e49efbd11fcb7b7f26bf4d448d4462f051b5b6892eff16e853cdb6cc4927f5cffddba SHA512 5382aba5c6ea0409fae31097516912d07133d2c14eb529e9df742f2efe4682c7e36e934786c9b12454d23e4c3acd5bdce3e97f410303b761f695db787058b034
-EBUILD jc-1.20.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.20.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
-EBUILD jc-1.20.4.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+DIST jc-1.21.2.gh.tar.gz 11910311 BLAKE2B ece8651c55f62821e30574cc208f3e1a569a2408ae1c637329556d49aae894afd7a57cdb7c70a0fdd16136fddd7329a1cefab493848376f22d5fae553c0231eb SHA512 3860e429a11131b888fa0689dd627016d3e9c052908979c22eca604281f13ba3df7164cdfa04ff6e4e08146b42d7bd76888efdcce65a549d5c904ecd207209f0
 EBUILD jc-1.21.0.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+EBUILD jc-1.21.2.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
 MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.20.2.ebuild b/dev-python/jc/jc-1.20.2.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.20.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.20.4.ebuild b/dev-python/jc/jc-1.20.4.ebuild
deleted file mode 100644
index 7b7bbfc30991..000000000000
--- a/dev-python/jc/jc-1.20.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jc/jc-1.20.1.ebuild b/dev-python/jc/jc-1.21.2.ebuild
index 7b7bbfc30991..7b7bbfc30991 100644
--- a/dev-python/jc/jc-1.20.1.ebuild
+++ b/dev-python/jc/jc-1.21.2.ebuild
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index ff33642f4b8b..f500c0baac04 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,7 +1,9 @@
 DIST mkdocs-material-8.3.9.gh.tar.gz 8347276 BLAKE2B 51c953aad234a177d6b74bc8ef5e836ea6ee9f3c9e53b843efe25214069bfd94c3695fbe0dde0d3daec54c030bc35f5c4be668592afda45fa7ba7bbeb63a0475 SHA512 e7012a6f7db41b2bc4a43d0463f08fb3f7102ca3d7957ecdb2c88343a96ea774c8f724e498b2254a6bc6464d88681a605e52e4632c56cf0c60c6bf4269ac01a9
 DIST mkdocs-material-8.4.0.gh.tar.gz 8459364 BLAKE2B 42d0a3fa9a06cd03629dcf10e8052ce56ec87ce9449da26b1d94ab5e520cd34be16f49339237ebaa673bd86a7148e663f5e7bddbfd9ef2f9151a0d62cd0a2c85 SHA512 5e1c4c08ca8c6a2d4af2b2ef51c3e136c630a683aaf6c1ce93a4b322127eadf4ba718cde0e2d8814c486658ecdcfbda7179e4478ddbf6ba8a8ca3876acd4b33a
 DIST mkdocs-material-8.4.1.gh.tar.gz 8461800 BLAKE2B 7272973be76715313e449882a0cde02ba91cb02160c5a71d91690f9c05da404c0039bd19f1a093ef0686ef38710e1da1a283a5997f7658b27dce3cf1d150a7cc SHA512 cd591b97009a3586b68af0885e05a26cc61689461b1b9d9c8e7c324ef2372062c9a9fa4cf83b167eaf2b148bd3adb7aeffa358bff19a70bc9d95c6f8a8cecdd3
+DIST mkdocs-material-8.4.2.gh.tar.gz 8471859 BLAKE2B aff2c0a972744a3e87586b448cb95dc3501efac69ce8247983a63dd73adc08e666e72e8595b962cad396435ba6eebf309b20c2dd6610ffa6a8bac8d934a039a0 SHA512 2bcaedc66b58c8a4ba476794433b94e3b5fb95c51085b867656ae65d96a9cfeb0b66a59187a53c3208f9ae3c967f2c5a3848dd1ee62c9ff6c1aab90ea65b10e7
 EBUILD mkdocs-material-8.3.9.ebuild 1044 BLAKE2B bae6282cd8a771c6c6d9f11205442841ba82f970b1a0ce8490902931670a45fa0ff1b8ba08d2d4c9b819ab43a668b9acbbc4f84aa7c35f854519cd609b2472f8 SHA512 7aaf4b2f7e3f75e579300424d9d8c2418c96a96ca61c085b53ae15f152abbe142dbf13924b24d36eddf1321f6de1dc6d3d5a018e19612b2245cd860eb03818c6
 EBUILD mkdocs-material-8.4.0.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 EBUILD mkdocs-material-8.4.1.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.4.2.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.4.2.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.4.2.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 70ca3d0667f0..437a9e7acf20 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,5 @@
 DIST owslib-0.26.0.gh.tar.gz 948463 BLAKE2B 2cbdad2d8e9bc4b8a7e2db58dc75a7c053bde0b2cc772a01f230db044909615b96e62b08bb93233df153686a180a5e93af1bda6ea79b8565efacccfa18fcf4da SHA512 27362c47eae87dc6318d505dd1b0987de36d140d2d0fd5d7a5195470de39d73807fbcafa142366f6981cc36453c262a41133c6c68baf45a97d0fdaae5a0ebf4b
+DIST owslib-0.27.2.gh.tar.gz 949148 BLAKE2B 2e12b43de3c3c362b03af15c93fe268e9ad8dd8647a18a8ef978203db896db65dd26cd20d6d58214880248593589604f764887b50c9eb8695d8e51accef3dfe8 SHA512 02c70731ef92783d53b8f0dff2cec7d28d14ac08b0a4b5090183f9eacf156d539c823fcd2ae480c07447e901697de498cdf2aaf27c8b6d46fa4cf8eb3679ceee
 EBUILD owslib-0.26.0.ebuild 1016 BLAKE2B b759495e41072f32b2e5dff2a986b39584b64cb11e0e2aaf28742d309fed54a7e46eed85cfa19ae06c6def31b76c1752bc24a82ee1720d3b29b02370cc6a1fc9 SHA512 df6fca3250c1bcba908ee57cc4885b8cfb56f531d9da02100d956aca73bad39138c37e71e629d0832b4d34382ccf351c270c044857e7c62190a25b1ad6f29a0e
+EBUILD owslib-0.27.2.ebuild 980 BLAKE2B f584ff3c696f591e83cfa57178e967eb6c821aba18d8892414716bfe0a0f9b6907036e5fc5eaf2e3ab60ba47989b0ef7359ef8eabbcf760ae490aa7f841d45d6 SHA512 2e1ceeef5259dc5c863c473afbdf05fd47a410c2a4179531a7491255b827419941e811a14f0012f77d07ef8423fcb5bafd7b4e96631a43414d24f61c264f4f26
 MISC metadata.xml 520 BLAKE2B 01705147ed084a8215d15016b6cc94b2fcdc926eff2755cf2d4c768197d0c39a30a8b0602d93bac7ec221e32c30b9280b37d5736f2f46342ad36e23c1b4a7c1c SHA512 c146cb483caacbde7966a95b899372261493543826cb20d638cd91e7cae245d60f1504bc53f485e35ca5d6c3f83780fc1da211c0838c604dafde27284dd8e40b
diff --git a/dev-python/owslib/owslib-0.27.2.ebuild b/dev-python/owslib/owslib-0.27.2.ebuild
new file mode 100644
index 000000000000..d33d496120be
--- /dev/null
+++ b/dev-python/owslib/owslib-0.27.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib/"
+SRC_URI="
+	https://github.com/geopython/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/OWSLib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+EPYTEST_DESELECT=(
+	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 4f9f1ec742bd..51ea0501f365 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,5 @@
 DIST pygit2-1.10.0.gh.tar.gz 752095 BLAKE2B ff7759c504f49ed124e0e0504742bad02c4f07d7ebf78de8a8f37dba5344e30ca14bbad30cce8e9035f25525499cee0309bf0660f24ffa4594a5dcb527c105e5 SHA512 e3dd6b90eee43e633e790c066f63782a8f8077fece5d94e6d39ff8f869efdad8360fe52473a5ad0e61adb29a646ea091db6486655199c777df1b1af0e9894aae
+DIST pygit2-1.10.1.gh.tar.gz 752254 BLAKE2B b0f09eb65be19e9bb0e21afab4613478e1ad516f2cdd10c01328b73233e4e7f3a33d2c90c5ccb35a55050b18e6bf1e1dadb330457a78d0fed9d75da5a4082588 SHA512 d545b5919b6c1ef5411a20acc7463a7ff934852bef209c7254b33365ccb6e127f136537745088be387a07a70e99d2a12466570a515fcb9410216a34a565e7ea9
 EBUILD pygit2-1.10.0.ebuild 870 BLAKE2B a0d75bd20f9f9b304f54ac7756c55abfc89eac8ec3b231bd079e96dc6e4c99df6b77c659076f27f5a079fead2f72131c7e9b590660146ed3ca39971d7d1b5848 SHA512 55dded03a3e369cd57f058480498c46841a4d916f637109714ff3205a3e312855d4d9cc0221941209a32e301fb0686bd06bc7b8af246f5a45d3c4cbde87afbcf
+EBUILD pygit2-1.10.1.ebuild 872 BLAKE2B 4b5a4941a48b1679e7b3347383de167109d4ccc91723dd451b2faf12b1d80043dafd007d66dbb444737fb922f63cdb2dd003d334f1b1945501a60141c4f6f356 SHA512 154df8853386f65754aabb509956e7bd5fa045a182c73c852a04f31bc3bb916a1e49c9ad8adb1b02b42507e38e041e940091720f1b903ad19ed7fe36bf7232c5
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.10.1.ebuild b/dev-python/pygit2/pygit2-1.10.1.ebuild
new file mode 100644
index 000000000000..47951e5eef7a
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.10.1.ebuild
@@ -0,0 +1,48 @@
+# 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="Python bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/
+"
+SRC_URI="
+	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	=dev-libs/libgit2-1.5*:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 7e811267ee5e..828a4b032801 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,6 +1,10 @@
+DIST pypy3-exe-7.3.9_p3-1.amd64-musl.xpak 12452882 BLAKE2B 73be01098cc4295e63b76fd7f542e9002ff6929220f02d86f99f051c76edabec68e0ed97695fe68d56a082e5bd915d9e68e04ee1dc7e1a3d8120a76ccf5f6e3f SHA512 9c6eb74844ed021dabf11998690e3099d6c37930378c1869726d96451a3847fc2bd60df06a3d7234b2fa182e4294328f292f4c24bdc49a4e5baa7ae3a0704805
 DIST pypy3-exe-7.3.9_p3-1.amd64.xpak 12394274 BLAKE2B 8f7a041839fdd1dd55fd0293660369310aaa1f118e34a730e066899c09ced71fa37d70d59952fb68d932f63e907b903c41c91b5ba4d646637fcfe628a20861b2 SHA512 166722fec0288b8c69645e0c8e630aa4c0b74f8d41817148147556ce6f0491e7251cbc202b62f7a1dec6b1da3e2f2c6313f02952b11220f35be2c1ad6276f89a
+DIST pypy3-exe-7.3.9_p3-1.arm64-musl.xpak 10473390 BLAKE2B 0d791a39850c51ff914885e5bff4a3f44164b77df4771db968b90e144857c8a045df3a61ebe0e386c3aeb3c63b45ccfbb58d5b4811a0a1aeadb75335a6bb586c SHA512 9f3c871d0b624d1f2f65933f85fad9d177046ad96a206e9ef1bd40c5fbac09144f1d87685cac9f31a19b4f1ec25b62477675cce9a99d4fb2cc5eef86578d4655
 DIST pypy3-exe-7.3.9_p3-1.arm64.xpak 10482599 BLAKE2B c48c9a19db30315be223bfc1121bc9a0300c91c511678a1d11bcf3a1601a3d1fd7d7852cc196d22650ec4ab4234d68f7a9046b01bf2f4f1f7104ae2d31797e9e SHA512 3200f7faf3b9c2211d828f6c434775138a1543a75b2ff4403c896f4941682ff40e16242045ec65908540b6537711c459ce7b0fdcdc201bc9768b2521bbe4cedb
+DIST pypy3-exe-7.3.9_p3-1.ppc64le-musl.xpak 6663514 BLAKE2B c8778a594f9999be4efe398901c5deab7fa22475faad55d047b995933708d861c0adf435d26c691f63ff49d8bf561081f96b64287846065bbcf8845c476ef909 SHA512 1feda175f90274fc214f9b018dddefdc40234ff398262a55523849c5f48bf543ab12fe86ac56e973900c39169e0d45d1150217a9b3597381f7e087af285f4811
 DIST pypy3-exe-7.3.9_p3-1.ppc64le.xpak 10930518 BLAKE2B fca375a3466ee51c9436587104d5f13cb4642a8efb347124fcc2880c2382bf56921889b2c3aa96f26d22fb734cbd27adcf5f0c8feeff92c2d625df1daaa38ade SHA512 ee33067b964c33701b687ace463cfc11795af37bf3302c8e3e2d1e0610728945d370f88d97d1ba3fd66ac9bbf905930857e78e5bc96c911d3a663c2e9c74a5cc
+DIST pypy3-exe-7.3.9_p3-1.x86-musl.xpak 9246639 BLAKE2B 7475f9a273157b55d1568e5d9f36a045969bb629047a8b8f478e6cd0e27bf2f46b0a141197047bd2779332acb5b36b069ad1bd371030a6a5d75b4dd0aadbb808 SHA512 783260846ec8057479808a7d7aab3c712ee6822293232099cfbe970cb3e8e5e3cf07ec08bb5ecd703c084c6a798dab70de5073146f8698430472196b351d19fb
 DIST pypy3-exe-7.3.9_p3-1.x86.xpak 9210827 BLAKE2B a740ef7e1d4559308c129399cda498b7c0fe8e654e4d36830ded5197a7788168dbc8b4f83908a41869cd51343dd9b371ba53de8e88655b2728b8f6351f502ef2 SHA512 bd2ef07e980bd37b7ecfb052a9304a80ee527c61f8a60344e8e9b1bfcdf1f50038e7b281257194c388e0452aa968f984f5b6bc7d9f7c89bf08279e9a169ed8e6
-EBUILD pypy3-exe-bin-7.3.9_p3-r2.ebuild 1419 BLAKE2B 9d10235ba31056486cda7861cdb5d85e4f2de901dcf46748ff4a2b837edfe4b2d06547fb2f4180ad81ea0573244ff86d86a3ad51456fa510b742522c89cea77e SHA512 13e841be0ae1787128b1a074d51767cae8b4f21671cab00e7c786ad96cbe1422dbace359336d47deb38baea710418785910c268337b0bcd7e816e6bba16b563f
+EBUILD pypy3-exe-bin-7.3.9_p3-r2.ebuild 2069 BLAKE2B a791593f3cc73974789ad2f5f878acd5b2de5548c4ff7031d07233aa58678117e3c5c3c3ed63978be2c125e76c1c4521b227a8b22786cfadcc515205be75eaa9 SHA512 62679da1b6f69122d1ddee68499981a680999269362e6439dea7533a0d2e0bbe1720c173d97f0e311f508194a30ce3e7bcc4256e2389e6d3c569236201f440cc
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
index 6a83f611cc92..4367d44c529c 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.9_p3-r2.ebuild
@@ -9,21 +9,41 @@ MY_P=pypy3-exe-${PV}-1
 DESCRIPTION="PyPy3 executable (pre-built version)"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.amd64.xpak
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.arm64.xpak
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.ppc64le.xpak
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.x86.xpak
+		)
 	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.ppc64le.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.amd64-musl.xpak
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.arm64-musl.xpak
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.ppc64le-musl.xpak
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+				-> ${MY_P}.x86-musl.xpak
+		)
 	)
 "
 S="${WORKDIR}"
@@ -36,10 +56,10 @@ RDEPEND="
 	app-arch/bzip2:0/1
 	dev-libs/expat:0/0
 	dev-libs/libffi:0/8
-	>=sys-libs/glibc-2.35
 	sys-libs/ncurses:0/6
 	>=sys-libs/zlib-1.1.3:0/1
 	virtual/libintl:0/0
+	elibc_glibc? ( >=sys-libs/glibc-2.35 )
 	!dev-python/pypy3-exe:${SLOT}
 "
 
@@ -49,10 +69,13 @@ QA_PREBUILT="
 "
 
 src_unpack() {
-	local pkg=${MY_P}.${ARCH/ppc64/ppc64le}.xpak
-	ebegin "Unpacking ${pkg}"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${pkg}")
-	eend ${?} || die "Unpacking ${pkg} failed"
+	if [[ -z ${A} ]]; then
+		die "No binary package available for ${ARCH}/${ELIBC}"
+	fi
+
+	ebegin "Unpacking ${A}"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${A}")
+	eend ${?} || die "Unpacking ${A} failed"
 }
 
 src_install() {
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 42cff08e5d1a..f6bcf1b5ca48 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,9 +1,11 @@
 DIST python-nbxmpp-3.1.0.tar.bz2 128551 BLAKE2B bbff0bd92b12addb73e661136531df7629baa7936a1d52a86a17b59047681d30744dbc3618143a0b4ff5460bb64ad01a70b1bfb018f32bd78cfd9dc848f18668 SHA512 6676da4a21915305952118b9d35d91f3b420a23f1f3bc1fa22ee885face3f9b4474417f58e4a2c6446fec48ff632822ab83343e104df480d33d75f1b46cf8fec
 DIST python-nbxmpp-3.1.1.tar.bz2 128913 BLAKE2B 938701b95d3b41638d2e9173d52ce69737bc7160b1113bbbb54e958ee0269a2d209d146a67c7caaf8f4e7aa394549360ecb3ad4c3a1a731b329b10cbc9654109 SHA512 9571d890112da8380d55894e52279bfb002151432d6c8103ce62f5ab08b198f847c50cb2c1c4a7502cbefff8c3c77cbb0e86ca24355af86136b0caceb0d75c0f
 DIST python-nbxmpp-3.2.0.tar.bz2 129023 BLAKE2B e61cfba5f88511981e1df768d594bc86c576ef1f4b7f88d0d49bb4b86adbcf36bb7821a2332cb2427007dc10134390a24e02b6cbd791331d93cf1f48c5fe8d7b SHA512 6eae6de22829c669ca17b2eaa68f53e161374d491b2f5bf7626ccdd966b0c857388852ff4c08f3d9d7391735b9633a832c7570e332f29dd038485de998d19f54
+DIST python-nbxmpp-3.2.1.tar.bz2 129362 BLAKE2B bbbeb5751fc5751cffe73c9a54c3330de9a1b48041c7a7964cefdfedbf8ae2966c8f5adaa7153386eebea44568af38ec1964d612b8baf48d6f318c83705e18d8 SHA512 3ebe1169475fcd65875cb2e6079f802a7f98717957e26e7dfcab5a71b1f94e967145a430f6d959a01b39842317d858c3b6275bcd909bf65f70699536e298b6e4
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
 EBUILD python-nbxmpp-3.1.0.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
 EBUILD python-nbxmpp-3.1.1.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
 EBUILD python-nbxmpp-3.2.0.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
+EBUILD python-nbxmpp-3.2.1.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
new file mode 100644
index 000000000000..20ab63a80429
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.2.1.ebuild
@@ -0,0 +1,32 @@
+# 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_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="
+	https://dev.gajim.org/gajim/python-nbxmpp/
+	https://pypi.org/project/nbxmpp/
+"
+SRC_URI="
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest