gentoo auto-resync : 14:10:2022 - 19:44:42

37 files changed, 1004 insertions, 96 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c00e438c0970..72334e1ebe85 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index 15f0637af2ac..8aca4e3897ae 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -63,5 +63,5 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD adblock-0.6.0.ebuild 2137 BLAKE2B 0e9cb1f414bbb13899c938a268709d7d427dea90a193a031cfc23b3720f4fd61495a058371cc1bc73adef602265b7ef9a19b88d2031443268ba81a73a4877b0a SHA512 86a1a9a3a2240751bcf1b5b4aa0218d82b0669a01f7ef170f8f77fe4230214dcc24678a08186757b73b4ecc346bd0c99ac6401a3ce286ae2d6696a567b2843bd
+EBUILD adblock-0.6.0.ebuild 2232 BLAKE2B 02f252b3672f9b3aeb219a0ab50929289cddbd9990b06f3a0bd6eae12efad03cd0ad9c719bc589ee85aecadb8c03123085f180b92a95f5a9c45dc5ec1c34f845 SHA512 9d2cb5e419e45f79d0ae81a3809d1b0ed94f0b0ff04d21828e43b09a8bffa7633c25ed4b859c0286d18beb02f7441d336f8fb33c78a4c35de4b122e92dfe605a
 MISC metadata.xml 488 BLAKE2B 8c58b29bbc160b2139fc54058c48da79ae48963e2cfbf97b6eb6c78678b6c57d7ff63c32d65dd082b3ceaffc383c0b03b27467e331738b086bfd6c5ee45c6cc0 SHA512 1a5fb02550400b8a25118982cd9b3651b2ac236208b8f933438786ca18cd8dabc17fe98a447379a0067004f8429439e1af9567e7e04c6ed13100bbe6c6321b04
diff --git a/dev-python/adblock/adblock-0.6.0.ebuild b/dev-python/adblock/adblock-0.6.0.ebuild
index 517d704e4f5e..eb67379a38c4 100644
--- a/dev-python/adblock/adblock-0.6.0.ebuild
+++ b/dev-python/adblock/adblock-0.6.0.ebuild
@@ -83,18 +83,22 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
 
-BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
-
 distutils_enable_tests pytest
 
 QA_FLAGS_IGNORED=".*/adblock.*.so"
 
 DOCS=( CHANGELOG.md README.md )
 
+EPYTEST_IGNORE=(
+	# not very meaningful here (e.g. validates changelog),
+	# and needs the deprecated dev-python/toml
+	tests/test_metadata.py
+)
+
 src_compile() {
 	distutils-r1_src_compile
 
-	# tests try to find Cargo.toml + adblock/adblock.pyi in current
-	# directory but will fail if pytest finds init in ./adblock
+	# prevent pytest from using ./adblock that lack the built module
+	# but the keep directory given tests check ./adblock/adblock.pyi
 	rm adblock/__init__.py || die
 }
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index ec77301c8235..a8c9062b3596 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,7 +1,8 @@
 AUX autopep8-1.6.0-lib2to3-deprecation-pytest.patch 1094 BLAKE2B fbca6a4c342f525cf20487551133d9a0279a00ed0de4439d3fe73736afaa70c4ae3d3ba2c2960d87423d2b6b98fb08f6c3604e17c9078dc9880f91cf090509fc SHA512 7f4204495c5ca0acfb3cf411c17cf4cdf6e340d84ff4a8a494ff33494923813e73b8bf55db975bd4f6c0fed1abb7669bb77c89be1512e9d8629cbb5898999440
+AUX autopep8-1.7.0-tomli.patch 1798 BLAKE2B a9742baf1be7720d2d7db36e9af40f0408203fdfdd1e6f771981dd52b0d9ddb3458edad4ebe1825a5534bbb3498f6a1ceb8f48a0bacb6bb82d1e6f1dbd4f343d SHA512 dc8257f7bad16396cbfd731eb1e00226ae874fbb88a95992ef1e974ceff60303cf098ad572cf37d1bf38c3b597c7b220cdc4c3cf6392eb5f4d26f6203f389b0f
 DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
 DIST autopep8-1.7.0.tar.gz 117055 BLAKE2B 36e2789551eb671b0bc7481742d9edf25aa622bd3f605fb2491195c45f7630378116e4b0bffb536cf7596b3b1c5ea695796259b944a886d55f05c9891e280d0c SHA512 e93ddf90ff989af71790f70f7e7101f7cc60890c8a976552a097c13b0a0e10c16dfd8770214b19d7fabd59403e6d87a9a37d75a2c6f3ed27f8c82a7d8da95dad
 EBUILD autopep8-1.6.0.ebuild 836 BLAKE2B 2a5c20f3034ffa486ed52cd08520c30d8dabdc764660d86e5d307bc180338a4c8c03ae74af8fb379708f777e2f9b8f3e6aafb526024de208b5f125f1a00b58b7 SHA512 782735f07b1a4a73c1fb9ec2bd9677d372069cf878756568507cd946a4c8ea44298a1669b2732127bbcbebb57fe902b9fdc980601899d04bc12eb05d75947257
