7 files changed, 70 insertions, 8 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1c3cbe7d7990..3b28c30114ec 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest
index 46aa347a3a61..31a51317caa6 100644
--- a/dev-python/PyQt6-WebEngine/Manifest
+++ b/dev-python/PyQt6-WebEngine/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6_WebEngine-6.6.0.tar.gz 31817 BLAKE2B 3e795bda50d1a5874e6caec7f69370840913cbbb33662ddc5624f0437c765e3318a2b4233d8e9963145dbeef8a4edc559112f114b850d9879eecb9e3e6b6fd2e SHA512 30927b7728d68cbeff6346234e131f96dfcd4b2af503d27d2f0a1eee584b5a928ac4fe1f66019c90aaf1ccd66fffe2edaf55de86d9aa0c83518c45669613bc0d
-EBUILD PyQt6-WebEngine-6.6.0.ebuild 1884 BLAKE2B 0dae56b8352f46c5847022ee820aa050436a8dc0a3e0ff3e4e267942dd51eed9043e9e2003ef84b1226f98ccb80abc16f059b4227f853e95ea18a772f56424a3 SHA512 b20f3bcd5815c90ff99ec7390c7d09c854513c81bb8fd58199c82c9dcdc74045f4ab8a7506f09dc74bc4d30ea77c1d61a626b23f7238240977e2c1eaeef1b2e3
+EBUILD PyQt6-WebEngine-6.6.0.ebuild 1847 BLAKE2B f83d1ec38378bbb55391bf31d19a47de3a60847fb872f6c025fbeeaf6c6bfdd85cd5b7d029dcc720453ee7cbf9c0804b3b26bb7f93143060f5259dc39fbdeda2 SHA512 8b077de65b048ae7b3794b0a911ae9a36d3472dd13582f6ae2268e5b22f7e1e07a938218925617eda62c1584078e5ea1fa6cedcf765ed3e1bd37182b332cd6fe
 MISC metadata.xml 574 BLAKE2B 1cc3bbf5d25e8aac390530005c225bfc618fbb1bdef3a3d075f445eee2cf68d86feb6ac8841d7e0efd1679b19fc14b33b33accdd7e4932e742f46907a8f98601 SHA512 1af94b1a66be1dd38feb818ba973852912bacacc715e0bd893f8b3de56d17f8902b7486cc487137defad749773a6f728c470cbb9c62d15f91a63d80b16296604
diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.6.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.6.0.ebuild
index a23756c616ea..15bbe5672ea4 100644
--- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.6.0.ebuild
+++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.6.0.ebuild
@@ -39,9 +39,9 @@ BDEPEND="
 src_prepare() {
 	default
 
-	# hack: qmake queries g++ or clang++ for info depending on which qtbase was
-	# built with, but ignores CHOST failing with -native-symlinks (bug #726112)
-	# and potentially using wrong information when cross-compiling
+	# hack: PyQt-builder runs qmake without our arguments and calls g++
+	# or clang++ depending on what qtbase was built with, not used for
+	# building but fails with -native-symlinks
 	mkdir "${T}"/cxx || die
 	local cxx
 	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index ec4403d31dcb..658b78871bb0 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,4 +1,4 @@
 AUX PyQt6-6.6.1-qt670.patch 2528 BLAKE2B 3157c4e4e063747db56e92b011147dfb3a57474b6e80f052372d4b83b91bf36bb18ba256f4e2b4466c140744b075ac47217915ad5d744900754c8f4af7ab8f61 SHA512 5894b371cfa9b22de2300cc75b7ab486944ecd7c8f2aed6bdd03355c9952ebd550ec2383ff057d629b54d91f92ef67cd566a39d7e38696d6ba2b09622b9900e8
 DIST PyQt6-6.6.1.tar.gz 1043203 BLAKE2B dd2b6988ebeabaae47fe57c5c0d17fbe4b62c377262b4bb360adb7fd6724ccb6a67ba5c2bd7498df98db3ce6b00978f936b11a43b464c3c7af169f25b30ee1a6 SHA512 c2ff8c47c9b0e43c009d0c90f565a54344e6f384c67dd30c2d422465d0702c07713acc0095c8b67827d1146675611c07d548ba282a26e41bb60a0a21977a7a64
-EBUILD PyQt6-6.6.1.ebuild 5589 BLAKE2B 7c089147a865bbf96e611bc2d3f2a368df4b705a8d6045e70106cb64ef540f6fb75a14ae69087fb84aa25f35ba532763786c657d1e0a12060e73a1b80dc11648 SHA512 4ff1c3f6cbb70ac12d7ac95e7b5e9dbfe014beb6a484753bec111c0ea96a082bdcfdae46c03d4e5c49f8e278400d2aeab800c7ba953146bf179da8ecf2b44ca3
+EBUILD PyQt6-6.6.1.ebuild 5552 BLAKE2B 877be0dfbc0f60169493a805035ee398f2e9d6dd005aa97695e1dc39014f0571fff1802f3a60e028659488c92da6640a265e29a0a64682d0e9b45233b30f236d SHA512 daf3dd77e42f5a5a6d1bf6fa3fdc3ff09c8f153c6fd430b1b6a4fedec707be5606ebd682c9059837f254762859d20c7379f993f6a2808e2c0066cdfe1f7fce8c
 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae
diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
index 082de8da926a..328355759d54 100644
--- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild
@@ -91,9 +91,9 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# hack: qmake queries g++ or clang++ for info depending on which qtbase was
-	# built with, but ignores CHOST failing with -native-symlinks (bug #726112)
-	# and potentially using wrong information when cross-compiling
+	# hack: PyQt-builder runs qmake without our arguments and calls g++
+	# or clang++ depending on what qtbase was built with, not used for
+	# building but fails with -native-symlinks
 	mkdir "${T}"/cxx || die
 	local cxx
 	! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index 59c03a1504a7..30cee191132d 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,4 +1,6 @@
 AUX python-rtmidi-1.5.1-unbundle_rtmidi.patch 1455 BLAKE2B 2cc76ace5758131a069194e9d30c8288ed93a261d41a2b4cf0294e2b4fc7ebee9e0c43b4377143ae8074a03dcc2abf13fd85fdebeebd321efce00e25e43057b1 SHA512 92c11d878018ded30dffa0d06006f8471054321af8d9f58268d4d899121dac66712ddc3a53285c19293fb2d52d4d054b0d803c559e9c01cb8c8f161ce5f2c734
 DIST python_rtmidi-1.5.7.tar.gz 368514 BLAKE2B 32028dff34928b1794cc178b22821fe8e01bff36d18b17b8673c763b21ca7ef85a6cb3ee62adcddbaf0b655079e7b8819ba5a28e58b8d5713015728cd6648246 SHA512 23c88cd307b5bc937920db9b39d0423043fb47878d679f4d721a025368a01e23b8e72749e1146da3277d37a20a9c5486e2c40c2a907c5efc5418567e97c3de91
+DIST python_rtmidi-1.5.8.tar.gz 368130 BLAKE2B 99fecb8cd003431b5fca31f436a77f27a50076a02ea7f92019800d0816c968f032bd31d236a13d67b2ee9ebdc341d16955675867a8dd345e76282131b781ef13 SHA512 0f2b949a2a53f813a891bc391ce0369fbbec0d6e898a9ace2925adc5714d791ce1f4df133edf34c87b3336cb3ab4ad70851a42124241ec1707f32f66a778dc18
 EBUILD python-rtmidi-1.5.7.ebuild 1559 BLAKE2B fcbddc44d5a6624303b4c6f06de5704215b9a79b6fe7a94d46e336f9c0faecaea59ba6a91a4e64ce4899d28a5f0f42d36e516436134a894a2c15557947d8b2c0 SHA512 d41c941fdc13381c022565b82c64100805698db6aada3cd20011482b36a7c755294ee160cb55df01db9f274f2cf38e92ebd6cff653826bb22cc6f92e8d97a520
+EBUILD python-rtmidi-1.5.8.ebuild 1559 BLAKE2B fcbddc44d5a6624303b4c6f06de5704215b9a79b6fe7a94d46e336f9c0faecaea59ba6a91a4e64ce4899d28a5f0f42d36e516436134a894a2c15557947d8b2c0 SHA512 d41c941fdc13381c022565b82c64100805698db6aada3cd20011482b36a7c755294ee160cb55df01db9f274f2cf38e92ebd6cff653826bb22cc6f92e8d97a520
 MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/python-rtmidi-1.5.8.ebuild b/dev-python/python-rtmidi/python-rtmidi-1.5.8.ebuild
new file mode 100644
index 000000000000..a1779b717ea1
--- /dev/null
+++ b/dev-python/python-rtmidi/python-rtmidi-1.5.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/myst-parser"
+DOCS_DIR="docs"
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+
+inherit distutils-r1 docs pypi
+
+DESCRIPTION="Python bindings for media-libs/rtmidi implemented using Cython"
+HOMEPAGE="
+	https://pypi.org/project/python-rtmidi/
+	https://spotlightkid.github.io/python-rtmidi/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa jack"
+
+# Most of these tests do not play nicely with the sandbox, some only
+# work with exactly the same version of rtmidi as the bundled one, and
+# several fail even with disabled sandbox unless there are actual MIDI
+# I/O devices present.
+RESTRICT="test"
+
+DEPEND="media-libs/rtmidi[alsa?,jack?]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-unbundle_rtmidi.patch
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# Just in case
+	rm -r src/rtmidi || die
+	rm src/_rtmidi.cpp || die
+
+	# Needed by USE=doc because documentation generation happens in ${S}
+	# but the version.py generated by Meson end up in respective ${BUILD_DIR}s.
+	# The version put in ${S} should be ignored by everything except Sphinx but
+	# just in case, be consistent and generate it unconditionally.
+	sed -e "s|@VERSION@|${PV}|" < rtmidi/version.py.in > rtmidi/version.py || die
+}
+
+python_test() {
+	cd "${T}" || die
+	eunittest "${S}"/tests
+}