gentoo auto-resync : 26:01:2023 - 13:56:06

27 files changed, 766 insertions, 21 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 590ecde0961c..be7419f74114 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 266146436200..2342f6c7a78d 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,3 +1,4 @@
+AUX bandit-1.7.4-tomli.patch 2465 BLAKE2B ad8f0e6a5880a29d97e3d3f58d58cdf748308605a7dda4817726e8d11f9b8f1d3847cabbf608b6e49c0c85e7e29572625fdfbb681092cab0ebdca6c452c651aa SHA512 2f3a4abdd0b3f25593cea35e10a16971b8df6676e157947a7a8fce8c0f4dcc9f196c7adff3ca62ef8fd3ed7610c2d0be9c850d23c037581d3124d07ffde53f83
 DIST bandit-1.7.4.tar.gz 495104 BLAKE2B 5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54 SHA512 93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
-EBUILD bandit-1.7.4.ebuild 1005 BLAKE2B 1c2b40559ebe01de3dea2ee1f60dd1cd30314ea6fc7b0aa955b31cbbf754b1dba85613a547a9d1367bb8621f233d6d1d3491385a8b320be3038a558b6bbac7b5 SHA512 adcb4b84fa6c17f1341bbf26d3690af5ad3cda82dd2733f65f94f31a6030add60b21424dc03c5a7c4f8c9a38a8634bb575a3ef8eb43fff652acf90d667aa9e7e
+EBUILD bandit-1.7.4-r1.ebuild 1131 BLAKE2B 63bdd78d59688da4847f6baedd1ff926290ac81dd6d83d6de74e7059d4bb7550bf1ec611f7f81524a4d7929e662e402f762eed43bd4fa34130971ae2dcccb529 SHA512 22d3ec188e4d7bf2c5dfaf397b8fc35727d18d441b5113b5259d12b191900247ba0221c5bdfeefb0a115d382eb4735b1cd48bd41369a5932f43dba1869638bd3
 MISC metadata.xml 709 BLAKE2B 845208c1e800577f159e34675344ce540c61888393dfcfc2f7c47e77ccfd4784cb3f1990b25b78f97d62c8b5c53feaadfdc894990333a09b7938a90be68b8815 SHA512 ba2c6de072973fcd891e4e161a43d52100df89f13243765cb5b2f2ccd7ef7a5266d8fd6e8d373859b53d6743c1de5b0733d5bb4f81b4a94d95843e0593e9dc8f
diff --git a/dev-python/bandit/bandit-1.7.4.ebuild b/dev-python/bandit/bandit-1.7.4-r1.ebuild
index cc946f6f00ff..769c2883561f 100644
--- a/dev-python/bandit/bandit-1.7.4.ebuild
+++ b/dev-python/bandit/bandit-1.7.4-r1.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="https://github.com/PyCQA/bandit"
+HOMEPAGE="
+	https://github.com/PyCQA/bandit/
+	https://pypi.org/project/bandit/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -30,8 +33,14 @@ BDEPEND="
 		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
 		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.{8..10})
 	)
 "
 
 distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
