12 files changed, 142 insertions, 209 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index da2236cb5e08..49fca664d828 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index cace21a93853..46847344892e 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index cace21a93853..46847344892e 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 79fab2dd73b3..c63fbc970fa1 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Anthony Ryan <anthonyryan1@gmail.com> (2017-01-21)
@@ -27,3 +27,4 @@ virtual/rust
 gnome-base/gdm
 gnome-extra/chrome-gnome-shell
 gnome-extra/gnome-tweaks
+>=media-libs/freetype-2.12.0
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index ae3c861fb8e5..4133c6e73598 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -59,6 +59,7 @@ media-libs/libcaca doc
 dev-python/argcomplete test
 dev-python/distlib test
 dev-python/fonttools test
+dev-python/hatchling test
 dev-python/isort test
 dev-python/nose test
 dev-python/numpydoc test
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 7e63597355cc..6af94b3d5e82 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jakov Smolić <jsmolic@gentoo.org> (2022-04-07)
+# Depends on sys-cluster/ceph which pulls in valgrind, which is
+# unavailable on riscv currently
+sys-block/fio rbd
+
 # Marek Szuba <marecki@gentoo.org> (2022-03-30)
 # Indirectly depends on dev-python/pytest-testinfra, which is currently
 # blocked from being keyworded on this arch by several errors (Bug #835717)
@@ -58,10 +63,6 @@ dev-python/anyio test
 # depends on dev-lang/ocaml
 app-accessibility/brltty ocaml ocamlopt
 
-# Sam James <sam@gentoo.org> (2021-10-26)
-# sys-libs/libhugetlbfs is not keyworded on ~riscv right now
-sys-apps/nvme-cli hugepages
-
 # Marek Szuba <marecki@gentoo.org> (2021-09-23)
 # mkdocs ecosystem only partly keyworded on riscv, has rather messy
 # Python-target requirements.
@@ -140,10 +141,6 @@ kde-plasma/plasma-meta grub plymouth
 sys-auth/sssd test
 
 # Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/httpclient not keyworded here due to failing tests
-# (Bug #807727). That said, with httpclient-2.8.3 installed manually
-# (and without testing) all webmock-3.13.0 tests passed.
-dev-ruby/webmock test
 # Currently requires dev-lang/spidermonkey:68, which explicitly
 # does not support riscv. Hopefully temporary, see Bug #807772.
 net-libs/libproxy spidermonkey
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index adf9bc52b851..3202f42f1995 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -127,8 +127,7 @@ dev-lang/rust parallel-compiler
 # rspamd-3.0 segfaults a lot with jemalloc enabled (Bug #810337)
 # It is caused by -Wl,--as-needed linker flag,
 # see also: https://github.com/rspamd/rspamd/issues/3871
-~mail-filter/rspamd-3.0 jemalloc
-~mail-filter/rspamd-3.1 jemalloc
+>=mail-filter/rspamd-3.0 jemalloc
 
 # Matt Turner <mattst88@gentoo.org> (2021-08-28)
 # Mask experimental options.
diff --git a/profiles/desc/apache2_modules.desc b/profiles/desc/apache2_modules.desc
index 73d4b6cd4651..7a7e5e061080 100644
--- a/profiles/desc/apache2_modules.desc
+++ b/profiles/desc/apache2_modules.desc
@@ -71,6 +71,7 @@ proxy_balancer - mod_proxy extension for load balancing
 proxy_connect - mod_proxy extension for CONNECT request handling
 proxy_fcgi - FastCGI support module for mod_proxy
 proxy_ftp - FTP support module for mod_proxy
+proxy_hcheck - Dynamic health check of Balancer members (workers) for mod_proxy
 proxy_html - Module to rewrite links in html pages behind a reverse proxy
 proxy_http - HTTP support module for mod_proxy
 proxy_http2 - HTTP2 support module for mod_proxy
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index fedbaa145e37..a62190387c27 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -28,6 +28,7 @@ net-misc/iputils rarpd
 # Sam James <sam@gentoo.org> (2021-11-20)
 # Pulls in po4a which doesn't seem to work on musl (wants /usr/bin/locale)
 sys-apps/man-db nls
+sys-apps/sysvinit nls
 
 # Sam James <sam@gentoo.org> (2021-11-07)
 # gdb-10[nls] doesn't build on musl
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 8c4fc7132fba..a042a92495d6 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -31,6 +31,8 @@ dev-cpp/gtkmm:2.4
 dev-cpp/libglademm
 dev-cpp/libgnomecanvasmm
 dev-libs/libcroco
+dev-libs/libIDL
+dev-libs/libunique:1
 gnome-base/gconf
 gnome-base/libgnomecanvas
 gnome-extra/gconf-editor
