dev-python/pyside6: rename to dev-python/pyside

Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>

38 files changed, 126 insertions, 97 deletions

diff --git a/dev-python/matplotlib/matplotlib-3.10.0.ebuild b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
index 389bbe80a27d..5bcc2d1df943 100644
--- a/dev-python/matplotlib/matplotlib-3.10.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.0.ebuild
@@ -78,7 +78,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			|| (
 				dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
-				dev-python/pyside6[gui,widgets,${PYTHON_USEDEP}]
+				dev-python/pyside:6[gui,widgets,${PYTHON_USEDEP}]
 			)
 		' 'python3*')
 	)
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside/Manifest
index 68e216d91778..f8b5c86f4f41 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside/Manifest
@@ -1,2 +1,3 @@
 DIST pyside-pyside-setup-6.8.1.1.gh.tar.gz 18699613 BLAKE2B 2c16f305a746106edc770c267900b31fe480b167a615adc82496e0604cc618982bb787a0c173b069c258749364d7d2cac900d8d8b82244fc3b916744b7339537 SHA512 bd258be6e4c5f0b6b4bbdf8887e5f8ab16a90117deb00f9c46c4acb7f6bbcc36fb9f6b6e7c201403556e0ee269947a5f5b2611ff1b05e48f231f81b1eeac7bce
 DIST pyside-pyside-setup-6.8.1.gh.tar.gz 18700869 BLAKE2B 5924f8ffc3e5a4f15442af9191b0531ee9f509595d41ae2759b94c2a7f8d7e08f4a70f9c7fff07f11c5252afb77084dc21ca3b22762d6c8dd66f4fca5944c9f2 SHA512 941844b1f6711859add828cbefe7c39497d45f0936f970f3050631294ed3bfe88d9d7b827a81d61ba3efbbf7920daef6ea6c28fa9c78f8e672d68b8bd3fbb2ad
+DIST pyside-pyside-setup-6.8.2.gh.tar.gz 19305680 BLAKE2B d4da8ec63d35714bf4418cdc9ff5921fe554c1635a7c5c467657b64c2140208b4bba57fc9932f0f96426e1d15c124209b0b29eb9340261d34eed194128a03545 SHA512 30691d27afaeaa3117e68b60745918d9697c8d9e4ee8941eaab51995cb5128c56d44964511f2db731f448bf32219160032e4a4cd4773d3fccc4de8c0e509d1c1
diff --git a/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch b/dev-python/pyside/files/pyside-6.3.1-no-strip.patch
index 9f3a8c396f05..9f3a8c396f05 100644
--- a/dev-python/pyside6/files/pyside6-6.3.1-no-strip.patch
+++ b/dev-python/pyside/files/pyside-6.3.1-no-strip.patch
diff --git a/dev-python/pyside6/files/pyside6-6.6.0-no-qtexampleicons.patch b/dev-python/pyside/files/pyside-6.6.0-no-qtexampleicons.patch
index f775310504f4..f775310504f4 100644
--- a/dev-python/pyside6/files/pyside6-6.6.0-no-qtexampleicons.patch
+++ b/dev-python/pyside/files/pyside-6.6.0-no-qtexampleicons.patch
diff --git a/dev-python/pyside/files/pyside-6.8.2-no-qtexampleicons.patch b/dev-python/pyside/files/pyside-6.8.2-no-qtexampleicons.patch
new file mode 100644
index 000000000000..29adbe25d479
--- /dev/null
+++ b/dev-python/pyside/files/pyside-6.8.2-no-qtexampleicons.patch
@@ -0,0 +1,10 @@
+diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
+index 2e4c701..6792258 100644
+--- a/sources/pyside6/CMakeLists.txt
++++ b/sources/pyside6/CMakeLists.txt
+@@ -41,5 +41,3 @@ if(BUILD_TESTS)
+ endif()
+ 
+ add_subdirectory(doc)
+-
+-add_subdirectory(qtexampleicons)
diff --git a/dev-python/pyside/files/pyside-6.8.2-quick-fix-build-wheel.patch b/dev-python/pyside/files/pyside-6.8.2-quick-fix-build-wheel.patch
new file mode 100644
index 000000000000..7cf0f46e87b1
--- /dev/null
+++ b/dev-python/pyside/files/pyside-6.8.2-quick-fix-build-wheel.patch
@@ -0,0 +1,17 @@
+diff --git a/build_scripts/wheel_override.py b/build_scripts/wheel_override.py
+index b389bb8..71de230 100644
+--- a/build_scripts/wheel_override.py
++++ b/build_scripts/wheel_override.py
+@@ -20,9 +20,9 @@ try:
+ 
+     from packaging import tags
+     from wheel import __version__ as wheel_version
+-    from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
+-    from wheel.bdist_wheel import get_abi_tag, get_platform
+-    from wheel.bdist_wheel import safer_name as _safer_name
++    from wheel._bdist_wheel import bdist_wheel as _bdist_wheel
++    from wheel._bdist_wheel import get_abi_tag, get_platform
++    from wheel._bdist_wheel import safer_name as _safer_name
+ 
+     wheel_module_exists = True
+ except Exception as e:
diff --git a/dev-python/pyside6/metadata.xml b/dev-python/pyside/metadata.xml
index d4c2e9662fd1..c760fb957e04 100644
--- a/dev-python/pyside6/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="bluetooth">Build QtBluetooth module</flag>
 		<flag name="charts">Build QtCharts module</flag>
 		<flag name="concurrent">Build QtConcurrent module</flag>
