gentoo resync : 08.10.2021

26 files changed, 86 insertions, 164 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c9188ccd0e40..69e8a285fdde 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index eddebf3d0ee1..16eb9ca985ee 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -192,10 +192,6 @@ app-admin/conserver -freeipmi
 # - rdrand plugin is supported on amd64
 net-vpn/strongswan -strongswan_plugins_aesni -strongswan_plugins_rdrand
 
-# James Le Cuirot <chewi@gentoo.org> (2018-11-02)
-# Vulkan is only available on amd64 at present.
-media-libs/libsdl2 -vulkan
-
 # Michael Palimaka <kensington@gentoo.org> (2018-10-12)
 # Unmask arch-specific USE flags available on amd64
 net-analyzer/testssl -bundled-openssl -kerberos
@@ -360,7 +356,6 @@ gnustep-base/gnustep-make -libobjc2
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # Robin H. Johnson <robbat2@gentoo.org> (2011-07-10), updated 2019-12-06
 # PPS should work on all arches, but only keyworded on some arches
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index a0232eb6ec61..05c072b5f607 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -81,7 +81,6 @@ kde-misc/kmarkdownwebview:5
 kde-misc/tellico:5
 kde-misc/zanshin:5
 mail-client/kube
-mail-client/trojita
 media-gfx/digikam:5
 media-gfx/luminance-hdr
 media-sound/frescobaldi
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index 3101e24236fd..3ebd7cadb6df 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -54,4 +54,3 @@ dev-python/QtPy test
 # The QML (V4) and JSC JITs do not work on x32.
 dev-qt/qtdeclarative jit
 dev-qt/qtscript jit
-dev-qt/qtwebkit jit
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index bc106a751a10..80329451c6a1 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Joonas Niilola <juippis@gentoo.org> (2020-09-26)
@@ -25,3 +25,4 @@
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
 # This is built for armv7a so unmask here.
 -dev-java/openjdk-bin:11
+-dev-java/openjdk-bin:17
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 7834df6416c0..cd022be2b22d 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -27,3 +27,4 @@ dev-java/icedtea-bin
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-06-22)
 # This is built for armv7a and will not work on earlier generations.
 dev-java/openjdk-bin:11
+dev-java/openjdk-bin:17
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3ea8dc29561c..c855277818be 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -332,6 +332,7 @@ media-gfx/xsane ocr
 # Alexis Ballier <aballier@gentoo.org> (2015-11-14)
 # MMAL is available on the Raspberry Pi (armv6 & armv7 so far)
 media-video/ffmpeg -mmal
+media-video/ffmpeg-chromium -mmal
 
 # Markus Meier <maekke@gentoo.org> (2015-10-10)
 # unkeyworded deps, bug #552330
@@ -493,7 +494,6 @@ net-vpn/tinc vde
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug vcd wavpack
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 5612ce870a4b..90e884f46c82 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -13,6 +13,7 @@ dev-libs/keystone llvm_targets_AArch64
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg cpu_flags_arm_neon
+media-video/ffmpeg-chromium cpu_flags_arm_neon
 
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a8b66f07c433..ddc7dccfcf54 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Jakov Smolić <jsmolic@gentoo.org> (2021-10-07)
+# dev-libs/mongo-c-driver is not keyworded here
+net-analyzer/zmap mongo
+
 # Sam James <sam@gentoo.org> (2021-08-14)
 # Needs Raspberry Pi specific applications
 media-video/mjpg-streamer -input-raspicam
@@ -27,10 +31,6 @@ dev-util/diffoscope pascal
 # and media-plugins/zam-plugins not keyworded here
 media-sound/easyeffects rnnoise webrtc zamaudio
 
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
-# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
-games-fps/yamagi-quake2 vulkan
-
 # Stefan Strogin <steils@gentoo.org> (2021-06-27)
 # Requires dev-python/adblock which is not keyworded on arm64 yet
 www-client/qutebrowser adblock
@@ -192,6 +192,7 @@ net-wireless/kismet ubertooth
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg -cpu_flags_arm_neon
+media-video/ffmpeg-chromium -cpu_flags_arm_neon
 
 # Tomáš Mózes <hydrapolic@gmail.com> (2019-12-19)
 # dev-libs/criterion is not keyworded yet
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 740c44392c08..089f99dfad2e 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -164,10 +164,6 @@ x11-apps/igt-gpu-tools overlay
 # - padlock plugin is only supported on amd64 and x86
 net-vpn/strongswan strongswan_plugins_aesni strongswan_plugins_rdrand strongswan_plugins_padlock
 