diff --git a/profiles/package.mask b/profiles/package.mask
index 22b061e6be36..cee178edb9fe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,16 +33,114 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2022-04-14)
+# Singularity has been renamed upstream to Apptainer. Therefore, up-to-date
+# versions of this software are now available as app-containers/apptainer.
+sys-cluster/singularity
+
+# Sam James <sam@gentoo.org> (2022-04-13)
+# 2.35.2 was a quick release to mitigate a security issue (bug #838127), but
+# introduces problems of its own with e.g. Portage. bug #838223. Pending
+# investigation both on the Portage side and potentially upstream (as there's
+# at least some UX issues with 2.35.2+ with the new "safe directory" mechanism).
+# Earlier versions are still safe as long as you do not use git commands
+# on a local repository controlled by a user you do not trust.
+=dev-vcs/git-2.35.2
+=dev-vcs/git-2.35.3
+
+# Conrad Kostecki <conikost@gentoo.org> (2022-04-13)
+# Abandoned by upstream, does not work correctly anymore.
+# Removal on 2022-06-13. Bug #832431.
+x11-plugins/pidgin-telegram
+
+# Michał Górny <mgorny@gentoo.org> (2022-04-13)
+# Unmaintained.  Last release in 2017, the Gentoo ebuild has not been
+# even bumped to it.  Requires old dev-lang/spidermonkey that requires
+# Python 2.7.
+# Removal on 2022-05-13.  Bug #838139.
+media-video/gxine
+
+# Hans de Graaff <graaff@gentoo.org> (2022-04-12)
+# dev-ruby/nokogumbo is now part of dev-ruby/nokogiri and nokogiri
+# versions still supporting a separate nokogumbo have known security
+# issues. nokogumbo's only reverse dependency is dev-ruby/sanitize:5,
+# but a newer slot is available.
+dev-ruby/nokogumbo
+dev-ruby/sanitize:5
+
+# Michał Górny <mgorny@gentoo.org> (2022-04-11)
+# Tests are broken once again.  Last activity in Jan 2020, last release
+# in Aug 2019.  No revdeps.
+# Removal on 2022-05-11.  Bug #832317.
+dev-python/ctypescrypto
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. Uses GTK+ 2. No reverse dependencies.
+# Removal on 2022-05-10
+x11-misc/gcolor2
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. No reverse dependencies.
+# Removal on 2022-05-10
+net-misc/vinagre
+net-misc/vino
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream (last release in 2004). No reverse dependencies.
+# Removal on 2022-05-10
+net-misc/grdesktop
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. EAPI 5. Only reverse dependency is gnome-extra/gnome-utils.
+# Removal on 2022-05-10
+gnome-extra/gnome-search-tool
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. No reverse dependencies.
+# Removal on 2022-05-10
+gnome-extra/filemanager-actions
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. No reverse dependencies.
+# Removal on 2022-05-10
+app-office/pinpoint
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead package upstream. Only reverse dependency is gnome-extra/gnome-utils.
+# Removal on 2022-05-10
+app-admin/gnome-system-log
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-10)
+# Dead (meta)packagesupstream. No reverse dependencies.
+# Removal on 2022-05-10
+gnome-extra/gnome-utils
+
+# David Seifert <soap@gentoo.org> (2022-04-10)
+# Unmaintained, last release upstream 16 years ago, Fedora dropped it,
+# relies on sys-libs/db, low quality port to EAPI 6, removal on 2022-05-10.
+net-p2p/syrep
+
+# Michał Górny <mgorny@gentoo.org> (2022-04-10)
+# Last release in 2016.  Last git commit in 2020.  No revdeps.
+# Removal on 2022-05-10.  Bug #837641.
+dev-python/repoze-sphinx-autointerface
+
+# Michał Górny <mgorny@gentoo.org> (2022-04-09)
+# A test runner specific to zope packages that was never really used
+# (only as a mistaken test-dep).  No revdeps left.
+# Removal on 2022-05-09.  Bug #837530.
+dev-python/zope-testrunner
+
+# Matt Turner <mattst88@gentoo.org> (2022-04-06)
+# Dead package upstream. No reverse dependencies.
+# Removal on 2022-05-06
+dev-util/nemiver
+
 # David Seifert <soap@gentoo.org> (2022-04-06)
 # Unsupported branches, no consumers left, removal on 2023-01-01.
 sys-devel/automake:1.13
 sys-devel/automake:1.15
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-04-05)
-# First version with py3 buildsystem support.
-# May be succeeded quickly by another snapshot.
-~dev-qt/qtwebengine-5.15.3_p20220330
-
 # Sergey Popov <pinkbyte@gentoo.org> (2022-04-05)
 # Upstream is dead long time ago
 # SRC_URI and HOMEPAGE are gone(bug #680362)
@@ -175,63 +273,6 @@ sci-biology/GBrowse
 # tries to fetch and install all dependencies locally).
 ~dev-python/jaraco-packaging-9.0.0
 