+		<flag name="core">Build QtCore module, if disable then only shiboken will be built</flag>
 		<flag name="designer">Build QtDesigner and QtUiTools modules</flag>
 		<flag name="gles2-only">Build QtGui "QOpenGL*" classes</flag>
 		<flag name="gui">Build QtGui module</flag>
@@ -24,6 +25,7 @@
 		<flag name="network">Build QtNetwork module</flag>
 		<flag name="network-auth">Build QtNetworkAuth module</flag>
 		<flag name="nfc">Build QtNfc module</flag>
+		<flag name="numpy">Build with support for <pkg>dev-python/numpy</pkg></flag>
 		<flag name="pdfium">Build QtPdf module</flag>
 		<flag name="positioning">Build QtPositioning module</flag>
 		<flag name="printsupport">Build QtPrintSupport module</flag>
@@ -32,6 +34,7 @@
 		<flag name="quick3d">Build QtQuick3D and QtQuickWidgets modules</flag>
 		<flag name="scxml">Build QtScxml module</flag>
 		<flag name="sensors">Build QtSensors module</flag>
+		<flag name="serialbus">Build QtSerialBus modules</flag>
 		<flag name="serialport">Build QtSerialPort modules</flag>
 		<flag name="spatialaudio">Build QtSpatialAudio module</flag>
 		<flag name="speech">Build QtTextToSpeech module</flag>
@@ -39,15 +42,18 @@
 		<flag name="svg">Build QtSvg module</flag>
 		<flag name="remoteobjects">Build QtRemoteObjects module</flag>
 		<flag name="testlib">Build QtTest module</flag>
+		<flag name="tools">Build PySide Tools</flag>
 		<flag name="uitools">Build UITools module</flag>
 		<flag name="webchannel">Build QtWebChannel module</flag>
 		<flag name="webengine">Build QtWebEngine and QtWebEngineWidgets modules</flag>
 		<flag name="websockets">Build QtWebSockets module</flag>
+		<flag name="webview">Build QtWebView module</flag>
 		<flag name="widgets">Build QtWidgets module</flag>
 		<flag name="xml">Build QtXml module</flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">PySide6</remote-id>
+		<remote-id type="pypi">shiboken6</remote-id>
 		<remote-id type="github">qtproject/pyside-pyside-setup</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyside6/pyside6-6.8.1.1.ebuild b/dev-python/pyside/pyside-6.8.1.1.ebuild