-# James Le Cuirot <chewi@gentoo.org> (2018-11-02)
-# Vulkan is only available on amd64 at present.
-media-libs/libsdl2 vulkan
-
 # Michael Palimaka <kensington@gentoo.org> (2018-10-12)
 # Only available on amd64/x86
 net-analyzer/testssl bundled-openssl kerberos
@@ -261,6 +257,7 @@ media-video/mpv raspberry-pi
 # MMAL is only available on the Raspberry Pi:
 # Mask it globally, unmask it on arm.
 media-video/ffmpeg mmal
+media-video/ffmpeg-chromium mmal
 
 # Brian Evans <grknight@gentoo.org (2015-09-14)
 # Mask new USE flags for mariadb which all arches do not yet have dependencies
@@ -338,7 +335,6 @@ media-video/transcode nuv pic
 # mask the flag here and unmask it in the appropriate arch profiles.
 dev-qt/qtdeclarative jit
 dev-qt/qtscript jit
-dev-qt/qtwebkit jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (2011-11-25)
 # Expose USE="suid" for USE="svga" only for x86 users,
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 7dc591aeedf7..b478a13dfc42 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -25,6 +25,8 @@ app-text/htmltidy test
 # James Le Cuirot <chewi@gentoo.org> (2021-09-19)
 # Requires texlive and friends to be keyworded.
 app-doc/doxygen doc
+dev-libs/libcbor doc
+media-libs/libcaca doc
 
 # James Le Cuirot <chewi@gentoo.org> (2021-08-21)
 # Avoid lots of unkeyworded dependencies of Python tests.
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index f3fc5130ffa9..d06346dd9a9b 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -m68k
 
+# James Le Cuirot <chewi@gentoo.org> (2021-10-02)
+# Keywording aside, m68k CPUs are probably too slow for PulseAudio.
+pulseaudio
+
 # James Le Cuirot <chewi@gentoo.org> (2021-09-28)
 # Too many unkeyworded dependencies for now.
 efl
@@ -72,6 +76,7 @@ audit
 # Masking these globally, since we don't have X
 gnome
 gnome-keyring
+nas
 
 # Masking since net-dns/avahi and net-misc/mDNSResponder are masked
 zeroconf
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index 1544eb028159..caf4ed631a0a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)↲
@@ -42,9 +42,10 @@ sci-mathematics/geogebra-bin
 -x11-drivers/xf86-video-amdgpu
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-04)
-# AdoptOpenJDK's ppc64 build is little-endian only
+# Temurin ppc64 build is little-endian only
 # so we can use bins and build from source
 -dev-java/openjdk:11
+-dev-java/openjdk:17
 -dev-java/openjdk-bin
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-04-11)
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index eadb9e0c4156..fbfee3c8638a 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -41,7 +41,6 @@ dev-qt/qtdeclarative -vulkan
 dev-qt/qtgui -vulkan
 dev-qt/qtwayland -vulkan
 media-libs/mesa -vulkan -vulkan-overlay
-media-libs/libsdl2 -vulkan
 media-video/mpv -vulkan
 media-video/vlc -libplacebo
 
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.mask b/profiles/arch/powerpc/ppc64/64ul/package.mask
index 053f87a07a01..50a78625fb11 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-25)
@@ -6,7 +6,8 @@
 net-im/telegram-desktop
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-01)
-# AdoptOpenJDK's ppc64 build is little-endian only so it's impossible
-# to build openjdk:11, but it's possible to build openjdk:8 with icedtea{,-bin}
+# Temurin ppc64 build is little-endian only so it's impossible
+# to build openjdk:11 and later, but it's possible to build openjdk:8 with icedtea{,-bin}
 dev-java/openjdk:11
+dev-java/openjdk:17
 dev-java/openjdk-bin
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 6c9eaa3ba660..f8dbe499da81 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -29,10 +29,6 @@ media-sound/pulseeffects rnnoise webrtc zamaudio
 # bug #801649
 dev-util/diffoscope -haskell
 
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
-# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
-games-fps/yamagi-quake2 vulkan
-
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # Feature currently relies on amd64 prebuilt binaries.
 media-video/obs-studio browser
@@ -75,13 +71,6 @@ net-misc/asterisk -blocks
 # Depends on media-plugins/gst-plugins-cairo, which isn't keyworded on x86.
 app-misc/pdfpc gstreamer
 