-# Jakov Smolić <jsmolic@gentoo.org> (2022-03-16)
-# Unmaintaned, broken packages, no revdeps.
-# Bugs 832618, 731720, 713684,
-# 733662, 741082, and many others.
-# Removal on 2022-04-16.
-net-wireless/yatebts
-net-wireless/srslte
-net-wireless/gr-scan
-
-# Jakov Smolić <jsmolic@gentoo.org> (2022-03-16)
-# Unmaintaned, broken library with no revdeps.
-# Removal on 2022-04-16. Bug #643444. Bug #749639. Bug #684758.
-net-libs/libosmocore
-
-# Jakov Smolić <jsmolic@gentoo.org> (2022-03-16)
-# 9999-only ebuilds, various other QA issues (no python
-# 3.10, using deprecated EAPI, ...)
-# Removal on 2022-04-15.
-net-libs/libmirisdr
-media-sound/deinvert
-net-wireless/gr-m2k
-net-wireless/libm2k
-
-# Jakov Smolić <jsmolic@gentoo.org> (2022-03-16)
-# Python packages with no revdeps, tests are not
-# enabled, not ported to python 3.10
-# Removal on 2022-04-15.
-net-wireless/soapy_power
-dev-python/simplesoapy
-dev-python/simplespectral
-
-# Fabian Groffen <grobian@gentoo.org> (2022-03-16)
-# little activity upstream, doesn't work with PHP 8.0
-# Removal in 30 days
-www-apps/agendav
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-03-16)
-# Java library without consumers.
-# Removal in 30 days. Bug #835389.
-dev-java/android-util
-
-# Michał Górny <mgorny@gentoo.org> (2022-03-15)
-# No maintainer.  This package is repeatedly non-bumpable due to missing
-# upstream tags.  No revdeps.
-# Removal on 2022-04-14.  Bug #835352.
-dev-python/sphinx-jinja
-
-# Sam James <sam@gentoo.org> (2022-03-15)
-# No reverse dependencies, stuck on deprecated EAPI 5.
-# Removal on 2022-04-15. bug #835350.
-dev-java/headius-options
-
-# Matthew Smith <matthew@gentoo.org> (2022-03-14)
-# Dead upstream, multiple open bugs.
-# Bug #835162. Removal on 2022-04-13.
-net-im/corebird
-
 # John Helmert III <ajak@gentoo.org> (2022-03-13)
 # Arti is not a production-ready Tor client. According to upstream, "do
 # not use this program yet if you seriously need anonymity, privacy,
@@ -239,61 +280,6 @@ net-im/corebird
 # necessity.
 net-p2p/arti
 
-# Alfredo Tupone <tupone@gentoo.org> (2022-03-13)
-# No revdeps, last update on 2011
-# Removal on 2022-04-13.
-www-apps/rocketwiki-lqfb
-
-# David Seifert <soap@gentoo.org> (2022-03-12)
-# Unmaintained, no revdeps in tree, no other distro packages this,
-# HOMEPAGE gone, stuck on deprecated (and soon-to-stop-working)
-# cmake-utils. bug #725610, #732056, #834117.
-# Removal on 2022-04-11.
-sys-apps/rtl-entropy
-
-# David Seifert <soap@gentoo.org> (2022-03-12)
-# Unmaintained, no revdeps in tree, no other distro packages this,
-# wrong dependencies, out of date, stuck on deprecated
-# (and soon-to-stop-working) cmake-utils. bug #702980, #834121.
-# Removal on 2022-04-11.
-net-wireless/rtl_power_fftw
-
-# Sam James <sam@gentoo.org> (2022-03-11)
-# No maintainer, out of date, stuck on deprecated
-# (and soon-to-stop-working) cmake-utils. bug #774480.
-# Removal on 2022-04-11.
-dev-libs/processor-trace
-
-# Sam James <sam@gentoo.org> (2022-03-11)
-# Significant number of open bugs including unaddressed security issues;
-# out of date; stuck on deprecated (and soon-to-stop-working) cmake-utils
-# eclass. See bug #834113. Removal on 2022-04-11.
-dev-db/mysql-cluster
-
-# Sam James <sam@gentoo.org> (2022-03-09)
-# EAPI 5, out-of-date. Not packaged by any other distributions.
-# Removal on 2022-04-09.
-dev-java/edtftpj
-
-# Sam James <sam@gentoo.org> (2022-03-09)
-# Depends on very-old slot of SpiderMonkey which shouldn't be
-# used with untrusted input (vulnerable to lots of security bugs).
-# No reverse dependencies and no updates upstream for a long while.
-# Stuck on EAPI 5 too. Removal on 2022-04-09. bug #832313.
-dev-perl/JavaScript-SpiderMonkey
-
-# Matthew Smith <matthew@gentoo.org> (2022-03-08)
-# Dead upstream, multiple vulnerabilities.
-# Try the fork media-gfx/prusaslicer instead.
-# Bug #834739. Removal on 2022-04-07.
-media-gfx/slic3r
-
-# Sam James <sam@gentoo.org> (2022-03-07)
-# Python 3.6 was declared end-of-life by upstream on 2021-11-04.
-# Please migrate to a newer Python version/slot or use a virtualenv
-# if still needed. Removal on 2022-04-07.
-dev-lang/python:3.6
-
 # Stephan Hartmann <sultan@gentoo.org> (2022-04-01)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
