Adding metadata

28 files changed, 455 insertions, 182 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 041a3710e014..2a442a821865 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,2 +1 @@
-DIST cairocffi-1.5.1.tar.gz 86924 BLAKE2B 51bbd85ed486d8a324255d7b328fc44490097f0eeb0568d0e9436350e627ee2da7770323d0cfa547da2f007dc097327962d80d0a9a96a2f119bac0bb4aa4d7f4 SHA512 58b33e921866a3db7dfa464514f935f7c615ae3463b852d888e9d221256e91efaa7639001781999bdf68619a725a90de06300973f9e635c7974e8c48729705dc
 DIST cairocffi-1.6.1.tar.gz 87436 BLAKE2B 54f7f3db31ab52aac6ebce1c830c4c0ff2f5ffde1f6a803bf8453b0ab3307414732c2e43b5b931ff77c9cbf6fe3229150e49254f13891f5e75e88eeef73970b9 SHA512 5489263b7e7e2aca7291860a90a6339d35e819cc03a9add47cd21b4ec0cb0274445c3e852ee3be127c42d8b5d9fcb98b02ff7eb66e3d9d243bd33527ce6ddf5c
diff --git a/dev-python/cairocffi/cairocffi-1.5.1.ebuild b/dev-python/cairocffi/cairocffi-1.5.1.ebuild
deleted file mode 100644
index b891fad10dfe..000000000000
--- a/dev-python/cairocffi/cairocffi-1.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="
-	https://github.com/Kozea/cairocffi/
-	https://pypi.org/project/cairocffi/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pikepdf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-)
-
-src_test() {
-	rm -r cairocffi || die
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/httpx-socks/httpx-socks-0.8.0.ebuild b/dev-python/httpx-socks/httpx-socks-0.8.0-r1.ebuild
index d4ce9179935c..3e9d2f76bac5 100644
--- a/dev-python/httpx-socks/httpx-socks-0.8.0.ebuild
+++ b/dev-python/httpx-socks/httpx-socks-0.8.0-r1.ebuild
@@ -24,9 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
-	<dev-python/httpx-0.26.0[${PYTHON_USEDEP}]
 	>=dev-python/httpx-0.21.0[${PYTHON_USEDEP}]
-	<dev-python/httpcore-2[${PYTHON_USEDEP}]
 	>=dev-python/httpcore-0.17.3[${PYTHON_USEDEP}]
 	>=dev-python/python-socks-2.0.0[${PYTHON_USEDEP}]
 "
@@ -42,3 +40,10 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin dependencies
+	sed -i -e 's:,<[0-9.]*::' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/os-api-ref/Manifest b/dev-python/os-api-ref/Manifest
index 04b388085db0..25aa0cb6d034 100644
--- a/dev-python/os-api-ref/Manifest
+++ b/dev-python/os-api-ref/Manifest
@@ -1 +1 @@
-DIST os-api-ref-2.3.0.tar.gz 92864 BLAKE2B 48d74f40a4b865520ec1b61235245f2571262c14c46f994d9b6655a33376a981732212ad4f38b894e495e6381302054eb455516de03b2d2f87662c8f29f4650d SHA512 e53063df90393c17e764e640c4ad5e1e6f1da7286ce9da6bdd460d54e2f831022a366c9cb711b95d8bfa872294309620f2d44cd4910277971ff2f2719c5d81eb
+DIST os-api-ref-3.0.0.tar.gz 92919 BLAKE2B 8797fe76819148bad25d35039144b04d65c58ff9ddb235adb5e5eb39c073a938f1e17ed71ddfcb3c9ea53e98fa4876ccaef1963ec0b7b34f7d1a85c5829567f7 SHA512 ad7030cc91eacb482da19e42d94a81af4c3715f090966e33063d49693f567b0653e2e4a51d9526fe0e2a63480493f148582f96dc811b24e26534c9c05edf3897
diff --git a/dev-python/os-api-ref/files/os-api-ref-3.0.0-python-3.12.patch b/dev-python/os-api-ref/files/os-api-ref-3.0.0-python-3.12.patch
new file mode 100644
index 000000000000..c0b7f66eb1e5
--- /dev/null
+++ b/dev-python/os-api-ref/files/os-api-ref-3.0.0-python-3.12.patch
@@ -0,0 +1,18 @@
+diff --git a/os_api_ref/tests/test_microversions.py b/os_api_ref/tests/test_microversions.py
+index 8281442..c338c51 100644
+--- a/os_api_ref/tests/test_microversions.py
++++ b/os_api_ref/tests/test_microversions.py
+@@ -44,11 +44,11 @@ class TestMicroversions(base.TestCase):
+     def test_rest_method(self):
+         """Test that min / max mv css class attributes are set"""
+         content = self.soup.find_all(class_='rp_min_ver_2_17')
+-        self.assertRegexpMatches(
++        self.assertRegex(
+             str(content[0]),
+             '^<div class="operation-grp rp_min_ver_2_17 rp_max_ver_2_19 ?"')
+         content = self.soup.find_all(class_='rp_max_ver_2_19')
+-        self.assertRegexpMatches(
++        self.assertRegex(
+             str(content[0]),
+             '^<div class="operation-grp rp_min_ver_2_17 rp_max_ver_2_19 ?"')
+ 
diff --git a/dev-python/os-api-ref/files/os-api-ref-3.0.0-sphinx-7.2.0.patch b/dev-python/os-api-ref/files/os-api-ref-3.0.0-sphinx-7.2.0.patch
new file mode 100644
index 000000000000..8e398371bdd7
--- /dev/null
+++ b/dev-python/os-api-ref/files/os-api-ref-3.0.0-sphinx-7.2.0.patch
@@ -0,0 +1,39 @@
+diff --git a/os_api_ref/tests/base.py b/os_api_ref/tests/base.py
+index 6e5e0dc..f5c2c1d 100644
+--- a/os_api_ref/tests/base.py
++++ b/os_api_ref/tests/base.py
+@@ -16,10 +16,11 @@
+ import os
+ 
+ import fixtures
++import shutil
+ import tempfile
+ import testtools
+ 
+-from sphinx.testing.path import path
++from pathlib import Path
+ from sphinx.testing.util import SphinxTestApp
+ 
+ 
+@@ -33,17 +34,16 @@ _TRUE_VALUES = ('True', 'true', '1', 'yes')
+ class with_app:
+     def __init__(self, **kwargs):
+         if 'srcdir' in kwargs:
+-            self.srcdir = path(kwargs['srcdir'])
++            self.srcdir = Path(kwargs['srcdir'])
+         self.sphinx_app_args = kwargs
+ 
+     def __call__(self, f):
+         def newf(*args, **kwargs):
+             with tempfile.TemporaryDirectory() as tmpdirname:
+-                tmpdir = path(tmpdirname)
+-                tmproot = tmpdir / self.srcdir.basename()
+-                self.srcdir.copytree(tmproot)
++                tmpdir = Path(tmpdirname)
++                tmproot = tmpdir / self.srcdir.name
++                shutil.copytree(self.srcdir, tmproot)
+                 self.sphinx_app_args['srcdir'] = tmproot
+-                self.builddir = tmproot.joinpath('_build')
+ 
+                 app = SphinxTestApp(freshenv=True, **self.sphinx_app_args)
+ 
diff --git a/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild b/dev-python/os-api-ref/os-api-ref-3.0.0.ebuild
index f62c99552dfe..4da89b72f24a 100644
--- a/dev-python/os-api-ref/os-api-ref-2.3.0.ebuild
+++ b/dev-python/os-api-ref/os-api-ref-3.0.0.ebuild
@@ -1,9 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-EPYTEST_DESELECT=( os_api_ref/tests/test_microversions.py::TestMicroversions::test_parameters_table )
+EPYTEST_DESELECT=(
+	os_api_ref/tests/test_basic_example.py::TestBasicExample::test_parameters
+	os_api_ref/tests/test_basic_example.py::TestBasicExample::test_rest_response
+	os_api_ref/tests/test_microversions.py::TestMicroversions::test_parameters_table
+	os_api_ref/tests/test_warnings.py::TestWarnings::test_missing_field
+)
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 PYPI_NO_NORMALIZE=1
 
@@ -29,11 +35,17 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
 		>=dev-python/beautifulsoup4-4.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-testing-1.0.1[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-python-3.12.patch"
+	"${FILESDIR}/${P}-sphinx-7.2.0.patch"
+)
+
 distutils_enable_tests pytest
 distutils_enable_sphinx doc/source ">=dev-python/openstackdocstheme-2.2.1"
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.1.1.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.1.1.ebuild
index 0e8f1c8a5588..59ffcb5c2889 100644
--- a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.1.1.ebuild
+++ b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pulsectl/pulsectl-23.5.2-r1.ebuild b/dev-python/pulsectl/pulsectl-23.5.2-r1.ebuild
index 186201685853..e05bd2c3ae3c 100644
--- a/dev-python/pulsectl/pulsectl-23.5.2-r1.ebuild
+++ b/dev-python/pulsectl/pulsectl-23.5.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	media-libs/libpulse
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index d72a741ffb51..1fea77820a76 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1 +1,2 @@
+DIST pygame_sdl2-2.1.0+renpy8.1.3.tar.gz 4252499 BLAKE2B b8bff6e3c96e0e8b70e2a6c83278435491a29421572054cca151deca441171ca4bb14277f5a68d32f7c839094347a78ba2dbba1a432b5bcc47fd068b30ecb9de SHA512 3754a29996aa1992748d49b3d178d18e0cefdf17a63c7181027a3210f7360ac01b3a1d90691bb9789085cb8b61331118e6db93be24ea81b2e24e77e3b0de556c
 DIST pygame_sdl2-2.1.0-for-renpy-8.0.3.tar.gz 4053740 BLAKE2B 607e9c587734a5d53f25ff7537b308eade273f97065e81166bbace9ca255adfda0bef23f05d9fcb370c96d7eeb6175a6b649b0b07727b027ed2b43506dc876c6 SHA512 135779d4de6e2bc8ade069c11d521dd0dc2bebae6dc63a374d478785fe7534626e9dc3c7f8f50c3291f4a60b26eb474c14e3971f0b9487215125bbcd5af6782c
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild
new file mode 100644
index 000000000000..cf01d67f32fd
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-8.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+inherit distutils-r1
+
+MY_P="${PN}-2.1.0+renpy${PV}"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# <wheel-0.41.0 wasn't installing headers correctly
+# https://github.com/pypa/setuptools/issues/3997
+# <cython-3 for bug #911781
+BDEPEND="
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.41.0
+"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# PyGame distribution for this version has some pregenerated files;
+	# we need to remove them
+	rm -r gen{,3,-static} || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 5fbaa19f4fc5..98d8f06dd0c3 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1 +1,2 @@
 DIST pytest_httpx-0.27.0.tar.gz 33905 BLAKE2B 352812df060f878044a628dee62ab36f15d17080afc0367b6331c2e5e13600eefff7a3668f4a9364d437394ad8f8354f41619ec4f6b8bc5ac14b1cd652357802 SHA512 e2834313f507d02b9df96a47f8be6f46b451972e88ed9c9bfcb8bdb92545cc44064b11a1160a5d9d900381181918611d5d5a9efaf60f4e491f33182e9bd884dd
+DIST pytest_httpx-0.28.0.tar.gz 34065 BLAKE2B 13b52ba38a6e98f0d9aa10109b2d476feedfef516492b4cbe3f2cc91d1b1809934409e0e696021e1b2d5e3668cf3493834f44cb11940bac73f64949a73401308 SHA512 5dae77c04e1d801ba63a487d91e2d80a94e0626673749453ce0d273bbe876967d73789dc7811f1e96ad7366de2a00a5cee1a512398693b41e7cbc2424cb0c44f
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.28.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.28.0.ebuild
new file mode 100644
index 000000000000..cc2e3a6f45a7
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.28.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="
+	https://colin-b.github.io/pytest_httpx/
+	https://github.com/Colin-b/pytest_httpx/
+	https://pypi.org/project/pytest-httpx/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	=dev-python/httpx-0.26*[${PYTHON_USEDEP}]
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index b0256ac7a2d7..c23cd281b3d9 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,2 +1 @@
-DIST tekore-5.2.0.gh.tar.gz 262281 BLAKE2B 84f759ed5856f9fdab2f4ef115cad11e021ac0c0c4006e7d07c23a413778d1c45e68d0b4bdb8234688c99f026daf519047e4ce7760a58c71e75aa30009472117 SHA512 9151d6d83420c8f80b420535b344063814ca2dc0ca5681c196e7c920844ad6b6305562e59a8d4e23c694eab2b47029cc735a4b0a079a98828252a09e75236a73
 DIST tekore-5.2.1.gh.tar.gz 262294 BLAKE2B 9572f4e45d4e90421b49697e816e4c83220af55360276f77ad86fd4469afdb214ec5dceab6e65170e9050d0e728f0f4998c99c30e6379c25c405f922b61ad853 SHA512 f91d9b166acf2a9906dff4aec00328221f4d54e6f833b982cc782168552284c29ddd03f8da052ccabd93dc2e7bbe72c95019599d6b57fcccd1561f36d7136e63
diff --git a/dev-python/tekore/tekore-5.2.0.ebuild b/dev-python/tekore/tekore-5.2.0.ebuild
deleted file mode 100644
index e6ebf1ba4135..000000000000
--- a/dev-python/tekore/tekore-5.2.0.ebuild
+++ /dev/null
@@ -1,55 +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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io/
-	https://github.com/felix-hilden/tekore/
-	https://pypi.org/project/tekore/
-"
-SRC_URI="
-	https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pydantic-2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-# TODO: package sphinx_codeautolink
-# distutils_enable_sphinx docs/src \
-# 	dev-python/sphinx-rtd-theme \
-# 	dev-python/sphinx-tabs \
-# 	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-	# these tests use calls specific to pydantic-2
-	# TODO: reselect when we can depend on >=pydantic-2
-	tests/model.py::TestModel::test_enum_in_model
-	tests/model.py::TestModel::test_unknown_attribute_ignored
-)
diff --git a/dev-python/tekore/tekore-5.2.1.ebuild b/dev-python/tekore/tekore-5.2.1-r1.ebuild
index 1ba95afea7d0..8727a16c9c29 100644
--- a/dev-python/tekore/tekore-5.2.1.ebuild
+++ b/dev-python/tekore/tekore-5.2.1-r1.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~arm64"
 SLOT="0"
 
 RDEPEND="
-	<dev-python/httpx-0.26[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
 	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
 "
 
@@ -49,3 +49,10 @@ EPYTEST_DESELECT=(
 	# Internet
 	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
 )
+
+src_prepare() {
+	# unpin dependencies
+	sed -i -e 's:,<[0-9.]*::' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index a7ac0ef8bf49..f15a69fc3bd1 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1 +1,2 @@
 DIST translate-3.11.1.gh.tar.gz 1197476 BLAKE2B 5db1d5ab5dd79b0f85b48ca13e1a281a88d7e9e3a5502f9d5e44c3a82014aa49e28b3e283b2636f3bff79385da7e5db658b160c32275deb823625199a8932b57 SHA512 5b75e28c0baa41dc3a0fabb08e1961530bdffb2ae9d18bf40a682816b222f0bb725dbe67ba3536b9029c8d50c1c6b38eaa9f3e8fcbeb69653ef6565613013371
+DIST translate-3.12.1.gh.tar.gz 1200341 BLAKE2B dd2a5ddcdc2d4f282d70fd2158268c23d55f8714d314071f9863baf6fdc1f8433fb2e0d6d241cac6f1db5c71affffffa9fbd74d96ec0520b088a051d4f73aaee SHA512 d49b57350063582fe49f91c164e0879df1e348137587c153a65372d3db288e23b37a50bd73a870ea4280019612a6be9f95eccb716723e1afc4c0248113eb377e
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.12.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.12.1.ebuild
new file mode 100644
index 000000000000..090f410c9919
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.12.1.ebuild
@@ -0,0 +1,118 @@
+# 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_{8,9,10,11,12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_P=translate-${PV}
+DESCRIPTION="Toolkit to convert between many translation formats"
+HOMEPAGE="
+	https://github.com/translate/translate/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+html +ical +ini +subtitles +yaml"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	dev-python/cheroot[${PYTHON_USEDEP}]
+	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	sys-devel/gettext
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
+	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
+	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
+"
+# Technically, the test suite also has undeclared dependency
+# on dev-python/snapshottest but all the tests using it are broken
+# anyway, so we skip them.
+BDEPEND="
+	test? (
+		dev-python/phply[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
+	# correctly, so we need to reassemble all data files in a single directory
+	local -x XDG_DATA_HOME=${T}/share
+	cp -r translate/share "${T}/" || die
+	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails with network-sandbox (and even with it off but w/ softer fail)
+		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
+		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
+		# all tests based on snapshottest are broken and I'm too tired
+		# to figure this out
+		tests/translate/tools/test_pocount.py::test_{cases,output}
+		tests/translate/tools/test_junitmsgfmt.py::test_output
+	)
+	local EPYTEST_IGNORE=(
+		# unpackaged fluent.*
+		tests/translate/storage/test_fluent.py
+		# changes directory and does not change it back, sigh
+		tests/odf_xliff/test_odf_xliff.py
+	)
+
+	if ! use ini; then
+		EPYTEST_IGNORE+=(
+			translate/convert/test_ini2po.py
+			translate/convert/test_po2ini.py
+		)
+	fi
+
+	if ! use subtitles; then
+		EPYTEST_IGNORE+=(
+			translate/storage/test_subtitles.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr
+	doins -r translate/share
+
+	if ! use html; then
+		rm "${ED}"/usr/bin/{html2po,po2html} || die
+	fi
+	if ! use ical; then
+		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
+	fi
+	if ! use ini; then
+		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
+	fi
+	if ! use subtitles; then
+		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
+	fi
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7487d3ee61f7..5c6a4c0dbfb4 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1 +1,2 @@
 DIST wxPython-4.2.0.tar.gz 70958238 BLAKE2B 2e8e34c4f5d1992983bfe4e09bb56ee5619b139b9b3b5f05dee48ecdf6971cf9fe1b0fb22aec685904eb44db6f50a4ba132a08aa91930d809040da828efa097e SHA512 9ec937a024efb2916403c84382a66004f0c2bb07471246b7de517778309ce459e929eeb59e261f538d3fa077c950628de62e49a3760fbd03ab9ff2114c6f354f
+DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch
new file mode 100644
index 000000000000..aff380108b8e
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/911703
+https://github.com/wxWidgets/Phoenix/pull/2441
+
+From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt@techie.net>
+Date: Tue, 25 Jul 2023 12:42:32 -0400
+Subject: [PATCH] Fix compatibility with Cython 3.0.0
+
+Remove unused import which seems to be removed in Cython 3.
+--- a/wx/svg/_nanosvg.pyx
++++ b/wx/svg/_nanosvg.pyx
+@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory.
+ 
+ import sys
+ 
+-cimport cython.object
+ from cpython.buffer cimport (
+     Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
+     PyBuffer_Release)
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch b/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch
deleted file mode 100644
index 3961f12e3442..000000000000
--- a/dev-python/wxpython/files/wxpython-4.2.0-fix-cython3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/wx/svg/_nanosvg.pyx b/wx/svg/_nanosvg.pyx
-index cda04d5ca..d1cae1aa9 100644
---- a/wx/svg/_nanosvg.pyx
-+++ b/wx/svg/_nanosvg.pyx
-@@ -42,7 +42,7 @@ for manipulating the SVG shape info in memory.
- 
- import sys
- 
--cimport cython.object
-+
- from cpython.buffer cimport (
-     Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
-     PyBuffer_Release)
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index 0d618616ba59..0bd9f9a61086 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -2,9 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
+  <email>wxwidgets@gentoo.org</email>
+  <name>Gentoo wxWidgets Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
  </maintainer>
  
- <origin>binaryden-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/wxpython/wxpython-4.2.0-r1.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index 806eaf8f66e6..7488b0c5e8dd 100644
--- a/dev-python/wxpython/wxpython-4.2.0-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.wxpython.org/"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 # Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
@@ -48,9 +48,10 @@ BDEPEND="
 "
 
 PATCHES=(
+	#"${FILESDIR}/${PN}-4.0.6-skip-broken-tests.patch"
 	"${FILESDIR}/${PN}-4.2.0-no-attrdict.patch"
 	"${FILESDIR}/${PN}-4.2.0-flags.patch"
-	"${FILESDIR}/${PN}-4.2.0-fix-cython3.patch"
+	"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
 )
 
 python_prepare_all() {
diff --git a/dev-python/wxpython/wxpython-4.2.1.ebuild b/dev-python/wxpython/wxpython-4.2.1.ebuild
new file mode 100644
index 000000000000..a609da43141e
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{10..11} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="
+	https://www.wxpython.org/
+	https://github.com/wxWidgets/Phoenix/
+	https://pypi.org/project/wxPython/
+"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+RESTRICT="!test? ( test )"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+DEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-doc/doxygen
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-flags.patch"
+	"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN=/usr/bin/doxygen ${PYTHON} build.py dox etg --nodoc || die
+
+	# Refresh the bundled/pregenerated sip files
+	"${EPYTHON}" build.py sip || die
+
+	# Build the bindings
+	"${EPYTHON}" build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs="$(makeopts_jobs)" \
+		--verbose \
+		--release || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# virtx probably
+		unittests/test_display.py::display_Tests::test_display
+		unittests/test_frame.py::frame_Tests::test_frameRestore
+		unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
+		unittests/test_uiaction.py::uiaction_MouseTests
+
+		# assertion (TODO)
+		unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+		unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
+
+		# seems to rely on state from a previous test (sigh)
+		unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+
+		# requires Spanish localization
+		unittests/test_intl.py::intl_Tests::test_intlGetString
+
+		# TODO
+		unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
+		unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+		unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+	)
+	local EPYTEST_IGNORE=()
+	if ! use webkit; then
+		EPYTEST_IGNORE+=( unittests/test_webview.py )
+	fi
+
+	# We use pytest-forked as opensuse does to avoid tests corrupting each
+	# other.
+	virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 962b03040073..2f517d261ab7 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,2 +1 @@
-DIST xcffib-1.3.0.tar.gz 89874 BLAKE2B 5dd8d64b906d92cb987ee4398da668d6034faf4abc24a56c0fca3e5b6d0cd1252ea1459736a9f7fb83ee97d4d6cec5d103eb19aba626a3d646f67e6332e255a5 SHA512 a493f86891158ffa0c36168da5e7ebdeadafe5e9f067e2ad6052cf302c89db612f907b5e9950748fcfd74886b808870986529902bae77fede7e27d5d422d6ec6
 DIST xcffib-1.5.0.tar.gz 89544 BLAKE2B cb3820a53eb7694078e5dbb175951b6dbdc445c06f397898e52319fd8a7633f2d8115f0d096a14b2b3de0c7b07918343d077705814574ff41de2bf06a12812c0 SHA512 aaa426b57d0d8dc45cb6a2036c862af6308fb5781667b8dba3f5ff399fe5e15912860d0bb696ac09f1efd4ffbbdaf7f555ef76039bd660f36f5c6179535b654f
diff --git a/dev-python/xcffib/xcffib-1.3.0-r1.ebuild b/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
deleted file mode 100644
index 0a8305f01526..000000000000
--- a/dev-python/xcffib/xcffib-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="
-	https://github.com/tych0/xcffib/
-	https://pypi.org/project/xcffib/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	x11-libs/libxcb
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf xcffib || die
-	epytest
-}