index 1964cf1dbe7b..89ab1f8e8b99 100644
--- a/dev-python/pyside6/pyside6-6.8.1.1.ebuild
+++ b/dev-python/pyside/pyside-6.8.1.1.ebuild
@@ -124,7 +124,7 @@ RDEPEND="${PYTHON_DEPS}
 		)
 	)
 	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside6:0
+	!dev-python/pyside:0
 "
 DEPEND="${RDEPEND}
 	$(llvm_gen_dep '
@@ -234,12 +234,12 @@ src_install() {
 		# file for the current Python target. See also:
 		#     https://github.com/leycec/raiagent/issues/73
 		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6.pc || die
 
 		# Uniquify the PySide6 pkgconfig file for the current Python target,
 		# preserving an unversioned "pyside6.pc" file arbitrarily associated
 		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6{,-${EPYTHON}}.pc || die
 	}
 	python_foreach_impl pyside6_install
 
diff --git a/dev-python/pyside6/pyside6-6.8.1.ebuild b/dev-python/pyside/pyside-6.8.1.ebuild
index f6f18aa25ee5..e80e682b8c51 100644
--- a/dev-python/pyside6/pyside6-6.8.1.ebuild
+++ b/dev-python/pyside/pyside-6.8.1.ebuild
@@ -124,7 +124,7 @@ RDEPEND="${PYTHON_DEPS}
 		)
 	)
 	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