@@ -324,11 +310,6 @@ dev-lang/python:3.6
 <app-doc/kicad-doc-6.0.2
 
 # Jonas Stein <jstein@gentoo.org> (2022-02-11)
-# Blocks gtk2 removal, which is EOL
-# Removal after 2022-04-01.  Bug #833145.
-x11-misc/gtk2fontsel
-
-# Jonas Stein <jstein@gentoo.org> (2022-02-11)
 # Not usable anymore
 # Removal after 2022-06-01.  Bug #833144.
 x11-misc/i855crt
@@ -343,18 +324,13 @@ x11-misc/sisctrl
 # Removal after 2022-07-01.  Bug #832953.
 x11-misc/easystroke
 
-# Jonas Stein <jstein@gentoo.org> (2022-02-06)
-# Dead upstream, unmaintained, open bugs.
-# Removal after 2022-04-01.  Bug #832808.
-app-misc/emelfm2
-
 # Eray Aslan <eras@gentoo.org> (2022-01-24)
 # Mask experimental software
 =mail-mta/postfix-3.8*
 
 # James Beddek <telans@posteo.de> (2022-01-19)
 # FFmpeg 5.0 ABI/API changes break many packages.
-# Masking for tracker/tinderbox.
+# Masking for tracker/tinderbox. Bug #831437
 >=media-video/ffmpeg-5.0
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-01-15)
@@ -372,18 +348,6 @@ app-misc/emelfm2
 # This is likely to cause issues in tests; Unmask if using for other purposes
 >=dev-php/PHP_Timer-5.0
 
-# Jonas Stein <jstein@gentoo.org> (2021-12-24)
-# Alpha version
-=app-editors/ghex-4.0.0_alpha
-
-# Michał Górny <mgorny@gentoo.org> (2021-12-18)
-# EOL kernel with known vulnerabilities.  Please move to one of the LTS
-# branches.  Bug #829491.
-=sys-kernel/gentoo-kernel-5.14*
-=sys-kernel/gentoo-kernel-bin-5.14*
-=sys-kernel/vanilla-kernel-5.14*
-=virtual/dist-kernel-5.14*
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-12-14)
 # AT&T decided to roll back community changes in March 2020
 # for version 2020.x.x
@@ -407,13 +371,6 @@ app-misc/emelfm2
 # Blocks (CVE-2018-11797, CVE-2021-{27807,27906,31811,31812})
 dev-tex/pdfannotextractor
 
-# Mike Pagano <mpagano@gentoo.org> (2021-11-18)
-# Bug introduced in this version that can
-# cause system freeze with data loss.
-# Bug #824558.
-=sys-kernel/gentoo-sources-5.14.19
-=sys-kernel/vanilla-sources-5.14.19
-
 # Ionen Wolkens <ionen@gentoo.org> (2021-10-09)
 # Vulkan beta driver branch aimed at Vulkan developers for testing
 # new features. Beside vulkan, it is typically behind the main branch
@@ -440,20 +397,6 @@ media-libs/webrtc-audio-processing:1
 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall.
 sys-devel/automake:1.11
 
-# Alice Ferrazzi <alicef@gentoo.org> (2021-09-16)
-# Regression in POSIX CPU timers.
-# Please upgrade your gentoo-sources.
-# Adding affected vanilla-sources
-# https://www.spinics.net/lists/stable/msg499206.html
-=sys-kernel/gentoo-sources-5.14.4
-=sys-kernel/gentoo-sources-5.13.17
-=sys-kernel/gentoo-sources-5.10.65
-=sys-kernel/gentoo-sources-5.4.146
-=sys-kernel/vanilla-sources-5.14.4
-=sys-kernel/vanilla-sources-5.13.17
-=sys-kernel/vanilla-sources-5.10.65
-=sys-kernel/vanilla-sources-5.4.146
-
 # Mart Raudsepp <leio@gentoo.org> (2021-09-15)
 # New major parallel-installable release which needs special care to not
 # end up loaded into the same process together with the earlier libsoup ABI.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c51121ebbe6b..ec8f9771b58d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -471,6 +471,7 @@ app-editors/xemacs:xim - Enable X11 XiM input method
 app-emacs/auctex:preview-latex - Use bundled preview-latex
 app-emacs/bbdb:tex - Install plain TeX support files
 app-emacs/bbdb:vm - Add support for app-emacs/vm