-# Sam James <sam@gentoo.org> (2021-01-14)
-# Needs libsdl2[vulkan]
-# Vulkan may be supported on x86, as per
-# Qt unmasking below, but not able to test
-# libsdl2 + Vulkan on x86 at the moment.
-games-strategy/warzone2100 vulkan
-
 # Michał Górny <mgorny@gentoo.org> (2020-12-21)
 # Sanitizers supported on this architecture.
 sys-libs/compiler-rt-sanitizers -asan -lsan
@@ -129,8 +118,9 @@ app-text/texlive-core -xindy
 sci-physics/lammps kokkos
 
 # Joonas Niilola <juippis@gentoo.org> (2020-05-14)
-# Dependency not keyworded on this arch.
+# sys-apps/apparmor not keyworded on x86.
 app-emulation/lxc apparmor
+app-emulation/lxd apparmor
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # sys-cluster/slurm is keyworded on x86
@@ -390,7 +380,6 @@ media-video/transcode -nuv -pic
 # so the flag is masked in the base profile and unmasked here.
 dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
 
 # Samuli Suominen <ssuominen@gentoo.org> (2011-11-25)
 # Expose USE="suid" for USE="svga" only for x86 users,
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ec229ccf0326..646cbed4a0ae 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,15 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-10-07)
+# parallel-compiler feature is not tested by upstream
+# and is not recommended for general usage and may silently
+# miscompile code if used (unlikely, but not impossible)
+# feel free to unmask, but be prepared to deal with possible bugs
+# https://bugs.gentoo.org/813954
+# https://github.com/rust-lang/rust/issues/89108
+dev-lang/rust parallel-compiler
+
 # Stephan Hartmann <sultan@gentoo.org> (2021-09-16)
 # Uses a function that is not available in media-video/ffmpeg.
 >=www-client/chromium-94 system-ffmpeg
@@ -16,12 +25,6 @@
 # see also: https://github.com/rspamd/rspamd/issues/3871
 ~mail-filter/rspamd-3.0 jemalloc
 
-# James Le Cuirot <chewi@gentoo.org> (2021-09-04)
-# Currently requires an unreleased version of FFmpeg. If you really want it,
-# unmask the flag and emerge ffmpeg-9999 with this environment variable set:
-# EGIT_OVERRIDE_COMMIT_FFMPEG=8649f5dca6688feb66f787dcf232d42ed20fdb28
->=www-client/vivaldi-snapshot-4.2.2406.4 proprietary-codecs
-
 # Matt Turner <mattst88@gentoo.org> (2021-08-28)
 # Mask experimental options.
 gui-libs/gtk ffmpeg vulkan
@@ -35,16 +38,6 @@ gui-libs/gtk ffmpeg vulkan
 # The ORBlite scanner plugin only works on amd64 and x86.
 net-print/hplip-plugin orblite
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# Two years after the tracker was opened it is time to mask dev-qt/qtwebkit
-# for good. No commits to upstream repository for >9 months, latest available
-# tarball still "alpha" with warning about known unpatched vulnerabilities.
-# Bugs: #684580, #750893
-app-office/kexi webkit
-dev-libs/kreport webkit
-media-plugins/mythplugins mythbrowser mythmusic
-net-irc/kvirc webkit
-
 # Sam James <sam@gentoo.org> (2021-07-24)
 # USE=exec-static-trampoline can break consumers due to
 # faulty assumptions. Masked for now due to the possibility
@@ -194,10 +187,6 @@ dev-libs/efl efl-one
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
-media-plugins/mythplugins mythnetvision
-
-# Michał Górny <mgorny@gentoo.org> (2020-09-09)
-# The respective dependencies are masked for removal.
 app-metrics/collectd collectd_plugins_onewire
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
@@ -452,10 +441,14 @@ dev-db/mysql client-libs
 media-video/ffmpeg appkit
 
 # James Le Cuirot <chewi@gentoo.org> (2017-12-17)
+# Georgy Yakovlev <gyakovlev@gentoo.org (2021-10-08)
 # Java 9+ is not yet fully supported on Gentoo. Having a masked
 # gentoo-vm flag allows us to provide it without it breaking Gentoo
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
+dev-java/openjdk-jre-bin:17 gentoo-vm
+dev-java/openjdk-bin:17 gentoo-vm
+dev-java/openjdk:17 gentoo-vm
 dev-java/openjdk-jre-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index b8250321b864..80c9e923ffde 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -77,7 +77,7 @@ mate-base/mate bluetooth
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-12-21)
 # For bleeding edge features and testing, not generally suitable
 # for stable systems