-	!dev-python/pyside6:0
+	!dev-python/pyside:0
 "
 DEPEND="${RDEPEND}
 	$(llvm_gen_dep '
@@ -234,12 +234,12 @@ src_install() {
 		# file for the current Python target. See also:
 		#     https://github.com/leycec/raiagent/issues/73
 		sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \
-			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die
+			"${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6.pc || die
 
 		# Uniquify the PySide6 pkgconfig file for the current Python target,
 		# preserving an unversioned "pyside6.pc" file arbitrarily associated
 		# with the last Python target. (See the previously linked issue.)
-		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die
+		cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}6{,-${EPYTHON}}.pc || die
 	}
 	python_foreach_impl pyside6_install
 
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.8.1.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.8.1.1.ebuild
index f4273b70a9dc..431ab6f76226 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.8.1.1.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.8.1.1.ebuild
@@ -29,7 +29,7 @@ QT_PV="$(ver_cut 1-3)*:6"
 
 RDEPEND="${PYTHON_DEPS}
 	~dev-python/shiboken6-${PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	~dev-python/pyside6-${PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
+	~dev-python/pyside-${PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
 	!dev-python/pyside6-tools:0
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild
index e40fed32fe2f..d047e5694dda 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.8.1.ebuild
@@ -29,7 +29,7 @@ QT_PV="$(ver_cut 1-3)*:6"
 
 RDEPEND="${PYTHON_DEPS}
 	=dev-python/shiboken6-${QT_PV}[${PYTHON_USEDEP},${LLVM_USEDEP}]
-	=dev-python/pyside6-${QT_PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
+	=dev-python/pyside-${QT_PV}[quick,${PYTHON_USEDEP},${LLVM_USEDEP}]
 	!dev-python/pyside6-tools:0
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild
index d2289519c423..b465a82bef5e 100644
--- a/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.4.0.ebuild
@@ -6,7 +6,6 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{10..13} )
-PYSIDE2_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1 virtualx pypi
 
@@ -29,10 +28,7 @@ BDEPEND="
 		|| (
 			dev-python/pyqt6[gui,testlib,widgets,${PYTHON_USEDEP}]
 			dev-python/pyqt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-			dev-python/pyside6[gui,testlib,widgets,${PYTHON_USEDEP}]
-			$(python_gen_cond_dep '
-				dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-			' "${PYSIDE2_COMPAT[@]}")
+			dev-python/pyside:6[gui,testlib,widgets,${PYTHON_USEDEP}]
 		)
 	)
 "
@@ -64,7 +60,7 @@ python_test() {
 	)
 
 	local -x PYTEST_QT_API
-	for PYTEST_QT_API in PyQt{5,6} pyside{2,6}; do
+	for PYTEST_QT_API in PyQt{5,6} "pyside:6"; do
 		if has_version "dev-python/${PYTEST_QT_API}[gui,testlib,widgets,${PYTHON_USEDEP}]"
 		then
 			einfo "Testing with ${EPYTHON} and ${PYTEST_QT_API}"
diff --git a/dev-python/qtpy/metadata.xml b/dev-python/qtpy/metadata.xml
index 2c32e7f74480..efd532e34547 100644
--- a/dev-python/qtpy/metadata.xml
+++ b/dev-python/qtpy/metadata.xml
@@ -17,8 +17,7 @@
 	<use>
 		<flag name="pyqt5">Use <pkg>dev-python/pyqt5</pkg> as Qt for Python implementation</flag>
 		<flag name="pyqt6">Use <pkg>dev-python/pyqt6</pkg> as Qt for Python implementation</flag>
-		<flag name="pyside2">Use dev-python/pyside2 as Qt for Python implementation</flag>
-		<flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt for Python implementation</flag>
+		<flag name="pyside6">Use <pkg>dev-python/pyside</pkg> as Qt for Python implementation</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
 		<flag name="help">Pull in bindings for the QtHelp module</flag>
diff --git a/dev-python/qtpy/qtpy-2.4.2-r1.ebuild b/dev-python/qtpy/qtpy-2.4.2-r1.ebuild
index 9b6dbd689790..d3951c0fdc70 100644
--- a/dev-python/qtpy/qtpy-2.4.2-r1.ebuild
+++ b/dev-python/qtpy/qtpy-2.4.2-r1.ebuild
@@ -62,12 +62,12 @@ RDEPEND="
 
 	)
 	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[bluetooth?,dbus?,designer?,gui?,help?,multimedia?]
-		dev-python/pyside6[network?,nfc?,opengl?,pdfium?,positioning?]
-		dev-python/pyside6[printsupport?,qml?,quick?,quick3d?,remoteobjects(-)?]
-		dev-python/pyside6[sensors?,serialport?,spatialaudio?,speech?,sql?,svg?]
-		dev-python/pyside6[testlib?,webchannel?,webengine?,websockets?,widgets?,xml?]
+		dev-python/pyside:6[${PYTHON_USEDEP}]
+		dev-python/pyside:6[bluetooth?,dbus?,designer?,gui?,help?,multimedia?]
+		dev-python/pyside:6[network?,nfc?,opengl?,pdfium?,positioning?]
+		dev-python/pyside:6[printsupport?,qml?,quick?,quick3d?,remoteobjects(-)?]
+		dev-python/pyside:6[sensors?,serialport?,spatialaudio?,speech?,sql?,svg?]
+		dev-python/pyside:6[testlib?,webchannel?,webengine?,websockets?,widgets?,xml?]
 	)
 "
 
@@ -88,14 +88,13 @@ BDEPEND="
 			dev-qt/qtbase:6[sqlite]
 		)
 		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[3d,bluetooth,charts,concurrent,dbus,designer,gui]
-			dev-python/pyside6[help,location,multimedia,network,network-auth]
-			dev-python/pyside6[nfc,opengl,pdfium,positioning,printsupport,qml]
-			dev-python/pyside6[quick,quick3d,scxml,sensors,serialport]
-			dev-python/pyside6[spatialaudio,speech,sql,svg,testlib,webchannel]
-			dev-python/pyside6[webengine,websockets,widgets,xml]
-			dev-python/pyside6-tools[${PYTHON_USEDEP}]
+			dev-python/pyside:6[${PYTHON_USEDEP}]
+			dev-python/pyside:6[3d,bluetooth,charts,concurrent,dbus,designer,gui]
+			dev-python/pyside:6[help,location,multimedia,network,network-auth]
+			dev-python/pyside:6[nfc,opengl,pdfium,positioning,printsupport,qml]
+			dev-python/pyside:6[quick,quick3d,scxml,sensors,serialport]
+			dev-python/pyside:6[spatialaudio,speech,sql,svg,testlib,webchannel]
+			dev-python/pyside:6[webengine,websockets,widgets,xml]
 			dev-qt/qtbase:6[sqlite]
 		)
 	)