+app-emacs/bbdb:wanderlust - Add support for app-emacs/wanderlust
 app-emacs/calfw:howm - Add support for the app-emacs/howm note-taking tool
 app-emacs/elscreen:wanderlust - Include support for app-emacs/wanderlust
 app-emacs/emacs-common:games - Support shared score files for games
@@ -751,7 +752,9 @@ app-i18n/fcitx-rime:configuration_tool - Install configuration tool
 app-i18n/fcitx-unikey:macro-editor - Install macro editor
 app-i18n/freewnn:uum - Build uum
 app-i18n/ibus:emoji - Enable support for Emoji
-app-i18n/ibus:gtk2 - Enable support for x11-libs/gtk+:2
+app-i18n/ibus:gtk2 - Enable the GTK-2 input method module
+app-i18n/ibus:gtk3 - Enable the GTK-3 input method module
+app-i18n/ibus:gtk4 - Enable the GTK-4 input method module
 app-i18n/ibus:unicode - Enable support for Unicode choice
 app-i18n/ibus-chewing:gconf - Enable support for gnome-base/gconf
 app-i18n/ibus-handwrite:zinnia - Enable support for app-i18n/zinnia
@@ -812,8 +815,6 @@ app-misc/digitemp:ds2490 - Build support for the ds2490 sensor
 app-misc/digitemp:ds9097 - Build support for the ds9097 sensor
 app-misc/digitemp:ds9097u - Build support for the ds9097u sensor
 app-misc/elasticsearch:x-pack - Enable additional features (may need a license)
-app-misc/emelfm2:ansi - Add support for ANSI escape sequences
-app-misc/emelfm2:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 app-misc/g810-led:hidapi - Use dev-libs/hidapi instead of virtual/libusb for talking to the device (advertised to be faster)
 app-misc/geoclue:modemmanager - Enable geolocation through 3G or GPS enabled hardware through net-misc/modemmanager.
 app-misc/geoclue:zeroconf - Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare
@@ -1295,15 +1296,6 @@ dev-db/mysql:router - Build the MySQL router program
 dev-db/mysql:server - Build the server program
 dev-db/mysql:systemtap - Build support for profiling and tracing using dev-util/systemtap
 dev-db/mysql:test - Install upstream testsuites for end use.
-dev-db/mysql-cluster:client-libs - Build the client libraries from the server package instead of the C Connector packages (not recommended)
-dev-db/mysql-cluster:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
-dev-db/mysql-cluster:latin1 - Use LATIN1 encoding instead of UTF8
-dev-db/mysql-cluster:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
-dev-db/mysql-cluster:profiling - Add support for statement profiling (requires USE=community).
-dev-db/mysql-cluster:server - Build the server program
-dev-db/mysql-cluster:systemtap - Build support for profiling and tracing using dev-util/systemtap
-dev-db/mysql-cluster:test - Install upstream testsuites for end use.
-dev-db/mysql-cluster:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/mysql-connector-c++:gcov - Build coverage support
 dev-db/mysql-connector-c++:legacy - Build the legacy 1.x API as well as the DevX API
 dev-db/oracle-instantclient:jdbc - Support for XA, Internationalization, and RowSet operations under JDBC
@@ -2209,6 +2201,7 @@ dev-libs/openssl:sslv2 - Support for the old/insecure SSLv2 protocol -- note: no
 dev-libs/openssl:sslv3 - Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https
 dev-libs/openssl:tls-compression - Enable support for discouraged TLS compression
 dev-libs/openssl:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
+dev-libs/openssl:weak-ssl-ciphers - Build support for SSL/TLS ciphers that are considered "weak"
 dev-libs/openssl-compat:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
 dev-libs/openssl-compat:bindist - Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI
 dev-libs/openssl-compat:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)
@@ -2524,8 +2517,6 @@ dev-python/scipy:sparse - Adds support for sparse solving with sci-libs/umfpack
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
 dev-python/shiboken2:vulkan - Generate "QSurface::VulkanSurface" bindings
-dev-python/simplespectral:faster - Use dev-python/scipy to speed up drawing
-dev-python/simplespectral:fastest - Use dev-python/pyFFTW to speed up drawing to the max
 dev-python/subprocess-tee:test-full - Enable full test mode. Pulls in many additional dependencies, and requires having been emerged without this flag first in order to avoid a circular dependency.
 dev-python/sympy:aesara - Add support for dev-python/aesara
 dev-python/sympy:imaging - Add support for dev-python/pillow
@@ -3561,7 +3552,6 @@ kde-apps/umbrello:php - Enable PHP import support using dev-util/kdevelop and de
 kde-apps/yakuake:absolute-position - Use kde-frameworks/kwayland for absolute window positioning in KWin
 kde-frameworks/kcompletion:designer - Build plugins for dev-qt/designer
 kde-frameworks/kconfig:qml - Enable QML/QtQuick support via dev-qt/qtdeclarative
