gentoo resync : 01.10.2021

17 files changed, 332 insertions, 49 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 82f25216ed85..c9188ccd0e40 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 4c4b2fa49920..7dc591aeedf7 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
+# Needs a lot of Perl packages to be keyworded.
+dev-vcs/git doc
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-20)
 # Requires zstd, which is currently broken on m68k.
 dev-util/cmake test
@@ -23,34 +27,16 @@ app-text/htmltidy test
 app-doc/doxygen doc
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
-# Avoid having to keyword dev-python/sphinx and friends for now.
-dev-python/more-itertools doc
-dev-python/pexpect doc
-dev-python/cython doc
-dev-python/cffi doc
-dev-python/cssselect doc
-dev-python/execnet doc
-dev-python/flake8 doc
-dev-python/greenlet doc
-dev-python/jinja doc
-dev-python/lxml doc
-dev-python/py doc
-dev-python/pyasn1 doc
-dev-python/pycodestyle doc
-dev-python/pygments doc
-dev-python/pylint doc
-dev-python/pytest-cov doc
-dev-python/smartypants doc
-dev-python/wrapt doc
-
-# James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid lots of unkeyworded dependencies of Python tests.
 dev-python/argcomplete test
 dev-python/distlib test
+dev-python/fonttools test
 dev-python/isort test
 dev-python/nose test
+dev-python/pytest-regressions test
 dev-python/requests test
 dev-python/setuptools test
+dev-python/sphinx test
 dev-python/urllib3 test
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-20)
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 411f503a5869..f3fc5130ffa9 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,20 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
+# Too many unkeyworded dependencies for now.
+efl
+subversion
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-27)
+# The Lua 5.3 tests fail on m68k so it's probably broken. 5.4 works.
+lua_targets_lua5-3
+lua_single_target_lua5-3
+
+# James Le Cuirot <chewi@gentoo.org> (2021-09-27)
+# MPI isn't very useful on an architecture that doesn't support SMP.
+mpi
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # I tried Mesa under qemu-system-m68k with VirtIO-GPU. It didn't work.
 opengl
@@ -24,10 +38,6 @@ rust
 # Qt is not keyworded or tested.
 qt5
 
-# James Le Cuirot <chewi@gentoo.org> (2021-08-20)
-# dev-libs/efl has many unkeyworded dependencies.
-efl
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-23)
 # valgrind has no m68k port.
 valgrind
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 562b60830521..3db64c002a9d 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alex Fan <alexfanqi@yahoo.com> (2021-09-27)
+# depends on mysql
+kde-apps/akonadi mysql
+
 # Marek Szuba <marecki@gentoo.org> (2021-09-23)
 # mkdocs ecosystem only partly keyworded on riscv, has rather messy
 # Python-target requirements.
@@ -24,6 +28,7 @@ sys-cluster/ceph pmdk
 # dev-ruby/asciidoctor isn't keyworded here
 dev-libs/nanomsg doc
 dev-util/ccache doc
+net-misc/chrony html
 
 # Alex Fan <alexfanqi@yahoo.com> (2021-09-15)
 # Marek Szuba <marecki@gentoo.org> (2021-09-07)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 52488bbb2e05..ec229ccf0326 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -259,7 +259,6 @@ sys-devel/gcc ada
 # and the package is confirmed to work with it.
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
-<=dev-python/vcstools-0.1.42 test
 
 # Michał Górny <mgorny@gentoo.org> (2020-03-27)
 # Requires old version of dev-python/docutils.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d5ff47743a6e..b08b6b8e6109 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (2021-09-26)
