Adding metadata

21 files changed, 255 insertions, 184 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
index cefc93b27c21..b32628aba771 100644
--- a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-cpp/rapidfuzz-cpp-1.7.0
diff --git a/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild b/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
index 61d9ee70b40b..46d6f94d1c50 100644
--- a/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-3.0.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 RESTRICT="test"
 # 150+ tests require network, too many to deselect
 PROPERTIES="test_network"
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 6af486a94872..f84c2122833d 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,2 +1 @@
-DIST exceptiongroup-1.0.4.gh.tar.gz 22529 BLAKE2B bdf58d36ea59cc7bed17947e4671c92058e7036b20c91df434625d8627db41d646dd0b90ea397c25674753e3ba09654f5978c22220e13007d0af8b1fe659540d SHA512 18f207cb028f1b9ab1073c2859b4aeff357706c3d4c9f05fbe8739f3e19852dd91da5be9c9e18b14b16bd494fc8bf1bd26d058e925084da8c00eac5ad057e2be
 DIST exceptiongroup-1.1.0.gh.tar.gz 22724 BLAKE2B 2de748494fe1356353b7f70d3afc7be7ecb8df4166f57461459c7f463bc5c22340c9073b0b0e032a52680560e37e4004c754fb4ddcc1a5a70f8dd0e973b1d8a9 SHA512 588b4ec3cae01a64140aac191cbdf8d0631eb614d430bbdbd02d17d8ff43aad9d233c3545694c6fffb622a2b3c38a289e20f1b8db6bf0e9b8819d668e38a87e3
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
deleted file mode 100644
index eda625258798..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
index c55de247b196..eda625258798 100644
--- a/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT PSF-2.4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index a3b3320e95bc..7eeba549552e 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,2 @@
-DIST fakeredis-py-2.2.0.gh.tar.gz 128817 BLAKE2B 8666427966e6a93cd33f521fbc38ecb9bb99e1c1a23506437d48bc6113f272aa89a465dc794b5130ef6dfa584f75f159fce0e3b6a50e5cb89b3bfe43ebcd89cd SHA512 857033a6362a6088cec715571d74a9aa1eb3eb8356ed904b10831540ce5be62d798a211d52fb3d8effab253e50fdb3f2a530d39bd722d8be357426f53fb41fe7
 DIST fakeredis-py-2.4.0.gh.tar.gz 132163 BLAKE2B fc3858eb364c63d776c81d715cbfb218dc0e763d568c97b0d1dafb0716aaf87e928f9b81bd49d28fcc235f4285277446945595d42ff1d440e5c8491b78abb6c3 SHA512 5fba3e84d0506b52e1561f750e045b6227ea21387ddb3a89b8a61e9698fc0e9ec80c4a7048d9426fb0d8e9f2acd808e7e07fcb11d14d6852d9b057fec86d6e6a
 DIST fakeredis-py-2.5.0.gh.tar.gz 139911 BLAKE2B 4e9c616b0066012e1ed681d06e73390fb670969c15fa57689244147a0175dbb14ff1c312066ffdc6eb2c647f884c351a98eebfb2c1ba0e6c1bbe1e6c3553808a SHA512 aff5a8679763d4cf1717f790c7c384aa8e5056e5f175c306626f3a1671fe27aa3caf24368831033c9cf5bffa2e3e6be1104b183f3912eadf34fd6f37ea0c63e8