-kde-frameworks/kconfigwidgets:auth - Enable authentication support via kde-frameworks/kauth
 kde-frameworks/kconfigwidgets:designer - Build plugins for dev-qt/designer
 kde-frameworks/kfilemetadata:epub - Enable support for reading EPUB ebook metadata
 kde-frameworks/kfilemetadata:mobi - Enable mobipocket support via kde-apps/kdegraphics-mobipocket
@@ -3892,7 +3882,6 @@ media-fonts/fira-sans:ttf - Install the TrueType version of the font
 media-fonts/fontawesome:otf - Install the OpenType version of the font
 media-fonts/fontawesome:ttf - Install the TrueType version of the font
 media-fonts/fonts-meta:emoji - Install a font supporting emojis
-media-fonts/fonts-meta:free - Install fonts for the "free" preset
 media-fonts/fonts-meta:latin - Install additional latin fonts
 media-fonts/fonts-meta:ms - Install (free) fonts for the "ms" preset
 media-fonts/ibm-plex:otf - Install OTF fonts
@@ -4001,6 +3990,7 @@ media-gfx/fontforge:woff2 - Enable support for WOFF2 format
 media-gfx/fotowall:webcam - Enable webcam support
 media-gfx/freecad:addonmgr - Build the addon manager module for automatic handling of 3rd party addons
 media-gfx/freecad:cloud - Build the Cloud workbench, to access cloud providers (mostly Amazon S3).
+media-gfx/freecad:designer - Build and install the Qt designer plugin, so the FreeCAD widgets can be used from within designer.
 media-gfx/freecad:drawing - Build the Drawing workbench, a predecessor to the TechDraw workbench. Users are encouraged to learn how to use the TechDraw workbench and switch to it instead. This is a compatibility option and will be removed in a later (0.20+) version of the package.
 media-gfx/freecad:fem - Build the FEM module and workbench which provides Finite Element Analysis (FEA) workflows
 media-gfx/freecad:headless - Build FreeCAD without a GUI, usable for server-side instances. The Python modules are still available, without their GUI parts though.
@@ -4039,7 +4029,7 @@ media-gfx/graphicsmagick:q16 - Set storage quantum size to 16 (~2*memory)
 media-gfx/graphicsmagick:q32 - Set storage quantum size to 32 (~5*memory)
 media-gfx/graphviz:X - Builds dotty, lneato, unflatten, vimdot, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)
 media-gfx/graphviz:devil - Enables DevIL output plugin -Tdevil
-media-gfx/graphviz:gtk - Enables gtk+ output plugin -Tgtk (needs cairo)
+media-gfx/graphviz:gtk2 - Enables gtk+ output plugin -Tgtk (needs cairo)
 media-gfx/graphviz:gts - Enables support for GNU Triangulated Surface Library (required for sfdp to work)
 media-gfx/graphviz:lasi - Enables PostScript output via media-libs/lasi, for plugin -Tlasi (needs cairo)
 media-gfx/graphviz:lefty - Builds lefty front-end, requires x11-libs/libXmu and x11-libs/libXaw
@@ -4226,7 +4216,7 @@ media-libs/libbluray:java - Add support for BD-J
 media-libs/libbluray:utils - Install command-line utilities and examples
 media-libs/libcanberra:alsa - Enables ALSA sound driver.
 media-libs/libcanberra:gstreamer - Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available.
-media-libs/libcanberra:gtk - Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules in the GTK_MODULES environment variable.
+media-libs/libcanberra:gtk2 - Enables building of gtk+ helper library, gtk+ runtime sound effects and the canberra-gtk-play utility. To enable the gtk+ sound effects add canberra-gtk-module to the colon separated list of modules in the GTK_MODULES environment variable.
 media-libs/libcanberra:gtk3 - Enables building of gtk+3 helper library, gtk+3 runtime sound effects and the canberra-gtk-play utility. To enable the gtk+3 sound effects add canberra-gtk-module to the colon separated list of modules in the GTK_MODULES environment variable.
 media-libs/libcanberra:pulseaudio - Enables PulseAudio sound driver that should be able to support positional event sounds. This is the preferred choice for best sound events experience and picked by default if compiled in and possible to use at runtime.
 media-libs/libcanberra:sound - Install x11-themes/sound-theme-freedesktop to get sounds on Gnome and Xfce.
