11 files changed, 45 insertions, 4 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 61e5885ef6f8..0e77f09abf6b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 87270ef86088..c86d63c758f6 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
 # Libei not keyworded here yet
 x11-base/xwayland libei
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index ead08d8ae2c3..d7a8b187e4b4 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
 # Libei not keyworded here yet
 x11-base/xwayland libei
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index b92f78941879..909bfda42592 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # WANG Xuerui <xen0n@gentoo.org> (2023-09-21)
 # dev-ruby/asciidoctor is not keyworded yet.
 dev-util/librnp man
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 8ab7c49f60d6..98350942a5a4 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
+# Sam James <sam@gentoo.org> (2023-09-22)
+# sys-apps/flatpak is not keyworded here
+sys-apps/xdg-desktop-portal flatpak
+
 # Matt Turner <mattst88@gentoo.org> (2023-05-30)
 # sys-apps/dbus-broker is not keyworded
 app-accessibility/at-spi2-core dbus-broker
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 396960e435d8..d76d0eb3b3a1 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Joonas Niilola <juippis@gentoo.org> (2023-08-24)
 # media-video/libva-utils is masked on ppc64, so hwaccel on Firefox
 # wouldn't work.
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 1de790f3d94b..21dba51a2a3b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been tested on this arch
 dev-db/spatialite rttopo
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 16d5a1698f76..03d0b6f2216f 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
 # Libei not keyworded here yet
 x11-base/xwayland libei
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index f6b0c5b323d1..388ee4e8ca86 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Qt 6 not keyworded here.
+dev-util/cmake gui
+
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
 # Libei not keyworded here yet
 x11-base/xwayland libei
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 891e53c08c97..4c5c2c567b03 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,13 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2023-09-22)
+# Most people aren't going to use CMake's GUI. USE=gui is enabled by default
+# on desktop profiles and CMake is unavoidable, it feels a shame to drag in
+# Qt 6 just for something people are unlikely to want. Plus, it avoids a
+# circular dependency out of the box.
+dev-util/cmake -gui -qt5
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2023-07-29)
 # Required by dev-python/PyQt5[multimedia]
 dev-qt/qtmultimedia:5 widgets
@@ -47,10 +54,6 @@ app-arch/unzip natspec
 # Required by kde-frameworks/kwayland
 dev-qt/qtgui:5 egl libinput
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2017-11-30)
-# Avoid circular dependency when installing from scratch
-dev-util/cmake -qt5
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-08-04)
 # Required by flac and mp3
 kde-apps/k3b taglib
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8238395d8e35..e6ad58c345e2 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7896,6 +7896,8 @@ sys-apps/util-linux:su - build the su program
 sys-apps/util-linux:suid - Install some programs with suid bit set to provide additional functionality. mount/umount: non-root users may mount/umount devices wall/write: non-root users can notify other users su: non-root users may become root
 sys-apps/util-linux:tty-helpers - install the mesg/wall/write tools for talking to local users
 sys-apps/watchdog:nfs - enable support for checking nfs mounts
+sys-apps/xdg-desktop-portal:flatpak - Enable sys-apps/flatpak integration
+sys-apps/xdg-desktop-portal:seccomp - Use sys-apps/bubblewrap (which requires seccomp) to sandbox some functionality like icon handling
 sys-apps/xinetd:rpc - support RPC services
 sys-auth/elogind:cgroup-hybrid - Use hybrid cgroup hierarchy (OpenRC's default) instead of unified.
 sys-auth/munge:gcrypt - Use libgcrypt instead of openssl