Adding metadata

26 files changed, 559 insertions, 225 deletions

diff --git a/dev-python/NSKeyedUnArchiver/Manifest b/dev-python/NSKeyedUnArchiver/Manifest
deleted file mode 100644
index e249e50422d0..000000000000
--- a/dev-python/NSKeyedUnArchiver/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NSKeyedUnArchiver-1.5.tar.gz 3431 BLAKE2B c66ca90e3585abb60efb2142111ccae8102de90ebf8fd904679abe0b24a4311616e051260cc018ac8128d8e3d81652d4e7d4e1ee6ae1dc6d7418fb82ed160407 SHA512 ecdf53bdcfff34366c4fb0d4e4ff45e765a7571374af803a1f9acf6c42fa5d300f00a7e58cb1380e1f5d1e1ad06696652225a6ae4fcfe9b6627f510b749f32e1
diff --git a/dev-python/NSKeyedUnArchiver/NSKeyedUnArchiver-1.5.ebuild b/dev-python/NSKeyedUnArchiver/NSKeyedUnArchiver-1.5.ebuild
deleted file mode 100644
index dd45d37af0c5..000000000000
--- a/dev-python/NSKeyedUnArchiver/NSKeyedUnArchiver-1.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unserializes binary|text|file|memory plist data to Python dict"
-HOMEPAGE="https://github.com/avibrazil/NSKeyedUnArchiver"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/NSKeyedUnArchiver/metadata.xml b/dev-python/NSKeyedUnArchiver/metadata.xml
deleted file mode 100644
index 28c14102372d..000000000000
--- a/dev-python/NSKeyedUnArchiver/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
-  <bugs-to>https://github.com/avibrazil/NSKeyedUnArchiver</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/biplist/Manifest b/dev-python/biplist/Manifest
deleted file mode 100644
index 87a542312aac..000000000000
--- a/dev-python/biplist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST biplist-1.0.3.tar.gz 21258 BLAKE2B 9ef9b827e3e4e0496545627e435a64a40fadc4580b8f61fe0cb40c96df5f3fa7559af4d117fe28ee777629efff0bc0f5789f03eca1314e375c93a0ada0018452 SHA512 186927481229988c713d9bb703115493001b129ed4e540e9a028e99b4f10e1576291c75f98d39b28e04092c14a9c96e4843c1445d9a318ced322323c7c1134b5
diff --git a/dev-python/biplist/biplist-1.0.3.ebuild b/dev-python/biplist/biplist-1.0.3.ebuild
deleted file mode 100644
index cf47dc59ccad..000000000000
--- a/dev-python/biplist/biplist-1.0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A binary plist parser/generator for Python"
-HOMEPAGE="https://pypi.org/project/biplist/ https://github.com/wooster/biplist"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Because using dev-python/nose test framework -
-# that is abandonware for 10 years
-# Related ticket on the upstream: https://github.com/wooster/biplist/issues/14
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=( "${FILESDIR}/${PN}-python3-compat.patch" )
diff --git a/dev-python/biplist/files/biplist-python3-compat.patch b/dev-python/biplist/files/biplist-python3-compat.patch
deleted file mode 100644
index d16ac809fe02..000000000000
--- a/dev-python/biplist/files/biplist-python3-compat.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Stefano Rivera <stefanor@debian.org>
-Date: Mon, 1 Feb 2021 17:58:06 -0700
-Subject: Python 3.9: Use bytes with plistlib
-
-Python 3.9 dropped the deprecated plistlib.Data class. Instead of
-plistlib.Data, we can just use bytes directly.
-
-Bug-Debian: https://bugs.debian.org/973082
-Bug-Upstream: https://bitbucket.org/wooster/biplist/issues/12/python-39-compatibility
----
- biplist/__init__.py | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/biplist/__init__.py b/biplist/__init__.py
-index f9d5836..4a40602 100644
---- a/biplist/__init__.py
-+++ b/biplist/__init__.py
-@@ -147,14 +147,7 @@ def readPlist(pathOrFile):
-     return result
- 
- def wrapDataObject(o, for_binary=False):
--    if isinstance(o, Data) and not for_binary:
--        v = sys.version_info
--        if not (v[0] >= 3 and v[1] >= 4):
--            o = plistlib.Data(o)
--    elif isinstance(o, (bytes, plistlib.Data)) and for_binary:
--        if hasattr(o, 'data'):
--            o = Data(o.data)
--    elif isinstance(o, tuple):
-+    if isinstance(o, tuple):
-         o = wrapDataObject(list(o), for_binary)
-         o = tuple(o)
-     elif isinstance(o, list):
diff --git a/dev-python/biplist/metadata.xml b/dev-python/biplist/metadata.xml
deleted file mode 100644
index 56988650ec34..000000000000
--- a/dev-python/biplist/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>davidroman96@gmail.com</email>
-  <name>David Roman</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/grpc-stubs/Manifest b/dev-python/grpc-stubs/Manifest
deleted file mode 100644
index 563d498fc079..000000000000
--- a/dev-python/grpc-stubs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST grpc-stubs-1.53.0.3.gh.tar.gz 14667 BLAKE2B 58f1ff46f6e4ad96fafa7583158e8a3be1ac5fc991f50dde34899fad919fbfb46afe5da8846aa7ef98cdc4de34609ee93a06d137630d505460d34ecaa3a47837 SHA512 dbcf9882b4ad986bcf17ed613c233cfd889d46340b91534d9ef33a11e1ce25db5e81a747c57b55a1e174012c81da94d29769706a1b3932ca13b020506235ccbd
diff --git a/dev-python/grpc-stubs/files/grpc-stubs-1.53.0.3-die-on-missing-import.patch b/dev-python/grpc-stubs/files/grpc-stubs-1.53.0.3-die-on-missing-import.patch
deleted file mode 100644
index 7b7a8e9f0b82..000000000000
--- a/dev-python/grpc-stubs/files/grpc-stubs-1.53.0.3-die-on-missing-import.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests should fail if mypy fails to find the stubs that are to be tested.
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,7 +1,7 @@
- [mypy]
- check_untyped_defs = True
- ignore_errors = False
--ignore_missing_imports = True
-+ignore_missing_imports = False
- strict_optional = True
- no_error_summary = True
- no_color_output = True
diff --git a/dev-python/grpc-stubs/grpc-stubs-1.53.0.3.ebuild b/dev-python/grpc-stubs/grpc-stubs-1.53.0.3.ebuild
deleted file mode 100644
index 753cfbe1aa95..000000000000
--- a/dev-python/grpc-stubs/grpc-stubs-1.53.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-inherit distutils-r1
-
-DESCRIPTION="gRPC typing stubs for Python"
-HOMEPAGE="
-	https://pypi.org/project/grpc-stubs/
-	https://github.com/shabbyrobe/grpc-stubs/
-"
-
-SRC_URI="https://github.com/shabbyrobe/grpc-stubs/archive/refs/tags/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="dev-python/types-protobuf[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-				dev-python/pytest-mypy-plugins[${PYTHON_USEDEP}]
-				${RDEPEND}
-			   )"
-
-distutils_enable_tests pytest
-
-PATCHES="${FILESDIR}/"${P}-die-on-missing-import.patch
-
-python_test() {
-	# Gentoo's PEP 517 mode runs tests in a venv-like environment.
-	# Pytest-mypy-plugins checks the PATH for mypy, we provide a venv-aware
-	# variant.
-	printf "#!/bin/bash\n $(which python) -m mypy \$@" > \
-		 "${BUILD_DIR}"/install/usr/bin/mypy || die
-	chmod +x "${BUILD_DIR}"/install/usr/bin/mypy || die
-	epytest --mypy-ini-file=setup.cfg
-	rm "${BUILD_DIR}"/install/usr/bin/mypy || die
-}
diff --git a/dev-python/grpc-stubs/metadata.xml b/dev-python/grpc-stubs/metadata.xml
deleted file mode 100644
index baa1a46259e9..000000000000
--- a/dev-python/grpc-stubs/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>watermanpaint@posteo.net</email>
-  <name>Lucio Sauer</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/iOSbackup/Manifest b/dev-python/iOSbackup/Manifest
deleted file mode 100644
index 2d7defc2b40b..000000000000
--- a/dev-python/iOSbackup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iOSbackup-0.9.925.tar.gz 25228 BLAKE2B aa4be5fb2190a3dd8e88c28129a2422c14041e564ef5ba3fc75b444049632bf621c7581c8a18d03afe3592d03ad7830a9384694a71ee856f013d96b49e4b0a06 SHA512 b8339359f806f9629736a7abe9e35a6b868c08529b43d0b9e0408afca25babc167ff70abb2516f557ac071fa26193d1cfaf1348f7bfee0eb57ef736c1c5d83d0
diff --git a/dev-python/iOSbackup/iOSbackup-0.9.925-r1.ebuild b/dev-python/iOSbackup/iOSbackup-0.9.925-r1.ebuild
deleted file mode 100644
index b9d3dfd04690..000000000000
--- a/dev-python/iOSbackup/iOSbackup-0.9.925-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reads and extracts files from a password-encrypted iOS backup"
-HOMEPAGE="
-	https://pypi.org/project/iOSbackup/
-	https://github.com/avibrazil/iOSbackup
-"
-
-# The project only states LGPL in setup.py
-LICENSE="
-	|| (
-		LGPL-2
-		LGPL-2+
-		LGPL-2-with-linking-exception
-		LGPL-2.1
-		LGPL-2.1+
-		LGPL-2.1-with-linking-exception
-		LGPL-3
-		LGPL-3+
-		LGPL-3-with-linking-exception
-	)
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/NSKeyedUnArchiver[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/iOSbackup/metadata.xml b/dev-python/iOSbackup/metadata.xml
deleted file mode 100644
index 8945319b4f23..000000000000
--- a/dev-python/iOSbackup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
-  <bugs-to>https://github.com/avibrazil/iOSbackup</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index d12ab8aeaca8..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9cd8a2a93a8d45bf51fe2324402b175d641762ea591fcb99459427f977a95eccffa6ca4777ca4df39814eea6eac62711567faa654456d32f79023a4685804504 SHA512 d973b85ba1a44389a4275f02a779a93a005f7c2e096467b94b072862e4984d5b42cf33f9821ac68aa5b85b12c98983a90b96049989d8c84497969174b6bb838e
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 56733bbffc48..98b2b0bf8d0b 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_COMPAT=( python3_{11..14} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi
 
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..c0f74ac187e2 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pysdl3/Manifest b/dev-python/pysdl3/Manifest
index 29ede0172c7b..18150ea28761 100644
--- a/dev-python/pysdl3/Manifest
+++ b/dev-python/pysdl3/Manifest
@@ -1,2 +1,2 @@
-DIST pysdl3-0.9.8b7.tar.gz 1416984 BLAKE2B 3fc870524bdb88cea14cd297e453a61c33c28e16b1ff56963395f8f29737310b142ab9d8e27f8c4449e44501d351605946a16239729bb290d0cf371139ea6093 SHA512 13bf70289bb7842b11b195836807f0e0581620ad4c0544389a750023a52c2901d8e21a94621e0ae1c005249b9ee22d85b6db8064056363154f85eeb9f7af9ab3
 DIST pysdl3-0.9.8b8.tar.gz 1417014 BLAKE2B d7218ccca34069926e10d76339fdf1268599ada6abd3e24ae4fb50425f7a568b204242e1d1f14022e56c4f9c1299297c038a5b6c556f95fdc4aab2226f47f033 SHA512 ca6116534f863dd9df38c4261244bfdca2d418e461d26bf50bec2de4179ad3982c42c2a8c85b6658ff51f5c047bb0349a53513d6f076130ba5949c5d9b01418f
+DIST pysdl3-0.9.8b9.tar.gz 1417052 BLAKE2B a57a2b9506239e9a74dbd55c3bed9ba28948030be41aa8b3decb4c80ad34ee60a334b240a78c0929fd1723a446286f8321bc829346ae26cf5487cd6065f2d35f SHA512 bb1cbb97c6394542726f7f7a12c5b700a4816520eeba5cb281d17cbd3dc04bcb575acb19296d1145b8c00b92bda2593c5dd9940c620413cab3e10dca7d73d46b
diff --git a/dev-python/pysdl3/pysdl3-0.9.8_beta7.ebuild b/dev-python/pysdl3/pysdl3-0.9.8_beta9.ebuild
index 5687858d8549..81d0c7260272 100644
--- a/dev-python/pysdl3/pysdl3-0.9.8_beta7.ebuild
+++ b/dev-python/pysdl3/pysdl3-0.9.8_beta9.ebuild
@@ -32,11 +32,11 @@ RDEPEND="
 src_install() {
 	distutils-r1_src_install
 
-	cat - > 99pysdl3 <<EOF
-SDL_DISABLE_METADATA=1
-SDL_DOC_GENERATOR=0
-SDL_BINARY_PATH=/usr/$(get_libdir)
-EOF
+	cat - > 99pysdl3 <<-EOF
+	SDL_DISABLE_METADATA=1
+	SDL_DOC_GENERATOR=0
+	SDL_BINARY_PATH=/usr/$(get_libdir)
+	EOF
 
 	# Workaround for https://github.com/Aermoss/PySDL3/issues/27
 	doenvd 99pysdl3
diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest
index 830ac2a641be..a5fa489ce856 100644
--- a/dev-python/pyside/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1 +1,2 @@
 DIST pyside-setup-everywhere-src-6.9.1.tar.xz 16669448 BLAKE2B a98dc9bea7824f2b98becba83ce8cf6488d76fe85ef91e96c1d8b3b6f08fccc57f13116dfb55507e9fbf5d7a82f370418a103a616869fe17b233fff76de3996d SHA512 2069b2154618e49aeeae4ed53e377bf08f7d519aa955dfec0e10603cc5a58abbb32a502b3b4066d0a7cd3bf24b288130c9578d909734a064413578cd6aef7d33
+DIST pyside-setup-everywhere-src-6.9.2.tar.xz 16659400 BLAKE2B baf8955d6a16b56807f202577a54737857fed5c7d7394f7d843111832a3b71978a1ae8b6561a1df041913875f32ba5a836cb219f53e8a13a218f2866a54ae9c3 SHA512 643bf42241e952ed028eb44830387864fd7343587a568d8be9d8a179af8b76b8ac5d0bb92a93db45abc83120c0cd627667312cc248f1924f4797fd74242c1808
diff --git a/dev-python/pyside/pyside-6.9.2.ebuild b/dev-python/pyside/pyside-6.9.2.ebuild
new file mode 100644
index 000000000000..8d370bb985d9
--- /dev/null
+++ b/dev-python/pyside/pyside-6.9.2.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTE: We combine here several PyPI packages, we do this because
+# pyside can and does break if it is compiled with a different
+# toolchain then was used to build shiboken. This bundling ensures
+# that we always use the same toolchain for all components.
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+LLVM_COMPAT=( {16..20} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+
+inherit distutils-r1 llvm-r1 multiprocessing qmake-utils virtualx
+
+MY_PN=${PN}-setup-everywhere-src
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://wiki.qt.io/PySide6"
+
+if [[ ${PV} == *.9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/${PN}/${PN}-setup.git"
+		"https://github.com/qtproject/${PN}-${PN}-setup.git"
+	)
+	EGIT_BRANCH=dev
+	[[ ${PV} == 6.*.9999 ]] && EGIT_BRANCH=${PV%.9999}
+else
+	SRC_URI="https://download.qt.io/official_releases/QtForPython/${PN}6/PySide6-${PV}-src/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="6/${PV}"
+
+# If a flag enables multiple Qt modules, they should be ordered
+# according to their dependencies, e.g. for 3d, 3DCore must be first.
+# Widgets for various modules are handled as a special case later
+declare -A QT_MODULES=(
+	["3d"]="3DCore 3DRender 3DLogic 3DInput 3DAnimation 3DExtras"
+	["bluetooth"]="Bluetooth"
+	["charts"]="Charts"
+	["+concurrent"]="Concurrent"
+	["+core"]="Core"
+	["+dbus"]="DBus"
+	["designer"]="Designer"
+	["+gui"]="Gui"
+	["help"]="Help"
+	["httpserver"]="HttpServer"
+	["location"]="Location"
+	["multimedia"]="Multimedia" # plus widgets
+	["network-auth"]="NetworkAuth"
+	["+network"]="Network"
+	["nfc"]="Nfc"
+	["+opengl"]="OpenGL" # plus widgets
+	["pdfium"]="Pdf" # plus widgets
+	["positioning"]="Positioning"
+	["+printsupport"]="PrintSupport"
+	["qml"]="Qml"
+	["quick3d"]="Quick3D"
+	["quick"]="Quick" # plus widgets
+	["remoteobjects"]="RemoteObjects"
+	["scxml"]="Scxml"
+	["sensors"]="Sensors"
+	["serialbus"]="SerialBus"
+	["serialport"]="SerialPort"
+	["spatialaudio"]="SpatialAudio"
+	["+sql"]="Sql"
+	["svg"]="Svg" # plus widgets
+	["speech"]="TextToSpeech"
+	["+testlib"]="Test"
+	["uitools"]="UiTools"
+	["webchannel"]="WebChannel"
+	["webengine"]="WebEngineCore" # plus widgets and quick
+	["websockets"]="WebSockets"
+	["webview"]="WebView"
+	["+widgets"]="Widgets"
+	["+xml"]="Xml"
+)
+
+# Manually reextract these requirements on version bumps by running the
+# following one-liner from within "${S}":
+#     $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt
+declare -A QT_REQUIREMENTS=(
+	["3d"]="gui network opengl"
+	["bluetooth"]="core"
+	["charts"]="core gui widgets"
+	["concurrent"]="core"
+	["dbus"]="core"
+	["designer"]="widgets"
+	["gles2-only"]="gui"
+	["gui"]="core"
+	["help"]="widgets"
+	["httpserver"]="core concurrent network websockets"
+	["location"]="core positioning"
+	["multimedia"]="core gui network"
+	["network-auth"]="network"
+	["network"]="core"
+	["nfc"]="core"
+	["opengl"]="gui"
+	["pdfium"]="core gui network"
+	["positioning"]="core"
+	["printsupport"]="widgets"
+	["qml"]="network"
+	["quick"]="gui network qml opengl"
+	["quick3d"]="gui network qml quick"
+	["remoteobjects"]="core network"
+	["scxml"]="core"
+	["sensors"]="core"
+	["serialbus"]="core network serialport"
+	["serialport"]="core"
+	["spatialaudio"]="core gui network multimedia"
+	["speech"]="core multimedia"
+	["sql"]="widgets"
+	["svg"]="gui"
+	["testlib"]="widgets"
+	["uitools"]="widgets"
+	["webchannel"]="core"
+	["webengine"]="core gui network printsupport quick webchannel"
+	["websockets"]="network"
+	["webview"]="gui quick webengine"
+	["widgets"]="gui"
+	["xml"]="core"
+)
+
+IUSE="${!QT_MODULES[@]} debug doc gles2-only numpy test tools"
+RESTRICT="!test? ( test )"
+
+# majority of QtQml tests require QtQuick support
+REQUIRED_USE="
+	test? (
+		qml? ( quick )
+	)
+"
+for requirement in ${!QT_REQUIREMENTS[@]}; do
+	REQUIRED_USE+=" ${requirement}? ( ${QT_REQUIREMENTS[${requirement}]} ) "
+done
+
+# Minimal supported version of Qt.
+QT_PV="$(ver_cut 1-3)*:6"
+
+# WebEngine needs sound support, so enable either pulseaudio or alsa
+RDEPEND="
+	=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+	3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] )
+	bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
+	charts? ( =dev-qt/qtcharts-${QT_PV} )
+	designer? ( =dev-qt/qttools-${QT_PV}[designer,widgets,gles2-only=] )
+	gui? (
+		=dev-qt/qtbase-${QT_PV}[gui,jpeg(+)]
+		x11-libs/libxkbcommon
+	)
+	help? ( =dev-qt/qttools-${QT_PV}[assistant,gles2-only=] )
+	httpserver? ( =dev-qt/qthttpserver-${QT_PV} )
+	location? ( =dev-qt/qtlocation-${QT_PV} )
+	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets(+)?] )
+	network? ( =dev-qt/qtbase-${QT_PV}[ssl] )
+	network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+	nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] )
+	numpy? ( >=dev-python/numpy-2.1.3[${PYTHON_USEDEP}] )
+	pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] )
+	positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+	printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+	qml? ( =dev-qt/qtdeclarative-${QT_PV}[opengl?,widgets?] )
+	quick3d? ( =dev-qt/qtquick3d-${QT_PV}[opengl?] )
+	remoteobjects? ( =dev-qt/qtremoteobjects-${QT_PV} )
+	scxml? ( =dev-qt/qtscxml-${QT_PV} )
+	sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] )
+	speech? ( =dev-qt/qtspeech-${QT_PV} )
+	serialbus? ( =dev-qt/qtserialbus-${QT_PV} )
+	serialport? ( =dev-qt/qtserialport-${QT_PV} )
+	svg? ( =dev-qt/qtsvg-${QT_PV} )
+	testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+	tools? (
+		=dev-qt/qtbase-${QT_PV}
+		=dev-qt/qtdeclarative-${QT_PV}[qmlls]
+		=dev-qt/qttools-${QT_PV}[assistant,designer,linguist]
+		dev-python/pkginfo[${PYTHON_USEDEP}]
+	)
+	uitools? ( =dev-qt/qttools-${QT_PV}[gles2-only=,widgets] )
+	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+	webengine? ( || (
+		=dev-qt/qtwebengine-${QT_PV}[alsa,widgets?]
+		=dev-qt/qtwebengine-${QT_PV}[pulseaudio,widgets?]
+		)
+	)
+	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
+	webview? ( =dev-qt/qtwebview-${QT_PV} )
+	!dev-python/pyside:0
+	!dev-python/shiboken6
+	!dev-python/pyside6-tools
+"
+
+DEPEND="${RDEPEND}
+	$(llvm_gen_dep '
+		llvm-core/clang:${LLVM_SLOT}
+		llvm-core/llvm:${LLVM_SLOT}
+	')
+	dev-util/vulkan-headers
+	test? ( =dev-qt/qtbase-${QT_PV}[gui] )
+" # testlib is toggled by the gui flag on qtbase
+
+BDEPEND="
+	dev-build/cmake
+	dev-python/distro[${PYTHON_USEDEP}]
+	<dev-python/wheel-0.46.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	doc? (
+		>=dev-libs/libxml2-2.6.32
+		>=dev-libs/libxslt-1.1.19
+		media-gfx/graphviz
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/myst-parser[${PYTHON_USEDEP}]
+	)
+	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	# Needs porting to newer wheel and setuptools
+	"${FILESDIR}/${PN}-6.8.2-quick-fix-build-wheel.patch"
+)
+
+# Build system duplicates system libraries. TODO: fix
+QA_PREBUILT=(
+	"/usr/lib/python*/site-packages/PySide6/*"
+)
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include"
+	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
+	sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
+			sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+
+	# Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/"
+	# subdirectory provides Clang builtin includes (e.g., "stddef.h") for the
+	# currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is
+	# the largest version specifier that exists under the "/usr/lib/clang/"
+	# subdirectory. This assumption is false in edge cases, including when
+	# users downgrade from newer Clang versions but fail to remove those
+	# versions with "emerge --depclean". See also:
+	#     https://github.com/leycec/raiagent/issues/85
+	#
+	# Sadly, the clang-* family of functions exported by the "toolchain-funcs"
+	# eclass are defective, returning nonsensical placeholder strings if the
+	# end user has *NOT* explicitly configured their C++ compiler to be Clang.
+	# PySide6 does *NOT* care whether the end user has done so or not, as
+	# PySide6 unconditionally requires Clang in either case. See also:
+	#     https://bugs.gentoo.org/619490
+	sed -e \
+		's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'"${LLVM_SLOT}"'/include"))~' \
+		-i sources/shiboken6/ApiExtractor/clangparser/compilersupport.cpp || die
+
+	# blacklist.txt works like XFAIL
+	cat <<- EOF >> build_history/blacklist.txt || die
+	# segfaults with QOpenGLContext::create
+	[pysidetest::qapp_like_a_macro_test]
+		linux
+	# Tries to execute pip install
+	[pyside6-deploy::test_pyside6_deploy]
+		linux
+	[pyside6-android-deploy::test_pyside6_android_deploy]
+		linux
+	# Behavior changed and test not changed to accomodate
+	# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-3135
+	[registry::existence_test]
+		linux
+	# Doesn't appear to play well with virtualx as it tries to use wayland
+	[QtUiTools::loadUiType_test]
+		linux
+	EOF
+
+	if ! use numpy; then
+		cat <<- EOF >> build_history/blacklist.txt || die
+		# Requires numpy support to pass
+		[sample::array_numpy]
+			linux
+		[sample::nontypetemplate]
+			linux
+		[QtGui::qpainter_test]
+			linux
+		EOF
+	fi
+}
+
+python_configure_all() {
+	ENABLED_QT_MODULES=()
+
+	# The order matters, dependencies must come first so process
+	# REQUIRED_USE and recursively enable modules
+	enable_qt_mod() {
+		local flag=${1}
+		local modules=${QT_MODULES[${flag}]}
+		if [[ -z ${modules} ]]; then
+			die "incorrect flag=${flag}, not registered"
+		fi
+		local dependencies=${QT_REQUIREMENTS[${flag//+}]}
+		if [[ -n ${dependencies} ]]; then
+			local depflag
+			for depflag in ${dependencies}; do
+				if use ${depflag}; then
+					if [[ -z ${QT_MODULES[${depflag}]} ]]; then
+						depflag=+${depflag}
+					fi
+					enable_qt_mod ${depflag}
+				else
+					die "${depflag} is required but not enabled"
+				fi
+			done
+		fi
+		if [[ "${ENABLED_QT_MODULES[*]}" != *${modules}* ]]; then
+			ENABLED_QT_MODULES+=( ${modules} )
+		fi
+	}
+	# Enable specified qt modules
+	local flag
+	for flag in ${!QT_MODULES[@]}; do
+		if use ${flag//+}; then
+			enable_qt_mod ${flag}
+		fi
+	done
+
+	# Special cases
+	if use widgets; then
+		use multimedia && ENABLED_QT_MODULES+=( MultimediaWidgets )
+		use opengl && ENABLED_QT_MODULES+=( OpenGLWidgets )
+		use pdfium && ENABLED_QT_MODULES+=( PdfWidgets )
+		use quick && ENABLED_QT_MODULES+=( QuickWidgets )
+		use svg && ENABLED_QT_MODULES+=( SvgWidgets )
+		use webengine && ENABLED_QT_MODULES+=( WebEngineWidgets )
+	fi
+	if use quick; then
+		use webengine && ENABLED_QT_MODULES+=( WebEngineQuick )
+		use testlib && ENABLED_QT_MODULES+=( QuickTest )
+	fi
+
+	# Arguments listed in options.py
+	MAIN_DISTUTILS_ARGS=(
+		--cmake="${EPREFIX}/usr/bin/cmake"
+		--ignore-git
+		--limited-api=no
+		--module-subset="$(printf '%s,' "${ENABLED_QT_MODULES[@]}")"
+		--no-strip
+		--no-size-optimization
+		--openssl="${EPREFIX}/usr/bin/openssl"
+		--qt=$(ver_cut 1-3)
+		--qtpaths=$(qt6_get_bindir)/qtpaths
+		--verbose-build
+		--parallel=$(makeopts_jobs)
+		$(usex debug "--debug" "--relwithdebinfo")
+		$(usex doc "--build-docs" "--skip-docs")
+		$(usex numpy "--enable-numpy-support" "--disable-numpy-support")
+		$(usex test "--build-tests --use-xvfb" "")
+		$(usex tools "" "--no-qt-tools")
+	)
+}
+
+python_compile() {
+	DISTUTILS_ARGS=(
+		"${MAIN_DISTUTILS_ARGS[@]}"
+		--build-type=shiboken6
+	)
+	distutils-r1_python_compile
+
+	# The build system uses its own build dir, find the name of this dir.
+	local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n")
+	export pyside_build_id=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-}
+
+	DISTUTILS_ARGS=(
+		"${MAIN_DISTUTILS_ARGS[@]}"
+		--reuse-build
+		--shiboken-target-path="${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))/${pyside_build_dir}/install"
+		--build-type=shiboken6-generator
+	)
+	distutils-r1_python_compile
+	# If no pyside modules enabled, build just shiboken
+	if [[ ${#ENABLED_QT_MODULES[@]} -gt 0 ]]; then
+		DISTUTILS_ARGS=(
+			"${MAIN_DISTUTILS_ARGS[@]}"
+			--reuse-build
+			--shiboken-target-path="${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))/${pyside_build_dir}/install"
+			--build-type=pyside6
+		)
+		distutils-r1_python_compile
+	fi
+
+	# Link libraries to the usual location for backwards compatibility
+	pushd "${BUILD_DIR}/install/$(python_get_sitedir)" >/dev/null ||
+		die
+	mkdir -p "${BUILD_DIR}/install/usr/$(get_libdir)" || die
+	local lib
+	for lib in */*.cpython-*.so
+	do
+		local base=${lib##*/}
+		ln -s "${base}" "${lib%/*}/${base%%.*}-${EPYTHON}.so" ||
+			die
+	done
+	for lib in */*.cpython-*.so.$(ver_cut 1-2)
+	do
+		local base=${lib##*/}
+		ln -s "${base}" "${lib%/*}/${base%%.*}-${EPYTHON}.so.$(ver_cut 1-2)" ||
+			die
+	done
+	for lib in */*.so*; do
+		ln -s "../../$(python_get_sitedir)/${lib}" \
+			"${BUILD_DIR}/install/usr/$(get_libdir)/${lib#*/}" || die
+	done
+	popd >/dev/null || die
+
+	# Symlinks for compatibility with pypi wheels
+	local dir
+	if [[ -d ${BUILD_DIR}/install/$(python_get_sitedir)/PySide6 ]]
+	then
+		pushd "${BUILD_DIR}/install/$(python_get_sitedir)/PySide6" \
+			>/dev/null || die
+		mkdir -p "${BUILD_DIR}/install/usr/share/PySide6" || die
+		for dir in doc glue typesystems; do
+			ln -s "../../../$(python_get_sitedir)/PySide6/${dir}" \
+				"${BUILD_DIR}/install/usr/share/PySide6/${dir}" ||
+					die
+		done
+		popd >/dev/null || die
+	fi
+	mkdir -p "${BUILD_DIR}/install/usr/include"
+	for dir in PySide6 shiboken6_generator; do
+		if [[ -d ${BUILD_DIR}/install/$(python_get_sitedir)/${dir}/include ]]
+		then
+			ln -s "../../$(python_get_sitedir)/${dir}/include" \
+				"${BUILD_DIR}/install/usr/include/${dir//_generator}" ||
+					die
+		fi
+	done
+
+	# Install misc files from inner install dir
+	find "${BUILD_DIR}"/build*/${pyside_build_dir}/install -type f \
+		-name libPySidePlugin.so -exec \
+		mkdir -p "${BUILD_DIR}/install/$(qt6_get_plugindir)/designer/" \; \
+		-exec \
+		cp "{}" "${BUILD_DIR}/install/$(qt6_get_plugindir)/designer/" \; \
+			|| die
+
+	for dir in cmake pkgconfig; do
+		find "${BUILD_DIR}"/build*/${pyside_build_dir}/install -type d -name ${dir} \
+			-exec cp -r "{}" "${BUILD_DIR}/install/usr/lib/" \; \
+				|| die
+	done
+
+	# Uniquify the pkgconfigs file for the current Python target,
+	# preserving an unversioned "shiboken6.pc" file arbitrarily
+	# associated with the last Python target.
+	if [[ -f ${BUILD_DIR}/install/usr/lib/pkgconfig/shiboken6.pc ]]
+	then
+		sed -e 's~prefix=.*~prefix=/usr~g' \
+			-e 's~exec_prefix=.*~exec_prefix=${prefix}~g' \
+			-e "s~libdir=.*~libdir=$(python_get_sitedir)/shiboken6~g" \
+			-e "s~includedir=.*~includedir=$(python_get_sitedir)/shiboken6_generator/include~g" \
+			-i "${BUILD_DIR}/install/usr/lib/pkgconfig/shiboken6.pc" || die
+		cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"shiboken6{,-${EPYTHON}}.pc || die
+	fi
+	if [[ -f ${BUILD_DIR}/install/usr/lib/pkgconfig/pyside6.pc ]]
+	then
+		sed -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
+			-e 's~prefix=.*~prefix=/usr~g' \
+			-e 's~exec_prefix=.*~exec_prefix=${prefix}~g' \
+			-e "s~libdir=.*~libdir=$(python_get_sitedir)/PySide6~g" \
+			-e "s~includedir=.*~includedir=$(python_get_sitedir)/PySide6/include~g" \
+			-e "s~typesystemdir=.*~typesystemdir=$(python_get_sitedir)/PySide6/typesystems~g" \
+			-e "s~gluedir=.*~gluedir=$(python_get_sitedir)/PySide6/glue~g" \
+			-e "s~pythonpath=.*~pythonpath=$(python_get_sitedir)~g" \
+			-i "${BUILD_DIR}/install/usr/lib/pkgconfig/pyside6.pc" || die
+		cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"pyside6{,-${EPYTHON}}.pc || die
+	fi
+
+	sed \
+		-e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \
+		-e "s~/lib/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \
+		-e "s~/lib/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \
+		-e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-3)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-2)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-2)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-2)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \
+		-i 	"${BUILD_DIR}/install/usr/lib/cmake/"*/*.cmake || die
+	local file
+	for file in "${BUILD_DIR}/install/usr/lib/cmake/"*/*.cpython-*.cmake
+	do
+		local base=${file##*/}
+		ln -s "${base}" "${file%/*}/${base%%.*}-${EPYTHON}.cmake" ||
+			die
+	done
+}
+
+python_test() {
+	# Otherwise it picks the last built directory breaking assumption for multi target builds
+	mkdir -p build_history/9999-99-99_999999/ || die
+	local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${pyside_build_id}
+	echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die
+	echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die
+
+	virtx ${EPYTHON} testrunner.py test --projects=shiboken6 $(usev core '--projects=pyside6')  ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+pkg_preinst() {
+	# Avoid symlinks being blocked by directories
+	rm -rf "${EROOT}/usr/include/"{PySide6,shiboken6} || die
+	rm -rf "${EROOT}/usr/share/PySide6" || die
+}
diff --git a/dev-python/pyside/pyside-6.9.9999.ebuild b/dev-python/pyside/pyside-6.9.9999.ebuild
index 6d4844edaf7b..8d370bb985d9 100644
--- a/dev-python/pyside/pyside-6.9.9999.ebuild
+++ b/dev-python/pyside/pyside-6.9.9999.ebuild
@@ -267,6 +267,13 @@ python_prepare_all() {
 		linux
 	[pyside6-android-deploy::test_pyside6_android_deploy]
 		linux
+	# Behavior changed and test not changed to accomodate
+	# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-3135
+	[registry::existence_test]
+		linux
+	# Doesn't appear to play well with virtualx as it tries to use wayland
+	[QtUiTools::loadUiType_test]
+		linux
 	EOF
 
 	if ! use numpy; then
diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild
index 6d4844edaf7b..8d370bb985d9 100644
--- a/dev-python/pyside/pyside-6.9999.ebuild
+++ b/dev-python/pyside/pyside-6.9999.ebuild
@@ -267,6 +267,13 @@ python_prepare_all() {
 		linux
 	[pyside6-android-deploy::test_pyside6_android_deploy]
 		linux
+	# Behavior changed and test not changed to accomodate
+	# https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-3135
+	[registry::existence_test]
+		linux
+	# Doesn't appear to play well with virtualx as it tries to use wayland
+	[QtUiTools::loadUiType_test]
+		linux
 	EOF
 
 	if ! use numpy; then
diff --git a/dev-python/pytest-fixture-classes/pytest-fixture-classes-1.0.3.ebuild b/dev-python/pytest-fixture-classes/pytest-fixture-classes-1.0.3.ebuild
index 37ff7e64a446..93045765082e 100644
--- a/dev-python/pytest-fixture-classes/pytest-fixture-classes-1.0.3.ebuild
+++ b/dev-python/pytest-fixture-classes/pytest-fixture-classes-1.0.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.3.4.ebuild b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.3.4.ebuild
index 652941844fc4..6de647ffb82b 100644
--- a/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.3.4.ebuild
+++ b/dev-python/pytest-lazy-fixtures/pytest-lazy-fixtures-1.3.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-7[${PYTHON_USEDEP}]