profiles/features/wd40: unmask libsecret, gvfs

libsecret only has an optional dep on gjs, so mask instead.

Reported-by: WANG Xuerui <xen0n@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>

16 files changed, 19 insertions, 70 deletions

diff --git a/app-cdr/brasero/brasero-3.12.3.ebuild b/app-cdr/brasero/brasero-3.12.3.ebuild
index ae3243b7334d..2bddf575a50f 100644
--- a/app-cdr/brasero/brasero-3.12.3.ebuild
+++ b/app-cdr/brasero/brasero-3.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
 IUSE="+css +introspection +libburn mp3 nautilus playlist tracker"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.29.14:2
diff --git a/app-crypt/gcr/gcr-3.41.1-r1.ebuild b/app-crypt/gcr/gcr-3.41.1-r1.ebuild
index 942c10fc3274..39aeeaaeb5c4 100644
--- a/app-crypt/gcr/gcr-3.41.1-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-3.41.1.ebuild b/app-crypt/gcr/gcr-3.41.1.ebuild
index 1d8d86de2422..39bd5b586655 100644
--- a/app-crypt/gcr/gcr-3.41.1.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gcr/gcr-4.0.0.ebuild b/app-crypt/gcr/gcr-4.0.0.ebuild
index 9f9d4c11cf32..6ac349e0b8c4 100644
--- a/app-crypt/gcr/gcr-4.0.0.ebuild
+++ b/app-crypt/gcr/gcr-4.0.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
index d4e276740719..3315eccf0ea2 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	gtk-doc? ( crypt )
 "
 
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/seahorse/seahorse-42.0-r1.ebuild b/app-crypt/seahorse/seahorse-42.0-r1.ebuild
index a36ae6b0ce21..2d3778f229b8 100644
--- a/app-crypt/seahorse/seahorse-42.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-42.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.66:2
diff --git a/app-crypt/seahorse/seahorse-43.0.ebuild b/app-crypt/seahorse/seahorse-43.0.ebuild
index 7d4cfe064c96..ac39c8301f91 100644
--- a/app-crypt/seahorse/seahorse-43.0.ebuild
+++ b/app-crypt/seahorse/seahorse-43.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.66:2
diff --git a/app-editors/gedit/gedit-42.2.ebuild b/app-editors/gedit/gedit-42.2.ebuild
index edc67b0f919d..5b4aa2eea9bc 100644
--- a/app-editors/gedit/gedit-42.2.ebuild
+++ b/app-editors/gedit/gedit-42.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
diff --git a/app-editors/gedit/gedit-43.1.ebuild b/app-editors/gedit/gedit-43.1.ebuild
index d8b130f6ae95..ecb7c41b1712 100644
--- a/app-editors/gedit/gedit-43.1.ebuild
+++ b/app-editors/gedit/gedit-43.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.70:2
diff --git a/dev-util/glade/glade-3.40.0.ebuild b/dev-util/glade/glade-3.40.0.ebuild
index 0c6a7babbc19..9aa0e270d621 100644
--- a/dev-util/glade/glade-3.40.0.ebuild
+++ b/dev-util/glade/glade-3.40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org https://gitlab.gnome.org/GNOME/glade"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
index e20822f2e6d3..9794b165e3c2 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/nautilus/nautilus-42.2.ebuild b/gnome-base/nautilus/nautilus-42.2.ebuild
index d318a14831fd..8cb207e691f8 100644
--- a/gnome-base/nautilus/nautilus-42.2.ebuild
+++ b/gnome-base/nautilus/nautilus-42.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.67.1:2
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index 83e63006fe14..5ae09de9508f 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -7,16 +7,10 @@ app-admin/ansible-core
 >=app-antivirus/clamav-0.105.1
 app-backup/borgbackup
 app-backup/borgmatic
-app-cdr/brasero
 app-crypt/acme
 app-crypt/certbot
 app-crypt/certbot-nginx
-app-crypt/gcr
-app-crypt/libsecret
-app-crypt/seahorse
-app-editors/gedit
 app-eselect/eselect-rust
-app-text/evince
 app-text/mdbook
 dev-embedded/esptool
 dev-lang/rust
@@ -68,38 +62,22 @@ dev-ros/roswtf
 dev-util/cargo-c
 dev-util/cbindgen
 dev-util/git-delta
-dev-util/glade
 dev-util/maturin
 dev-util/tree-sitter-cli
 gnome-base/gdm
-gnome-base/gnome-control-center
-gnome-extra/gnome-contacts
 >=gnome-base/gnome-core-apps-3.36.5
 >=gnome-base/gnome-core-libs-3.36.5
