7 files changed, 6 insertions, 10 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d6c25cb2b86d..2c9acb57f4dc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 318ce16a1a88..9542a2f79225 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -150,6 +150,7 @@ gconf
 gnome
 gnome-keyring
 gnome-online-accounts
+keyring
 
 # Jeroen Roovers <jer@gentoo.org> (2010-07-19)
 # Masked because of missing gnome-base/gnome-panel
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 3c5efe6fcfca..205311408f62 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -101,6 +101,7 @@ audit
 # Masking these globally, since we don't have X
 gnome
 gnome-keyring
+keyring
 nas
 
 # Masking since net-dns/avahi and net-misc/mDNSResponder are masked
@@ -128,7 +129,6 @@ djbfft
 djvu
 emacs
 emf
-gnome-keyring
 graphite
 guile
 hardened
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 44f73131aeb9..aefa28077ca8 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -95,6 +95,7 @@ gtk2
 gtk3
 gnome
 gnome-keyring
+keyring
 
 diet
 m17n-lib
diff --git a/profiles/targets/desktop/gnome/make.defaults b/profiles/targets/desktop/gnome/make.defaults
index 82661cdf4d80..2f7d314eb777 100644
--- a/profiles/targets/desktop/gnome/make.defaults
+++ b/profiles/targets/desktop/gnome/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-USE="colord eds evo gnome gnome-keyring gnome-online-accounts gstreamer introspection libsecret nautilus networkmanager pulseaudio sysprof tracker wayland"
+USE="colord eds evo gnome gnome-keyring gnome-online-accounts gstreamer introspection keyring nautilus networkmanager pulseaudio sysprof tracker wayland"
diff --git a/profiles/use.desc b/profiles/use.desc
index 675fd291fee2..2d5489acc568 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -152,6 +152,7 @@ jpeg - Add JPEG image support
 jpeg2k - Support for JPEG 2000, a wavelet-based image compression format
 kde - Add support for software made by KDE, a free software community
 kerberos - Add kerberos support
+keyring - Enable support for freedesktop.org Secret Service API password store
 ladspa - Enable the ability to support ladspa plugins
 lame - Prefer using LAME libraries for MP3 encoding support
 lapack - Add support for the virtual/lapack numerical library
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 43f4cbd8ec99..41526957b512 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -139,7 +139,6 @@ app-admin/salt:cheetah - Enable support for dev-python/cheetah3
 app-admin/salt:cherrypy - Enable support for using cherrypy.
 app-admin/salt:genshi - Enable support for dev-python/genshi
 app-admin/salt:gnupg - Enable support for gnupg via python-gnupg.
-app-admin/salt:keyring - Enable support for keyrings via python-keyring.
 app-admin/salt:libcloud - Enable salt-cloud support via libcloud.
 app-admin/salt:libvirt - Support managing virtual machines with app-emulation/libvirt.
 app-admin/salt:mako - Add support for using the mako template engine for parsing salt states.
@@ -321,7 +320,6 @@ app-containers/docker:cli - This is a temporary use flag which pulls in app-cont
 app-containers/docker:container-init - Makes the a staticly-linked init system tini available inside a container.
 app-containers/docker:device-mapper - Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.
 app-containers/docker:overlay - Enables dependencies for the "overlay" graph driver, including necessary kernel flags.
-app-containers/docker-credential-helpers:gnome-keyring - Build secretservice helper which works with gnome-keyring or kwallet using D-Bus.
 app-containers/docker-credential-helpers:pass - Build pass helper for the pass utility.
 app-containers/lxc:io-uring - Enable io_uring support, and use io_uring instead of epoll
 app-containers/lxc:lto - Enable Link Time Optimization (LTO)
@@ -400,7 +398,6 @@ app-crypt/tpm2-tss:mbedtls - Use net-libs/mbedtls as crypto engine
 app-crypt/tpm2-tss:openssl - Use dev-libs/openssl as crypto engine
 app-crypt/tpm2-tss:policy - Enable policy library (requires openssl as crypto backend)
 app-crypt/veracrypt:asm - Enable assembly for optimization
-app-crypt/zulucrypt:gnome - Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret
 app-crypt/zulucrypt:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 app-crypt/zulucrypt:udev - Whether udev will be consulted when deciding if a volume is system or not
 app-dicts/aspell-be:classic - Support classic spelling by default
@@ -3840,7 +3837,6 @@ mate-extra/caja-extensions:share - Add an extension to support sharing files.
 mate-extra/caja-extensions:wallpaper - Add an extension to support setting an image as the current wallpaper
 mate-extra/mate-polkit:accountsservice - Support extraction of data from AccountsService
 mate-extra/mate-power-manager:applet - Enable building of the MATE applet.
-mate-extra/mate-power-manager:libsecret - Support locking of keyring via app-crypt/libsecret
 mate-extra/mate-system-monitor:wnck - Enable experimental support using x11-libs/libwnck.
 mate-extra/mate-utils:applet - Enable the mate dictionary applet
 media-fonts/corefonts:tahoma - Also install the Tahoma font. Due to the lack of a free bold variant, this may render badly. See bug 184790.
@@ -5786,7 +5782,6 @@ net-im/psi:enchant - Enable spellchecking using app-text/enchant
 net-im/psi:extras - Enable Psi+ patchset
 net-im/psi:hunspell - Enable spellchecking using app-text/hunspell
 net-im/psi:iconsets - Install additional iconsets, some of them have no clear licensing
-net-im/psi:keyring - Enable storing password in system keyring manager
 net-im/psi:webengine - Enable themed, html-based chatlogs using dev-qt/qtwebengine
 net-im/psi:whiteboarding - Enable experimental interactive SVG drawing
 net-im/psi:xscreensaver - Use X screensaver protocol extension to monitor idle/active status based on mouse/keyboard events
@@ -6728,7 +6723,6 @@ net-p2p/mldonkey:fasttrack - enable fasttrack support
 net-p2p/mldonkey:gnutella - enable gnutella and gnutella2 support
 net-p2p/mldonkey:guionly - enable client build only
 net-p2p/qbittorrent:webui - Enable the Web UI
-net-p2p/retroshare:autologin - Enables potentially insecure autologin capability via app-crypt/libsecret
 net-p2p/retroshare:cli - Enables terminal login support for retroshare-service
 net-p2p/retroshare:jsonapi - Enables the new RetroShare JSON API
 net-p2p/retroshare:libupnp - Enables UPnP port forwarding via net-libs/libupnp
@@ -8936,7 +8930,6 @@ x11-plugins/vicious:contrib - Install extra widgets, some for less common hardwa
 x11-plugins/wmbattery:apm - Add APM (Advanced Power Management) support
 x11-plugins/wmfire:session - Enable session management
 x11-plugins/wmudmount:gcr - Enable support for secure memory with app-crypt/gcr
-x11-plugins/wmudmount:secret - Enable support for secret service with app-crypt/libsecret
 x11-terms/aterm:background - Enable background image support via media-libs/libafterimage
 x11-terms/aterm:xgetdefault - Enable resources via X instead of aterm small version
 x11-terms/gnome-terminal:gnome-shell - Integrate with gnome-base/gnome-shell search