diff --git a/dev-python/qtpy/qtpy-2.4.2.ebuild b/dev-python/qtpy/qtpy-2.4.2.ebuild
index f2a73c7871e3..72c97df1856c 100644
--- a/dev-python/qtpy/qtpy-2.4.2.ebuild
+++ b/dev-python/qtpy/qtpy-2.4.2.ebuild
@@ -24,14 +24,10 @@ _IUSE_QT_MODULES="
 	printsupport qml quick sensors serialport speech +sql svg testlib
 	webchannel webengine websockets +widgets +xml
 "
-IUSE="+pyqt5 +pyqt6 pyside2 pyside6 ${_IUSE_QT_MODULES}"
+IUSE="+pyqt5 +pyqt6 pyside6 ${_IUSE_QT_MODULES}"
 unset _IUSE_QT_MODULES
 
-REQUIRED_USE="
-	|| ( pyqt5 pyqt6 pyside2 pyside6 )
-	python_targets_python3_12? ( !pyside2 )
-	python_targets_python3_13? ( !pyside2 )
-"
+REQUIRED_USE="|| ( pyqt5 pyqt6 pyside6 )"
 
 # These flags are currently *not* common to the PySide2/6 and PyQt5/6 ebuilds
 # Disable them for now, please check periodically if this is still up to date.
@@ -88,21 +84,12 @@ RDEPEND="
 		webengine? ( dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets?,quick?] )
 
 	)
-	pyside2? (
-		$(python_gen_cond_dep '
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[designer?,gui?,help?,multimedia?,network?,opengl(+)?]
-			dev-python/pyside2[positioning?,printsupport?,qml?,quick?,sensors?,serialport(+)?]
-			dev-python/pyside2[speech?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-			dev-python/pyside2[widgets?,xml?]
-		' python3_{10..11})
-	)
 	pyside6? (
-		dev-python/pyside6[${PYTHON_USEDEP}]
-		dev-python/pyside6[designer?,gui?,help?,multimedia?,network?,opengl?]
-		dev-python/pyside6[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?]
-		dev-python/pyside6[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside6[widgets?,xml?]
+		dev-python/pyside[${PYTHON_USEDEP}]
+		dev-python/pyside[designer?,gui?,help?,multimedia?,network?,opengl?]
+		dev-python/pyside[positioning?,printsupport?,qml?,quick?,sensors(-)?,serialport?]
+		dev-python/pyside[speech(-)?,sql?,svg?,testlib?,webchannel?,webengine?,websockets?]
+		dev-python/pyside[widgets?,xml?]
 	)
 "
 
@@ -130,28 +117,13 @@ BDEPEND="
 			dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets,quick]
 			dev-qt/qtbase:6[sqlite]
 		)
-		pyside2? (
-			$(python_gen_cond_dep '
-				dev-python/pyside2[${PYTHON_USEDEP}]
-				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-				dev-python/pyside2[location,multimedia,network,opengl(+)]
-				dev-python/pyside2[positioning,printsupport,qml,quick,scxml]
-				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-				dev-python/pyside2[xml,xmlpatterns]
-				dev-qt/qtsql:5[sqlite]
-				dev-python/pyside2-tools[${PYTHON_USEDEP}]
-			' python3_{10..11})
-			dev-qt/qtsql:5[sqlite]
-		)
 		pyside6? (
-			dev-python/pyside6[${PYTHON_USEDEP}]
-			dev-python/pyside6[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help]
-			dev-python/pyside6[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)]
-			dev-python/pyside6[printsupport,qml,quick,quick3d,scxml(-),sensors(-)]
-			dev-python/pyside6[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel]
-			dev-python/pyside6[webengine,websockets,widgets,xml]
-			dev-python/pyside6-tools[${PYTHON_USEDEP}]
+			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/pyside[3d(-),bluetooth(-),concurrent,dbus,designer,gui,help]
+			dev-python/pyside[location(-),multimedia,network,nfc(-),opengl,positioning,pdfium(-)]
+			dev-python/pyside[printsupport,qml,quick,quick3d,scxml(-),sensors(-)]
+			dev-python/pyside[serialport,spatialaudio(-),speech(-),sql,svg,testlib,webchannel]
+			dev-python/pyside[webengine,websockets,widgets,xml]
 			dev-qt/qtbase:6[sqlite]
 		)
 	)
