17 files changed, 89 insertions, 46 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8881364409fc..f1599e884fd2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
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/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b918228c0ddc..bfa19e1b8225 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # New entries go on top.
 # Please use the same syntax as in package.use.mask.
 
+# Arthur Zamarin <arthurzam@gentoo.org> (2025-02-03)
+# Requires dev-util/shelltestrunner
+app-arch/mt-st test
+
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2025-01-04)
 # dev-libs/protobuf-28.3 is not yet marked stable.
 >=dev-java/protobuf-java-4.28.3 system-protoc
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/profiles/use.local.desc b/profiles/use.local.desc
index f488e0abfaeb..fce912b1176e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2470,41 +2470,46 @@ dev-python/pyqt6:xml - Build bindings for the QtXml module
 dev-python/pyqt6-webengine:quick - Build bindings for the QtWebEngineQuick module
 dev-python/pyqt6-webengine:widgets - Build bindings for the QtWebEngineWidgets module
 dev-python/pyrsistent:native-extensions - Compiles native C extensions (speedups, instead of using python fallback code).
-dev-python/pyside6:3d - Build Qt3DCore, Qt3DAnimation, Qt3DExtras, Qt3DInput, Qt3DLogic, and Qt3DRender modules
-dev-python/pyside6:bluetooth - Build QtBluetooth module
-dev-python/pyside6:charts - Build QtCharts module
-dev-python/pyside6:concurrent - Build QtConcurrent module
-dev-python/pyside6:designer - Build QtDesigner and QtUiTools modules
-dev-python/pyside6:gles2-only - Build QtGui "QOpenGL*" classes
-dev-python/pyside6:gui - Build QtGui module
-dev-python/pyside6:help - Build QtHelp module
-dev-python/pyside6:httpserver - Build QtHttpServer module
-dev-python/pyside6:location - Build QtLocation module
-dev-python/pyside6:multimedia - Build QtMultimedia and QtMultimediaWidgets modules
-dev-python/pyside6:network - Build QtNetwork module
-dev-python/pyside6:network-auth - Build QtNetworkAuth module
-dev-python/pyside6:nfc - Build QtNfc module
-dev-python/pyside6:pdfium - Build QtPdf module
-dev-python/pyside6:positioning - Build QtPositioning module
-dev-python/pyside6:printsupport - Build QtPrintSupport module
-dev-python/pyside6:qml - Build QtQml module
-dev-python/pyside6:quick - Build QtQuick and QtQuickWidgets modules
-dev-python/pyside6:quick3d - Build QtQuick3D and QtQuickWidgets modules
-dev-python/pyside6:remoteobjects - Build QtRemoteObjects module
-dev-python/pyside6:scxml - Build QtScxml module
-dev-python/pyside6:sensors - Build QtSensors module
-dev-python/pyside6:serialport - Build QtSerialPort modules
-dev-python/pyside6:spatialaudio - Build QtSpatialAudio module
-dev-python/pyside6:speech - Build QtTextToSpeech module
-dev-python/pyside6:sql - Build QtSql module
-dev-python/pyside6:svg - Build QtSvg module
-dev-python/pyside6:testlib - Build QtTest module
-dev-python/pyside6:uitools - Build UITools module
-dev-python/pyside6:webchannel - Build QtWebChannel module
-dev-python/pyside6:webengine - Build QtWebEngine and QtWebEngineWidgets modules
-dev-python/pyside6:websockets - Build QtWebSockets module
-dev-python/pyside6:widgets - Build QtWidgets module
-dev-python/pyside6:xml - Build QtXml module
+dev-python/pyside:3d - Build Qt3DCore, Qt3DAnimation, Qt3DExtras, Qt3DInput, Qt3DLogic, and Qt3DRender modules
+dev-python/pyside:bluetooth - Build QtBluetooth module
+dev-python/pyside:charts - Build QtCharts module
+dev-python/pyside:concurrent - Build QtConcurrent module
+dev-python/pyside:core - Build QtCore module, if disable then only shiboken will be built
+dev-python/pyside:designer - Build QtDesigner and QtUiTools modules
+dev-python/pyside:gles2-only - Build QtGui "QOpenGL*" classes
+dev-python/pyside:gui - Build QtGui module
+dev-python/pyside:help - Build QtHelp module
+dev-python/pyside:httpserver - Build QtHttpServer module
+dev-python/pyside:location - Build QtLocation module
+dev-python/pyside:multimedia - Build QtMultimedia and QtMultimediaWidgets modules
+dev-python/pyside:network - Build QtNetwork module
+dev-python/pyside:network-auth - Build QtNetworkAuth module
+dev-python/pyside:nfc - Build QtNfc module
+dev-python/pyside:numpy - Build with support for dev-python/numpy
+dev-python/pyside:pdfium - Build QtPdf module
+dev-python/pyside:positioning - Build QtPositioning module
+dev-python/pyside:printsupport - Build QtPrintSupport module
+dev-python/pyside:qml - Build QtQml module
+dev-python/pyside:quick - Build QtQuick and QtQuickWidgets modules
+dev-python/pyside:quick3d - Build QtQuick3D and QtQuickWidgets modules
+dev-python/pyside:remoteobjects - Build QtRemoteObjects module
+dev-python/pyside:scxml - Build QtScxml module
+dev-python/pyside:sensors - Build QtSensors module
+dev-python/pyside:serialbus - Build QtSerialBus modules
+dev-python/pyside:serialport - Build QtSerialPort modules
+dev-python/pyside:spatialaudio - Build QtSpatialAudio module
+dev-python/pyside:speech - Build QtTextToSpeech module
+dev-python/pyside:sql - Build QtSql module
+dev-python/pyside:svg - Build QtSvg module
+dev-python/pyside:testlib - Build QtTest module
+dev-python/pyside:tools - Build PySide Tools
+dev-python/pyside:uitools - Build UITools module
+dev-python/pyside:webchannel - Build QtWebChannel module
+dev-python/pyside:webengine - Build QtWebEngine and QtWebEngineWidgets modules
+dev-python/pyside:websockets - Build QtWebSockets module
+dev-python/pyside:webview - Build QtWebView module
+dev-python/pyside:widgets - Build QtWidgets module
+dev-python/pyside:xml - Build QtXml module
 dev-python/python-box:native-extensions - Compiles native C extensions
 dev-python/python-lsp-server:all-plugins - Pull in all optional plugins
 dev-python/python-mpd2:twisted - Enable twisted support
@@ -2524,8 +2529,7 @@ dev-python/qtpy:positioning - Pull in bindings for the QtPositioning module
 dev-python/qtpy:printsupport - Pull in bindings for the QtPrintSupport module
 dev-python/qtpy:pyqt5 - Use dev-python/pyqt5 as Qt for Python implementation
 dev-python/qtpy:pyqt6 - Use dev-python/pyqt6 as Qt for Python implementation
-dev-python/qtpy:pyside2 - Use dev-python/pyside2 as Qt for Python implementation
-dev-python/qtpy:pyside6 - Use dev-python/pyside6 as Qt for Python implementation
+dev-python/qtpy:pyside6 - Use dev-python/pyside as Qt for Python implementation
 dev-python/qtpy:qml - Build bindings for the QtQml
 dev-python/qtpy:quick - Build bindings for the QtQuick
 dev-python/qtpy:quick3d - Build bindings for the QtQuick3D