9 files changed, 14 insertions, 88 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 927caa0ca605..829351c8d895 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 8ddd7647fae5..3f46a721e665 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -34,7 +34,6 @@ media-gfx/freecad
 # reverse-dependencies.
 dev-qt/qtwebengine
 dev-qt/qtwebview
-dev-python/PyQt6_WebEngine
 dev-python/PyQtWebEngine
 app-admin/calamares
 app-doc/zeal
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 73346775f658..32c6c113f5d5 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-06-29)
+# dev-java/assertj-core:3 not keyworded
+>=dev-java/randomized-runner-2.8.0 test
+
 # Sam James <sam@gentoo.org> (2022-06-23)
 # ceph, zfs not keyworded here
 app-emulation/libvirt rbd zfs
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 9fdccb6a9c92..e4140e44ea9c 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-07-20)
+# dev-java/assertj-core:3 not keyworded
+>=dev-java/randomized-runner-2.8.0 test
+
 # Sam James <sam@gentoo.org> (2022-07-08)
 # Unmask galera for dev-db/mariadb
 >=dev-db/mariadb-10.1.0 -galera
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 5fab53c509a8..39262bf42b35 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-06-29)
+# dev-java/assertj-core:3 not keyworded
+>=dev-java/randomized-runner-2.8.0 test
+
 # Conrad Kostecki <conikost@gentoo.org> (2022-07-19)
 # www-servers/nginx currently only available on amd64/x86
 www-servers/nginx -nginx_modules_http_security
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2777f80b9ba1..5ea6a18a5ba1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,11 +6,9 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Joonas Niilola <juippis@gentoo.org> (2022-08-02)
 # Doesn't compile with 'Xaw3d' use flag, #849947.
 app-text/xdvik Xaw3d
 
-# Joonas Niilola <juippis@gentoo.org> (2022-07-13)
 # Depends on an older enigmail that only supports python2, which is
 # being removed soon. #758344
 www-client/seamonkey crypt
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b777369fddc1..b68a2f27b1b1 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,11 +4,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Sam James <sam@gentoo.org> (2022-08-02)
-# Masked for testing. The split of some packages may still
-# change. bug #838970.
-qt6
-
 # Hans de Graaff <graaff@gentoo.org> (2022-07-16)
 # Mask ruby 2.6 as EOL
 ruby_targets_ruby26
diff --git a/profiles/package.mask b/profiles/package.mask
index 94171d0fe9ce..184dc5e98572 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,28 +33,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Jimi Huotari <chiitoo@gentoo.org> (2022-08-02)
-# Masked for testing. The split of some packages may still
-# change. bug #838970.
-dev-python/PyQt6
-dev-python/PyQt6_WebEngine
-dev-qt/qt5compat:6
-dev-qt/qtbase:6
-dev-qt/qtdeclarative:6
-dev-qt/qtlocation:6
-dev-qt/qtmultimedia:6
-dev-qt/qtpositioning:6
-dev-qt/qtquick3d:6
-dev-qt/qtquicktimeline: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
-
 # Sam James <sam@gentoo.org> (2022-08-02)
 # Multiple rendering/font issues reported: bug #844115, bug #851141.
 =app-text/ghostscript-gpl-9.56.1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 22bd563f44e2..e2b042cd4e70 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1798,11 +1798,10 @@ dev-lang/php:xmlwriter - Enable XMLWriter support
 dev-lang/php:xslt - Enable the XSL extension
 dev-lang/polyml:portable - Build the portable interpreter version of Poly/ML instead of native
 dev-lang/python:bluetooth - Build Bluetooth protocol support in socket module
-dev-lang/python:ensurepip - Install the ensurepip module that uses bundled wheels to bootstrap pip and setuptools (if disabled, it will be only possible to use venv `--without-pip`)
-dev-lang/python:libedit - Link readline extension against dev-libs/libedit instead of sys-libs/readline
+dev-lang/python:libedit - Link readline extension against dev-libs/libedit instead of sys-libs/readline.
 dev-lang/python:lto - Optimize the build using Link Time Optimization (LTO)
 dev-lang/python:pgo - Optimize the build using Profile Guided Optimization (PGO)