-dev-lang/rust miri nightly parallel-compiler system-bootstrap
+dev-lang/rust miri nightly system-bootstrap
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-09)
 # Declared experimental, and dev-cpp/websocketpp not stable yet
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 577d8fa2a780..218e736762fc 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,13 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Brian Evans <grknight@gentoo.org> (2020-12-08)
-# Allow packages to add php 8.0 support while waiting on its stable
-php_targets_php8-0
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs
diff --git a/profiles/license_groups b/profiles/license_groups
index fcebd32957d3..4a5b1d039692 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 PAPERS-PLEASE Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion JoyPixels LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 PAPERS-PLEASE PassMark-EULA Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Deprecated license labels, used by repoman
 #DEPRECATED (currently none)
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 08605a3da7ff..f57b032ea72e 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -26,10 +26,6 @@ dev-perl/Mail-Sender
 dev-perl/Gtk2-SourceView2
 dev-perl/Gtk2-Unique
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-20)
-# dev-qt/qtwebkit is in the process of being removed, tracker bug #684580
-dev-qt/qtwebkit
-
 # Mart Raudsepp <leio@gentoo.org> (2020-07-04)
 # Port to gtk+:3 using wxGTK:3.0-gtk3 SLOT
 x11-libs/wxGTK:3.0
diff --git a/profiles/package.mask b/profiles/package.mask
index 4b1aea196f76..c73ae18e286f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Fabian Groffen <grobian@gentoo.org> (2021-10-03)
+# Masked for erratic behaviour
+# https://bugs.exim.org/show_bug.cgi?id=2813
+=mail-mta/exim-4.95
+
+# Hans de Graaff <graaff@gentoo.org> (2021-10-03)
+# Old obsolete slots. Use a newer slot instead.
+# Masked for removal in 30 days.
+dev-ruby/hashie:0
+dev-ruby/thor:0
+
+# Joonas Niilola <juippis@gentoo.org> (2021-10-02)
+# A library without revdeps. Last upstream release in 2009, huge amount
+# of open bugs not fixed has led the project being forked already.
+# Bug #776895. Removal in ~30 days.
+dev-libs/rapidxml
+
 # 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/
@@ -279,27 +296,6 @@ dev-python/oauth2
 # Masked until dev-libs/openssl-3.0* is unmasked
 =dev-libs/gost-engine-3.0*
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-07)
-# EAPI-5, dead upstream, last (and only) version added in 2011
-# Bug 644344; Removal on 2021-10-07.
-net-libs/gsnmp
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-07)
-# EAPI-5, dead upstream, last bump in 2012
-# Bug 644344; Removal on 2021-10-07.
-net-analyzer/scli
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-09-04)
-# EAPI-5, dead, unused, bug 808213; Removal on 2021-10-04.
-x11-libs/mx
-
-# David Seifert <soap@gentoo.org> (2021-09-04)
-# Last upstream release over 2.5 years ago, removed by Fedora,
-# unresponsive maintainer in Gentoo, broken with linux-headers-5.13,
-# relies on glibc implementation details.
-# Bug #717114, #801457, removal in 30 days.
-dev-util/trinity
-
 # Ionen Wolkens <ionen@gentoo.org> (2021-09-03)
 # Currently may not function with kde-plasma/kwin (black screen),
 # so keeping masked for testing due to being a primary consumer.
@@ -320,22 +316,6 @@ games-puzzle/gnudoku
 # Preparing for final 5.0.0 release
 >=app-text/tesseract-5.0.0_beta
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #685750
-# Last release in 2016. Removal on 2021-10-04.
-mail-client/trojita
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #740416
-# Removal on 2021-10-04.
-app-text/fb2edit
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-08-02)
-# No commits to upstream repository for >9 months, latest available tarball
-# still "alpha" with warning about known unpatched vulnerabilities. Bug #684580
-# Removal on 2021-10-04.
-dev-qt/qtwebkit:5
-
 # Joonas Niilola <juippis@gentoo.org> (2021-07-29)
 # Upstream provided migration instructions from 2. -> 3. update,
 # breaks if not all at least many revdeps. #805011 for tracker bug.
@@ -356,6 +336,7 @@ dev-qt/qtwebkit:5
 
 # Lars Wendler <polynomial-c@gentoo.org> (2021-07-10)
 # Masked for testing
+# bug #802186
 >=mail-client/claws-mail-4.0.0
 
 # Michał Górny <mgorny@gentoo.org> (2021-07-06)
@@ -364,20 +345,6 @@ dev-qt/qtwebkit:5
 # is resolved.  Bug #791259.
 >=media-libs/libopenaptx-0.2.1
 