@@ -4397,6 +4387,10 @@ media-libs/sdl2-mixer:playtools - Install playwave and playmus tools (useful for
 media-libs/sdl2-mixer:tremor - enable OGG Vorbis music via libtremor
 media-libs/sdl2-mixer:wav - support WAVE files
 media-libs/sdl2-ttf:harfbuzz - Use media-libs/harfbuzz for enhanced font rendering
+media-libs/sdl_audiolib:fluidsynth - use media-sound/fluidsynth for MIDI
+media-libs/sdl_audiolib:mpg123 - Enable support for mp3 decoding via media-sound/mpg123
+media-libs/sdl_audiolib:openmpt - OpenMPT decoder via media-libs/libopenmpt
+media-libs/sdl_audiolib:soxr - Enable SoX Resampler support via media-libs/soxr
 media-libs/sge:image - enable sdl-image support
 media-libs/spandsp:fixed-point - Enable fixed point support
 media-libs/speex:utils - Enables speex commandline utilities (speexenc, speexdec).
@@ -4593,8 +4587,6 @@ media-sound/deadbeef:nullout - Dummy output driver
 media-sound/deadbeef:sc68 - Atari ST and Amiga music player
 media-sound/deadbeef:shellexec - Define custom shell commands that can be called on tracks
 media-sound/deadbeef:supereq - Enable equalizer
-media-sound/deinvert:liquid - improve sound quality using net-libs/liquid-dsp
-media-sound/deinvert:wav - wav file support using media-libs/libsndfile
 media-sound/denemo:alsa - Enable alsa support through media-libs/alsa-lib
 media-sound/denemo:aubio - Enable media-libs/aubio support
 media-sound/denemo:fluidsynth - Enable Fluidsynth MIDI software synthesis using media-sound/fluidsynth
@@ -5797,7 +5789,6 @@ net-im/bitlbee:twitter - Enable Twitter protocol support
 net-im/choqok:attica - Build Open Collaboration Services plugin using kde-frameworks/attica
 net-im/choqok:share - Enable support for a share menu using kde-frameworks/purpose
 net-im/choqok:telepathy - Enable support for the real-time communication framework telepathy
-net-im/corebird:spellcheck - Support spell checking
 net-im/coturn:mongodb - Enable support for the mongodb database
 net-im/coturn:redis - Enable support for the redis database
 net-im/dino:gpg - Enable OpenPGP encryption plugin
@@ -6087,7 +6078,6 @@ net-libs/liboauth:curl - If enabled, net-misc/curl is used thorugh the libcurl l
 net-libs/liboauth:nss - Use Mozilla NSS (dev-libs/nss) as hash library; if this is disabled, dev-libs/openssl is used instead.
 net-libs/liboping:filecaps - Allow non-root users to use [n]oping utility.
 net-libs/liboping:ncurses - Build ncurses-based version of oping utility (requires sys-libs/ncurses)
-net-libs/libosmocore:pcsc-lite - Enable smartcard support with sys-apps/pcsc-lite
 net-libs/libpcap:netlink - Use dev-libs/libnl to put wireless interfaces in monitor mode.
 net-libs/libpcap:rdma - Enable RDMA capture support using sys-cluster/rdma-core
 net-libs/libpcap:remote - Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!
@@ -6724,6 +6714,7 @@ net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
 net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
 net-nds/nsscache:s3 - Support for S3-based NSS sources
 net-nds/openldap:argon2 - Enable password hashing algorithm from app-crypt/argon2
+net-nds/openldap:autoca - Automatic Certificate Authority overlay
 net-nds/openldap:cleartext - Enable use of cleartext passwords
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:kinit - Enable support for kerberos init
@@ -7050,8 +7041,6 @@ net-wireless/neard:tools - Build and install 'nfctool' for further NFC debugging
 net-wireless/rtl-sdr:zerocopy - may cause a bus error on some ARM systems
 net-wireless/rtl_433:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
 net-wireless/rtl_433:soapysdr - Build with SoapySDR support
-net-wireless/soapy_power:faster - Use dev-python/scipy to speed up drawing
-net-wireless/soapy_power:fastest - Use dev-python/pyFFTW to speed up drawing to the max
 net-wireless/soapysdr:bladerf - Add support for bladerf hardware
 net-wireless/soapysdr:hackrf - Add support for hackrf hardware
 net-wireless/soapysdr:plutosdr - Add support for Analog Devices ADALM-PLUTO hardware
@@ -7060,11 +7049,6 @@ net-wireless/soapysdr:uhd - Add support for Ettus USRP hardware
 net-wireless/spectools:debug - Build the raw output client for spectools. (for developers)
 net-wireless/spectools:gtk - Build the gtk-2 based client for spectools
 net-wireless/spectools:ncurses - Build the ncurses based client for spectools
-net-wireless/srslte:bladerf - support Nuand BladeRF hardware
-net-wireless/srslte:simcard - support hardware sim cards
-net-wireless/srslte:soapysdr - use soapysdr to support various hardware
-net-wireless/srslte:uhd - support Ettus Research hardware
-net-wireless/srslte:zeromq - enable zeromq message passing
 net-wireless/ubertooth:bluez - use bluez to support clock following and scanning
 net-wireless/ubertooth:ubertooth1-firmware - Build/install ubertooth1-firmware
 net-wireless/uhd:b100 - support B100 hardware
@@ -7109,10 +7093,6 @@ net-wireless/wpa_supplicant:uncommon-eap-types - Add support for GPSK, SAKE, GPS
 net-wireless/wpa_supplicant:wep - Add support for Wired Equivalent Privacy (deprecated 2004)
 net-wireless/wpa_supplicant:wimax - Add support for Wimax EAP-PEER authentication algorithm
 net-wireless/wpa_supplicant:wps - Add support for Wi-Fi Protected Setup
-net-wireless/yatebts:bladerf - Build bladeRF transceiver
-net-wireless/yatebts:rad1 - Build RAD1 transceiver
-net-wireless/yatebts:uhd - Build UHD transceiver
-net-wireless/yatebts:usrp1 - Build USRP1 transceiver
 sci-astronomy/cpl:gasgano - Enable support for sci-astronomy/gasgano file organizer
 sci-astronomy/esomidas:libtirpc - Build against net-libs/libtirpc for RPC support
 sci-astronomy/kstars:fits - Enable support for NASA's sci-libs/cfitsio library
@@ -7903,7 +7883,6 @@ sys-apps/rng-tools:jitterentropy - Enable Jitter RNG entropy support
 sys-apps/rng-tools:nistbeacon - Enable NIST beacon entropy support
 sys-apps/rng-tools:pkcs11 - Enable PKCS11 entropy support
 sys-apps/rng-tools:rtlsdr - Enable atmospheric-static entropy support with net-wireless/rtl-sdr
-sys-apps/rtl-entropy:bladerf - Build with Nuand BladeRF support
 sys-apps/s390-tools:cryptsetup - build the zkey-cryptsetup utility (requires USE=openssl)
 sys-apps/s390-tools:fuse - build cmsfs-fuse to read files stored on a z/VM CMS disk
 sys-apps/s390-tools:ncurses - build hyptop monitoring program
@@ -8015,6 +7994,7 @@ sys-block/fio:curl - Enable HTTP engine for S3 and WebDav support support via ne
 sys-block/fio:glusterfs - Enable GlusterFS gfapi support via sys-cluster/glusterfs
 sys-block/fio:gnuplot - Install tools for generating gnuplots
 sys-block/fio:io-uring - Enable efficient I/O via sys-libs/liburing.
+sys-block/fio:nfs - Enable NFS support
 sys-block/fio:numa - Enable numa support
 sys-block/fio:rbd - Enable Rados block device support via sys-cluster/ceph
 sys-block/fio:rdma - Enable infiniband support via sys-cluster/rdma-core
@@ -8253,7 +8233,7 @@ sys-devel/parity:vc8_0 - Enable support for Visual Studio 2005
 sys-devel/parity:vc9_0 - Enable support for Visual Studio 2008
 sys-devel/parity:vcx64 - Enable support for 64bit Visual Studio compilers
 sys-devel/parity:vcx86 - Enable support for 32bit Visual Studio compilers
-sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+ version 2)
+sys-devel/sparse:gtk - Build the test-inspect utility (requires x11-libs/gtk+:3)
 sys-devel/sparse:llvm - Build the sparse-llvm utility
 sys-devel/sparse:xml - Build the c2xml utility (requires dev-libs/libxml2)
 sys-fabric/mstflint:adb-generic-tools - Enable compiling the following tools: mstreg and mstlink