diff --git a/media-gfx/freecad/freecad-1.0.0-r2.ebuild b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
index 7812856f8a98..e4819c63e7f7 100644
--- a/media-gfx/freecad/freecad-1.0.0-r2.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r2.ebuild
@@ -82,8 +82,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-			dev-python/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
-			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+			dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}]
 		' )
 		virtual/glu
 		virtual/opengl
diff --git a/media-gfx/freecad/freecad-1.0.0-r3.ebuild b/media-gfx/freecad/freecad-1.0.0-r3.ebuild
index d90bcdea5bf9..3460ebcd8d63 100644
--- a/media-gfx/freecad/freecad-1.0.0-r3.ebuild
+++ b/media-gfx/freecad/freecad-1.0.0-r3.ebuild
@@ -83,8 +83,8 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-			dev-python/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
-			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+			dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}]
+
 		' )
 		virtual/glu
 		virtual/opengl
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ed5c07ceb995..fce4aa961fa8 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -83,8 +83,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/matplotlib[${PYTHON_USEDEP}]
 			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
-			dev-python/pyside6:=[uitools(-),gui,svg,${PYTHON_USEDEP}]
-			dev-python/shiboken6:=[${PYTHON_USEDEP}]
+			dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}]
 		' )
 		virtual/glu
 		virtual/opengl
diff --git a/media-gfx/hydrus/hydrus-565-r1.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild
index 350292414dcf..dd1049f2921a 100644
--- a/media-gfx/hydrus/hydrus-565-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-565-r1.ebuild
@@ -150,5 +150,5 @@ pkg_postinst() {
 	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
 	optfeature "memory compression in the client" "dev-python/lz4"
 	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+	optfeature "bandwidth charts support" "dev-python/pyside[charts]"
 }
diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild
index 350292414dcf..dd1049f2921a 100644
--- a/media-gfx/hydrus/hydrus-571.ebuild
+++ b/media-gfx/hydrus/hydrus-571.ebuild
@@ -150,5 +150,5 @@ pkg_postinst() {
 	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
 	optfeature "memory compression in the client" "dev-python/lz4"
 	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+	optfeature "bandwidth charts support" "dev-python/pyside[charts]"
 }
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2a870e24c78f..0a2743c1a8cf 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -144,5 +144,5 @@ pkg_postinst() {
 	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
 	optfeature "memory compression in the client" "dev-python/lz4"
 	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks"
-	optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]"
+	optfeature "bandwidth charts support" "dev-python/pyside[charts]"
 }
diff --git a/metadata/stabilization-groups/qt/qt6.group b/metadata/stabilization-groups/qt/qt6.group
index 24c391b0f57f..ff400cbf75e2 100644
--- a/metadata/stabilization-groups/qt/qt6.group
+++ b/metadata/stabilization-groups/qt/qt6.group
@@ -1,6 +1,4 @@
-dev-python/pyside6
-dev-python/pyside6-tools
-dev-python/shiboken6
+dev-python/pyside:6
 dev-qt/qt-docs:6
 dev-qt/qt3d:6
 dev-qt/qt5compat:6
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index c890f947cf84..885390ca59c8 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtWebView is available here
+dev-python/pyside -webview
+
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtSerialBus is available here
+dev-python/pyside -serialbus
+
 # Eli Schwartz <eschwartz@gentoo.org> (2025-01-27)
 # All dependencies available
 dev-build/meson -test-full