-# David Seifert <soap@gentoo.org> (2021-07-01)
-# Berkeley DB slots that are long past EOL by Oracle,
-# maintenance burden, and no real path forward by Oracle.
-# Bug #792222, removal in 90 days.
-sys-libs/db:1
-sys-libs/db:3
-sys-libs/db:4.2
-sys-libs/db:4.3
-sys-libs/db:4.4
-sys-libs/db:4.5
-sys-libs/db:4.6
-sys-libs/db:4.7
-sys-libs/db:5.1
-
 # Conrad Kostecki <conikost@gentoo.org> (2021-06-20)
 # New Minecraft server release needs at least Java 16,
 # which is currently not available in Gentoo.
@@ -385,10 +352,10 @@ sys-libs/db:5.1
 
 # Sam James <sam@gentoo.org> (2021-06-12)
 # Masked until all reverse dependencies support
-# OCaml 4.12.
-# bug #795138
->=dev-lang/ocaml-4.12
-=dev-ml/camlp4-4.12
+# OCaml 4.13.
+# bug #816498
+>=dev-lang/ocaml-4.13
+>=dev-ml/camlp4-4.13
 
 # Bernard Cafarelli <voyageur@gentoo.org> (2021-06-04)
 # Alpha versions of fetchmail 7
@@ -418,16 +385,6 @@ sys-libs/db:5.1
 # to a fresher gcc branch.
 <sys-devel/gcc-7
 
-# Sam James <sam@gentoo.org> (2021-05-07)
-# Masked for testing. Two major releases ahead of last packaged version.
-# Please report bugs but this is experimental for now.
-# bug #731266
->=net-mail/cyrus-imapd-3.4.0
-
-# David Seifert <soap@gentoo.org> (2021-05-05)
-# Causes unsolvable package conflicts, bug #788310
->=media-libs/openexr-3
-
 # Eray Aslan <eras@gentoo.org> (2021-04-29)
 # Mask experimental software
 =mail-mta/postfix-3.7*
@@ -443,6 +400,7 @@ sys-libs/db:5.1
 
 # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
 # Masked for testing
+# bug #790248
 >=app-crypt/gnupg-2.3.0
 
 # Sam James <sam@gentoo.org> (2021-03-30)
@@ -543,6 +501,7 @@ app-office/texmacs
 # Java 11 is not yet fully supported on Gentoo. Packages cannot depend
 # on it so these virtuals are not yet required. If you wish to use
 # Java 11 then install openjdk-(jdk|jre)-bin directly.
+# bug #697014
 virtual/jdk:11
 virtual/jre:11
 
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index a2fa672a2bcf..dcdced93f384 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -22,10 +22,6 @@ net-fs/samba client
 # Required by app-office/libreoffice
 dev-libs/xmlsec nss
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-06-09)
-# Enable sensible defaults for desktop users
-dev-qt/qtwebkit:5 printsupport
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-11-30)
 # Not required, but makes life easier with Qt; bug #457934
 app-arch/unzip natspec
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index d2a2b7433f62..f66652c74312 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -7,7 +7,7 @@ gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ https://artfiles
 gmt		http://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
 gnu		https://ftp.gnu.org/gnu/ https://artfiles.org/gnu.org/ https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/
-gnupg		https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
+gnupg		https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ https://mirrors.dotsrc.org/gcrypt/ https://gnupg.org/ftp/gcrypt/ ftp://ftp.gnupg.org/gcrypt/
 goproxy https://proxy.golang.org/ https://goproxy.io/
 idsoftware	ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
 imagemagick	https://www.imagemagick.org/download/releases/ https://mirror.checkdomain.de/imagemagick/releases/ https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ ftp://ftp.fifi.org/pub/ImageMagick/releases/
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
new file mode 100644
index 000000000000..8ae9097b3308
--- /dev/null
+++ b/profiles/updates/4Q-2021
@@ -0,0 +1,2 @@
+move dev-libs/intel-neo dev-libs/intel-compute-runtime
+move dev-python/hyper-h2 dev-python/h2
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5c72d44ca77d..22253bcb816e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -498,10 +498,10 @@ app-emulation/hyperd:libvirt - Enable support for KVM via libvirt
 app-emulation/hyperd:xen - Enable support for the Xen Hypervisor
 app-emulation/libcacard:passthrough - Enable smartcard passthrough support via sys-apps/pcsc-lite
 app-emulation/libguestfs:erlang - Build Erlang bindings