diff --git a/dev-python/bandit/files/bandit-1.7.4-tomli.patch b/dev-python/bandit/files/bandit-1.7.4-tomli.patch
new file mode 100644
index 000000000000..238cc1f6d352
--- /dev/null
+++ b/dev-python/bandit/files/bandit-1.7.4-tomli.patch
@@ -0,0 +1,85 @@
+From 5a8f1050011a6eeca96c1b8a0fe1988fda97f214 Mon Sep 17 00:00:00 2001
+From: Mathieu Kniewallner <mathieu.kniewallner@gmail.com>
+Date: Fri, 25 Mar 2022 23:27:56 +0100
+Subject: [PATCH] Replace `toml` with `tomli` (#829)
+
+* Replace `toml` with `tomli`
+
+* Only require `tomli` on Python < 3.11
+
+* Update test-requirements.txt
+
+Co-authored-by: Eric Brown <ericwb@users.noreply.github.com>
+---
+ bandit/core/config.py | 20 ++++++++++++--------
+ setup.cfg             |  2 +-
+ test-requirements.txt |  2 +-
+ 3 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/bandit/core/config.py b/bandit/core/config.py
+index 7c259bcc..236f357c 100644
+--- a/bandit/core/config.py
++++ b/bandit/core/config.py
+@@ -3,13 +3,17 @@
+ #
+ # SPDX-License-Identifier: Apache-2.0
+ import logging
++import sys
+ 
+ import yaml
+ 
+-try:
+-    import toml
+-except ImportError:
+-    toml = None
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    try:
++        import tomli as tomllib
++    except ImportError:
++        tomllib = None
+ 
+ from bandit.core import constants
+ from bandit.core import extension_loader
+@@ -34,14 +38,14 @@ def __init__(self, config_file=None):
+ 
+         if config_file:
+             try:
+-                f = open(config_file)
++                f = open(config_file, "rb")
+             except OSError:
+                 raise utils.ConfigError(
+                     "Could not read config file.", config_file
+                 )
+ 
+             if config_file.endswith(".toml"):
+-                if toml is None:
++                if tomllib is None:
+                     raise utils.ConfigError(
+                         "toml parser not available, reinstall with toml extra",
+                         config_file,
+@@ -49,8 +53,8 @@ def __init__(self, config_file=None):
+ 
+                 try:
+                     with f:
+-                        self._config = toml.load(f)["tool"]["bandit"]
+-                except toml.TomlDecodeError as err:
++                        self._config = tomllib.load(f)["tool"]["bandit"]
++                except tomllib.TOMLDecodeError as err:
+                     LOG.error(err)
+                     raise utils.ConfigError("Error parsing file.", config_file)
+             else:
+diff --git a/setup.cfg b/setup.cfg
+index 5d570eea..7449f15b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -31,7 +31,7 @@ project_urls =
+ yaml = 
+ 	PyYAML
+ toml = 
+-	toml
++	tomli>=1.1.0; python_version < "3.11"
+ 
+ [entry_points]
+ console_scripts =
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 39c1ae8db4b5..6ae26edc5dfb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,7 @@ DIST boto3-1.26.53.gh.tar.gz 592023 BLAKE2B 07f09144913b7506dcb790e9a72adacecafd
 DIST boto3-1.26.54.gh.tar.gz 592401 BLAKE2B 7fd5bb10cda2b27fc43a7efa65c4651d95c8ddb7c94b424847f21010f9d748398a9efc47118ed7d2d90369664dddd4903fb8c4e7bc3ba3f70643a565b426023f SHA512 86d315eba84d783d327d19b41a593f193d9b356a205f29a1589e43e43519aa6eedefc26e7b23234dade6ab0bbb309d8039b011d0ba766757be8eb7a57c22f49b
 DIST boto3-1.26.55.gh.tar.gz 592495 BLAKE2B 3e187731eb2eefafb349709df589ee7001f234059a9d68a4170fd3643e1eaa8528b6f6b89d32a239375ff792df93dd675b8effcbd18b8167de23aea313ac87a1 SHA512 59eec6c16e7010cadd11235806204c50b353d9ec101595ad6838ea72407d55849854aa68da088a94a2e56802d3caeec8fb1d5a432ed360c20edce1fff44ff273
 DIST boto3-1.26.56.gh.tar.gz 592747 BLAKE2B d74dbfc691212267b6c755a853e80fd6affec257f89e79626646d0b75f3b96a95e8b39924eb7ec9a091b59102f016ef26a33cfbec8c2e19b28216677cce1adfe SHA512 61bb273c64b5adbbb8eb67636719b92c270636d533a64f2531ec40d266afb0dc31c261b7bb38aa98b42121a70d7226d282b8041c638dcb0e2907d803a37c0b3c
+DIST boto3-1.26.57.gh.tar.gz 593947 BLAKE2B 5a30f237d992bb766b3afaced8b9e01c792c857a02aee5ba589f0f03c4c8eace3b32920d1dd62554fbb85d14b7f96789590d4acbc764dd3c56208fa5bf2dea1d SHA512 112719584ad122373e5aa24ebb6ea5c87772cdab71f59274b2f2172d92c72ed6894645253e15e12a808a83e14b12d27fde8a9fe086ccc33b987166de3fe0984b
 EBUILD boto3-1.26.45.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
 EBUILD boto3-1.26.50.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.52.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
@@ -12,5 +13,6 @@ EBUILD boto3-1.26.53.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef
 EBUILD boto3-1.26.54.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.55.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-1.26.56.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
+EBUILD boto3-1.26.57.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
 EBUILD boto3-9999.ebuild 1586 BLAKE2B 44b7d2804e4a484ed5fb864ca2c60348f4e4eb2265c1ba946adf27b31052dd9041f148c1ec935af0bdcabc66109ad3b479dac167613c679a2d9e42f689182734 SHA512 bf11d1114aaff8762b6162a7ba94223e2eb180868e8395aafd1f466c48683514a3ae755baac40d7e0e1afb26ab49e14d30f39266382661b01e8f7ec53d71f145
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.57.ebuild b/dev-python/boto3/boto3-1.26.57.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.57.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a849b84cdc3c..d20cf0ba8993 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,6 +5,7 @@ DIST botocore-1.29.53.gh.tar.gz 11124794 BLAKE2B 0d5fd0a4e9ffb0d077cf740df604b1f
 DIST botocore-1.29.54.gh.tar.gz 11127081 BLAKE2B 7c2d11d968ca6a4d3b23b12c44cb8f050ac1848f75280c44bbb2f3567860204ed8615bd1596e02b8d0222f4d54c22a8559114365ec6a69e4a01a166a821d8c8a SHA512 4ba58c9b881ff95149ba1a5805453885208cdb68f197cc9a6c13cc9ca075e988ae33e4809f2970d9c48fa426e26c06d83686b8bbf4ff69d4a7cfe26ef3f903bf
 DIST botocore-1.29.55.gh.tar.gz 11128407 BLAKE2B 182c39bc0e1b40a5ef8cd4bbb87243972282a6cfcfea7d1b6830790c8b759c67e6cad18e93d7a56224efa0d97b96edc06853f1df12a22c11a694beb677e75880 SHA512 02fc018e313b9ee4c2c745343bf8977a5311cd9264fc1186cbf19610d1ca8224f362b29432f7a2676fe85d03b1102e7e2736f4933ba564784f0e61832f3989a6
 DIST botocore-1.29.56.gh.tar.gz 11128363 BLAKE2B fd6a416e822294ef5ba2e33e7a1bdde026031721d54185514845651e196957a2a17cb9cfba1ff0c6766cdcb47697d27898796586f9144cc5116ec13b818dd911 SHA512 a452d10560432b0fc96ffa9db0e716e57c71b522c9cccdc852087240ddfee22005e7f553be0618c0319d5404d9627e1ccd8682320d8d3f03d78bf41ae8c913be
+DIST botocore-1.29.57.gh.tar.gz 11132049 BLAKE2B 748a8b709cb6bff1a1bb38757ad68c31aa680589ed59e7c3f73b6563a5b9572ace96102ffda56643d33f0dee98f30f8443a431c7869ccfe54a311964ce781b5b SHA512 adbd760b8238b259bcc1eb3ba42cdb702b60eb6fece73a5bda5129a974826655157e702cef6a1114c2e3bd036b1cf22ebbead6e78bf88129fe68b02de1f38dae
 EBUILD botocore-1.29.45.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
 EBUILD botocore-1.29.50.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.52.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
@@ -12,5 +13,6 @@ EBUILD botocore-1.29.53.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d1388
 EBUILD botocore-1.29.54.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.55.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-1.29.56.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
+EBUILD botocore-1.29.57.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
 EBUILD botocore-9999.ebuild 1808 BLAKE2B c88307d04e9daf86db23c54e39fb14931a6e60ab83593db191859652e67c90cfac45263f60c0211f81bfa10fe755b9023924713f2855324c929322d557b4ec17 SHA512 16e3144cef752302fa7ad350f5bb86301d41c0223f9ea41ed784083f2475d48efae095d82da95f93f77fadc86dea96b6aad1f1bce96bd926be01ef2d519fe230
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.57.ebuild b/dev-python/botocore/botocore-1.29.57.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.57.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 4f8276bfd83a..9d72584623ad 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,3 +1,5 @@
 DIST braintree_python-4.18.0.gh.tar.gz 216422 BLAKE2B 30ed072c3f6c6ae3cc9661fe5a1f49327ad2fd17261590a61aaae543966a40c9018a1c3b789e1ba3f387a8d93cff35c8b7ffd589e76ffefc572b7dc9fcd84951 SHA512 2abdec5e16386bed5e9c6d1d085ec604050907a57bf9dbe65c6c3d05b2bdf8f00929e11729b50a4774ab2bdd61a1a8d4a73f6c23368b663cc5757562b8ce1e4f
+DIST braintree_python-4.18.1.gh.tar.gz 216743 BLAKE2B 715656ac712d6b79200c4453ca5ff35bf803ddaa04f57e174ebbc3f61776b3d373184ed82781349f0ea5205c8e7cedff701e6d254ff3b821be06b77c39352946 SHA512 7adb1f5e66113d663dc59cfc1df638c3bcdfc2f1ed46125b3e882ee48053e2ea07139f447cc4151dde6a7afb6986cb65d41f26a116d00a89e5f28d54409b9fcb
 EBUILD braintree-4.18.0.ebuild 758 BLAKE2B ad30702354fe4d865abdfb1c971b9a0a9fb2facd43457a31b87c29a5efc9710732449999aca9ab07bb17167cdfed5b1be9d11fa24525039249afd108f78e23d7 SHA512 f7b052605214eb36ccc6113cbbe1f8fc9c6c294f7e9431fa694269419c92acbf07496ef5efac2055c8cca6b3b6ec426bcadecfbc3f8825a9bc00b705122d1c00
+EBUILD braintree-4.18.1.ebuild 758 BLAKE2B ad30702354fe4d865abdfb1c971b9a0a9fb2facd43457a31b87c29a5efc9710732449999aca9ab07bb17167cdfed5b1be9d11fa24525039249afd108f78e23d7 SHA512 f7b052605214eb36ccc6113cbbe1f8fc9c6c294f7e9431fa694269419c92acbf07496ef5efac2055c8cca6b3b6ec426bcadecfbc3f8825a9bc00b705122d1c00
 MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49
diff --git a/dev-python/braintree/braintree-4.18.1.ebuild b/dev-python/braintree/braintree-4.18.1.ebuild
new file mode 100644
index 000000000000..ba88647058bf
--- /dev/null
+++ b/dev-python/braintree/braintree-4.18.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=braintree_python-${PV}
+DESCRIPTION="Braintree Python Library"
+HOMEPAGE="
+	https://developer.paypal.com/braintree/docs/reference/overview/
+	https://github.com/braintree/braintree_python/
+	https://pypi.org/project/braintree/
+"
+SRC_URI="
+	https://github.com/braintree/braintree_python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-0.11.1[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.md )
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest tests/unit
+}
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index dfdc31a568bf..85218cbf658b 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,7 +1,9 @@
 DIST pikepdf-6.2.6.gh.tar.gz 2905945 BLAKE2B 3ab7e80ca43c7395994333a47f3ef667b69228cc80c5e03d3264c9dbefaafcd7d367030a90f7836904f141ce497967024264939a50dd59a0ab92e0beca607697 SHA512 a395e6b53792ecbd604424be67ccefd66d4a0a73dc1f22c86ee763e97a2f940d607494d5a0c5172867196932ffa0efac44427dddb277b754fe39e28f41f1fae5
 DIST pikepdf-6.2.7.gh.tar.gz 2906211 BLAKE2B bfc3d8e707b952e214fda3e31ecb0cb44266f41de63f2daea7e13dc944ed8d9d2438ead7a0b6a8f18b6295f52621311f94849b060459d082e75eef0c71713148 SHA512 4cfab0729c0f87bd52f58b9f23af8a4ddd34029b1259e4e2c67a73abfda3b5bd2e8de25962ed70a5497609398453e4f1ea6642e3b01245cb2c70bc09b5ac55f8
 DIST pikepdf-6.2.8.gh.tar.gz 2906054 BLAKE2B 7b639741112857dbf784da7245f905e76664b200f4f832b6a2e8bbf7ab3e48e7f3a5dba1ae00bba72a5797e7e7bce0f1cea6777114ccf9a9b39d352a754edaeb SHA512 d27d8dcd80aa6a553ea6fb3c404bbe7752b2d1a7fb7a8e0315707f24243ff3fcdf58f273dc283e117a0124bfa724f7384004340f20d9f322cf08a5e0366b0225
+DIST pikepdf-6.2.9.gh.tar.gz 2906102 BLAKE2B bd876f506714b237a6010b72c4557bc600e2ee4d6621131c21902ae9f41eb39a9a54a6c08d08dfa84fb3eeec8f2ae7e256d1f1fde533dbc2660a2b415077c8a7 SHA512 2b16e51c999fe1d1f593a9079ae0f13fdaa1955b5d55023169e3a805cbdda07b7ca4108ecea66463a1a253712b851b6dc824aed2c80e5f0caa3ba398d413bd64
 EBUILD pikepdf-6.2.6.ebuild 1607 BLAKE2B 92e6ac52cf35242199acaabb4e12698be2ebe9c49ce0f9dc30755a74667c1546dd1bfae5d5fea084d4bc1175dcf5d859f1d7f51097fc930867b0530bf02c7868 SHA512 bb41d2eb4da7f92a90e7a0f8a959336bf66623b6f4493b19fe0a372b0c3138f258c95807e06473f8310027136f3bfd1d6be5f038885d5581d2346af565ecf685
 EBUILD pikepdf-6.2.7.ebuild 1611 BLAKE2B edf22a90167ea2dd54d8030ae451f95e5d24745528afe0340ab6d348af65e155d7a8b1fd8d7258926f6b20a956e04b2b49bbf12fc8e2f5d26f03e8c1437750b6 SHA512 28afe4b977b06826974b969f5837a46198eadae27ca30e05ad7d8065cbeb44373f4f97170e22dc97e308691fe3f237538dc1997885056b3c7b6e4d1fe80a979e
 EBUILD pikepdf-6.2.8.ebuild 1611 BLAKE2B edf22a90167ea2dd54d8030ae451f95e5d24745528afe0340ab6d348af65e155d7a8b1fd8d7258926f6b20a956e04b2b49bbf12fc8e2f5d26f03e8c1437750b6 SHA512 28afe4b977b06826974b969f5837a46198eadae27ca30e05ad7d8065cbeb44373f4f97170e22dc97e308691fe3f237538dc1997885056b3c7b6e4d1fe80a979e
+EBUILD pikepdf-6.2.9.ebuild 1611 BLAKE2B edf22a90167ea2dd54d8030ae451f95e5d24745528afe0340ab6d348af65e155d7a8b1fd8d7258926f6b20a956e04b2b49bbf12fc8e2f5d26f03e8c1437750b6 SHA512 28afe4b977b06826974b969f5837a46198eadae27ca30e05ad7d8065cbeb44373f4f97170e22dc97e308691fe3f237538dc1997885056b3c7b6e4d1fe80a979e
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-6.2.9.ebuild b/dev-python/pikepdf/pikepdf-6.2.9.ebuild
new file mode 100644
index 000000000000..fae6bc7738cb
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-6.2.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=app-text/qpdf-11.1.1:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/-n auto/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pkgcraft-python/Manifest b/dev-python/pkgcraft-python/Manifest
index c7af868d00e5..f7e40fde8c06 100644
--- a/dev-python/pkgcraft-python/Manifest
+++ b/dev-python/pkgcraft-python/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcraft-0.0.3.tar.gz 1239742 BLAKE2B c9148d3ac34d80c47db5d1080b3806e6b64fffa226d595a11499215626342286efc19b86fd1e158a8ca0021ab8946d35e4393fceaf8a318c258114a6c2e1ffdf SHA512 53ae196d073271654807ef5587c38d83e10b606f59baf63e3c8da7ce1b1d80d7acd1e3e201ebba1346c14d101eded666d6ad9bdf972b36c574c9b494147baa4a
-EBUILD pkgcraft-python-0.0.3.ebuild 1671 BLAKE2B 827a3e27229295cee2c8dafc2db2fb681b9c28727a571db1acce3b7cdaa59da43c8e4cc25f778aadc92b16eb21848ad711b1f62c8a2883e1c2820fee63c5e6c2 SHA512 330e7378f0c9d4436cff9fc3022d1354452997c8e680d6c92a22d1a4c02b18430354924b360bea99f3dda9fb291ea0b3d34a60455f2ccb899e7e05eb9255c145
-EBUILD pkgcraft-python-9999.ebuild 1671 BLAKE2B 827a3e27229295cee2c8dafc2db2fb681b9c28727a571db1acce3b7cdaa59da43c8e4cc25f778aadc92b16eb21848ad711b1f62c8a2883e1c2820fee63c5e6c2 SHA512 330e7378f0c9d4436cff9fc3022d1354452997c8e680d6c92a22d1a4c02b18430354924b360bea99f3dda9fb291ea0b3d34a60455f2ccb899e7e05eb9255c145
+EBUILD pkgcraft-python-0.0.3.ebuild 1669 BLAKE2B 34ddfe21de878010bb5c4619142c0deed93b9be8463dec4f3b8ac9f081f2f66d1bf39db905f60f140e216b91d0edee8e5bc8c8051ca9f07bf68516c3df40c56b SHA512 53e44ec94bbb6c36470876b6d077d604ce3c2a6aacdc673772b851a4f6ea04bc54413088a49797adc16db6bb4939ddea1c5e2479223a286b1025aacb58b3e224
+EBUILD pkgcraft-python-9999.ebuild 1669 BLAKE2B 34ddfe21de878010bb5c4619142c0deed93b9be8463dec4f3b8ac9f081f2f66d1bf39db905f60f140e216b91d0edee8e5bc8c8051ca9f07bf68516c3df40c56b SHA512 53e44ec94bbb6c36470876b6d077d604ce3c2a6aacdc673772b851a4f6ea04bc54413088a49797adc16db6bb4939ddea1c5e2479223a286b1025aacb58b3e224
 MISC metadata.xml 454 BLAKE2B 5085311aaebe3c2cc696fee5da4ee272e47936a4f729c2007efce94097087a987985fb972df477fb72eead3402555924ca8b8f183b69af357453ad93daeb946e SHA512 ba7457ec4b43f1664042599d4e23506e496d1f2212ea7aa02c58fd9d796915dace2817bfb1c71e6f022e9490215248e2a705b223a087d91255b97b23f82f9c23
diff --git a/dev-python/pkgcraft-python/pkgcraft-python-0.0.3.ebuild b/dev-python/pkgcraft-python/pkgcraft-python-0.0.3.ebuild
index 18b5c4eb6c8d..5dc743ca3d03 100644
--- a/dev-python/pkgcraft-python/pkgcraft-python-0.0.3.ebuild
+++ b/dev-python/pkgcraft-python/pkgcraft-python-0.0.3.ebuild
@@ -29,7 +29,7 @@ else
 	PKGCRAFT_VERSION_MIN="0.0.4"
 fi
 
-LICENSE="BSD-1"
+LICENSE="MIT"
 SLOT="0"
 IUSE="+examples"
 
diff --git a/dev-python/pkgcraft-python/pkgcraft-python-9999.ebuild b/dev-python/pkgcraft-python/pkgcraft-python-9999.ebuild
index 18b5c4eb6c8d..5dc743ca3d03 100644
--- a/dev-python/pkgcraft-python/pkgcraft-python-9999.ebuild
+++ b/dev-python/pkgcraft-python/pkgcraft-python-9999.ebuild
@@ -29,7 +29,7 @@ else
 	PKGCRAFT_VERSION_MIN="0.0.4"
 fi
 
-LICENSE="BSD-1"
+LICENSE="MIT"
 SLOT="0"
 IUSE="+examples"
 
diff --git a/dev-python/podman-py/Manifest b/dev-python/podman-py/Manifest
index 484536ac6384..56e5cb8eebfc 100644
--- a/dev-python/podman-py/Manifest
+++ b/dev-python/podman-py/Manifest
@@ -1,3 +1,4 @@
+AUX podman-py-4.3.0-tomli.patch 2671 BLAKE2B 2100c5a3ee89d0e78f9e8f17c9f3338a86a278c071589b1dc4fb14849de06ac7702bc2fd3731083793a0b09a829396e71408cf301001a989673ba6fb1245aac3 SHA512 88ddd9cda9c0829e0576811e5a81c0e0ec8ea73c0c5b38bb33e105f4ca1c8d798deeceb2aba4dd91e9fe12cf789e1ecef944ba4f69642a349cce18a498272b1e
 DIST podman-py-4.3.0.gh.tar.gz 177403 BLAKE2B 549d3aba023423e5ae45fb04e0ec67bdb8ef6cdbe3e4fe6dec2f5e4d1f1df08828aed00aa83b7ad26f6c88ba225211a108ff67ba28e0003827c00ce3c32428ea SHA512 4e7c1f23d7baf425079689635c2b468871eff7f898f150b9244faf3d199a1cf2544aee1f633e431cd40701fbaaa41861d894e72486a38c6a198fd2c33691b826
-EBUILD podman-py-4.3.0.ebuild 1051 BLAKE2B 039e6e5ccff24be4640729afe9bf3783bd78b7d752878ff13d3ef43839d6bfc71ffb763499adba70e2bc016232e866c4b171d3fadb84f8322a19e72d32916485 SHA512 84c119d1a174e880b9ce42703fabe6dc1f245d6fc84ff375870215cd6bc8917886278cd1faa1e72886f0e71402fcda9f6160760182096b07472a30347673c6f0
+EBUILD podman-py-4.3.0-r1.ebuild 1136 BLAKE2B e07f33897b5b0480810cd9c70012e51a2cfbcaad76cde2c99768c1bb66748419e236468123fea5331b1a6b9c9624102ecb280b6c4865108270ef2ec36ed43db8 SHA512 292133839287a63ca76886772463a1147ed7aad6d159b1f74295da4e7badc69b3f80d800e04578de4918a7e3adf49cf8021c1e2ca2d2ae83576401fd309ea536
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman-py/files/podman-py-4.3.0-tomli.patch b/dev-python/podman-py/files/podman-py-4.3.0-tomli.patch
new file mode 100644
index 000000000000..0be9ab796217
--- /dev/null
+++ b/dev-python/podman-py/files/podman-py-4.3.0-tomli.patch
@@ -0,0 +1,89 @@
+From c5a356fb4ea8a6fb66a6d20bdc2c9cffe615028b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 14 Oct 2022 13:54:31 +0200
+Subject: [PATCH] Use modern tomllib/tomli modules for reading TOML files
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Replace the unmaintained `toml`/`pytoml` dependencies with the modern
+alternatives: the built-in `tomllib` module in Python 3.11, and `tomli`
+in older Python versions.  Preserving backwards compatibility does not
+seem necessary, as podman-py no longer supports Python versions older
+than 3.6.
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ podman/domain/config.py | 16 ++++++++++------
+ pyproject.toml          |  2 +-
+ python-podman.spec.rpkg |  8 ++++----
+ requirements.txt        |  2 +-
+ setup.cfg               |  2 +-
+ 5 files changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/podman/domain/config.py b/podman/domain/config.py
+index 555ed9d..6ea8eb6 100644
+--- a/podman/domain/config.py
++++ b/podman/domain/config.py
+@@ -1,17 +1,21 @@
+ """Read containers.conf file."""
++import sys
+ import urllib
+ from pathlib import Path
+ from typing import Dict, Optional
+ 
+ import xdg.BaseDirectory
+ 
+-try:
+-    import toml
+-except ImportError:
+-    import pytoml as toml
+-
+ from podman.api import cached_property
+ 
++if sys.version_info >= (3, 11):
++    from tomllib import loads as toml_loads
++else:
++    try:
++        from tomli import loads as toml_loads
++    except ImportError:
++        from toml import loads as toml_loads
++
+ 
+ class ServiceConnection:
+     """ServiceConnection defines a connection to the Podman service."""
+@@ -64,7 +68,7 @@ def __init__(self, path: Optional[str] = None):
+         if self.path.exists():
+             with self.path.open(encoding='utf-8') as file:
+                 buffer = file.read()
+-            self.attrs = toml.loads(buffer)
++            self.attrs = toml_loads(buffer)
+ 
+     def __hash__(self) -> int:
+         return hash(tuple(self.path.name))
+diff --git a/pyproject.toml b/pyproject.toml
+index f3cdfb9..3b29ecb 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -25,7 +25,7 @@ requires = [
+     "requests>=2.24",
+     "setuptools>=46.4",
+     "sphinx",
+-    "toml>=0.10.2",
++    "tomli>=1.2.3; python_version<'3.11'",
+     "urllib3>=1.24.2",
+     "wheel",
+ ]
+diff --git a/setup.cfg b/setup.cfg
+index f8d1b6f..2066951 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -36,7 +36,7 @@ test_suite =
+ install_requires =
+     pyxdg>=0.26
+     requests>=2.24
+-    toml>=0.10.2
++    tomli>=1.2.3; python_version<'3.11'
+     urllib3>=1.24.2
+ 
+ # typing_extensions are included for RHEL 8.5
diff --git a/dev-python/podman-py/podman-py-4.3.0.ebuild b/dev-python/podman-py/podman-py-4.3.0-r1.ebuild
index d52abd69e9e2..e223cbf3882a 100644
--- a/dev-python/podman-py/podman-py-4.3.0.ebuild
+++ b/dev-python/podman-py/podman-py-4.3.0-r1.ebuild
@@ -25,8 +25,10 @@ KEYWORDS="~amd64"
 RDEPEND="
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+	' 3.{8..10})
 "
 BDEPEND="
 	test? (
@@ -36,6 +38,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index c3ada4d05c6e..02bbfa26dc21 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,3 +1,4 @@
+AUX python-lsp-black-1.2.1-tomli.patch 2955 BLAKE2B 9627be0dcae6a723242e22831384caa772082842a1ae4758534ad40e99402a2f9adc8677b547a2ba899e5763e0d9785c51afced6aafc620d0e0927f6bf719997 SHA512 3fcea10adfd6f25abcf5dda95c4d2ed4e86666d06522baa014fe805dbc6c06a825af1491a931610eabdd5e907f4d34b94513aa3caa4ba43cc584859ae5a76035
 DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
-EBUILD python-lsp-black-1.2.1.ebuild 703 BLAKE2B 89c7399c1b3139efbf77f7a6b0f1efb28d2aa142a01e6d2ac4d54c8bf4085883728b62f5bad5d559b723392b948786b4884085de434fb007b9923525c1370ff3 SHA512 bfd0ffc69d22cf555d411c61e437e069e469ca584649842632f9efa2d1f8e815d3e7d37d4cf9abe8a73d709e829503ded371257564a12a503e85df293e6dc7d0
+EBUILD python-lsp-black-1.2.1-r1.ebuild 791 BLAKE2B 376cc8a9bb0ecf16dc28b6f0402d0ef2982fa49d8010625d4172b349a85e87cbb7930ff6b25b5c327e22c9e396e80494fb9922d1161cb6f0149968cc989d9044 SHA512 f9b3aaa2cfcd4deb47b90d0033498edd280e533314f0e26173976b220a0d8708bf49a50349b5040f6410f806b70ff4f76bd309412b32b428e449bee7c47311a2
 MISC metadata.xml 530 BLAKE2B 385bef4e8337f4a4fbcdbd32f52dec0b0758dd0eba50c9492465caee46dbbc96402b744d5835043f50f6c89147576c96305d8fcc4cedd42254ca2a19caf9234b SHA512 121b726a498e17b6244ecad14edd8fa3fcf23297516280f10b6b4fd5c1cb784f3a6caf902764977f8abd3cd3967db6d8fbac594c773969711dd572a487cae717
diff --git a/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch b/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
new file mode 100644
index 000000000000..8ecef0287f40
--- /dev/null
+++ b/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
@@ -0,0 +1,94 @@
+From 80d34ca4f35baa654e5f1fee7860214950f1ae37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 26 Jan 2023 12:07:11 +0100
+Subject: [PATCH] Replace the obsolete toml package with tomllib/tomli
+
+Use the modern `tomllib` module (in Python 3.11+) or its drop-in
+replacement `tomli` (for older Python versions) instead of the obsolete
+`toml` module.  The latter is unmaintained and does not support TOML
+1.0.
+---
+ .pre-commit-config.yaml |  2 +-
+ pylsp_black/plugin.py   | 12 +++++++++---
+ setup.cfg               |  7 +++++--
+ 3 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
+index 304770e..d5bd147 100644
+--- a/.pre-commit-config.yaml
++++ b/.pre-commit-config.yaml
+@@ -17,7 +17,7 @@ repos:
+   rev: v0.942
+   hooks:
+   - id: mypy
+-    additional_dependencies: [black, types-pkg_resources, types-setuptools, types-toml]
++    additional_dependencies: [black, types-pkg_resources, types-setuptools]
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+   rev: v4.1.0
+   hooks:
+diff --git a/pylsp_black/plugin.py b/pylsp_black/plugin.py
+index f013171..090b1b0 100644
+--- a/pylsp_black/plugin.py
++++ b/pylsp_black/plugin.py
+@@ -1,15 +1,20 @@
+ import logging
+ import os
++import sys
+ from functools import lru_cache
+ from pathlib import Path
+ from typing import Dict, Optional
+ 
+ import black
+-import toml
+ from pylsp import hookimpl
+ from pylsp._utils import get_eol_chars
+ from pylsp.config.config import Config
+ 
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    import tomli as tomllib
++
+ logger = logging.getLogger(__name__)
+ 
+ 
+@@ -154,8 +159,9 @@ def _load_config(filename: str, client_config: Config) -> Dict:
+             return defaults
+ 
+     try:
+-        pyproject_toml = toml.load(str(pyproject_filename))
+-    except (toml.TomlDecodeError, OSError):
++        with open(pyproject_filename, "rb") as f:
++            pyproject_toml = tomllib.load(f)
++    except (tomllib.TOMLDecodeError, OSError):
+         logger.warning(
+             "Error decoding pyproject.toml, using defaults: %r",
+             defaults,
+diff --git a/setup.cfg b/setup.cfg
+index 47510d5..257add6 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -18,7 +18,10 @@ classifiers =
+ 
+ [options]
+ packages = find:
+-install_requires = python-lsp-server>=1.4.0; black>=22.3.0; toml
++install_requires =
++    python-lsp-server>=1.4.0
++    black>=22.3.0
++    tomli; python_version<'3.11'
+ python_requires = >= 3.7
+ 
+ [options.entry_points]
+@@ -26,7 +29,7 @@ pylsp = pylsp_black = pylsp_black.plugin
+ 
+ [options.extras_require]
+ # add any types-* packages to .pre-commit-config.yaml mypy additional_dependencies
+-dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools; types-toml
++dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools
+ 
+ [flake8]
+ max-line-length = 88
+-- 
+2.39.1
+
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
index b14d4254f151..72414f29252b 100644
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
@@ -29,8 +29,14 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.{8..10})
 	)
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 0b4da5eb2628..718804e2ba57 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,7 +1,7 @@
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.3.4.gh.tar.gz 298487 BLAKE2B d1b36e537cdc8309c550b664e8543ae06329d713fe2267ce2c7082c57c597155b4d1764baedf58c2ce762570a4988bb293ec5e74829e722163dd0d00ed13f558 SHA512 288d7867131009229acfcd3fb78fdc60e0f4de933a64c1a91600cbcee496eb5787e24b43705815705b7d1fe6a4d19f4987571d9a237292d6e7216bd63c235444
 DIST tox-4.3.5.gh.tar.gz 298866 BLAKE2B 86f6d76d2600f6acc3ac02f0998e818acf053991b3a2e89c3c206d36a32f1427f14ba2e5524124172a353c51d4fab8dfd7161b0d2d437f80cfc7b554befcc91c SHA512 18347306857c616801fc0975dff94fcd5097dc16741a0fdd0c885d4f43bbc8620a419b53fd8a5c97b8f80220ba6a2d3911e42b42c767233260337152784b732b
+DIST tox-4.4.2.gh.tar.gz 303341 BLAKE2B 812394e15996b04138e2a8167b3d332b48217c5ecfb807d8ed77ff106d8ad31cfc6b43e07737dec39e1deba7165aa7778471894823b0dbe795b1ccddd2396602 SHA512 1e5b8f025c93bea5b9071d5cfcb4e4e68f1925e7b70c4c838b9f4ba70f8f077ed752176c2a7349b96d125842312c4fa8ccbd23d79665ba46667f4b408bf58f78
 EBUILD tox-3.28.0.ebuild 1916 BLAKE2B bc1acd79c969c87cc3a6ca2058d2acd56e89672c033cb670a58906a41e321e94813a25a844bbcdc09781795611384ece6c80b1ce8a8dcc980b775213f27ee165 SHA512 0a756d8535e8eb1daf6b82ed541d18d7e5dbf608a9739580e708506ffb9ad1b138211a1efe700bd4ecc7939c0150750fb0f0cc13f2db0d145fd8d943b7ecc1ce
-EBUILD tox-4.3.4.ebuild 2294 BLAKE2B 615dce9d0eb8538cbe2ac54a9beb8f042d8494aead56ce45ee852928294af5e02febf2c902c24c61029f13c750439d619d6e447e62324e1f2c4625a40bc07663 SHA512 78b12f3a57afec6e68480ac7e85573e203d64835fed314bd8bab59c3b21e6ef12a815349fae8a6c27bce77a4508fba0c00da01e321715040dce4bedc28727c2e
 EBUILD tox-4.3.5.ebuild 2294 BLAKE2B 10a32d3dc1e92ed1261f4b73d22252f08f058d396c35b8395cff1a95f2dd32718191fbda0816c6d8d9caf0fef6b0d673a0f475d5a5b4c116da2bcb49b9d8b92b SHA512 c41325597debf9011cd807cb0d45d8f08c45f616a000c712107a2b5d3ad89ebdc6fd1024e8c5551a582f08149858dadc3047ce96c2e3cc6bf5490e18de60fe3a
+EBUILD tox-4.4.2.ebuild 2994 BLAKE2B 7fc52bf2ee56ea96226a6b4eaad7bf77a17a20c6a6889b90cb9e2af7d1ee27441e9901c02e8a57d74fb8c4cd4c96f6ea2a08fedae000d65b66e405cd9edbcfe1 SHA512 d1a250acdd4a287d79af1a41bfc69f864b0737abeba78bca19dcc12f911b53ffd81d3b98752e3b3861e00bf16964b07574c353ab671968f77116cb49c1ffdb84
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.3.4.ebuild b/dev-python/tox/tox-4.4.2.ebuild
index 287d0a04be39..3f569fd7734b 100644
--- a/dev-python/tox/tox-4.3.4.ebuild
+++ b/dev-python/tox/tox-4.4.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.4[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-api-1.5[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	' 3.8 3.9 3.10)
@@ -82,5 +82,14 @@ python_test() {
 		tests/test_provision.py
 	)
 
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
+		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
+	)
+
 	epytest
 }
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index d2c6cede7f36..2745af9cd679 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,3 +1,4 @@
-DIST yapf-0.32.0.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
-EBUILD yapf-0.32.0.ebuild 599 BLAKE2B 07a4269277313d39e45bf35342534d61932221f77c30b5f3c8af3d8764cafba6b1cee5b6d893499df38e9c7568fa2cd289d4e10d2a8c884121f443d9ef80b976 SHA512 2fd4d4a85abea972811250ca2632fb224154d49c506cd910aa68ade3536902a75481c6c7ceaec8ab41ee70d6051c9078640f17fd31be707c6b27df10057b78fb
-MISC metadata.xml 603 BLAKE2B 3c5e1326c4a276e94f5bfbc44c0ee89ac37dfd91f131444faa1345471e8aac8c306da211af47d7176c2756904b8cf3c3ed5bff1bcef26d9ee56e243fa0bc15b5 SHA512 e0d943210f72f70877bac20467e7fcc696a2b61f6e1b601ebc78eeceac427ff5e48ae3f0cec5913d95bff51e237038afd9eb29bf5ee3429f46fef983b5369c9f
+AUX yapf-0.32.0-tomli.patch 6596 BLAKE2B 9693c14cc55bf54c763dab158e488ce4a3013426d9cac62822715071fe424252e096d2d1b78bcb62798b586edcc195fe9241227c8b85d1e3570aff5bdb7fdd12 SHA512 b859f1b487dd0331a9e59c411072ceba719cd7b95bea450b6d8ed8f969d0af552adde77d9d8251bd31416d9715b238e628df5a7516da8eca028dd1a99ca72731
+DIST yapf-0.32.0.gh.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
+EBUILD yapf-0.32.0-r1.ebuild 726 BLAKE2B 5039d43c021920f55ebb7937ffc4f8eae6159cf1956b50a2188215336a7e646bad4e3579adf65d5cd286c9d8593298257bc714196b206357fef62f44c1512fa8 SHA512 211b484cf1490b940469b16a471068a4eb61727723649e80049c8acc2afac9a2406f7c2599beb40e30f2f720a6d8b8ed6877c02f1a1b3ce7e6099bcdcb9d0312
+MISC metadata.xml 654 BLAKE2B 9b8696004f7b8613e02a2cdc79c74a79806b1e4278c7a6e8b8b82f953629ad1233f1a5d1b1212306c688edba57ed4933fc23ba251ec12baac5c93c67b51ec47c SHA512 ccea54dccfb6f336699e0078cb3cd238b3aff5e7c05c50d6fdaf60e9b717a064c7e0cf27e17b001d252b0b52f7fa48c48eec5789aecd81c8f2e53a6ebb4054b6
diff --git a/dev-python/yapf/files/yapf-0.32.0-tomli.patch b/dev-python/yapf/files/yapf-0.32.0-tomli.patch
new file mode 100644
index 000000000000..bdbfd96112a2
--- /dev/null
+++ b/dev-python/yapf/files/yapf-0.32.0-tomli.patch
@@ -0,0 +1,178 @@
+From 5909ba87f79ea1d687e5836c62dc82a116f4229f Mon Sep 17 00:00:00 2001
+From: Eric McDonald <221418+emcd@users.noreply.github.com>
+Date: Wed, 30 Nov 2022 14:23:50 -0800
+Subject: [PATCH] Prevent crashes against valid 'pyproject.toml'. (#1040)
+
+* Replace 'toml' dependency with 'tomli', which fully supports TOML 1.
+
+Co-authored-by: Eric McDonald <emcd@users.noreply.github.com>
+---
+ setup.py                         |  2 +-
+ yapf/yapflib/file_resources.py   | 15 ++++++++-------
+ yapf/yapflib/style.py            | 25 ++++++++++++++-----------
+ yapftests/file_resources_test.py | 10 +++++-----
+ yapftests/style_test.py          |  4 ++--
+ 5 files changed, 30 insertions(+), 26 deletions(-)
+
+diff --git a/yapf/yapflib/file_resources.py b/yapf/yapflib/file_resources.py
+index b5e2612b..6809ca9f 100644
+--- a/yapf/yapflib/file_resources.py
++++ b/yapf/yapflib/file_resources.py
+@@ -49,14 +49,15 @@ def _GetExcludePatternsFromPyprojectToml(filename):
+   """Get a list of file patterns to ignore from pyproject.toml."""
+   ignore_patterns = []
+   try:
+-    import toml
++    import tomli as tomllib
+   except ImportError:
+     raise errors.YapfError(
+-        "toml package is needed for using pyproject.toml as a "
++        "tomli package is needed for using pyproject.toml as a "
+         "configuration file")
+ 
+   if os.path.isfile(filename) and os.access(filename, os.R_OK):
+-    pyproject_toml = toml.load(filename)
++    with open(filename, 'rb') as fd:
++      pyproject_toml = tomllib.load(fd)
+     ignore_patterns = pyproject_toml.get('tool',
+                                          {}).get('yapfignore',
+                                                  {}).get('ignore_patterns', [])
+@@ -127,19 +128,19 @@ def GetDefaultStyleForDir(dirname, default_style=style.DEFAULT_STYLE):
+     # See if we have a pyproject.toml file with a '[tool.yapf]'  section.
+     config_file = os.path.join(dirname, style.PYPROJECT_TOML)
+     try:
+-      fd = open(config_file)
++      fd = open(config_file, 'rb')
+     except IOError:
+       pass  # It's okay if it's not there.
+     else:
+       with fd:
+         try:
+-          import toml
++          import tomli as tomllib
+         except ImportError:
+           raise errors.YapfError(
+-              "toml package is needed for using pyproject.toml as a "
++              "tomli package is needed for using pyproject.toml as a "
+               "configuration file")
+ 
+-        pyproject_toml = toml.load(config_file)
++        pyproject_toml = tomllib.load(fd)
+         style_dict = pyproject_toml.get('tool', {}).get('yapf', None)
+         if style_dict is not None:
+           return config_file
+diff --git a/yapf/yapflib/style.py b/yapf/yapflib/style.py
+index 233a64e6..c8397b32 100644
+--- a/yapf/yapflib/style.py
++++ b/yapf/yapflib/style.py
+@@ -746,17 +746,18 @@ def _CreateConfigParserFromConfigFile(config_filename):
+     # Provide a more meaningful error here.
+     raise StyleConfigError(
+         '"{0}" is not a valid style or file path'.format(config_filename))
+-  with open(config_filename) as style_file:
+-    config = py3compat.ConfigParser()
+-    if config_filename.endswith(PYPROJECT_TOML):
+-      try:
+-        import toml
+-      except ImportError:
+-        raise errors.YapfError(
+-            "toml package is needed for using pyproject.toml as a "
+-            "configuration file")
+-
+-      pyproject_toml = toml.load(style_file)
++  config = py3compat.ConfigParser()
++
++  if config_filename.endswith(PYPROJECT_TOML):
++    try:
++      import tomli as tomllib
++    except ImportError:
++      raise errors.YapfError(
++          "tomli package is needed for using pyproject.toml as a "
++          "configuration file")
++
++    with open(config_filename, 'rb') as style_file:
++      pyproject_toml = tomllib.load(style_file)
+       style_dict = pyproject_toml.get("tool", {}).get("yapf", None)
+       if style_dict is None:
+         raise StyleConfigError(
+@@ -766,7 +767,9 @@ def _CreateConfigParserFromConfigFile(config_filename):
+         config.set('style', k, str(v))
+       return config
+ 
++  with open(config_filename) as style_file:
+     config.read_file(style_file)
++
+     if config_filename.endswith(SETUP_CONFIG):
+       if not config.has_section('yapf'):
+         raise StyleConfigError(
+diff --git a/yapftests/file_resources_test.py b/yapftests/file_resources_test.py
+index 31184c4a..f54f393d 100644
+--- a/yapftests/file_resources_test.py
++++ b/yapftests/file_resources_test.py
+@@ -75,7 +75,7 @@ def test_get_exclude_file_patterns_from_yapfignore_with_wrong_syntax(self):
+ 
+   def test_get_exclude_file_patterns_from_pyproject(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
+@@ -93,7 +93,7 @@ def test_get_exclude_file_patterns_from_pyproject(self):
+   @unittest.skipUnless(py3compat.PY36, 'Requires Python 3.6')
+   def test_get_exclude_file_patterns_from_pyproject_with_wrong_syntax(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
+@@ -109,7 +109,7 @@ def test_get_exclude_file_patterns_from_pyproject_with_wrong_syntax(self):
+ 
+   def test_get_exclude_file_patterns_from_pyproject_no_ignore_section(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
+@@ -122,7 +122,7 @@ def test_get_exclude_file_patterns_from_pyproject_no_ignore_section(self):
+ 
+   def test_get_exclude_file_patterns_from_pyproject_ignore_section_empty(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
+@@ -192,7 +192,7 @@ def test_setup_config(self):
+   def test_pyproject_toml(self):
+     # An empty pyproject.toml file should not be used
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+ 
+diff --git a/yapftests/style_test.py b/yapftests/style_test.py
+index 8a37f953..d2203d9a 100644
+--- a/yapftests/style_test.py
++++ b/yapftests/style_test.py
+@@ -230,7 +230,7 @@ def testErrorUnknownStyleOption(self):
+ 
+   def testPyprojectTomlNoYapfSection(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+ 
+@@ -242,7 +242,7 @@ def testPyprojectTomlNoYapfSection(self):
+ 
+   def testPyprojectTomlParseYapfSection(self):
+     try:
+-      import toml
++      import tomli
+     except ImportError:
+       return
+ 
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index a0cd829c2bc3..51f7db08b2d2 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -12,6 +12,7 @@
 		didn't violate the style guide.
 	</longdescription>
 	<upstream>
+		<remote-id type="github">google/yapf</remote-id>
 		<remote-id type="pypi">yapf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/yapf/yapf-0.32.0.ebuild b/dev-python/yapf/yapf-0.32.0-r1.ebuild
index e0552774be32..d8665695e7b3 100644
--- a/dev-python/yapf/yapf-0.32.0.ebuild
+++ b/dev-python/yapf/yapf-0.32.0-r1.ebuild
@@ -1,14 +1,22 @@
 # Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="A formatter for Python files"
-HOMEPAGE="https://github.com/google/yapf"
-SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/google/yapf/
+	https://pypi.org/project/yapf/
+"
+SRC_URI="
+	https://github.com/google/yapf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,7 +25,14 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
 
 python_test() {
 	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||