+# Mask 8.1 as it is RC
+php_targets_php8-1
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
new file mode 100644
index 000000000000..36128fb4712c
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
new file mode 100644
index 000000000000..e38047556647
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
new file mode 100644
index 000000000000..70e347cc4398
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64/systemd
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
new file mode 100644
index 000000000000..36128fb4712c
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
new file mode 100644
index 000000000000..cbac179df32e
--- /dev/null
+++ b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
@@ -0,0 +1,43 @@
+default/linux/riscv/20.0/rv64gc/lp64d/systemd
+
+On RISC-V we are switching from two-level library directories (e.g., 
+/usr/lib64/lp64d) to a more traditional directory architecture.
+This is done via the profile upgrade from 17.0 to 20.0 profiles.
+
+We recommend to re-install from scratch using a 20.0 profile based
+stage. 17.0 profiles will be deprecated immediately and removed
+in 6 months.
+
+If you want to upgrade an existing installation, the following
+steps should be taken. Please read all commands carefully first and
+make sure you understand them, since the procedure is risky. The 
+commands are given for a lp64d profile; in case of a lp64 profile, 
+always replace lp64d with lp64.
+
+# cd /usr/local/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /usr/lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# ln -s . lp64d
+
+# cd /lib64
+# cp -av lp64d/. .
+# rm -rf lp64d
+# sln . lp64d
+
+Note that the last command uses "sln" instead of "ln -s".
+
+Then switch from your 17.0 profile to the corresponding 20.0 profile,
+either by using "eselect profile" or by manually changing the
+/etc/portage/make.profile symlink.
+
+Next, rebuild all packages:
+
+# emerge -eav world
+
+As last step, check if portage has removed any of the symlinks created 
+above, and if yes, recreate them.
diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc
index b63c5d69d88b..76a65f23514a 100644
--- a/profiles/desc/php_targets.desc
+++ b/profiles/desc/php_targets.desc
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags
 
+php8-1 - Build against PHP 8.1
 php8-0 - Build against PHP 8.0
 php7-4 - Build against PHP 7.4
 php7-3 - Build against PHP 7.3
diff --git a/profiles/desc/postgres_targets.desc b/profiles/desc/postgres_targets.desc
index a6e6798121fa..39f97a1ad44d 100644
--- a/profiles/desc/postgres_targets.desc
+++ b/profiles/desc/postgres_targets.desc
@@ -8,3 +8,4 @@ postgres10 - Build against PostgreSQL 10
 postgres11 - Build against PostgreSQL 11
 postgres12 - Build against PostgreSQL 12
 postgres13 - Build against PostgreSQL 13
+postgres14 - Build against PostgreSQL 14
diff --git a/profiles/package.mask b/profiles/package.mask
index 3b3a64a98240..4b1aea196f76 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,82 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-10-01)
+# KDE Plasma 5.22.90 (5.23 Beta) mask - Pre-release version
+# See also: https://kde.org/announcements/plasma/5/5.22.90/
+# KDE Plasma Beta Review Day on 2021-10-01: https://tinyurl.com/kdereview
+~kde-plasma/bluedevil-5.22.90
+~kde-plasma/breeze-5.22.90
+~kde-plasma/breeze-grub-5.22.90
+~kde-plasma/breeze-gtk-5.22.90
+~kde-plasma/breeze-plymouth-5.22.90
+~kde-plasma/discover-5.22.90
+~kde-plasma/drkonqi-5.22.90
+~kde-plasma/kactivitymanagerd-5.22.90
+~kde-plasma/kde-cli-tools-5.22.90
+~kde-plasma/kde-gtk-config-5.22.90
+~kde-plasma/kdecoration-5.22.90
+~kde-plasma/kdeplasma-addons-5.22.90
+~kde-plasma/kgamma-5.22.90
+~kde-plasma/khotkeys-5.22.90
+~kde-plasma/kinfocenter-5.22.90
+~kde-plasma/kmenuedit-5.22.90
+~kde-plasma/kscreen-5.22.90
+~kde-plasma/kscreenlocker-5.22.90
+~kde-plasma/ksshaskpass-5.22.90
+~kde-plasma/ksystemstats-5.22.90
+~kde-plasma/kwallet-pam-5.22.90
+~kde-plasma/kwayland-integration-5.22.90
+~kde-plasma/kwayland-server-5.22.90
+~kde-plasma/kwin-5.22.90
+~kde-plasma/kwrited-5.22.90
+~kde-plasma/layer-shell-qt-5.22.90
+~kde-plasma/libkscreen-5.22.90
+~kde-plasma/libksysguard-5.22.90
+~kde-plasma/libkworkspace-5.22.90
+~kde-plasma/milou-5.22.90
+~kde-plasma/oxygen-5.22.90
+~kde-plasma/plasma-browser-integration-5.22.90
+~kde-plasma/plasma-desktop-5.22.90
+~kde-plasma/plasma-disks-5.22.90
+~kde-plasma/plasma-firewall-5.22.90
+~kde-plasma/plasma-integration-5.22.90
+~kde-plasma/plasma-meta-5.22.90
+~kde-plasma/plasma-nm-5.22.90
+~kde-plasma/plasma-pa-5.22.90
+~kde-plasma/plasma-sdk-5.22.90
+~kde-plasma/plasma-systemmonitor-5.22.90
+~kde-plasma/plasma-thunderbolt-5.22.90
+~kde-plasma/plasma-workspace-5.22.90
+~kde-plasma/plasma-workspace-wallpapers-5.22.90
+~kde-plasma/plasma-vault-5.22.90
+~kde-plasma/plymouth-kcm-5.22.90
+~kde-plasma/polkit-kde-agent-5.22.90
+~kde-plasma/powerdevil-5.22.90
+~kde-plasma/sddm-kcm-5.22.90
+~kde-plasma/systemsettings-5.22.90
+~kde-plasma/xdg-desktop-portal-kde-5.22.90
+~kde-plasma/xembed-sni-proxy-5.22.90
+
+# Alfredo Tupone <tupone@gentoo.org> (2021-09-30)
+# Deprecated upstream
+# bug #815466.
+dev-ml/ppx_metaquot
+
+# John Helmert III <ajak@gentoo.org> (2021-09-29)
+# VM image data corruption bug, causing I/O errors in VMs. Bug #815379
+=app-emulation/qemu-6.1.0
+
+# Joonas Niilola <juippis@gentoo.org> (2021-09-26)
+# A library without revdeps, EAPI-5. #776901
+# Removal in ~30 days.
+media-libs/libyami
+
+# Brian Evans <grknight@gentoo.org> (2021-09-26)
+# Mask for 8.1 RC
+dev-lang/php:8.1
+virtual/httpd-php:8.1
+
 # Jakov Smolić <jsmolic@gentoo.org> (2021-09-25)
 # Upstream renamed the Theano project and continued as dev-python/aesara.
 # No reverse dependencies.