-app-emulation/libguestfs:fuse - Enable image mount support via fuse
-app-emulation/libguestfs:inspect-icons - Use media-gfx/icoutils for acces icon file in image and inspect it
+app-emulation/libguestfs:fuse - Enable image mount support via sys-fs/fuse
+app-emulation/libguestfs:inspect-icons - Use media-gfx/icoutils for accessing/inspecting icon file within images
 app-emulation/libguestfs:libvirt - Use app-emulation/libvirt to manipulate VMs
-app-emulation/libguestfs:systemtap - Use dev-util/systemtap to inspect VM via "probes" way
+app-emulation/libguestfs:systemtap - Use dev-util/systemtap to inspect VM via "probes"
 app-emulation/libspectrum:gcrypt - Use dev-libs/libgcrypt for low-level crypto of some features, including logfiles.
 app-emulation/libvirt:apparmor - Enable AppArmor support
 app-emulation/libvirt:dtrace - Enable dtrace support via dev-util/systemtap
@@ -572,7 +572,7 @@ app-emulation/qemu:pin-upstream-blobs - Pin the versions of BIOS firmware to the
 app-emulation/qemu:plugins - Enable qemu plugin API via shared library loading.
 app-emulation/qemu:png - Enable png image support for the VNC console server
 app-emulation/qemu:pulseaudio - Enable pulseaudio output for sound emulation
-app-emulation/qemu:rbd - Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD
+app-emulation/qemu:rbd - Enable rados block device backend support, see https://docs.ceph.com/en/mimic/rbd/qemu-rbd/
 app-emulation/qemu:sdl - Enable the SDL-based console
 app-emulation/qemu:sdl-image - SDL Image support for icons
 app-emulation/qemu:slirp - Enable TCP/IP in hypervisor via net-libs/libslirp
@@ -584,10 +584,10 @@ app-emulation/qemu:systemtap - Enable SystemTAP/DTrace tracing
 app-emulation/qemu:usb - Enable USB passthrough via dev-libs/libusb
 app-emulation/qemu:usbredir - Use sys-apps/usbredir to redirect USB devices to another machine over TCP
 app-emulation/qemu:vde - Enable VDE-based networking
-app-emulation/qemu:vhost-net - Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet
+app-emulation/qemu:vhost-net - Enable accelerated networking using vhost-net, see https://www.linux-kvm.org/page/VhostNet
 app-emulation/qemu:vhost-user-fs - Enable shared file system access using the FUSE protocol carried over virtio.
 app-emulation/qemu:virgl - Enable experimental Virgil 3d (virtual software GPU)
-app-emulation/qemu:virtfs - Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup
+app-emulation/qemu:virtfs - Enable VirtFS via virtio-9p-pci / fsdev. See https://wiki.qemu.org/Documentation/9psetup
 app-emulation/qemu:vte - Enable terminal support (x11-libs/vte) in the GTK+ interface
 app-emulation/qemu:xattr - Add support for getting and setting POSIX extended attributes, through sys-apps/attr. Requisite for the virtfs backend.
 app-emulation/qemu:xen - Enables support for Xen backends
@@ -805,7 +805,6 @@ app-misc/graphlcd-base:freetype - Add support for media-libs/freetype.
 app-misc/graphlcd-base:graphicsmagick - Add support for media-gfx/graphicsmagick.
 app-misc/graphlcd-base:imagemagick - Add support for media-gfx/imagemagick.
 app-misc/irtrans-irserver:mono - Enable mono support
-app-misc/jp:jp - Install jp which is the official jp CLI for JMESPath
 app-misc/jp:jpp - Install jpp which is an extended superset of the jp CLI for JMESPath
 app-misc/jpipe:jp-symlink - Install a jp symlink that points to jpipe.
 app-misc/jpipe:jpp-symlink - Install a jpp symlink that points to jpipe.
@@ -868,7 +867,6 @@ app-misc/lirc:uinput - Enable support for uinput
 app-misc/mc:edit - Compile and install the mcedit application
 app-misc/mc:sftp - Add support for sftp (uses net-libs/libssh2 for it).
 app-misc/mc:slang - Use sys-libs/slang instead of sys-libs/ncurses.
-app-misc/mc:xdg - Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc
 app-misc/mosquitto:bridge - Enable bridge support in the MQTT broker.
 app-misc/mosquitto:persistence - Store messages and subscriptions to a file.
 app-misc/mosquitto:srv - Include SRV lookup support.