-EBUILD autopep8-1.7.0.ebuild 950 BLAKE2B 086de99551a18e855733e24d854d5b9afc6b8bdeea2f18c1fd4927dc9c13a6f1bfabf189c2b6b88818b761864cd17d94144e4ab63641f0ee95ebe3e736d680a7 SHA512 f5717728d3a1b3f83debdeb71874e789ef2b52f64ccddc0ff18ae6d0239b49144f539f53f76235fccf87f62b1ac28085c17bdc3b97feaf294490d2340e49cc32
-EBUILD autopep8-9999.ebuild 796 BLAKE2B f268b10e32865c7e92de9b22d929c5f0a632044a9311d3a6cba736c00b9b65906b30afa0b30cf8e70fc756b60093146777b99b1486119537cdb77a37be5011e6 SHA512 96d829614ed05ae8574369d8dac5146a8e20e20eacfa4d50a580aae54a99369eb21b7f5d92862007fbe423379ae9a224b33dfdde5cd669918395ca235f5d99aa
+EBUILD autopep8-1.7.0-r1.ebuild 984 BLAKE2B c2fafa3466fb72223bfda311195321039736e33de5a7fbab67c784f4f37238cae554ff830a4e5416b2ed9027453827f344f2670ed120dbcb71a33271746efef7 SHA512 e5d302d557634d57a0bbde7347426cbd2534784c10737baed58692f957de6d0f64bc521a2a397822592cd3a8f86269a7ace09ae87f3d7a0a7dd422cfae4681d4
+EBUILD autopep8-9999.ebuild 798 BLAKE2B 9bcad3f6102dbf1dbb8ea65fae6abaec30c44d666548771337729ec4b216f3f265f57f908fb785424eeec2e24c8687fdad93121f2a46299edad3fcfd1df24149 SHA512 42c0a97810816fe6f99c31b41da913a6b233118c437dbb32d9b7bebbb9d3d70248bba57b91d5ab6957b198c1cae3ded524205dec3b1c0400700485b69d2f415a
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-1.7.0.ebuild b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
index 31163b3a63e5..58d653e49809 100644
--- a/dev-python/autopep8/autopep8-1.7.0.ebuild
+++ b/dev-python/autopep8/autopep8-1.7.0-r1.ebuild
@@ -23,7 +23,8 @@ SLOT="0"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.9.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
@@ -34,4 +35,5 @@ EPYTEST_DESELECT=(
 
 PATCHES=(
 	"${FILESDIR}"/autopep8-1.6.0-lib2to3-deprecation-pytest.patch
+	"${FILESDIR}"/${P}-tomli.patch
 )
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index 91c5dbfceeba..bb50e6c643bd 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
new file mode 100644
index 000000000000..6a8dd147d474
--- /dev/null
+++ b/dev-python/autopep8/files/autopep8-1.7.0-tomli.patch
@@ -0,0 +1,57 @@
+From d0836947df66a052a1d18925a64feb0374598f02 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 Apr 2022 18:30:11 +0200
+Subject: [PATCH] Use tomli in place of unmaintained toml package
+
+Use the modern `tomli` TOML parser instead of `toml`.  The latter
+package is no longer maintained and does not support TOML 1.0.
+---
+ autopep8.py | 10 +++++-----
+ setup.py    |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/autopep8.py b/autopep8.py
+index d856f711..ab1a88ac 100755
+--- a/autopep8.py
++++ b/autopep8.py
+@@ -4040,13 +4040,13 @@ def read_config(args, parser):
+ 
+ def read_pyproject_toml(args, parser):
+     """Read pyproject.toml and load configuration."""
+-    import toml
++    import tomli
+ 
+     config = None
+ 
+     if os.path.exists(args.global_config):
+-        with open(args.global_config) as fp:
+-            config = toml.load(fp)
++        with open(args.global_config, "rb") as fp:
++            config = tomli.load(fp)
+ 
+     if not args.ignore_local_config:
+         parent = tail = args.files and os.path.abspath(
+@@ -4054,8 +4054,8 @@ def read_pyproject_toml(args, parser):
+         while tail:
+             pyproject_toml = os.path.join(parent, "pyproject.toml")
+             if os.path.exists(pyproject_toml):
+-                with open(pyproject_toml) as fp:
+-                    config = toml.load(fp)
++                with open(pyproject_toml, "rb") as fp:
++                    config = tomli.load(fp)
+                     break
+             (parent, tail) = os.path.split(parent)
+ 
+diff --git a/setup.py b/setup.py
+index caa639bf..4849574a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -10,7 +10,7 @@
+ 
+ 
+ INSTALL_REQUIRES = (
+-    ['pycodestyle >= 2.9.1', 'toml']
++    ['pycodestyle >= 2.9.1', 'tomli']
+ )
+ 
+ 
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index bfdc7e2ac5b1..8ae2a218cbbc 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,7 +1,9 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
 DIST Flask-SQLAlchemy-3.0.0.tar.gz 127234 BLAKE2B 97737e16e3929b4449b7c004463d5976263bebdeb4d06f93afc531ad10545f7648103ebdaf8792967d504ec4e404e5f0411397216944eff8deebb1a69d01efe7 SHA512 48461453555cc659b1f35ea0d255c080784222a51a90de1cb5761ed08f3fffa83b6647a7346b860f2354484496e6cdbf1420cb9f0405b128174e7e6f1e30cbbe
 DIST Flask-SQLAlchemy-3.0.1.tar.gz 128448 BLAKE2B 69294c328df5a6bd8c40b5bc74b411ccd616a926db55c579aa00f777b7b0a3e7045c719487c2d2cffaee804fbe4690e45cee06f9ec860b5ad75de62b1e1811e7 SHA512 5b4a79f700b6e42d4796d0b4c9fc9ab489cdbf7d0598f5df3adfa8d9edef8c9203ab3d53805c24764f7e9f2668b907af9782b51310492b21d355cb2440b3453f
+DIST Flask-SQLAlchemy-3.0.2.tar.gz 128634 BLAKE2B 0203de67bd4c3a61562ad8bd69b6be2826ce7a49b763f101b5455a8452a1950728dee4a6a627c82f6ef741f57334de41511675b254a8da3c334021fcdbe8fd63 SHA512 89fa71796efe53e993ef8fc264b04f64c3174cadc960a9e51944e4fe70513a1c91e244e55f70690623f1d7d6d7c215729581a6989484bb0369b4bb0e412f499c
 EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B d197db5d301949b5ccb7a911fdc40d9a69a993327517cc41c08b0c889b0d0c68865234ef8953557216c7996ad83a73463a87db6f2fc9beed655fa6f26234e089 SHA512 77f2e0076a57ec17ae06a36a3a7304ed6a9cf12c4e74b50589c8be62ea54c4455ea34dfe032bb07d0a47ee39afd5e6260dc6bd4403e2fd49b193aed62a0cde2b
 EBUILD flask-sqlalchemy-3.0.0.ebuild 843 BLAKE2B 5cb91c6e7068672dd5287b7006c6a8dd3d14387d958a38f58f19700f3dbc9b04e2873489f8cd6ad738886d5fea35bea2c2c6afad805815249620dce4bc24c693 SHA512 3f5c3ba2ea9ec2ff1bf429f42baf00132570c36cf2bc0aca40404ea2a71eb952850f7e1c2bfdd994aeec638bd03c2be624eb852b220355a2fcf8c26e0fc9e241
 EBUILD flask-sqlalchemy-3.0.1.ebuild 897 BLAKE2B 29b4aa8c2344c6bf13f306f16f00f38e19a2726203e536b1027597de390ca9346c1a8cae23139d08c1ff3c2f3747375c2080556c53535adc5de7f053d1e63e1c SHA512 d285269ee19c0617d5047cba100d7d1fd049e6622a7ea1d419371ec211e8c6bb6ee6eb717d62ba206cd8ec7a1be3352bad6b51ec5807ca65b5d2dd3aaed57d2e
+EBUILD flask-sqlalchemy-3.0.2.ebuild 897 BLAKE2B 29b4aa8c2344c6bf13f306f16f00f38e19a2726203e536b1027597de390ca9346c1a8cae23139d08c1ff3c2f3747375c2080556c53535adc5de7f053d1e63e1c SHA512 d285269ee19c0617d5047cba100d7d1fd049e6622a7ea1d419371ec211e8c6bb6ee6eb717d62ba206cd8ec7a1be3352bad6b51ec5807ca65b5d2dd3aaed57d2e
 MISC metadata.xml 728 BLAKE2B 460134fb84c2af57ce63bfe8c25a248ae4fb8c97bcc669807bac949d4f8c33ad728b6757ee96abf36354e3e1931cad1fde4cb3d17486c98c93df3dfa178c132b SHA512 72190b1d84680e846b3aee8dba5e2e9d3b172fdec925b006b182e9f7fec62c45042b8549ac6c5c32e80b5f4e1ec34b08ba14d9719fbec63739c46b8bcb2078fe
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.2.ebuild
new file mode 100644
index 000000000000..4f1c66408c0b
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-3.0.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=pdm
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="
+	https://github.com/pallets-eco/flask-sqlalchemy/
+	https://pypi.org/project/flask-sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/flask-2.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.4.18[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-log_cabinet
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 3fc033fc3ef2..222e13c59290 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,4 @@
+AUX ipdb-0.13.9-tomli.patch 2404 BLAKE2B 28f1fa1b44632d40eefeebaf641f78a18a324e8af14679886767f4e6f5365efa3c4d622cca605c3a4e43f8046ab721525e479cecd7319b4a0970e17b95859c83 SHA512 95ead7e4cc19b85cd74f8e621982e3075400be3bab7616eaeb976b1f0a598ba68996398cbdd805442b0952cd30177d447914b45d98b5df4bb8a71da4d64c2447
 DIST ipdb-0.13.9.tar.gz 16820 BLAKE2B d028fff2c4273fd4a57c3338093f0065868856b4f7b2b95aa0db3c2b1e7c5906fc17b5b55b79b3a3809465214bd91ac1891cefc1604ed866edaa2811380175f6 SHA512 da0ac6d8a7451e90cf433ab2a0d4e43fff76be03082da5cf31b83fdc56174fde7f0256009ad9a407d805c0bf12da5fa2f081e1aa0e0ce73ca648262acd385671
-EBUILD ipdb-0.13.9-r2.ebuild 711 BLAKE2B 3dad49c26f73a1f6f48dd57a76395770f9a310d7cfeba11c95f9a4733b82fb2d33f29dd16137b199b79a30af96766475ea81e6caf439e065540d6985be08cc4a SHA512 5c77700b58fb6bc9868239e0a6426bd6b78439da74e4fb6682a63ae9f5d073c6ac8b34a483f2eea0cfd698969b790a42b9e1c5f98da0bcab18c9a5ca3ff46c9e
+EBUILD ipdb-0.13.9-r3.ebuild 773 BLAKE2B ea7dc6afb17068ee6c619943a12604c2a74b7380e16ecae9be72dec79967078c7761d56a17ce119fcf7bbacf99debb421a71913d36b79e449ac4c207df4b2c19 SHA512 6578503eb8fc7f99c1afe56929eea261ef149a202a958f909e0aa5cc25bb618768fb086bcdd8ba26a98eb18b98e928588bfbae797cc8bf61ae511e724033dc19
 MISC metadata.xml 332 BLAKE2B 3cb1465ff0559029739d49dc1bbc06a6d99bafc7fdf63adfe7130529791d9091e8835f13e4d37ef7b3fc1e8b5bd66578e0f18963ec30552cfa2cd8df556c420e SHA512 7e2965f3534c46964709a62f8065f63cc03e7d1bb47efc26553d8f240fe7fd6e56e161a3ef242c2a1ede1800aade4142d16e8792104fa126eca49e1e178d8905
diff --git a/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch b/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch
new file mode 100644
index 000000000000..20eecdd8721c
--- /dev/null
+++ b/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch
@@ -0,0 +1,54 @@
+From bc06e22817f2644c6ecc838f60c93fbedb9e0016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 12 Oct 2022 16:57:24 +0200
+Subject: [PATCH] Support tomllib/tomli in newer Python versions
+
+Support the built-in `tomllib` module from Python 3.11 and the modern
+TOML processing library `tomli` in newer versions of Python 3.  The old
+`toml` package is unmaintained and does not implement TOML 1.0
+correctly.
+---
+ ipdb/__main__.py | 14 ++++++++++++--
+ setup.py         |  4 ++--
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/ipdb/__main__.py b/ipdb/__main__.py
+index ea2ae88..2c3f675 100644
+--- a/ipdb/__main__.py
++++ b/ipdb/__main__.py
+@@ -176,8 +176,18 @@ def get_config():
+                     read_func(f)
+             # To use on pyproject.toml, put [tool.ipdb] section
+             elif filepath.endswith('pyproject.toml'):
+-                import toml
+-                toml_file = toml.load(filepath)
++                try:
++                    if sys.version_info >= (3, 11):
++                        import tomllib
++                    else:
++                        import tomli as tomllib
++
++                    with open(filepath, "rb") as f:
++                        toml_file = tomllib.load(f)
++                except ImportError:
++                    import toml
++                    toml_file = toml.load(filepath)
++
+                 if "tool" in toml_file and "ipdb" in toml_file["tool"]:
+                     if not parser.has_section("ipdb"):
+                         parser.add_section("ipdb")
+diff --git a/setup.py b/setup.py
+index 6ce51c0..04f594c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -64,8 +64,8 @@
+           # FTR, `decorator` is also a dependency of Ipython.
+           ':python_version == "3.4"': ['ipython >= 6.0.0, < 7.0.0', 'toml >= 0.10.2', 'decorator < 5.0.0'],
+           ':python_version == "3.5"': ['ipython >= 7.0.0, < 7.10.0', 'toml >= 0.10.2', 'decorator'],
+-          ':python_version == "3.6"': ['ipython >= 7.10.0, < 7.17.0', 'toml >= 0.10.2', 'decorator'],
+-          ':python_version > "3.6"': ['ipython >= 7.17.0', 'toml >= 0.10.2', 'decorator'],
++          ':python_version == "3.6"': ['ipython >= 7.10.0, < 7.17.0', 'tomli', 'decorator'],
++          ':python_version > "3.6"': ['ipython >= 7.17.0', 'tomli', 'decorator'],
+       },
+       tests_require=[
+           'mock; python_version<"3"'
diff --git a/dev-python/ipdb/ipdb-0.13.9-r2.ebuild b/dev-python/ipdb/ipdb-0.13.9-r3.ebuild
index 9ab449099c1c..b68eb873626a 100644
--- a/dev-python/ipdb/ipdb-0.13.9-r2.ebuild
+++ b/dev-python/ipdb/ipdb-0.13.9-r3.ebuild
@@ -5,23 +5,37 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1 optfeature
 
 DESCRIPTION="IPython-enabled pdb"
-HOMEPAGE="https://pypi.org/project/ipdb/ https://github.com/gotcha/ipdb"
+HOMEPAGE="
+	https://github.com/gotcha/ipdb/
+	https://pypi.org/project/ipdb/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
-RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/ipython-7.17[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+	)
+"
 
 DOCS=( AUTHORS HISTORY.txt README.rst )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
+
 distutils_enable_tests unittest
 
 pkg_postinst() {
-	optfeature "pyproject.toml support" dev-python/toml
+	optfeature "pyproject.toml support" dev-python/tomli
 }
diff --git a/dev-python/jaraco-test/Manifest b/dev-python/jaraco-test/Manifest
index 64482eafdbdf..69bbb092d8bb 100644
--- a/dev-python/jaraco-test/Manifest
+++ b/dev-python/jaraco-test/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.test-5.1.0.tar.gz 6700 BLAKE2B 69ac08ab7e1c8aeff45d25483f2bb2648ad57a5977dbff8aab844f114a15f054b782ad5b424d9baa805ab80fc7483362dc97320965ef0abe86573b1e7f40b97b SHA512 d1d93eab85068fcba94530df50da9221b7f574e58b2c4ed519c8c4dec7231aa982d588e29137418226f23e0f94bd98f47c0859cf14d7a58c1683ac8ccc24d900
-EBUILD jaraco-test-5.1.0.ebuild 753 BLAKE2B 9f7bc219fd632c25687fd88f62d258352d6f894f2f47601755d7b6623cba009916fe032431a0f2781939d9a06cf701b02786c16f8b424cb9614c483455af8d3f SHA512 d187b636003c76a7b2ec38b04b13d60230aecc0dad543f121ceff2ecb41201dc0bc17683b3b651e18ee9d8625703e8c21d4d6e6b71c63fa6038757de9af9df4e
+EBUILD jaraco-test-5.1.0-r1.ebuild 814 BLAKE2B 485fa57bf60eaf93425b47fb479e2ec2a9c9408b57c8652f6a4e0fae706744a80270a7b366a640e6a0e2ea2dc391d0e5b48d2414a7ecea148d26f1570c17595d SHA512 125dd57f0fffaa8db952118c44b868f4db16d64cb93bcdc52e7356c3e96d5b15d2165adc69c22625aee32898fee93f5660618d5041239c93287771ba517bb5f3
 MISC metadata.xml 397 BLAKE2B 24c07f0efc966e9d4445968ba639a5476a24a0885051e4eab17075ea9b7b6369fe9ed919ccdc0b51a1e667c8d327428caac2196c2a3e087d8b36176e7b4b2c81 SHA512 4fce74bc524dc018611c219b86b87b7643fe5d133309a00dd5ade217895165f85cfbe26b686c79fc4dd8b1e016b07c83c25afa1c015fc240ffa0ac75e4c17159
diff --git a/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild b/dev-python/jaraco-test/jaraco-test-5.1.0-r1.ebuild
index b372c99a21be..1bfd53ff5f73 100644
--- a/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
+++ b/dev-python/jaraco-test/jaraco-test-5.1.0-r1.ebuild
@@ -26,7 +26,12 @@ RDEPEND="
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	# stray dep
+	sed -i -e '/toml/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index f50b38a0d92c..1b16ffb84650 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,5 +1,7 @@
 DIST Nuitka-1.1.3.tar.gz 3921812 BLAKE2B f3160facc010fb55510246d8c455665c9be1c893629a04ecfd204fcd6898ae6e4955684804cc83abff8e35084727c87b848abd9d5c25f8d0eb5b054b1c2f7d5a SHA512 fcc1374605ae8429a3f22c926783d8f96b335597b152320d2a33152ccabb7e3cb003f7870d51dcf36d1e4bbc391f517e56631c49905a4bd1cc146e5ada9c5aa6
 DIST Nuitka-1.1.4.tar.gz 3923043 BLAKE2B 7c85aab9170f118f43c56a097ef4ea90e78e539d8a796fcf4435f1e2d27e1f8a7f87ab030736f231834ab044db512e6649f6f0f2b7726dcda989edad5cc9cbae SHA512 9bf9de077d71cdca629737f21ddac22fa8526d4e1d3ec3a41465f8764997141a3a5e6e2d545001b72f66dc972fe7a9fa23cdf36636a29552652d1a04a23fd2d6
+DIST Nuitka-1.1.5.tar.gz 3920916 BLAKE2B 7352009df91e39c63073e8230065af990c86d07cf51752ceaf234e4e8b5814d085ee7423440dc5bb8ca63341f7e1eccdbd41631711ebcfac481bcb3645c011f2 SHA512 ef88b98341cb930529d6e31bb487cf3bb8c217dd9b8a8b50c8e5b147f0b4879a17f2d6c7621a056ad3f1ffd15ac88781445bc0dc8dc164a38aea83b43a6bf3c7
 EBUILD nuitka-1.1.3.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
 EBUILD nuitka-1.1.4.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
+EBUILD nuitka-1.1.5.ebuild 1214 BLAKE2B b5c547ea636f0c56f83984808e9596f6119416150c47d49fbb77c6ba7c9ffaf8f23781fdf6a18aadabb5e7c77986c1709820583abee20d7ec6d2e53de4655653 SHA512 9c1931c4e40b695eb166bd0160c6a4cb5874873cbd1241bf275d38c823f4cb82fc335b8083b8bac4575294cdd1a7767b31533a437ae4f5364e3bc546da989cca
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-1.1.5.ebuild b/dev-python/nuitka/nuitka-1.1.5.ebuild
new file mode 100644
index 000000000000..b55f0385d58a
--- /dev/null
+++ b/dev-python/nuitka/nuitka-1.1.5.ebuild
@@ -0,0 +1,55 @@
+# 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://www.nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 67ef702986b2..4e8bf7c11ad8 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,6 @@
 DIST pandas-1.4.4.tar.gz 4949620 BLAKE2B 7ce236ae28ed6c6857a3acf6936aad2b1dc53a048986809d8dedbb9595dd2234bacbe114b74d8a171a6b31254372ea262566b134e7b5b24d5d4666938c7e6154 SHA512 a12e92dd751ed2342d9291724833732cdadbc9791e59533b9efded570b9893bacbe2f10e6bc70d673adb9356dcb0ae3d64d8a1dfe6ae8a3c70e474556ded4d91
 DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2
 EBUILD pandas-1.4.4.ebuild 6486 BLAKE2B 65421968a776be789bd034222242ec3ed5a43b25e0fbe7f136b20ed46d16f8bf99af85673a1544aceef25997fc761f7a558c10f9358b06061a654772529861b3 SHA512 78f9a087894510b87e777e6ed0c64d3c75b640858f8be52332767985dd111dca46d4338d40bfd662d0785d06e8f5609657108eae740442ae6edd0e8cdac9f5e7
+EBUILD pandas-1.5.0-r1.ebuild 6752 BLAKE2B cdf46e171d595990224a00261be8a70cf03c7bf4860d55ac04edf2a8fce8c92d77cc542814023ef9f1f775ed1689f98cbc3fa07dc09e4416a5ecf605e3be844f SHA512 3cb71918734101adf9c27ec6e3f72e41edb086b0a14fc48876bdb0c132f6aee8adc6914c86344319d4888050ad431f18481409198d5bcf7c15e546dac3204101
 EBUILD pandas-1.5.0.ebuild 6579 BLAKE2B 215cbfefa2456ab577cb13e687a034325afc4fdc184d3810dc8495e38588257c8f90f5a4de116f43072b808a1c6716b40759134ac6394cdb526fab5c041a45e4 SHA512 58a27b293a7da2ecf84631789357c22c32e108ee9d12b8385d3d0c4101d887f2d413db17e4013860589c0ccd4700a8d2232a659e16d5c278b8e71ae3ce2726dd
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.5.0-r1.ebuild b/dev-python/pandas/pandas-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..b2de50f560c0
--- /dev/null
+++ b/dev-python/pandas/pandas-1.5.0-r1.ebuild
@@ -0,0 +1,204 @@
+# 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="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/
+	https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+# TODO: Re-add dev-python/statsmodel[python3_11] dep once it supports python3_11
+# https://github.com/statsmodels/statsmodels/issues/8287
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!hppa? (
+		$(python_gen_cond_dep  \
+			'dev-python/statsmodels[${PYTHON_USEDEP}]' python3_{8..10} )
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
+		pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip
+
+		# TODO: xdist?
+		pandas/tests/test_expressions.py::TestExpressions::test_run_binary
+
+		# TODO: these require a running db server
+		pandas/tests/io/test_sql.py::TestMySQLAlchemy
+		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
+	)
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	epytest pandas --skip-slow --skip-network -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 5624189c7679..6a7298c9be72 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,5 +1,6 @@
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 DIST patsy-0.5.3.tar.gz 397680 BLAKE2B 43696f9e95c124cab5bf907723596d8b2b15f0539fbd2b9c2a2fcc76591e935020929ba31fd5378114fe58d22a9931508d89edf21f24b00c916a6e78dc4ee58f SHA512 9a6ea2382287208013e02bab7cba9378311a8e18fe059593aa99090bb6191efa74badff011424a7f6b3c8ec72c1b8650637322b71617f23357bb4b38ac6a79a0
 EBUILD patsy-0.5.2.ebuild 643 BLAKE2B 178669501e3bc257c62e061463dd0e7157da8147b9551a35c1c5fd0779957bcef28525027f4c80c02ba164705b7de1838d7744aafe0facbe081d674cdd26af26 SHA512 5a5d675a8c17e6f1c2687a3e64baa55c6fed6e0d5b686e9be22398b5cbcfffa6da5191f7d689bf86a1f4097d3b32afa2c0ed7a17c2a9a0a5639d1c2ed9c09fd7
+EBUILD patsy-0.5.3-r1.ebuild 668 BLAKE2B 9cd2a6ce36351ae831dbac62a7ba872c18bfacb117f0cb04642c7fa5b24a9c5773bd2841586013856f7974526dac6b50cc5391dffe6cc8e56bf6aa7199603238 SHA512 9a0ddec23ad61f163d9f3cea857758478cd3382fd8f31674171a9ac29116e3f4eff1a289d9701816790852f658489984c6df4b952181781d8f9e232db4d9836a
 EBUILD patsy-0.5.3.ebuild 649 BLAKE2B 5b6a69a576c29112c8421da889e31c04a9c7cee36eb42820761bcf750c6f2d2130a291df1bd25d935820bca0851683fcf040fe1438c77b79020d377c9697da3f SHA512 880aba647c2f8a51e64b624974b745ae30d168762065451ce97a61eefaabefc7414fcd72a9694a6d3e6cbceb528a2648bc69c5bc0aacf8f22e61b05ade6a7d41
 MISC metadata.xml 730 BLAKE2B 4385d911c45fe13937984f9d6eb3d9d1eedcc53d470dded2df02b60e07dbcc4bda4c44efa1a69a4ec14ada8963bc618393ab9a24c1cc80ee704b4c2b73e7ffc4 SHA512 78fd7c79c6b0c40bbe2b958a5eee12708e9c8ff180af595072637c60930a416b66077a49c6ebe0d6b3cb10b679de9d0c13ba50826f3e3b992257a7ee77008285
diff --git a/dev-python/patsy/patsy-0.5.3-r1.ebuild b/dev-python/patsy/patsy-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..5bc24b1a5b23
--- /dev/null
+++ b/dev-python/patsy/patsy-0.5.3-r1.ebuild
@@ -0,0 +1,24 @@
+# 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=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python module to describe statistical models and design matrices"
+HOMEPAGE="https://patsy.readthedocs.io/en/latest/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!hppa? ( dev-python/scipy[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index ca5653afb1f6..fc96d3d8a2e4 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1,5 @@
 DIST python-phonenumbers-8.12.56.gh.tar.gz 4906531 BLAKE2B d55d828a26bc3a86660b6341c9577de6f489d3511971c5a843f10c14c05f0c82340109f13cc86c261119d6598ade95c2c3c9afdea485b09f3f73be891ee2a16e SHA512 675cf8d15536efd156a230cff9e027cdba718a32ca2facb493b235f39dc1a0c86f6a376d3d501690b25a5e52d6d411309626b8ecce9a065456e42774da04ea49
+DIST python-phonenumbers-8.12.57.gh.tar.gz 4906700 BLAKE2B b755e6e27c3006ce2b72f8e8900937ac2b7d2bd464052cd9a788ba5cdbd08ead4628963ea794a5dee962531753f6674342a3eed092edfb421c1d8f203d90b2b3 SHA512 8da340dd88c4bd41fd18af264667211e7d9dea97dcb71306c901feb3f32ee7a7012dfa1a66b8ddac746ceaab972529c32d9fc19e331893296f9938c7249173ba
 EBUILD phonenumbers-8.12.56.ebuild 808 BLAKE2B ef45a7f57cab5aa38bb958cae5b0bb0bbca327073d8d4bc41aa56552037a2ae91e5e01b3e6af6e9d948ad4f7edd5ff7fd0808c2a7d742845040fbcd55a6b3b77 SHA512 2786479b7b053e0c900d5548a1339a0d81c0d4c44a25d0b33ce6058e06a872710d7c887d4ee20b7c705065e2a2e4eee6519bb76960902afc45f86c3806819108
+EBUILD phonenumbers-8.12.57.ebuild 810 BLAKE2B 3b18782b7466900c6dcf66ada03d333fefd3df0a6a02bc1417de82a4e692e0baf316db5d1b4bf070d4a73b7f8b5133018c22587f5549fbe8863b8e3ec6859441 SHA512 9f1fc8118ab9fc7284723238e398f9152d6e491bfe0be97fa5b181f1bb30a0d96900c1e1674b6ca325daefb8813bc25dfae44f1ab172361e367725c5a040ba4e
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
new file mode 100644
index 000000000000..baab22b23fc7
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.57.ebuild
@@ -0,0 +1,39 @@
+# 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
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 74e213c15abd..6a341cb76b8e 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,7 +1,9 @@
 DIST psycopg-3.1.2.gh.tar.gz 467017 BLAKE2B 5e13156ff05a356bb59ebae77e8ad3d3e35ab669a43102fa7751927e0ecfbebd1b30db7d62bd0865f426c2e6362a98a6d9cad19c9001abf29b6d030b4dd0204b SHA512 3e412ec91a337012086b1260527b2179883f6b44a26c5e8437c92351ca39594c4430f251abdfbc52e4b2c69d5e91ba09883578b177e836691cd295b6e8464fdf
 DIST psycopg-3.1.3.gh.tar.gz 468400 BLAKE2B 5df0414d1afef4a09a319453e2d9cebd6177af507c30e69aac64dc1d476cf7a0d182c72b81e46d95e3167ee503fa9756ba82ad1092419eea0d6fc3c6e9ba972c SHA512 83ca6dc81cff841c9e22ad8ae86500be0012ee0edbc50b8ab97dcdcbe9d17a8b32feb637275bbaef8333f252aeb961fc5f1f9d2c66dcb1e92b0a1b67223624fb
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
+DIST psycopg2-2.9.4.tar.gz 384017 BLAKE2B 4bc0afcc890c8a257c1ccd5c6e4e5301857a80f8b1428aa46c1473c9e18f5d2914a2e592c13336b06106217bb334d9b0321835bdd123f1627cbeb29dedf97bf7 SHA512 259088e42e0ab0d8a1a0ccf04f5e560f32c6179b4a0a0059e91bcf269baa8f4b0f1f949c332c640a2438c927a29b2c144078a861f8e18ba9c764da7c93c73b8d
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
+EBUILD psycopg-2.9.4.ebuild 1348 BLAKE2B 15b9a3244a73a769cda7236d9bc85f36eee993498672911b121973196f1462f88a7175e26d24e1f772c4f099f2f43b3cc07c603821e13844a103de73abaf7cc7 SHA512 7e63185760b05025ebe0b1eb53673926a4f68d242f4ec2e28a7e1192e72dd876b1982e85f7418a22efada373486edaa2ccd6bd8ff3bebfd2a77d39c295fc1ee8
 EBUILD psycopg-3.1.2.ebuild 1725 BLAKE2B c78cc5299f68452a34fedef960e3ad1bab4d2ab350e06717813bb6972bc0b71c138d1b7d8da12fbea9c36d6b107d9be137e278d43e3a31e74a9fb0df09cbb404 SHA512 2efabffff8d9ae101f2207e694f60bb47daa54454274c8c7abfd69e7b21189628c088e9f8b2677a8bb2a9dde4a345abb165a538a35be7c7dc436a0f886b88ed0
 EBUILD psycopg-3.1.3.ebuild 1732 BLAKE2B 346e6e31a3be765833c4a1d75009d3c8e7347aea9a4a38d35d0cc5c7da722d23abfc41c5b4943331a008b19238a7544c0b181eec83a23a68ae1bc68e5748757f SHA512 f808046857d7400d55ebd1e10ab5f090c26f78b181ded703798acd5a9531bff61bbb450350f904533e265f0fcd2c5032db53a9c1503ced826dc26002cc2a844e
 MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/psycopg-2.9.4.ebuild b/dev-python/psycopg/psycopg-2.9.4.ebuild
new file mode 100644
index 000000000000..c33f29d549ad
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.9.4.ebuild
@@ -0,0 +1,56 @@
+# 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=setuptools
+inherit distutils-r1
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )
+"
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 4edf24c1d7f3..f29b416b480d 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,5 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
+AUX pydocstyle-6.1.1-tomli.patch 2889 BLAKE2B 9e246941b41b19ee463f50e76075f3cdbc47ce48af6e6678e22826c5e184629a7fe6532540f7088174cebce4dfd97099e79eb9e106ef342af3814cf6d72a1755 SHA512 2e34de862def3f56e88e5feb0dfb1fc8f634f72c7796735c55d8830245a3dff1b95f5199d99299b87a680c8debaf5e7e1ced934a1bc07122d2faff1df54601ae
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.1.1-r1.ebuild 907 BLAKE2B 57f32b8f5e4ec34f8bda21894780e698a054bdc5550e8adadc7acdcb36d7ac95ee369214b0d2c5900242e8d61bfae7b44de3840b8a59338ebe86df27b891751c SHA512 0073f98c21a90b393de547bb7116041fd20d04eeeb0246059a14dad6ebfa17718acfdc7d895083b772f53df3f79b3fdaf19d76a48acd0df295d66bc5b48b3e34
+EBUILD pydocstyle-6.1.1-r2.ebuild 982 BLAKE2B bc5778cfc802aad80bd9bdf123e46e16ebf9dc9e8db929fef7ff0de6f2568d0ff9c404c5dfac57ddd9f48af94eadd9a439dae28caabec0261a5ae4df6f73567d SHA512 fc42be5ad6943b9c17c1d28284009d8e2e27a1cc9e4a59e2bc235175543b80be6dab817baff6b08a90c1ac2fbbd1d94592cbe7362ec83685c5042e644320892b
 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc
diff --git a/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch b/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch
new file mode 100644
index 000000000000..8be2adca5ba1
--- /dev/null
+++ b/dev-python/pydocstyle/files/pydocstyle-6.1.1-tomli.patch
@@ -0,0 +1,90 @@
+From 4c9ed77d3629a69febdaa14d153d3db869b58e4f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 12 Oct 2022 16:37:40 +0200
+Subject: [PATCH] Use tomllib/tomli for reading .toml configs
+
+Use the built-in `tomllib` module in Python 3.11 and the modern `tomli`
+package in older Python versions to read .toml configs instead of
+the unmaintained and broken `toml` package.
+
+Fixes #599
+Fixes #600
+---
+ docs/release_notes.rst   |  1 +
+ requirements/runtime.txt |  2 +-
+ requirements/tests.txt   |  1 -
+ setup.py                 |  2 +-
+ src/pydocstyle/config.py | 20 ++++++++++++--------
+ 5 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/requirements/runtime.txt b/requirements/runtime.txt
+index 80302751..b4e9ca76 100644
+--- a/requirements/runtime.txt
++++ b/requirements/runtime.txt
+@@ -1,2 +1,2 @@
+ snowballstemmer==1.2.1
+-toml==0.10.2
++tomli==2.0.1; python_version < "3.11"
+diff --git a/setup.py b/setup.py
+index a9c5df1c..6c0671c7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -8,7 +8,7 @@
+     'snowballstemmer',
+ ]
+ extra_requirements = {
+-    'toml': ['toml'],
++    'toml': ['tomli; python_version < "3.11"'],
+ }
+ 
+ 
+diff --git a/src/pydocstyle/config.py b/src/pydocstyle/config.py
+index ed00c874..db7ed1b6 100644
+--- a/src/pydocstyle/config.py
++++ b/src/pydocstyle/config.py
+@@ -4,6 +4,7 @@
+ import itertools
+ import operator
+ import os
++import sys
+ from collections import namedtuple
+ from collections.abc import Set
+ from configparser import NoOptionError, NoSectionError, RawConfigParser
+@@ -13,10 +14,13 @@
+ from .utils import __version__, log
+ from .violations import ErrorRegistry, conventions
+ 
+-try:
+-    import toml
+-except ImportError:  # pragma: no cover
+-    toml = None  # type: ignore
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    try:
++        import tomli as tomllib
++    except ImportError:  # pragma: no cover
++        tomllib = None  # type: ignore
+ 
+ 
+ def check_initialized(method):
+@@ -59,15 +63,15 @@ def read(self, filenames, encoding=None):
+         read_ok = []
+         for filename in filenames:
+             try:
+-                with open(filename, encoding=encoding) as fp:
+-                    if not toml:
++                with open(filename, "rb") as fp:
++                    if not tomllib:
+                         log.warning(
+                             "The %s configuration file was ignored, "
+-                            "because the `toml` package is not installed.",
++                            "because the `tomli` package is not installed.",
+                             filename,
+                         )
+                         continue
+-                    self._config.update(toml.load(fp))
++                    self._config.update(tomllib.load(fp))
+             except OSError:
+                 continue
+             if isinstance(filename, os.PathLike):
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild
index e3d4a9f3dd1b..2c8dc81111c3 100644
--- a/dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1-r2.ebuild
@@ -27,7 +27,9 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.{8..10})
 	)
 "
 