-dev-lang/python:wininst - Install Windows executables required to create an executable installer for MS Windows
+dev-lang/python:wininst - Install Windows executables required to create an executable installer for MS Windows.
 dev-lang/python-exec:native-symlinks - Install generic symlinks like python and python3. If this flag is disabled, only versioned python3.X executables will be available to end users and ebuilds not using python eclasses.
 dev-lang/qu-prolog:pedro - Pedro subscription/notification communications system
 dev-lang/rakudo:clang - Use Clang to compile the MoarVM backend
@@ -2387,28 +2386,6 @@ dev-python/PyQt5:websockets - Build bindings for the QtWebSockets module
 dev-python/PyQt5:widgets - Build bindings for the QtWidgets module
 dev-python/PyQt5:x11extras - Build bindings for the QtX11Extras module
 dev-python/PyQt5:xmlpatterns - Build bindings for the QtXmlPatterns module
-dev-python/PyQt6:dbus - Build bindings for the QtDBus module
-dev-python/PyQt6:designer - Build bindings for the QtDesigner module and enable the designer plugin
-dev-python/PyQt6:gui - Build bindings for the QtGui module
-dev-python/PyQt6:help - Build bindings for the QtHelp module
-dev-python/PyQt6:multimedia - Build bindings for the QtMultimedia module
-dev-python/PyQt6:network - Build bindings for the QtNetwork module
-dev-python/PyQt6:opengl - Build bindings for the QtOpenGL module
-dev-python/PyQt6:positioning - Build bindings for the QtPositioning module
-dev-python/PyQt6:printsupport - Build bindings for the QtPrintSupport module
-dev-python/PyQt6:qml - Build bindings for the QtQml module and enable the qml plugin
-dev-python/PyQt6:quick - Build bindings for the QtQuick module
-dev-python/PyQt6:quick3d - Build bindings for the QtQuick3D module
-dev-python/PyQt6:serialport - Build bindings for the QtSerialPort module
-dev-python/PyQt6:sql - Build bindings for the QtSql module
-dev-python/PyQt6:svg - Build bindings for the QtSvg module
-dev-python/PyQt6:testlib - Build bindings for the QtTest module
-dev-python/PyQt6:webchannel - Build bindings for the QtWebChannel module
-dev-python/PyQt6:websockets - Build bindings for the QtWebSockets module
-dev-python/PyQt6:widgets - Build bindings for the QtWidgets module
-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/QtPy:declarative - Build bindings for the QtQml and QtQuick modules and enable the qmlscene plugin
 dev-python/QtPy:designer - Pull in bindings for the QtDesigner module and enable the designer plugin
 dev-python/QtPy:gui - Pull in bindings for the QtGui module
@@ -2625,33 +2602,12 @@ dev-qt/qt-docs:xmlpatterns - Install documentation for dev-qt/qtxmlpatterns
 dev-qt/qt3d:gamepad - Add support for gamepad hardware via dev-qt/qtgamepad
 dev-qt/qt3d:qml - Build QML/QtQuick bindings
 dev-qt/qt3d:vulkan - Enable support for Vulkan