diff --git a/dev-python/fakeredis/fakeredis-2.2.0.ebuild b/dev-python/fakeredis/fakeredis-2.2.0.ebuild
deleted file mode 100644
index fa3901f472f1..000000000000
--- a/dev-python/fakeredis/fakeredis-2.2.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
-	<dev-python/redis-py-4.5[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.4.0.ebuild b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
index 90049b194fdf..4bfeb2c64af3 100644
--- a/dev-python/fakeredis/fakeredis-2.4.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.4.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 09841391df3b..9f490b261f7d 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,3 +1,4 @@
 DIST libtmux-0.15.10.gh.tar.gz 240378 BLAKE2B 81841a25b01bb26d2c612a14cd4518c48b12162d4aafa280fe0d6de269d149bddaffe72f4ce2c735e41b00cd2bfec19773d7cd3b9fd927c892f11f0cdf8e8a88 SHA512 8ee870c94bd3e3a9fffc19854f978d4faad747ea395e53c3576adc9cc2dcdd3cbdedeeb589a2dc11b0ac836931ffbdcea06a4a850b2ead163235dda2334defb5
 DIST libtmux-0.18.3.gh.tar.gz 261540 BLAKE2B be98707101d7481b6787694795eb05dbe1070a0eed0b7408af1714be01f4870c51223559d1edc3a3fb7b60e02496a413e92c0734031223bca9d521604cb6e65e SHA512 67173c4f2f45f1236e7a1a5ce0895c53bfd6316aa7017382f97b87f84cbc6a23a6ef0f2574a276b7b064da9e4982804fb2004d31ddb1237f97ca835fafdf9ccb
 DIST libtmux-0.19.1.gh.tar.gz 262280 BLAKE2B 9d1a2c74b49011e66df6ed2012096b0df6c6731e258078f8ce2b4fef38d21513488b195e3fdb722478ae5f829ba77bd09c152569d73cab83bfa6e4a360346b39 SHA512 b9f3b29de7c8ca86e8495843aa04e2dedfaea749bd57095a9d7a2f638111de7474500c3dbd892f0c580c613c796fece8da47d6c099b8b78056fbd242451eb129
+DIST libtmux-0.20.0.gh.tar.gz 266849 BLAKE2B 51840c4cf5aecb077c7c5205a33e6a620b68aed3f61bf52f4c376b257896c907a0e9117c35f70493464d4a3e136e9bd81e0d2ed6cd8a9f4a7c80276dc1461568 SHA512 1e8b49898aeb622aca6160c9ed99c7714d75f716baae5109e278baf5b70d0211d3ac4ed89c3755823b203add1fe4198ceb9e16ad03941eed2cbd2407fd46f0d2
diff --git a/dev-python/libtmux/libtmux-0.20.0.ebuild b/dev-python/libtmux/libtmux-0.20.0.ebuild
new file mode 100644
index 000000000000..f7491752915e
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.20.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API for tmux"
+HOMEPAGE="
+	https://libtmux.git-pull.com/
+	https://github.com/tmux-python/libtmux/
+	https://pypi.org/project/libtmux/
+"
+SRC_URI="
+	https://github.com/tmux-python/libtmux/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	libtmux/pane.py::libtmux.pane.Pane.send_keys
+)
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	# increase timeouts for tests
+	sed -e 's/0.01/0.1/' -i tests/test_test.py || die
+
+	sed -e '/addopts/s:--doctest-docutils-modules::' \
+		-e '/README\.md/d' \
+		-i setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lit/lit-15.0.7.ebuild b/dev-python/lit/lit-15.0.7.ebuild
index 6f08054dd1e1..47835027452d 100644
--- a/dev-python/lit/lit-15.0.7.ebuild
+++ b/dev-python/lit/lit-15.0.7.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pylama/files/pylama-8.4.1-tomli.patch b/dev-python/pylama/files/pylama-8.4.1-tomli.patch
new file mode 100644
index 000000000000..291bc9f530e7
--- /dev/null
+++ b/dev-python/pylama/files/pylama-8.4.1-tomli.patch
@@ -0,0 +1,69 @@
+From 8b7908fec960a05af0a0a9b10d24ed458fcf97c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 8 Nov 2022 14:33:59 +0100
+Subject: [PATCH] Use tomli/tomllib instead of the unmaintained toml package
+
+Replace the use of the unmaintained `toml` package with the modern
+alternatives: the built-in `tomllib` in Python 3.11+, and its equivalent
+`tomli` in older Python versions.  `tomli` installs type stubs, so there
+is no need for an additional `types-*` package for it.
+---
+ pylama/config_toml.py               | 9 +++++++--
+ requirements/requirements-tests.txt | 3 +--
+ setup.py                            | 2 +-
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/pylama/config_toml.py b/pylama/config_toml.py
+index 2af02a5..ea6e17a 100644
+--- a/pylama/config_toml.py
++++ b/pylama/config_toml.py
+@@ -1,16 +1,21 @@
+ """Pylama TOML configuration."""
+ 
+-import toml
++import sys
+ 
+ from pylama.libs.inirama import Namespace as _Namespace
+ 
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    import tomli as tomllib
++
+ 
+ class Namespace(_Namespace):
+     """Inirama-style wrapper for TOML config."""
+ 
+     def parse(self, source: str, update: bool = True, **params):
+         """Parse TOML source as string."""
+-        content = toml.loads(source)
++        content = tomllib.loads(source)
+         tool = content.get("tool", {})
+         pylama = tool.get("pylama", {})
+         linters = pylama.pop("linter", {})
+diff --git a/requirements/requirements-tests.txt b/requirements/requirements-tests.txt
+index d786f1f..e62ccae 100644
+--- a/requirements/requirements-tests.txt
++++ b/requirements/requirements-tests.txt
+@@ -5,8 +5,7 @@ radon       >= 5.1.0
+ mypy
+ pylint      >= 2.11.1
+ pylama-quotes
+-toml
++tomli       >= 1.2.3  ; python_version < "3.11"
+ vulture
+ 
+ types-setuptools
+-types-toml
+diff --git a/setup.py b/setup.py
+index 911aea6..6d0222b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -21,6 +21,6 @@ def parse_requirements(path: str) -> "list[str]":
+     extras_require=dict(
+         tests=parse_requirements("requirements/requirements-tests.txt"),
+         all=OPTIONAL_LINTERS, **{linter: [linter] for linter in OPTIONAL_LINTERS},
+-        toml="toml>=0.10.2",
++        toml="tomli>=1.2.3; python_version < '3.11'",
+     ),
+ )
diff --git a/dev-python/pylama/pylama-8.4.1.ebuild b/dev-python/pylama/pylama-8.4.1-r1.ebuild
index 318f9647b56f..5b98482a432d 100644
--- a/dev-python/pylama/pylama-8.4.1.ebuild
+++ b/dev-python/pylama/pylama-8.4.1-r1.ebuild
@@ -9,8 +9,14 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 inherit distutils-r1
 
 DESCRIPTION="Code audit tool for python"