@@ -230,13 +306,6 @@ dev-util/trinity
 # Should be safe to unmask if you are using x11-wm/mutter instead.
 >=gui-libs/egl-wayland-1.1.8
 
-# David Seifert <soap@gentoo.org> (2021-08-29)
-# Broken for the past 5 years (#585942), no new upstream release in over
-# 5 years. Same issues as sci-biology/wgs-assembler, use a modern
-# assembler like sci-biology/abyss or canu.
-# Bug #585942, #731880, #808667, removal in 30 days.
-sci-biology/mira
-
 # Alexey Sokolov <alexey+gentoo@asokolov.org> (2021-08-30)
 # Homepage dead, uses gtk2, fails to build, https://bugs.gentoo.org/711344
 games-puzzle/gnudoku
@@ -247,10 +316,6 @@ games-puzzle/gnudoku
 # and accept a more unstable release.
 >=www-client/chromium-96
 
-# Anthony G. Basile <blueness@gentoo.org> (2021-08-27)
-# Masked for removal in 30 days.  Deprecated upstream.
-net-vpn/ipsec-tools
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2021-08-26)
 # Preparing for final 5.0.0 release
 >=app-text/tesseract-5.0.0_beta
@@ -504,7 +569,7 @@ virtual/jre:11
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-libs/glibc-2.33
-<sys-devel/binutils-2.35.2
+<sys-devel/binutils-2.36.1-r2
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
 # This package has some dangerous quality and security issues, but
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 362bc02c60cd..1e100b77f5e2 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -203,8 +203,6 @@ riscv		default/linux/riscv/17.0/rv64gc/lp64d					exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64d/systemd				exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64					exp
 riscv		default/linux/riscv/17.0/rv64gc/lp64/systemd				exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32					exp
-riscv		default/linux/riscv/17.0/rv32imac/ilp32d				exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d					stable
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop				dev
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome			dev
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index cde2ff095b42..faa4e3963bc3 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -4,7 +4,6 @@ move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
 move app-cdr/k3b kde-apps/k3b
 move net-misc/badvpn net-vpn/badvpn
-move net-firewall/ipsec-tools net-vpn/ipsec-tools
 move net-misc/libreswan net-vpn/libreswan
 move net-misc/logmein-hamachi net-vpn/logmein-hamachi
 move net-misc/openconnect net-vpn/openconnect
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b8060249a2f9..5c72d44ca77d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1818,7 +1818,7 @@ dev-lang/ruby:systemtap - Enable SystemTAP/DTrace tracing
 dev-lang/rust:clippy - Install clippy, Rust code linter
 dev-lang/rust:miri - Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly)
 dev-lang/rust:nightly - Enable nightly (UNSTABLE) features