@@ -37,4 +39,5 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch
+	"${FILESDIR}"/${P}-tomli.patch
 )
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index e2e64dd23a6f..dfab509c28f4 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,3 @@
-DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
 DIST pygobject-3.42.2.tar.xz 558724 BLAKE2B 3e98cf52e818eff42beb8b6120ee8eb4cbe3a6f49670d355e1081b71d411bc93fc701cc37108a321cfcc19698c39b8b61cce5a9369d871da58fd2a2c0455fb96 SHA512 eb604f839e0702e8aeff0f19665e44c05c56cae02ce892e9ab8a95ddb0d5d0216182d0c9a0059fc8e05990c0d5707f2f7456d8924bbfb95ce1d9a42908ac0119
-EBUILD pygobject-3.42.1.ebuild 1786 BLAKE2B 8da4bf87d753a965f24204363d4250554fceb822bf55090a401ac643d2bd91491ba6dbf3eef57517cfd684350261dc97e73058bf98656a9c92fc3e0dbd84d592 SHA512 aece28c7d33be016887008111abef907eed8d7746559d0527a8a1ef4c46cfde25a2689f620a7b4d4ed4edae332a07630d3b918ac767440b7c91eb892da4dea53
 EBUILD pygobject-3.42.2.ebuild 1738 BLAKE2B 86acf53831b915fdb91c6665a5787005eb8f2196550117fc4ea768adc7ac37a9af4473b1830572a4dc2aae350dcae3cc5a61b3fafaa19f7c7b1fca3916d888c0 SHA512 1cb56095da33e487b98d6b87dce49e71d02ef27a41132567bf7a3f1ccc6294a84baad40c69b41323209ccd55d70cd8bf220085102a44271baef4e7373e68b711
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/pygobject-3.42.1.ebuild b/dev-python/pygobject/pygobject-3.42.1.ebuild
deleted file mode 100644
index 95db0a28fc86..000000000000
--- a/dev-python/pygobject/pygobject-3.42.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 94a805d2a4fd..6cc0b360688b 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,5 @@
+DIST pymysql-1.0.2.gh.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
+EBUILD pymysql-1.0.2-r1.ebuild 4247 BLAKE2B 3bb170fa68516b9db414c76583b31cfba1de8d9fac4c5954638fe2d52148d7d150ce4d232a711bc4ee49e89cf2c59b4e12562f66b19a9da0a44b9f80324530ca SHA512 2c176d2dd692bc3deca132c0c2b4978256fa5184d21b839647fbffd60835c6885e5a939f4e686382ef1090076cdd27fcd8169af7f213db266d926ed1551de7b6
 EBUILD pymysql-1.0.2.ebuild 4207 BLAKE2B a87b3bcc18a7ac903ecd79fe6add4412dc3155997a93edaa036d624052422aae2d579a15f7e6a0426c49cc92016ef310b8bb0fe7b7aca885c92d9010bee55125 SHA512 49e27f6608e4110c1080974e4b140e42120bfe7d0b728ab15f78dba7f6a6e8e235619899d19bfc53a1b39fceaab5429a319b4ee2139c4bb2544c9afdb4795c11
 MISC metadata.xml 494 BLAKE2B b77cafe43ba22f501e74de63e2629860f6d360e21533ce1b02593735f5a5bad5730f58bc05d3dbc94742cd26fda12092f66fb6d98b4a34d1a2ae9bced30c9631 SHA512 a8378d8970dc0fd8af8f9df6ed1e22b30b1c7901bc8f5a73e1180a3871d092b3afc16bdf939f05407533dd009c380f2301952cae93099b2b00d021b0aa8455ec