@@ -90,6 +98,7 @@ media-gfx/blender -gnome -oneapi -renderdoc -vulkan
 # dev-qt/qtlanguageserver:6 is keyworded here
 dev-qt/qtdeclarative:6 -qmlls
 dev-qt/qttools:6 -qmlls
+dev-python/pyside -tools
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-03-17)
 # virt-firmware is keyworded here
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 3ab4ba732f18..831c341d5bfa 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtWebView is masked here
+dev-python/pyside webview
+
 # Ben Kohler <bkohler@gentoo.org> (2024-05-27)
 # Runtime issues (bug #925115) and build issues (bug #931092)
 dev-libs/libpcre2 jit
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index b28ea303c999..d525eba1917c 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -57,7 +57,7 @@ app-crypt/pinentry qt6
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-06-01)
 # qtnetworkauth, qtremoteobjects and qthttpserver not yet keyworded here
-dev-python/pyside6 network-auth httpserver remoteobjects
+dev-python/pyside network-auth httpserver remoteobjects
 dev-python/qtpy remoteobjects
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-03-21)
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 662117c2d8fa..fc09e29863e0 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtWebView is available here
+dev-python/pyside -webview
+
 # Eli Schwartz <eschwartz@gentoo.org> (2025-01-27)
 # Dependencies e.g. pypy keyworded (not stable) here.
 dev-build/meson -test-full
@@ -11,7 +15,7 @@ llvm-core/clang-runtime -offload
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-12-20)
 # qtremoteobjects and qthttpserver not yet keyworded here
-dev-python/pyside6 httpserver remoteobjects
+dev-python/pyside httpserver remoteobjects
 dev-python/qtpy remoteobjects
 
 # Sam James <sam@gentoo.org> (2024-12-17)
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 3f0b759852d1..d82a9fed8ab6 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -18,7 +18,7 @@ app-emulation/qemu capstone
 sys-kernel/installkernel efistub
 
 # Ionen Wolkens <ionen@gentoo.org> (2024-01-27)
-# dev-python/pyside6 is not stable here yet
+# dev-python/pyside is not stable here yet
 dev-python/qtpy pyside6
 
 # Michał Górny <mgorny@gentoo.org> (2023-04-22)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index bd928db11c2a..256443307be4 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtWebView is not available everywhere
+dev-python/pyside webview
+
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtSerialBus is not available everywhere
+dev-python/pyside serialbus
+
 # Michał Górny <mgorny@gentoo.org> (2024-12-24)
 # OpenMP offloading is supported on 64-bit architectures only.
 llvm-core/clang-runtime offload
@@ -63,6 +71,7 @@ media-gfx/blender gnome oneapi renderdoc vulkan
 # dev-qt/qtlanguageserver:6 currently has very few keywords
 dev-qt/qtdeclarative:6 qmlls
 dev-qt/qttools:6 qmlls
+dev-python/pyside tools
 
 # Mike Gilbert <floppym@gentoo.org> (2024-04-13)
 # Missing keywords on dev-python/looseversion.
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 7955e2e9dfbf..5c1746b3c084 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -91,7 +91,7 @@ dev-db/spatialite rttopo
 # Nowa Ammerlaan <nowa@gentoo.org> (2023-08-30)
 # Avoid keywordming more Qt stuff
 dev-python/pyside2 3d datavis scxml
-dev-python/pyside6 3d httpserver remoteobjects scxml
+dev-python/pyside 3d httpserver remoteobjects scxml
 dev-python/qtpy remoteobjects
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2023-03-07)
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 3c1f55daae6b..80cfc4da9641 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -31,7 +31,7 @@ dev-python/selenium test-rust
 dev-util/selenium-manager test
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-12)
-# dev-python/pyside6 is not stable here
+# dev-python/pyside is not stable here
 dev-python/qtpy pyside6
 
 # Sam James <sam@gentoo.org> (2024-04-30)
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 1ce74e758bd2..5bb9427b613b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -60,7 +60,7 @@ sys-apps/openrc-navi s6
 
 # Nowa Ammerlaan <nowa@gentoo.org> (2023-08-30)
 # Avoid keywording more Qt stuff