-HOMEPAGE="https://github.com/klen/pylama"
-SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/klen/pylama/
+	https://pypi.org/project/pylama/
+"
+SRC_URI="
+	https://github.com/klen/pylama/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -28,13 +34,19 @@ BDEPEND="
 		dev-python/mypy[${PYTHON_USEDEP}]
 		dev-python/pylint[${PYTHON_USEDEP}]
 		dev-python/radon[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
 		dev-vcs/git
+		$(python_gen_cond_dep '
+			dev-python/tomli[${PYTHON_USEDEP}]
+		' 3.{8..10})
 	)
 "
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
+
 EPYTEST_DESELECT=(
 	# not packaged
 	tests/test_linters.py::test_quotes
diff --git a/dev-python/seedir/seedir-0.4.2.ebuild b/dev-python/seedir/seedir-0.4.2.ebuild
index 53a842e236a5..d5faed2dd16f 100644
--- a/dev-python/seedir/seedir-0.4.2.ebuild
+++ b/dev-python/seedir/seedir-0.4.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/natsort[${PYTHON_USEDEP}]
diff --git a/dev-python/sip/files/sip-6.7.5-tomli.patch b/dev-python/sip/files/sip-6.7.5-tomli.patch
new file mode 100644
index 000000000000..c785e41f265a
--- /dev/null
+++ b/dev-python/sip/files/sip-6.7.5-tomli.patch
@@ -0,0 +1,93 @@
+diff --git a/setup.py b/setup.py
+index 586606d..312a431 100644
+--- a/setup.py
++++ b/setup.py
+@@ -51,7 +51,7 @@ setup(
+         version=version,
+         license='SIP',
+         python_requires='>=3.7',
+-        install_requires=['packaging', 'ply', 'setuptools', 'toml'],
++        install_requires=['packaging', 'ply', 'setuptools', 'tomli; python_version<"3.11"'],
+         packages=find_packages(),
+         package_data={
+             'sipbuild.module': ['source/*/*'],
+diff --git a/sip.egg-info/requires.txt b/sip.egg-info/requires.txt
+index b465c08..8547535 100644
+--- a/sip.egg-info/requires.txt
++++ b/sip.egg-info/requires.txt
+@@ -1,4 +1,4 @@
+ packaging
+ ply
+ setuptools
+-toml
++tomli; python_version<"3.11"
+diff --git a/sipbuild/bindings_configuration.py b/sipbuild/bindings_configuration.py
+index 8197e27..a942f3f 100644
+--- a/sipbuild/bindings_configuration.py
++++ b/sipbuild/bindings_configuration.py
+@@ -22,11 +22,16 @@
+ 
+ 
+ import os
+-import toml
++import sys
+ 
+ from .exceptions import UserFileException, UserParseException
+ from .module import resolve_abi_version
+ 
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    import tomli as tomllib
++
+ 
+ def get_bindings_configuration(abi_major, sip_file, sip_include_dirs):
+     """ Get the configuration of a set of bindings. """
+@@ -47,7 +52,8 @@ def get_bindings_configuration(abi_major, sip_file, sip_include_dirs):
+ 
+     # Read the configuration.
+     try:
+-        cfg = toml.load(toml_file)
++        with open(toml_file, "rb") as f:
++            cfg = tomllib.load(f)
+     except Exception as e:
+         raise UserParseException(toml_file, detail=str(e))
+ 
+diff --git a/sipbuild/pyproject.py b/sipbuild/pyproject.py
+index 1ba2223..6e4a7c6 100644
+--- a/sipbuild/pyproject.py
++++ b/sipbuild/pyproject.py
+@@ -22,11 +22,16 @@
+ 
+ 
+ from collections import OrderedDict
+-import toml
++import sys
+ 
+ from .exceptions import UserFileException
+ from .py_versions import OLDEST_SUPPORTED_MINOR
+ 
++if sys.version_info >= (3, 11):
++    import tomllib
++else:
++    import tomli as tomllib
++
+ 
+ class PyProjectException(UserFileException):
+     """ An exception related to a pyproject.toml file. """
+@@ -69,7 +74,8 @@ class PyProject:
+         self.toml_error = None
+ 
+         try:
+-            self._pyproject = toml.load('pyproject.toml', _dict=OrderedDict)
++            with open('pyproject.toml', 'rb') as f:
++                self._pyproject = tomllib.load(f)
+         except FileNotFoundError:
+             self.toml_error = "there is no such file in the current directory"
+         except Exception as e:
+@@ -174,4 +180,4 @@ class PyProject:
+     def _is_section(value):
+         """ Returns True if a section value is itself a section. """
+ 
+-        return isinstance(value, (OrderedDict, list))
++        return isinstance(value, (OrderedDict, dict, list))
diff --git a/dev-python/sip/sip-6.7.5.ebuild b/dev-python/sip/sip-6.7.5-r1.ebuild
index 0013bda95170..e1f22b4354ec 100644
--- a/dev-python/sip/sip-6.7.5.ebuild
+++ b/dev-python/sip/sip-6.7.5-r1.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
+HOMEPAGE="
+	https://www.riverbankcomputing.com/software/sip/
+	https://pypi.org/project/sip/
+"
 
 MY_P=${PN}-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
@@ -28,7 +32,13 @@ RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/ply[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
 "
 
 distutils_enable_sphinx doc --no-autodoc
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tomli.patch
+)
diff --git a/dev-python/sybil/sybil-4.0.0.ebuild b/dev-python/sybil/sybil-4.0.0.ebuild
index fe09db99f498..072efe0a2527 100644
--- a/dev-python/sybil/sybil-4.0.0.ebuild
+++ b/dev-python/sybil/sybil-4.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index a3d6c84859a2..35e0762bd80d 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,2 +1 @@
 DIST towncrier-22.12.0.gh.tar.gz 54670 BLAKE2B b6baf6970cc8a5f798f378ae7c0637184a869c3c72907205c6493786353f1a5f26e1bca0faa7f4685236e3a1fc9d4b2cfe6632f01d36926ae9e74cb188460674 SHA512 6fad515b2368f2c1ee27673080607460949d6651d3c9b9ab106b8e7f0298d0748a4ec1424f73bb7bf8a81eef5b0fa74de6a0b7295f02f02f354f20a99eb30814
-DIST towncrier-22.8.0.gh.tar.gz 47182 BLAKE2B 87674c49dc101d4e90ff3ec93b417a5e7fdc3b8b1c4adb76829789d2ee6271e2963306f3fbb2695e102f941afc0d3fcc57735b3f106eb3d9c2d1da49cb1af199 SHA512 4b404fdc7083de4807bb3a910c62a44cabde09b19807f46c255c935e8e1d5313f328785c14c845be168085bbaf9d54e3f589c6883c8a0bd2434ae46add3f6bff
diff --git a/dev-python/towncrier/towncrier-22.12.0.ebuild b/dev-python/towncrier/towncrier-22.12.0.ebuild
index 4781659da6c0..7344087cc5dc 100644
--- a/dev-python/towncrier/towncrier-22.12.0.ebuild
+++ b/dev-python/towncrier/towncrier-22.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/towncrier/towncrier-22.8.0.ebuild b/dev-python/towncrier/towncrier-22.8.0.ebuild
deleted file mode 100644
index 7344087cc5dc..000000000000
--- a/dev-python/towncrier/towncrier-22.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Building newsfiles for your project"
-HOMEPAGE="
-	https://github.com/twisted/towncrier/
-	https://pypi.org/project/towncrier/
-"
-SRC_URI="
-	https://github.com/twisted/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-default-group[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/incremental[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial towncrier ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/xcffib/xcffib-1.1.2.ebuild b/dev-python/xcffib/xcffib-1.1.2.ebuild
index 8b4c828c9141..8aefb1734b92 100644
--- a/dev-python/xcffib/xcffib-1.1.2.ebuild
+++ b/dev-python/xcffib/xcffib-1.1.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	x11-libs/libxcb