-dev-qt/qtbase:X - Build the XCB platform plugin and enable X11 integration
-dev-qt/qtbase:brotli - Enable support for Brotli decompression
-dev-qt/qtbase:concurrent - Build Qt6Concurrent module
-dev-qt/qtbase:dbus - Build Qt6DBus module
-dev-qt/qtbase:egl - Enable EGL integration
-dev-qt/qtbase:eglfs - Build the EGL Full Screen/Single Surface platform plugin
-dev-qt/qtbase:evdev - Enable support for input devices via evdev
-dev-qt/qtbase:gssapi - Enable support for GSSAPI (virtual/krb5)
-dev-qt/qtbase:gtk - Build the GTK platform theme plugin
-dev-qt/qtbase:gui - Build Qt6Gui module
-dev-qt/qtbase:libinput - Enable support for input devices via dev-libs/libinput
-dev-qt/qtbase:libproxy - Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration
-dev-qt/qtbase:network - Build Qt6Network module
-dev-qt/qtbase:sql - Build Qt6Sql module
-dev-qt/qtbase:systemd - Enable native journald logging support
-dev-qt/qtbase:tslib - Enable support for touchscreen devices via x11-libs/tslib
-dev-qt/qtbase:tuio - Build plugin to receive touch events over the TUIO protocol
-dev-qt/qtbase:vulkan - Enable support for Vulkan
-dev-qt/qtbase:widgets - Build Qt6Widgets module
 dev-qt/qtbluetooth:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtcharts:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtcore:old-kernel - Disable syscalls not available on Linux kernels older than 4.11
 dev-qt/qtcore:systemd - Enable native journald logging support
 dev-qt/qtdatavis3d:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtdeclarative:localstorage - Build the LocalStorage import for QtQuick (requires QtSql)
-dev-qt/qtdeclarative:opengl - Enable OpenGL support
-dev-qt/qtdeclarative:sql - Enable QtSQL support
 dev-qt/qtdeclarative:vulkan - Enable support for Vulkan
 dev-qt/qtdeclarative:widgets - Enable QtWidgets support
 dev-qt/qtdiag:network - Report network information
@@ -2683,16 +2639,6 @@ dev-qt/qtquickcontrols2:widgets - Enable QtWidgets support
 dev-qt/qtscript:scripttools - Build the QtScriptTools module (requires QtWidgets)
 dev-qt/qtsensors:qml - Build QML bindings
 dev-qt/qtspeech:flite - Enable text-to-speech synthesizer plugin using app-accessibility/flite engine
-dev-qt/qttools:assistant - Build Qt Assistant
-dev-qt/qttools:designer - Build Qt Designer
-dev-qt/qttools:distancefieldgenerator - Build Qt Distance Field Generator
-dev-qt/qttools:linguist - Build Qt Linguist
-dev-qt/qttools:pixeltool - Build Qt Pixeltool
-dev-qt/qttools:qdbus - Build the Qt D-Bus Interface and D-Bus Viewer
-dev-qt/qttools:qdoc - Build Qt Documentation Generator
-dev-qt/qttools:qtattributionsscanner - Build Qt Source Code Attribution Scanner
-dev-qt/qttools:qtdiag - Build Qt Diag
-dev-qt/qttools:qtplugininfo - Build Qt Plugin Info
 dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
 dev-qt/qtwayland:vulkan - Enable support for Vulkan-based server buffer integration
 dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
@@ -5851,7 +5797,6 @@ net-im/teams:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of b
 net-im/teams:system-mesa - Use the system-wide media-libs/mesa instead of bundled.
 net-im/telegram-desktop:enchant - Enable the app-text/aspell spell-checking backend
 net-im/telegram-desktop:hunspell - Enable the app-text/hunspell spell-checking backend
-net-im/telegram-desktop:qt6 - Build with Qt6 support
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
 net-im/telepathy-connection-managers:icq - Enable ICQ IM protocol support.
 net-im/telepathy-connection-managers:irc - Enable Internet Relay Chat (IRC) support.
@@ -8694,7 +8639,6 @@ www-client/opera:proprietary-codecs - Enable codecs for patent-encumbered audio
 www-client/opera-beta:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/opera-developer:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/qutebrowser:adblock - Enable Brave's ABP-style adblocker library for improved adblocking
-www-client/qutebrowser:qt6 - Use Qt6 that provides a newer Chromium version
 www-client/qutebrowser:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/seamonkey:chatzilla - Build Mozilla's IRC client (default on)
 www-client/seamonkey:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)