@@ -960,7 +958,6 @@ app-office/grisbi:goffice - enable goffice graphic support
 app-office/kexi:experimental - Enable features deemed experimental by upstream
 app-office/kexi:marble - Enable displaying of maps using kde-apps/marble
 app-office/kexi:mdb - Enable support for Microsoft Access database
-app-office/kexi:webkit - Enable web form designer widget using dev-qt/qtwebkit
 app-office/kmymoney:activities - Enable kde-frameworks/kactivities integration
 app-office/kmymoney:addressbook - Enable kde-apps/akonadi contact integration
 app-office/kmymoney:hbci - Enable HBCI support using net-libs/aqbanking
@@ -1736,7 +1733,6 @@ dev-lang/gnat-gpl:sanitize - Build support for various sanitizer functions (ASAN
 dev-lang/gnat-gpl:ssp - Build packages with stack smashing protector on by default
 dev-lang/gnat-gpl:systemtap - enable systemtap static probe points
 dev-lang/gnat-gpl:vtv - Build support for virtual table verification (a C++ hardening feature)
-dev-lang/icon:iplsrc - install the icon programming library source
 dev-lang/janet:static-libs - install janet static library archive, you must enable this flag for using `jpm build`
 dev-lang/jerryscript:debugger - Install jerry-debugger
 dev-lang/jsonnet:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -1818,7 +1814,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 (experimental, unsupported)
+dev-lang/rust:parallel-compiler - Build a multi-threaded rustc (experimental, not tested by upstream)
 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
@@ -2011,8 +2007,8 @@ dev-libs/hidapi:fox - Build a x11-libs/fox GUI
 dev-libs/imath:large-stack - Enables code to take advantage of large stack support
 dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
 dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
-dev-libs/intel-neo:l0 - Install the oneAPI Level Zero driver alongside the OpenCL one
-dev-libs/intel-neo:vaapi - Support the sharing of surfaces with Video Acceleration API (OpenCL Extension #36)
+dev-libs/intel-compute-runtime:l0 - Install the oneAPI Level Zero driver alongside the OpenCL one
+dev-libs/intel-compute-runtime:vaapi - Support the sharing of surfaces with Video Acceleration API (OpenCL Extension #36)
 dev-libs/jemalloc:lazy-lock - Enable lazy locking (only lock when multi-threaded)
 dev-libs/jemalloc:prof - Enable allocation profiling
 dev-libs/jemalloc:stats - Enable statistics calculation/reporting
@@ -2412,6 +2408,7 @@ dev-python/cvxopt:dsdp - Use interior point library sci-libs/dsdp
 dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
+dev-python/elasticsearch-py:async - Add async support
 dev-python/falcon:cython - Build cython-based python modules
 dev-python/gevent:events - Enables the gevent events system which is required by libraries that use gevent monkey patching. This adds dev-python/zope-event and dev-python/zope-interface as runtime dependencies.
 dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
@@ -2649,13 +2646,6 @@ dev-qt/qtwebengine:jumbo-build - Combine source files to speed up build process.
 dev-qt/qtwebengine:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled.
 dev-qt/qtwebengine:system-icu - Use the system-wide dev-libs/icu instead of bundled.
 dev-qt/qtwebengine:widgets - Enable QtWidgets support
-dev-qt/qtwebkit:geolocation - Enable physical position determination via dev-qt/qtpositioning
-dev-qt/qtwebkit:gstreamer - Enable HTML5 audio/video support via media-libs/gstreamer using SLOT 1.0
-dev-qt/qtwebkit:hyphen - Enable hyphenation support via dev-libs/hyphen
-dev-qt/qtwebkit:multimedia - Enable HTML5 audio/video support via dev-qt/qtmultimedia
-dev-qt/qtwebkit:orientation - Enable device orientation detection via dev-qt/qtsensors
-dev-qt/qtwebkit:printsupport - Enable printing via dev-qt/qtprintsupport
-dev-qt/qtwebkit:qml - Build QML/QtQuick bindings
 dev-qt/qtwebsockets:qml - Build QML bindings
 dev-qt/qtwidgets:gtk - Build the GTK platform theme plugin
 dev-qt/qtxmlpatterns:qml - Build the XmlListModel import for QtQuick (requires QtDeclarative)
@@ -3720,8 +3710,6 @@ mail-client/thunderbird:system-jpeg - Use the system-wide media-libs/libjpeg-tur
 mail-client/thunderbird:system-libevent - Use the system-wide dev-libs/libevent instead of bundled.
 mail-client/thunderbird:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled.
 mail-client/thunderbird:system-webp - Use the system-wide media-libs/libwebp instead of bundled.
-mail-client/trojita:password - Store passwords securely via dev-libs/qtkeychain
-mail-client/trojita:pim - Enable support for KDE PIM resources integration via kde-apps/akonadi addressbook plugin
 mail-filter/MailScanner:exim - Set mail-mta/exim to used MTA
 mail-filter/MailScanner:postfix - Set mail-mta/postfix to used MTA
 mail-filter/MailScanner:spamassassin - Enable usage of mail-filter/spamassassin for spam protection
@@ -4422,11 +4410,8 @@ media-plugins/mythplugins:exif - Allows MythGallery to read EXIF data from photo
 media-plugins/mythplugins:fftw - Adds visual effects to MythMusic when playing back music
 media-plugins/mythplugins:hls - HTTP Live Streaming support
 media-plugins/mythplugins:mytharchive - Allows you to archive recorded content to CD or DVD
-media-plugins/mythplugins:mythbrowser - Adds a web browser within MythTV
 media-plugins/mythplugins:mythgame - Adds a frontend to various ROM emulators within MythTV
-media-plugins/mythplugins:mythmusic - Adds the ability for MythTV to act as a music player
 media-plugins/mythplugins:mythnetvision - Adds the ability to view netvision devices within MythTV
-media-plugins/mythplugins:mythnews - Adds a news viewer within MythTV
 media-plugins/mythplugins:mythweather - Adds weather information within MythTV
 media-plugins/mythplugins:mythzmserver - Build mythzmserver daemon needed by zoneminder on LAN
 media-plugins/mythplugins:mythzoneminder - Adds support for zoneminder (requires active mythzmserver daemon on LAN).
@@ -4983,6 +4968,10 @@ media-video/ffmpeg:x265 - Enables HEVC encoding with media-libs/x265.
 media-video/ffmpeg:zeromq - Enables net-libs/zeromq support with the zmq/azmq filters.
 media-video/ffmpeg:zimg - Enables media-libs/zimg based scale filter.
 media-video/ffmpeg:zvbi - Enables media-libs/zvbi based teletext decoder.
+media-video/ffmpeg-chromium:cpudetection - Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)
+media-video/ffmpeg-chromium:gpl - Build GPL code. Should be enabled unless you require LGPL binaries.
+media-video/ffmpeg-chromium:mmal - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.
+media-video/ffmpeg-chromium:vulkan - Enables support for the vulkan API for GPU offload.
 media-video/ffmpeg2theora:kate - Adds support for Ogg Kate subtitles via libkate.
 media-video/google2srt:html - Install HTML documentation
 media-video/guvcview:qt5 - Build with Qt5 interface instead Gtk+
@@ -5077,7 +5066,6 @@ media-video/nvidia_video_sdk:tools - Build and install example tools.
 media-video/obs-studio:browser - Enable browser source support via (precompiled) CEF.
 media-video/obs-studio:decklink - Build the Decklink plugin.
 media-video/obs-studio:fdk - Build with LibFDK AAC support.
-media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead of FFmpeg.
 media-video/obs-studio:nvenc - Build with NVENC encoding support for nVidia video cards.
 media-video/obs-studio:pipewire - Build with PipeWire support.
 media-video/obs-studio:python - Build with scripting support for Python 3.
@@ -5969,6 +5957,7 @@ net-irc/weechat:logger - Enable support for logging
 net-irc/weechat:relay - Enable relay plugin (experimental)
 net-irc/weechat:scripts - Build infrastructure for scripting
 net-irc/weechat:trigger - Enable trigger plugin
+net-irc/weechat:typing - Enable typing plugin
 net-irc/weechat:xfer - Enable xfer plugin support
 net-irc/znc:zlib - Enable mod_deflate-like gzip support for znc's web interface using sys-libs/zlib.
 net-libs/aqbanking:ebics - Enable support for Electronic Banking Internet Communication Standard (EBICS)
@@ -7285,6 +7274,7 @@ sci-libs/gmsh:petsc - Enable sci-mathematics/petsc support
 sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
 sci-libs/gsl:deprecated - Enable deprecated functions
 sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)
+sci-libs/hdf5:ros3 - Enable support for read-only S3 access (https://portal.hdfgroup.org/display/HDF5/Configuration+and+Setup+for+HDF5+Read+Only+S3+VFD)
 sci-libs/hdf5:unsupported - Enable unsupported combinations of configuration options
 sci-libs/hypre:int64 - Build the 64 bits integer library
 sci-libs/indilib:rtlsdr - Enable support for devices supported by net-wireless/rtl-sdr