@@ -8428,6 +8408,8 @@ sys-libs/libcap:tools - Install captree, which requires dev-lang/go
 sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
 sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
 sys-libs/libcxxabi:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc
+sys-libs/libnvme:json - Support JSON output via dev-libs/json-c
+sys-libs/libnvme:uuid - UUID support via sys-apps/util-linux
 sys-libs/libomp:cuda - Build CUDA offloading plugin (only with USE=offload)
 sys-libs/libomp:hwloc - Enable CPU affinity support via hwloc
 sys-libs/libomp:offload - Support offloading OpenMP using libomptarget
@@ -8571,6 +8553,7 @@ www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
 www-apps/gitea:acct - User and group management via acct-*/git packages
 www-apps/gitit:plugins - enables optional plugin runtime loader
 www-apps/hugo:sass - Enable SASS/SCSS support
+www-apps/hugo:test-full - Pull optional heavier test-dependency packages
 www-apps/icingaweb2:apache2-server - Adds support for the apache2-server
 www-apps/icingaweb2:fpm - Adds FPM support to php
 www-apps/icingaweb2:nginx - Adds support for nginx
@@ -8620,6 +8603,9 @@ www-client/chromium:system-harfbuzz - Use system harfbuzz instead of the bundled
 www-client/chromium:system-icu - Use system icu instead of the bundled one
 www-client/chromium:system-png - Use system libpng instead of the bundled one.
 www-client/chromium:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
+www-client/chromium-bin:suid - Install the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels.
+www-client/chromium-bin:swiftshader - Install SwiftShader OpenGL libraries.
+www-client/chromium-bin:widevine - Unsupported closed-source DRM capability (required by Netflix VOD).
 www-client/dillo:xembed - Enable X11 XEmbed support
 www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
 www-client/elinks:brotli - Enable support for brotli compression