-dev-python/pyside6 httpserver remoteobjects
+dev-python/pyside httpserver remoteobjects
 dev-python/qtpy remoteobjects
 
 # Marek Szuba <marecki@gentoo.org> (2023-08-19)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 39d2510fe0f5..3cd9bf818161 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtSerialBus is available here
+dev-python/pyside -serialbus
+
 # Nowa Ammerlaan <nowa@gentoo.org> (2024-12-20)
 # qtremoteobjects and qthttpserver not yet keyworded here
-dev-python/pyside6 httpserver remoteobjects
+dev-python/pyside httpserver remoteobjects
 dev-python/qtpy remoteobjects
 
 # Ben Kohler <bkohler@gentoo.org> (2024-10-23)
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 78cae9fe9e90..9726a67d739f 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -35,7 +35,7 @@ dev-python/selenium test-rust
 dev-util/selenium-manager test
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-20)
-# dev-python/pyside6 is not stable here.
+# dev-python/pyside is not stable here.
 dev-python/qtpy pyside6
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-09-02)
diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask
index 1272812b2df4..7b11c936a2e9 100644
--- a/profiles/features/big-endian/package.use.mask
+++ b/profiles/features/big-endian/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Nowa Ammerlaan <nowa@gentoo.org> (2025-02-03)
+# QtWebView is masked here
+dev-python/pyside webview
+
 # Michał Górny <mgorny@gentoo.org> (2024-06-05)
 # media-libs/exempi is seriously broken on big endian platforms.
 # https://gitlab.freedesktop.org/libopenraw/exempi/-/merge_requests/8#note_2277243
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 365fff912652..b96230069e63 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -17,7 +17,7 @@ dev-libs/libjcat gpg pkcs7
 # required by some popular desktop packages such as calibre,
 # qutebrowser, and freecad (or indirectly through PyQt*WebEngine).
 dev-python/pyqt6 webchannel
-dev-python/pyside6 webchannel
+dev-python/pyside webchannel
 
 # Required by sys-apps/flatpak, a dependency of kde-plasma/discover
 dev-util/ostree curl
diff --git a/profiles/updates/1Q-2025 b/profiles/updates/1Q-2025
new file mode 100644
index 000000000000..ae7c9c333efc
--- /dev/null
+++ b/profiles/updates/1Q-2025
@@ -0,0 +1 @@
+move dev-python/pyside6 dev-python/pyside
diff --git a/www-client/falkon/falkon-24.08.3-r3.ebuild b/www-client/falkon/falkon-24.08.3-r3.ebuild
index 8583f3f0d916..743860393db4 100644
--- a/www-client/falkon/falkon-24.08.3-r3.ebuild
+++ b/www-client/falkon/falkon-24.08.3-r3.ebuild
@@ -40,8 +40,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep "
-			>=dev-python/pyside6-${QTMIN}[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
-			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
+			>=dev-python/pyside-${QTMIN}:6[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
 		")
 	)
 	X? (
diff --git a/www-client/falkon/falkon-24.12.1.ebuild b/www-client/falkon/falkon-24.12.1.ebuild
index 46095f11fb25..b171ec517eae 100644
--- a/www-client/falkon/falkon-24.12.1.ebuild
+++ b/www-client/falkon/falkon-24.12.1.ebuild
@@ -40,8 +40,7 @@ COMMON_DEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep "
-			>=dev-python/pyside6-${QTMIN}[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
-			>=dev-python/shiboken6-${QTMIN}[\${PYTHON_USEDEP}]
+			>=dev-python/pyside-${QTMIN}:6[gui,positioning,uitools(-),webengine,widgets,\${PYTHON_USEDEP}]
 		")
 	)
 	X? (