-dev-lang/rust:parallel-compiler - Build a multi-threaded rustc
+dev-lang/rust:parallel-compiler - Build a multi-threaded rustc (experimental, unsupported)
 dev-lang/rust:rls - Install rls, Rust Language Server (used with IDEs supporting RLS protocol)
 dev-lang/rust:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/rust:system-bootstrap - Bootstrap using installed rust compiler
@@ -2724,7 +2724,6 @@ dev-tex/abntex:lyx - Install with app-office/lyx layout
 dev-tex/biblatex:biber - Install the unicode compatible backend processor
 dev-tex/pythontex:highlighting - Syntax highlighting using dev-python/pygments
 dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
-dev-util/android-studio:custom-jdk - Install and use Android Studio's custom JRE.
 dev-util/anjuta:devhelp - Enable devhelp integration
 dev-util/anjuta:glade - Build glade plugin for anjuta
 dev-util/anjuta:terminal - Enable terminal plugin based on x11-libs/vte
@@ -3692,11 +3691,14 @@ mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
 mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/neomutt:kyotocabinet - Enable Kyoto Cabinet database backend for header caching
 mail-client/neomutt:lmdb - Enable LMDB (Lightning Memory-Mapped Database) backend for header caching
+mail-client/neomutt:lz4 - Add lz4 support for header cache compression
 mail-client/neomutt:notmuch - Enable support for net-mail/notmuch
 mail-client/neomutt:pgp-classic - Build classic-pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backend for header caching
 mail-client/neomutt:smime-classic - Build classic-smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
+mail-client/neomutt:zlib - Add zlib support for header cache compression
+mail-client/neomutt:zstd - Add zstd support for header cache compression
 mail-client/roundcube:change-password - Allow users to change passwords through Roundcube
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
 mail-client/roundcube:fileinfo - Use the dev-lang/php fileinfo extension to guess the mime_type of attachments
@@ -3871,6 +3873,8 @@ media-fonts/terminus-font:ru-i - Changes view of Russian letter 'i' - not like L
 media-fonts/terminus-font:ru-k - Changes view of Russian letter 'k' (see homepage)
 media-fonts/unifont:fontforge - Use media-gfx/fontforge to build fonts from source
 media-fonts/unifont:utils - Install unifont utilities
+media-fonts/vollkorn:otf - Install the OpenType version of the font
+media-fonts/vollkorn:ttf - Install the TrueType version of the font
 media-gfx/ahoviewer:plugins - Build plugin support for now, in future pull additional plugins
 media-gfx/ahoviewer:rar - Rar archive support
 media-gfx/ahoviewer:zip - Zip archive support
@@ -6861,11 +6865,6 @@ net-vpn/badvpn:tun2socks - Build tun2socks, a program which implements a TUN dev
 net-vpn/badvpn:udpgw - Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.
 net-vpn/i2p:nls - Adds Native Language Support using GNU gettext.
 net-vpn/i2pd:i2p-hardening - Compile with hardening on vanilla compilers/linkers
-net-vpn/ipsec-tools:hybrid - Makes available both mode-cfg and xauth support
-net-vpn/ipsec-tools:idea - Enable support for the IDEA algorithm
-net-vpn/ipsec-tools:nat - Enable NAT-Traversal
-net-vpn/ipsec-tools:rc5 - Enable support for the patented RC5 algorithm
-net-vpn/ipsec-tools:stats - Enable statistics reporting
 net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
 net-vpn/ocserv:otp - Enable support for one-time passwords
 net-vpn/openconnect:gssapi - Build GSSAPI support
@@ -8504,6 +8503,7 @@ www-apps/nikola:webmedia - Use dev-python/micawber to extract metadata from web
 www-apps/postfixadmin:vacation - Install vacation.pl script and dependencies
 www-apps/radicale:bcrypt - Enable bcrypt
 www-apps/redmine:markdown - Enable support for Markdown
+www-apps/redmine:minimagick - Enable image processing support via dev-ruby/mini_magick
 www-apps/redmine:passenger - Enable support for www-apache/passenger
 www-apps/roundup:jinja - Enable Jinja2 support
 www-apps/roundup:markdown - Enable markdown rendering