diff --git a/dev-python/pymysql/pymysql-1.0.2-r1.ebuild b/dev-python/pymysql/pymysql-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..dc541b68e6d9
--- /dev/null
+++ b/dev-python/pymysql/pymysql-1.0.2-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	if [[ -z "${USER}" ]] ; then
+		# Tests require system user
+		local -x USER="$(whoami)"
+		einfo "USER set to '${USER}'"
+	fi
+
+	local mysql_install_db_cmd="${EPREFIX}/usr/share/mariadb/scripts/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && mysql_install_db_cmd="${EPREFIX}/usr/bin/mysql_install_db"
+	[[ ! -x "${mysql_install_db_cmd}" ]] && die "mysql_install_db command not found!"
+
+	local mysqld_cmd="${EPREFIX}/usr/sbin/mysqld"
+	[[ ! -x "${mysqld_cmd}" ]] && die "mysqld command not found!"
+
+	local PIDFILE="${T}/mysqld.pid"
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Killing already running mysqld process ..."
+		pkill -F "${PIDFILE}"
+	fi
+
+	if [[ -d "${T}/mysql" ]] ; then
+		einfo "Removing already existing mysqld data dir ..."
+		rm -rf "${T}/mysql" || die
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	"${mysql_install_db_cmd}" \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+		|| die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	"${mysqld_cmd}" \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++)); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	# create test user for auth tests
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		INSTALL SONAME "auth_ed25519";
+		CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+	' || die "Failed to set up auth_ed25519"
+
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+		SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+		SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+	" || die "Failed to create ed25519 test users"
+
+	# create test databases
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		create database test1 DEFAULT CHARACTER SET utf8mb4;
+		create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+		create user test2 identified by "some password";
+		grant all on test2.* to test2;
+
+		create user test2@localhost identified by "some password";
+		grant all on test2.* to test2@localhost;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	distutils-r1_src_test
+
+	if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+		einfo "Stopping mysql test instance ..."
+		pkill -F "${PIDFILE}"
+	fi
+}
+
+python_test() {
+	local excludes=(
+		# requires some dialog plugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
+	)
+
+	PYTHONPATH=. pytest -vv ${excludes[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index c1effae3c68c..0da92d915006 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,3 @@
 DIST tables-3.7.0.tar.gz 8227955 BLAKE2B 0d5b7b765375c4787f1210138e5fd02e3c0ce429ef209a3a8d4fd3bc094f68486ab6f4d0a960ce86efea6991ed691ef2a3e9e8f37a49fe91cb8d6372cadea80e SHA512 eaa368d063b5fad87e6d0f9ab6f02da0b2a3542740a52fe8c2bb58e41121495d07b6d2710ad402a28891294aa61a11238c6a7e2cf2933a1bb11391b79cf4fd13
-EBUILD pytables-3.7.0.ebuild 1645 BLAKE2B 67380343373fd8bf9029a8b1667950a13ba3b467b9a7ae468001000201e0775aac5c8141f4568a7995febc20e3dd8be05d0cf06b98a22bcf444c078f80600a26 SHA512 2fc2d40eb8ea533121b1db80fb731d7f55b2c1649523486e7b6a9fcd1c79fe1dc4370cbe7de5b5abe3cab505522567da1b464f410d967ebe8b6750f2c61f2abe
+EBUILD pytables-3.7.0.ebuild 1645 BLAKE2B 1878a51553ea7e069b3968ad92f7eb62490d14e7f47b5e4be71bd9d0e2a792ba1980d011d7571de014a344ea48f35ab8fcb00129f87758c5482e2d206c635f61 SHA512 db1a8c323e04500c581565125d3bbb5da9bcee9049f0b62789223b8320c743533746135169fc94b70094ee82868412eb0fa24d8ec995a3519c6aff0bde401251
 MISC metadata.xml 895 BLAKE2B a6d5fd675fc62419446dcfb557f0f16d1f0a9b7552b5a9d05286486603fb038ae49d0df6ecc6214e8b18f64c168fd0fb0c12dd1d052cb66a4c54921bb529bd2f SHA512 412a0d2d5f90b7b73889f531b2759c2466a7effb507e38095810453237b6989e95a02f2fca102a43b9c088fa563fef3d761831b28633510e9318d6e50ec6a5b6
diff --git a/dev-python/pytables/pytables-3.7.0.ebuild b/dev-python/pytables/pytables-3.7.0.ebuild
index 60bf3a743b83..b04f58328a71 100644
--- a/dev-python/pytables/pytables-3.7.0.ebuild
+++ b/dev-python/pytables/pytables-3.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 MY_PN=tables
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index f9d8a74025ce..6a03a5c65088 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,8 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST setuptools-65.3.0.tar.gz 2615722 BLAKE2B 1344fe17c1c2a4ec60dbf37b3e1cbad56bb5299bed9f8e30a21015f2457e1e90d6782369dfc2d804973e7348d22a356ec0ef75d1aeabba7d77e20e5ddf36e576 SHA512 3c173b1e1a8dbbed0bf3bf600df1256aeabf1b9dec34d5f5d0b1429b0fe16f2aa61fa6c4f400a5b6da24b9d679954866b76e019130bcf2246b138fe017025de9
 DIST setuptools-65.4.1.tar.gz 2615710 BLAKE2B 12e644412c7f910a8bf6fb470e0c7e78bcd11a9403d7d0821eecad156d0a4ed03751de6bd6c51ebc2ce1c0925386120971c0da129ebd7e1b8376feee1f8edc7e SHA512 d13253bb556380b1b45d4b51dc7922b0cffa390ba92d97ccbc43c314aceccdcf51ee8b5c751cf6f36c6c8955836bc248214d55fe7419ff0332719862772f0f95
+DIST setuptools-65.5.0.tar.gz 2616463 BLAKE2B b2f4ea3750a6ebd2d83a99e2c6beaccebf2c167dac23c901937fecb3fff9891c8c2cf4f150281c00656d2057c89ede80a7b47c73c783b268c91a3700426fd66d SHA512 5f65765a2971662ef4864473d7b54d7d5357fba2b6e9369f1b7923ef5466463852a714e6ee0b6581835c1524069cdfefd907cc65681c7f2b73c6ef278bff6228
 EBUILD setuptools-65.3.0.ebuild 4261 BLAKE2B 3ee99d3763734ce401eca631ec21f1dc0497b9d9216569ee1f9decdbdbe59668a17a271a0db8fe7f1c646b3eef26772c3aa0b394839920ae9ce9d80e16fe31c2 SHA512 9c748d867f71d7c7c8eda664cd5a11c75d13cf1e82928ac9ef9a4fc3984208f1d9439941016dded058cc63f446b14099b99b86e3cd9055e2365c5b482ee24a74
 EBUILD setuptools-65.4.1.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
+EBUILD setuptools-65.5.0.ebuild 4269 BLAKE2B 5df1501305bd2717a5671d8e0d9ec0b0f9b5da733e09d54858884ea3ef1fe0d1444f476295c8a42133e566e9db836d8ccc3be8709b6a35a9a02ab2c3a7a0e1a5 SHA512 3fbf979376dfe61f354af1b80d452203161411eb0538ccc1138852aa5daeac044af3a5a579a1c0f0beec41df16414af0b0f0c25c06a265a36c6e076ee3614fc6
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.5.0.ebuild b/dev-python/setuptools/setuptools-65.5.0.ebuild
new file mode 100644
index 000000000000..c11a0923e907
--- /dev/null
+++ b/dev-python/setuptools/setuptools-65.5.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+# please bump dev-python/ensurepip-setuptools along with this package!
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
+			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/pip-run[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_build_meta.py::test_legacy_editable_install
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_editable_install.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index d1d26c770364..d151c8262191 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,6 +1,7 @@
 DIST xarray-2022.10.0.tar.gz 3035596 BLAKE2B f42df85bdfa66403826fc7d2fa811419898134723ee24afc6b77a320b23c9b5b95fcfd25520f74abf0a3b7bf009fdc33655eebf0ff9703753872072515deee58 SHA512 ecfc92c68ea7ba02b673c6c317e68daad23b6882b4ed316ad1dd733f179c643411d3ee5902954dbd62f2eb7ad591d8ba1a5f0c1b2c7f6873e733df2f22b6650c
 DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B 4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663 SHA512 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
 DIST xarray-2022.9.0.tar.gz 3030815 BLAKE2B 71bea98d49fa9ce2e8e881bdcba7872293e1cd9fa4bd23e6cdce40220d87550fade52a7b7c25ff5d0b11b8a729c57ed219031b1f13d1f375c5278ecc611dfbc5 SHA512 57383cfc809b26d743c06eb5a158d318c65aedfa374e62b0a5fdc99708632a364b2efb6275fbc728e441effb7c695635a443cf141d69fa742216a677f4168b3b
+EBUILD xarray-2022.10.0-r1.ebuild 1100 BLAKE2B 94d3b2cbd5167a14f107d424c2a31ed2a3f8705c4a8d9d2f2c7b638265520dc2502df7436a66a760cb55a5ba5cad9016fa3cf8590ce980f4dc77cd7fb52a454e SHA512 cf1f2e42ea1c43af41b2d3408fd9624b45ad800d95b04bd8bbad004dbcc48cbf2fe22b0751614fc7f469e5746262e2660e260fde1580779c85b060838fe4a518
 EBUILD xarray-2022.10.0.ebuild 1113 BLAKE2B 7c6c9efa34384aea2c7bbcc0f263d2b5fd4eff771a5e3eeca5bced653384d635e22863da38011c6f3875e6eee169cb1e75e52d689b2a42b810e6ccc4b16b9709 SHA512 20a3143028e3c8d42e881cc9bf0c286df66f5a79e1f30b8d956b7579ffaef5a13064e9ec61737ea45689fc779ae51377bbf9e81692fa57182cece4a7c86aee8f
 EBUILD xarray-2022.6.0.ebuild 1100 BLAKE2B 69026f76a222a1c1f6f4a52dbadd28d70154c6355fa8b21541697a9859716b566264d44f9ff8819705251556337dbb84588859e4f18ceb474e72b0502ef11006 SHA512 5ad0633eff44291cacb14c40477944ddbcdbcee1ad7d618c5b677bbc409912b4be064c00814b2ce21f542dfd1056050b7f4384b38d45fa395f0d6c0ce42b40bd
 EBUILD xarray-2022.9.0.ebuild 1106 BLAKE2B 42f7907525a13a7051e1d7d801df654b04b696a4bcc54254898bd3e4a70d8892d8ca1747e63e1c67ee1aae50142219d3f15c2cff97f92d7af61f919f8d0b824f SHA512 f11c67003d20f5e6dcd9990773653c9baf9fe6ca00d65b462f7e01055186a1352fd7fc5eb9fb968eb889b36cd83fb1ae680fae0740c6f119360ed7a2950084ff
diff --git a/dev-python/xarray/xarray-2022.10.0-r1.ebuild b/dev-python/xarray/xarray-2022.10.0-r1.ebuild
new file mode 100644
index 000000000000..5e56abd493ea
--- /dev/null
+++ b/dev-python/xarray/xarray-2022.10.0-r1.ebuild
@@ -0,0 +1,40 @@
+# 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="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+)