-gnome-base/gnome-keyring
 >=gnome-base/gnome-light-3.36.5
-gnome-base/gnome-menus
 >=gnome-base/gnome-shell-3.38
-gnome-base/gvfs
 >=gnome-base/librsvg-2.41
-gnome-base/nautilus
-gnome-extra/evolution-data-server
 gnome-extra/gnome-browser-connector
 gnome-extra/gnome-tweaks
-gnome-extra/nm-applet
-gnome-extra/sushi
-lxde-base/lxlauncher
 >=media-gfx/libimagequant-4
-media-gfx/shotwell
 media-libs/libavif
 >=media-libs/libopenraw-0.3.2
-media-sound/sound-juicer
 media-video/ogmrip
 media-video/rav1e
 >=net-irc/polari-3.37
-net-libs/gnome-online-accounts
-net-libs/libgfbgraph
-net-libs/libzapojit
 net-libs/quiche
 net-misc/electrum-ltc
 net-misc/gsutil
@@ -107,16 +85,7 @@ net-news/newsboat
 net-p2p/deluge
 ros-meta/ros_comm
 sci-geosciences/gnome-maps
-sys-apps/gnome-disk-utility
 >=sys-apps/bat-0.18.1
 virtual/rust
 www-apps/radicale
-www-client/epiphany
-xfce-base/thunar-volman
-xfce-base/xfce4-meta
-x11-libs/libcryptui
-x11-misc/alacarte
 >=x11-themes/adwaita-icon-theme-3.36
-x11-plugins/pidgin-opensteamworks
-x11-plugins/wmpasman
-virtual/secret-service
diff --git a/profiles/features/wd40/package.use.mask b/profiles/features/wd40/package.use.mask
index 06f950ad187e..db10e4b004c3 100644
--- a/profiles/features/wd40/package.use.mask
+++ b/profiles/features/wd40/package.use.mask
@@ -1,31 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2022-11-21)
+# USE="test introspection" needs gjs. TODO: change ebuild instead?
+app-crypt/libsecret test
+
 # Sam James <sam@gentoo.org> (2022-11-19)
 # GNOME packages pulling in e.g. gjs which then needs Rust.
-app-arch/file-roller nautilus
-app-crypt/eid-mw gtk p11-kit
-app-crypt/pinentry gtk
-dev-libs/libgdata crypt
-dev-libs/totem-pl-parser test
-dev-util/devhelp gedit
+dev-util/glade gjs
+gnome-base/gnome-menus test
 gnome-base/gnome-settings-daemon modemmanager
 gnome-base/nautilus previewer
-lxqt-base/lxqt-meta trash
-mate-extra/caja-extensions cdr
-mate-extra/mate-screensaver pam
-media-gfx/gimp gnome
-media-gfx/gthumb cdr
-media-sound/easytag nautilus
-media-sound/rhythmbox cdr
-net-libs/libnma pkcs11
 net-vpn/networkmanager-openconnect gtk
 net-vpn/networkmanager-openvpn gtk
 net-vpn/networkmanager-pptp gtk
 net-vpn/networkmanager-vpnc gtk
-xfce-base/thunar trash-panel-plugin udisks
-x11-libs/libfm automount
-x11-terms/gnome-terminal nautilus
 
 # Michał Górny <mgorny@gentoo.org> (2022-07-29)
 # More packages requiring dev-python/cryptography or its revdeps.
diff --git a/profiles/features/wd40/use.mask b/profiles/features/wd40/use.mask
index b3b867311b54..a265b328acb2 100644
--- a/profiles/features/wd40/use.mask
+++ b/profiles/features/wd40/use.mask
@@ -3,15 +3,6 @@
 
 rust
 
-# Sam James <sam@gentoo.org> (2022-11-19)
-# Indirectly depends on Rust:
-# glade/libsecret -> gjs -> Rust
-eds
-gnome-keyring
-gnome-online-accounts
-glade
-libsecret
-
 # Michał Górny <mgorny@gentoo.org> (2022-10-09)
 # Disable tests requiring Rust.
 test-rust
diff --git a/virtual/secret-service/secret-service-0.ebuild b/virtual/secret-service/secret-service-0.ebuild
index 4b29ca7356e9..46098587ee3b 100644
--- a/virtual/secret-service/secret-service-0.ebuild
+++ b/virtual/secret-service/secret-service-0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual for a freedesktop.org Secret Service API provider"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="|| (
 	gnome-base/gnome-keyring