profiles: unmask qt6

Also unmask packages depending on qt6, and mask packages depending
on already removed versions of qt6.

Closes: https://bugs.gentoo.org/838970
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>

5 files changed, 20 insertions, 51 deletions

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index a7962c924f6c..b0644e56961e 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -amd64
 
+# Jimi Huotari <chiitoo@gentoo.org> (2023-03-03)
+# Unmask on amd64 only for now.
+-qt6
+-pyqt6
+-pyside6
+
 # matoro <matoro_gentoo@matoro.tk> (2022-09-29)
 # dev-util/google-perftools is supported here
 -tcmalloc
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index 2f7f7dbd0ebc..2f33e3ec9765 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,12 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Jimi Huotari <chiitoo@gentoo.org> (2023-03-03)
+# Mask until stable.
+qt6
+pyqt6
+pyside6
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ccf3190838bb..07060c3795d1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -216,10 +216,6 @@ app-antivirus/clamav jit
 app-metrics/collectd collectd_plugins_slurm
 sys-cluster/openmpi openmpi_rm_slurm
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-13)
-# PyQt6/PySide6 are masked for testing
-dev-python/QtPy pyqt6 pyside6
-
 # Joonas Niilola <juippis@gentoo.org> (2022-08-02)
 # Doesn't compile with 'Xaw3d' use flag, #849947.
 app-text/xdvik Xaw3d
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 04a5f7545c93..dad9b1707b61 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -12,6 +12,8 @@ ruby_targets_ruby27
 # Masked for testing. The split of some packages may still
 # change. bug #838970.
 qt6
+pyqt6
+pyside6
 
 # Matt Turner <mattst88@gentoo.org> (2022-04-16)
 # dev-util/sysprof not keyworded on most arches yet
diff --git a/profiles/package.mask b/profiles/package.mask
index 2dfe676fe49b..b4003fe62bf1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Jimi Huotari <chiitoo@gentoo.org> (2023-06-10)
+# Mask to allow qt6 unmask.
+<dev-python/pyside6-6.5.0
+<dev-python/pyside6-tools-6.5.0
+<dev-python/shiboken6-6.5.0
+
 # Sam James <sam@gentoo.org> (2023-06-10)
 # Integrated into media-libs/gst-plugins-bad[vaapi]. Please use that instead.
 # Removal in 14 days.
@@ -429,15 +435,6 @@ x11-drivers/nvidia-drivers:0/390
 # Breaks too many revdeps for now
 =app-text/discount-3*
 
-# Ionen Wolkens <ionen@gentoo.org> (2022-12-24)
-# Upstream dropped wxGTK support in >=games-emulation/pcsx2-1.7.3773,
-# and it now always requires Qt6. Masked given Qt6 is also masked in
-# Gentoo at the moment. It is recommended to use <=pcsx2-1.7.3772 for
-# now, but you can opt-in for testing by searching for "qtbase" in:
-# https://gitweb.gentoo.org/repo/gentoo.git/tree/profiles/package.mask
-# and package.unmask the whole list alongside pcsx2.
->=games-emulation/pcsx2-1.7.3773
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-19)
 # This version currently is not compatible with kernel build (yet)
 ~dev-util/bindgen-0.63.0
@@ -467,44 +464,6 @@ sys-cluster/slurm
 # See: <https://github.com/martijnbastiaan/doctest-parallel/issues/45>
 dev-haskell/doctest-parallel
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-08-12)
-# Masked for testing, depends on dev-qt/qt*:6
-# Pyside6 is stuck on python3_10 for the moment being
-dev-python/shiboken6
-dev-python/pyside6
-dev-python/pyside6-tools
-
-# Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
-# Masked for testing. The split of some packages may still
-# change. bug #838970.
->=app-editors/retext-8.0.0
-dev-python/PyQt6
-dev-python/PyQt6-WebEngine
-dev-qt/qt3d:6
-dev-qt/qt5compat:6
-dev-qt/qtbase:6
-dev-qt/qtcharts:6
-dev-qt/qtdeclarative:6
-dev-qt/qtimageformats:6
-dev-qt/qtlocation:6
-dev-qt/qtmultimedia:6
-dev-qt/qtnetworkauth:6
-dev-qt/qtpositioning:6
-dev-qt/qtquick3d:6
-dev-qt/qtquicktimeline:6
-dev-qt/qtscxml:6
-dev-qt/qtserialport:6
-dev-qt/qtshadertools:6
-dev-qt/qtsvg:6
-dev-qt/qttools:6
-dev-qt/qtwayland:6
-dev-qt/qtwebchannel:6
-dev-qt/qtwebengine:6
-dev-qt/qtwebsockets:6
->=games-board/tetzle-2.2.2
->=media-video/bino-2
->=x11-misc/albert-0.20.13
-
 # Sam James <sam@gentoo.org> (2022-05-28)
 # GCC 9 and older no longer receive upstream support or fixes for
 # bugs. Please switch to a newer GCC version using gcc-config.