16 files changed, 285 insertions, 477 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9219595152fc..080f4e4344cd 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index 9b4403d62ea2..461959670b63 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -78,6 +78,8 @@ media-gfx/luminance-hdr
 media-sound/frescobaldi
 media-sound/teamspeak-client:3
 >=media-video/openshot-2.5.1_p20210103
+media-video/vidify
+media-video/vidify-audiosync
 net-analyzer/nmapsi
 net-libs/signon-ui
 net-misc/nextcloud-client
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 6232cc0b5c6d..fd254115d79a 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2021-05-27)
+# Not keyworded by the arch team, but has conditions in the ebuild 
+# that needs to be pre-written.
+app-editors/vscode
+
 # Joonas Niilola <juippis@gentoo.org> (2020-09-26)
 # Depends on media-video/rav1e that's listed below. #744637
 media-libs/libavif
diff --git a/profiles/arch/arm64/package.mask b/profiles/arch/arm64/package.mask
index 6e760b5ea696..acd227116476 100644
--- a/profiles/arch/arm64/package.mask
+++ b/profiles/arch/arm64/package.mask
@@ -1,2 +1,7 @@
-# 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> (2021-05-27)
+# Package not properly tested by the arch team, but ebuild needs to
+# have conditions pre-written based on arch.
+app-editors/vscode
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 8a1bfb3f418c..c2929544f7c0 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -104,11 +104,6 @@ sys-block/tgt rbd
 # dev-lua/busted is not keyworded yet
 dev-lua/mpack test
 
-# Sam James <sam@gentoo.org> (2020-07-09)
-# mariadb[rocksdb] fails to build on arm64
-# bug #731998
-dev-db/mariadb rocksdb
-
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is available here
 # bug #728558
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 5a0689be85a7..3da146e52375 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2021-05-28)
+# media-gfx/inkscape is not yet stable on arm64
+# bug #785685
+app-text/dblatex inkscape
+
 # Sam James <sam@gentoo.org> (2021-02-25)
 # Roy Bamford <neddyseagoon@gentoo.org> (2021-02-25)
 # Dependencies not yet stable, migrated from p.u.m.
@@ -120,10 +125,6 @@ sys-auth/pambase pam_krb5 pam_ssh
 sys-block/thin-provisioning-tools test
 sys-devel/distcc gssapi
 
-# Michał Górny <mgorny@gentoo.org> (2018-03-03)
-# Requires masked dependent flags.
-net-dns/avahi python
-
 # Michał Górny <mgorny@gentoo.org> (2018-02-28)
 # Requires masked dependent flags.
 net-fs/samba ads
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 31189e614c5d..ab8ad504b577 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -51,6 +51,7 @@ app-editors/emacs xwidgets
 dev-python/matplotlib qt5 test
 media-sound/pulseaudio qt5
 net-print/hplip qt5
+dev-python/pyudev qt5
 
 # David Seifert <soap@gentoo.org> (2017-09-23)
 # MPI does not have stable keywords on ppc/ppc64
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 14b7e271a6e3..6b1bc0da1976 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,36 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-05-31)
+# dev-python/networkx not keyworded here
+app-portage/nattka depgraph-order
+
+# Marek Szuba <marecki@gentoo.org> (2021-05-28)
+# net-dns/avahi, net-libs/libgssglue and sys-apps/xinetd
+# not keyworded here
+sys-devel/distcc gssapi xinetd zeroconf
+
+# Yixun Lan <dlan@gentoo.org> (2021-05-24)
+# Dependencies not keyworded, not tested
+dev-libs/libdbusmenu test
+virtual/notification-daemon gnome kde
+media-libs/libsdl nas pulseaudio
+media-libs/libcaca doc imlib
+x11-libs/tslib sdl
+dev-libs/libbytesize test
+sys-libs/libblockdev dmraid escrow
+app-text/docbook-xsl-ns-stylesheets ruby
+app-misc/geoclue modemmanager zeroconf
+gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios samba test zeroconf
+sys-power/upower ios
+xfce-base/xfce4-settings colord libcanberra
+# KDE not tested, so mask
+sys-auth/polkit kde
+
+# Yixun Lan <dlan@gentoo.org> (2021-05-21)
+# sys-libs/libunwind do not support riscv
+media-libs/gstreamer unwind
+
 # Yixun Lan <dlan@gentoo.org> (2021-05-19)
 # Dependencies not keyworded, not tested
 dev-libs/gobject-introspection doctool test
@@ -8,8 +38,6 @@ dev-python/markdown test
 x11-libs/gtk+ cups test colord
 net-libs/libsoup samba gssapi test
 net-libs/libproxy mono spidermonkey webkit kde networkmanager
-# Request sys-auth/polkit, dev-lang/spidermonkey
-sys-auth/elogind policykit
 
 # Sam James <sam@gentoo.org> (2021-03-11)
 # media-libs/libheif isn't keyworded here
@@ -150,7 +178,6 @@ net-nds/openldap cxx kerberos sasl
 sys-apps/kmod doc
 sys-apps/portage apidoc
 sys-apps/rng-tools nistbeacon pkcs11
-sys-apps/systemd policykit
 sys-auth/pambase gnome-keyring pam_krb5 pam_ssh  mktemp
 sys-block/thin-provisioning-tools test
 sys-devel/automake test
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 147753a565ce..f33dedb8b8d2 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -5,6 +5,8 @@
 # Depends on either unkeyworded dev-java/openjdk:11
 # or unavailable >=dev-java/icedtea-4, bug #785640
 >=app-office/libreoffice-7 base java
+>=app-office/libreoffice-bin-7 java
+>=app-office/libreoffice-bin-debug-7 java
 
 # Mike Gilbert <floppym@gentoo.org> (2021-03-29)
 # Unmask TPM on supported archs.
@@ -51,10 +53,6 @@ sys-libs/compiler-rt-sanitizers -profile
 # (See 9.3.8 in the Guile manual)
 dev-scheme/guile -jit
 
-# Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
-# Columnstore engine is supported on x86
-dev-db/mariadb -columnstore
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-07-27)
 # media-video/pipewire:0/0.3 is available for x86
 www-client/firefox -screencast
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 03e3fe6d8861..5aead25bf943 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -133,10 +133,6 @@ net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
 # caution!
 dev-libs/efl efl-one
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-20)
-# The respective dependencies are masked for removal.
-net-nntp/pan gnome-keyring
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision
@@ -154,7 +150,7 @@ app-metrics/collectd collectd_plugins_onewire
 sci-geosciences/qgis grass
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-08-17)
-# CMake checks will only allow on amd64 & x86
+# Only supported on 64bit systems, see storage/columnstore/CMakeLists.txt
 dev-db/mariadb columnstore
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-27)
@@ -511,8 +507,10 @@ dev-java/icedtea cacao jamvm
 
 # Justin Lecher <jlec@gentoo.org> (2015-09-22)
 # Downloads files during installation
-# bug #533876
->=sci-libs/vtk-6.1.0 examples
+# https://bugs.gentoo.org/show_bug.cgi?id=533876
+# Bernd Waibel <waebbl-gentoo@posteo.net> (2021-03-26)
+# Fixed in vtk-9
+<sci-libs/vtk-9 examples
 
 # James Le Cuirot <chewi@gentoo.org> (2015-08-18)
 # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
@@ -552,11 +550,6 @@ sys-devel/gcc sanitize
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr
 
-# Tom Wijsman <TomWij@gentoo.org> (2014-05-14)
-# Documentation generation needs APIviz which is not in the Portage tree yet.
-# Tracked in Gentoo bug #509602.
-dev-java/jboss-logging doc
-
 # Mike Frysinger <vapier@gentoo.org> (2014-02-03)
 # Upstream says to not use this for now.
 dev-libs/elfutils threads
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 93a8c20dae7a..4cf756030c95 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
+# dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
+# up pulling in a Test-Simple version newer than 5.32.
+# Not something we want to add to all stable users' Perl.
+# Stable-masking the test useflag until Perl 5.34 goes stable too.
+# Bug 779163
+dev-perl/Net-Netmask test
+
 # Mart Raudsepp <leio@gentoo.org> (2021-02-21)
 # Enabling sysprof causes consumers to include sysprof-capture-4
 # headers, but we still have stable consumers that themselves want
diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
index e633b1a19318..ff5c14576286 100644
--- a/profiles/desc/ada_target.desc
+++ b/profiles/desc/ada_target.desc
@@ -6,3 +6,4 @@ gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 gnat_2018 - Compile with dev-lang/gnat-gpl-2018
 gnat_2019 - Compile with dev-lang/gnat-gpl-2019
 gnat_2020 - Compile with dev-lang/gnat-gpl-2020
+gnat_2021 - Compile with dev-lang/gnat-gpl-2021
diff --git a/profiles/license_groups b/profiles/license_groups
index 16f9e0632a1b..df001e5c9d9e 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -21,7 +21,7 @@ FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4
 # Licenses approved by the Open Source Initiative
 # https://www.opensource.org/licenses
 # Note that the FSF lists these as nonfree: Artistic NOSA Watcom-1.0
-OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL
+OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artistic-2 Boost-1.0 BSD BSD-2 CDDL CNRI CPAL-1.0 CPL-1.0 ECL-2.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ HPND IBM IPAfont ISC LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ LPPL-1.3c MIT MPL-1.0 MPL-1.1 MPL-2.0 Ms-PL nethack NOSA OFL-1.1 OSL-2.1 PHP-3 PHP-3.01 POSTGRESQL PSF-2 QPL-1.0 Sleepycat UoI-NCSA W3C Watcom-1.0 wxWinLL-3 ZLIB ZPL MirOS
 
 # Misc licenses that are probably free software, i.e. follow the
 # Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
@@ -30,7 +30,7 @@ OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Ar
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -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 Google-TOS Intel-SDP Introversion LOKI-EULA MakeMKV-EULA Microsemi Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE 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 Google-TOS Intel-SDP Introversion LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE 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
 
 # Deprecated license labels, used by repoman
 # Use Free-Art-1.2 or Free-Art-1.3 instead
diff --git a/profiles/package.mask b/profiles/package.mask
index 06f530345160..dfb0196e7a58 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,190 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-05-30)
+# GStreamer 1.18.x! Masked for testing.
+# This is a large suite of packages, so please
+# be patient and report bugs if you choose to
+# unmask.
+# bug #756298, bug #690468.
+~media-libs/gst-plugins-bad-1.18.4
+~media-libs/gst-plugins-base-1.18.4
+~media-libs/gst-plugins-good-1.18.4
+~media-libs/gst-plugins-ugly-1.18.4
+~media-libs/gstreamer-1.18.4
+~media-libs/gst-rtsp-server-1.18.4
+~media-plugins/gst-plugins-a52dec-1.18.4
+~media-plugins/gst-plugins-amr-1.18.4
+~media-plugins/gst-plugins-assrender-1.18.4
+~media-plugins/gst-plugins-bluez-1.18.4
+~media-plugins/gst-plugins-bs2b-1.18.4
+~media-plugins/gst-plugins-cairo-1.18.4
+~media-plugins/gst-plugins-cdio-1.18.4
+~media-plugins/gst-plugins-cdparanoia-1.18.4
+~media-plugins/gst-plugins-chromaprint-1.18.4
+~media-plugins/gst-plugins-colormanagement-1.18.4
+~media-plugins/gst-plugins-dash-1.18.4
+~media-plugins/gst-plugins-dtls-1.18.4
+~media-plugins/gst-plugins-dts-1.18.4
+~media-plugins/gst-plugins-dv-1.18.4
+~media-plugins/gst-plugins-dvb-1.18.4
+~media-plugins/gst-plugins-dvdread-1.18.4
+~media-plugins/gst-plugins-faac-1.18.4
+~media-plugins/gst-plugins-faad-1.18.4
+~media-plugins/gst-plugins-flac-1.18.4
+~media-plugins/gst-plugins-gdkpixbuf-1.18.4
+~media-plugins/gst-plugins-gtk-1.18.4
+~media-plugins/gst-plugins-hls-1.18.4
+~media-plugins/gst-plugins-jack-1.18.4
+~media-plugins/gst-plugins-jpeg-1.18.4
+~media-plugins/gst-plugins-kate-1.18.4
+~media-plugins/gst-plugins-ladspa-1.18.4
+~media-plugins/gst-plugins-lame-1.18.4
+~media-plugins/gst-plugins-libav-1.18.4
+~media-plugins/gst-plugins-libde265-1.18.4
+~media-plugins/gst-plugins-libmms-1.18.4
+~media-plugins/gst-plugins-libpng-1.18.4
+~media-plugins/gst-plugins-libvisual-1.18.4
+~media-plugins/gst-plugins-lv2-1.18.4
+~media-plugins/gst-plugins-meta-1.18.4
+~media-plugins/gst-plugins-modplug-1.18.4
+~media-plugins/gst-plugins-mpeg2dec-1.18.4
+~media-plugins/gst-plugins-mpeg2enc-1.18.4
+~media-plugins/gst-plugins-mpg123-1.18.4
+~media-plugins/gst-plugins-mplex-1.18.4
+~media-plugins/gst-plugins-neon-1.18.4
+~media-plugins/gst-plugins-ofa-1.18.4
+~media-plugins/gst-plugins-opencv-1.18.4
+~media-plugins/gst-plugins-openh264-1.18.4
+~media-plugins/gst-plugins-opus-1.18.4
+~media-plugins/gst-plugins-oss-1.18.4
+~media-plugins/gst-plugins-pulse-1.18.4
+~media-plugins/gst-plugins-raw1394-1.18.4
+~media-plugins/gst-plugins-resindvd-1.18.4
+~media-plugins/gst-plugins-rtmp-1.18.4
+~media-plugins/gst-plugins-shout2-1.18.4
+~media-plugins/gst-plugins-sidplay-1.18.4
+~media-plugins/gst-plugins-smoothstreaming-1.18.4
+~media-plugins/gst-plugins-soundtouch-1.18.4
+~media-plugins/gst-plugins-soup-1.18.4
+~media-plugins/gst-plugins-speex-1.18.4
+~media-plugins/gst-plugins-srt-1.18.4
+~media-plugins/gst-plugins-srtp-1.18.4
+~media-plugins/gst-plugins-taglib-1.18.4
+~media-plugins/gst-plugins-twolame-1.18.4
+~media-plugins/gst-plugins-uvch264-1.18.4
+~media-plugins/gst-plugins-v4l2-1.18.4
+~media-plugins/gst-plugins-vaapi-1.18.4
+~media-plugins/gst-plugins-voaacenc-1.18.4
+~media-plugins/gst-plugins-voamrwbenc-1.18.4
+~media-plugins/gst-plugins-vpx-1.18.4
+~media-plugins/gst-plugins-wavpack-1.18.4
+~media-plugins/gst-plugins-webrtc-1.18.4
+~media-plugins/gst-plugins-x264-1.18.4
+~media-plugins/gst-plugins-x265-1.18.4
+~media-plugins/gst-plugins-ximagesrc-1.18.4
+~media-plugins/gst-plugins-zbar-1.18.4
+
+# Alfredo Tupone <tupone@gentoo.org> (2021-05-29)
+# Old version masked for removal on 2021-07-01
+# bug #788013
+<net-mail/courier-imap-5
+
+# Matthew Thode <prometheanfire@gentoo.org> (2021-05-27)
+# remove some stuff to make redacted happy
+app-admin/glance
+dev-python/aodhclient
+dev-python/automaton
+dev-python/castellan
+dev-python/cursive
+dev-python/futurist
+dev-python/glance_store
+dev-python/keystonemiddleware
+dev-python/ldappool
+dev-python/microversion-parse
+dev-python/neutron-lib
+dev-python/os-brick
+dev-python/os-ken
+dev-python/oslo-cache
+dev-python/oslo-concurrency
+dev-python/oslo-db
+dev-python/oslo-messaging
+dev-python/oslo-middleware
+dev-python/oslo-policy
+dev-python/oslo-privsep
+dev-python/oslo-reports
+dev-python/oslo-rootwrap
+dev-python/oslo-service
+dev-python/oslo-upgradecheck
+dev-python/oslo-versionedobjects
+dev-python/oslo-vmware
+dev-python/osprofiler
+dev-python/os-resource-classes
+dev-python/os-traits
+dev-python/os-vif
+dev-python/os-win
+dev-python/os-xenapi
+dev-python/ovsdbapp
+dev-python/pycadf
+dev-python/pypowervm
+dev-python/pysaml2
+dev-python/python-barbicanclient
+dev-python/python-blazarclient
+dev-python/python-designateclient
+dev-python/python-heatclient
+dev-python/python-magnumclient
+dev-python/python-manilaclient
+dev-python/python-mistralclient
+dev-python/python-monascaclient
+dev-python/python-octaviaclient
+dev-python/python-saharaclient
+dev-python/python-senlinclient
+dev-python/python-troveclient
+dev-python/python-vitrageclient
+dev-python/python-zaqarclient
+dev-python/python-zunclient
+dev-python/ryu
+dev-python/taskflow
+dev-python/tinyrpc
+dev-python/tooz
+dev-python/WSME
+dev-python/XenAPI
+dev-python/yaql
+dev-python/zVMCloudConnector
+sys-auth/keystone
+sys-cluster/cinder
+sys-cluster/heat
+sys-cluster/neutron
+sys-cluster/nova
+sys-cluster/openstack-meta
+sys-cluster/placement
+sys-cluster/swift
+
+# Andrey Grozin <grozin@gentoo.org> (2021-05-25)
+# DEPENDs on sci-libs/proj-8
+# Unmask after unmasking proj-8
+>=sci-geosciences/qmapshack-1.16
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-05-25)
+# dev-java/jakarta-activation-api-2.0.1 depends on masked >=virtual/{jdk,jre}-11
+>=dev-java/jakarta-activation-api-2.0.1
+
+# Fabian Groffen <grobian@gentoo.org> (2021-05-24)
+# Hack on hack no longer sustainable
+# - seemingly dead upstream
+# - no (official) Python 3 support
+# removal in 30 days, bug: https://bugs.gentoo.org/791613
+app-admin/diamond
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-24)
+# it's just a demo project, not a real app, see disclaimer
+# at https://github.com/romainguy/jext
+# removal in 30 days
+# also removing an obsolete package that has only this dependant
+# see bug: https://bugs.gentoo.org/791106
+app-editors/jext
+dev-java/jgoodies-looks:1.2
+
 # Andrew Ammmerlaan <andrewammerlaan@gentoo.org> (2021-05-20)
 # dev-python/QtPy-1.9.0-r4 now uses USE flags to control if it uses
 # PySide2 or PyQt5. With the removal of -r3, this eselect module does
@@ -123,6 +307,7 @@ media-gfx/gimageview
 # w/ sphinx-4 but with Python 3.7 being removed in half a month, bumping
 # makes little sense.  No reverse dependencies.
 # Removal on 2021-06-14.  Bug #743889.
+dev-python/sphinxcontrib-httpdomain
 dev-python/sphinxcontrib-httpexample
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-05-09)
@@ -216,29 +401,6 @@ sci-physics/jaxodraw
 # see bug: https://bugs.gentoo.org/785400
 dev-java/cldc-api
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-01)
-# nsplugin is dead, bug #771801
-# Removal on 2021-05-31
-www-plugins/google-talkplugin
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-01)
-# Unmaintained, java depends on deprecated JDK-7, nsplugin is dead.
-# Multiple bugs: #446508, #678776, #682600, #787407
-# Removal on 2021-05-31
-media-gfx/freewrl
-
-# Michał Górny <mgorny@gentoo.org> (2021-05-01)
-# The following packages have not been ported to Python 3.8, and are
-# therefore going to be removed when support for Python 3.7 target is
-# removed.  Please do not unmask them unless you port them both to
-# Python 3.8 *and* Python 3.9 (that is becoming the default
-# on 2021-06-01).
-#
-# Removal on 2021-05-31.  Relevant bugs found on tracker #701178.
-gnome-extra/gnome-dvb-daemon
-sci-chemistry/gmxapi
-www-apps/netbox
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-30)
 # Superceded by dev-perl/Image-Sane. Tests hang, bug 626594
 # Removal in 30 days.
@@ -257,109 +419,6 @@ perl-core/Unicode-Normalize
 # see bug: https://bugs.gentoo.org/787152
 dev-java/tagsoup
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786888
-dev-java/zeus-jscl
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786864
-dev-java/sun-jmx
-java-virtuals/jmx
-dev-util/jconfig
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786843
-dev-java/sun-httpserver-bin
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786840
-dev-java/stax-ex
-dev-java/xmlstreambuffer
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786831
-dev-java/stax2-api
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786756
-dev-java/nekohtml
-dev-java/boilerpipe
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786786
-dev-java/spymemcached
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786783
-dev-java/skinlf
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786780
-dev-java/sblim-cim-client
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786774
-dev-java/radeox
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bugs: https://bugs.gentoo.org/786771
-dev-java/prefuse
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786768
-dev-java/picocontainer
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786753
-dev-java/msv
-dev-java/relaxngcc
-dev-java/wstx
-dev-java/jettison
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786744
-dev-java/minlog
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786714
-dev-java/libmatthew-java
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786711
-dev-java/ldapsdk
-
 # Michał Górny <mgorny@gentoo.org> (2021-04-29)
 # The most recent release is still broken with current
 # dev-python/coverage.  Inactive downstream maintainer.  No revdeps.
@@ -370,285 +429,16 @@ dev-python/pytest-testmon
 # Mask experimental software
 =mail-mta/postfix-3.7*
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# security issues, last release in 2004
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/631394
-media-sound/bladeenc
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786522
-dev-java/netty-codec
-dev-java/netty-codec-http
-dev-java/netty-handler
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# obsolete, use dev-util/visualvm
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786513
-dev-java/jvmstat
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786510
-dev-java/junrar
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786507
-dev-java/junit-addons
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786486
-dev-java/jstun
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786483
-dev-java/l2fprod-common
-dev-java/jreleaseinfo
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786480
-dev-java/jortho
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786441
-dev-java/jlibeps
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786438
-dev-java/jisp
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786435
-dev-java/jinput
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786432
-dev-java/jid3
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786426
-dev-java/jebl
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# project abandoned
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786420
-dev-java/jdbm
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786417
-dev-java/jdbc2-stdext
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786414
-dev-java/jcmdline
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# no consumers
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786408
-dev-java/jboss-logmanager
-dev-java/jboss-logging
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# last release in 2017, website is offline
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786381
-dev-java/javolution
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786237
-dev-java/jarbundler
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-28)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786234
-dev-java/j2ssh
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786117
-dev-java/helpgui
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786120
-dev-java/higlayout
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786096
-dev-java/hamcrest-integration
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786090
-dev-java/fscript
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/786087
-dev-java/fastinfoset
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785985
-dev-java/ehcache
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785886
-dev-java/easymock-classextension
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# libraries with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785883
-dev-java/httpcomponents-client
-dev-java/httpcomponents-core
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
-# library with no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785877
-dev-java/dtdparser
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-26)
-# no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785847
-dev-java/commons-fileupload
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-26)
-# does not compile with java 1.8, no consumer
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785796
-dev-java/commons-el
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-25)
-# Broken, bug 616986; removal in 30 days
-dev-perl/HTTPD-User-Manage
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-04-25)
-# Broken, bug 663274; removal in 30 days
-dev-perl/Text-Unaccent
-
-# Jonas Stein <jstein@gentoo.org> (2021-04-25)
-# Bad SRC_URI, dead upstream.
-# Removal on 2021-06-01.  Bug #785736.
-app-misc/logitech-applet
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-25)
-# obsolete package, nothing depends on it
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785508
-dev-java/velocity-dvsl
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-25)
-# nothing depends on it
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785532
-dev-java/cdegroot-db
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-25)
-# uses depracated classes, not used by anything,
-# removal in 30 days
-# see bug: https://bugs.gentoo.org/785415
-dev-java/codemodel
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-25)
-# seems to be obsolete, nothing uses it
-# removal in 30 days
-dev-java/istack-commons-buildtools
-
-# David Seifert <soap@gentoo.org> (2021-04-24)
-# Doesn't build, live ebuild broken too, blocks wxwidgets.eclass
-# modernization, unmaintained, requires unreleased changes in
-# net-libs/liquid-dsp. Bug #777720, removal in 30 days.
-net-wireless/cubicsdr
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-24)
-# dev-dotnet/gtk-sharp is effectively unmaintained. Last upstream release
-# in 2016, version packaged in Gentoo from 2013. gtk-sharp-3 never made it
-# out of beta state. An actively developed fork that targets GTK3 exists:
-# https://github.com/GtkSharp/GtkSharp
-# Removal on 2021-05-24. Tracker bug #769041
-dev-dotnet/gtk-sharp
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-24)
-# Depends on deprecated dev-dotnet/gtk-sharp, bug #769077
-# Removal on 2021-05-24
-app-misc/gnutu
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-24)
-# Depends on deprecated dev-dotnet/gtk-sharp, bug #769083
-# Alternatives (all in app-editors category): curses-hexedit, dhex, ghex,
-# hexcurse, okteta, qhexedit2, shed, wxhexeditor
-# Removal on 2021-05-24
-dev-util/bless
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-24)
-# Unmaintained, depends on dev-dotnet/gtk-sharp which is dead upstream.
-# Removal on 2021-05-24; bugs #769050, #769059
-dev-dotnet/gkeyfile-sharp
-dev-dotnet/notify-sharp
-
 # Stephan Hartmann <sultan@gentoo.org> (2021-04-24)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
 >=www-client/chromium-92
 
-# Michał Górny <mgorny@gentoo.org> (2021-04-22)
-# py3.7 backport with no revdeps left.
-# Removal on 2021-05-22.  Bug #784983.
-dev-python/idna-ssl
-
 # Ulrich Müller <ulm@gentoo.org> (2021-04-20)
 # Version 3.15 is broken with Emacs 27.2.
 =app-emacs/mic-paren-3.15-r0
 
-# Matt Turner <mattst88@gentoo.org> (2021-04-18)
-# Pretty dead. Needs GTK+3 port. Doesn't build with glib-2.68.
-# Removal on 2021-05-19.  Bug #784266.
-net-nntp/pan
-
 # Jonas Stein <jstein@gentoo.org> (2021-04-19)
 # Bad SRC_URI, missing license files
 # Removal on 2021-07-01.  Bug #784221.
@@ -665,21 +455,6 @@ x11-apps/amlc
 >=dev-java/jcodings-1.0.55
 >=dev-java/joni-2.1.41
 
-# Jonas Stein <jstein@gentoo.org> (2021-04-15)
-# Depends on gtk2, which is EOL
-# Removal on 2021-06-01.  Bug #782904.
-x11-themes/gtk-engines-aurora
-
-# Jonas Stein <jstein@gentoo.org> (2021-04-14)
-# Open bugs, dead upstream.
-# Removal on 2021-06-01.  Bug #782730.
-x11-misc/superswitcher
-
-# Jonas Stein <jstein@gentoo.org> (2021-04-14)
-# dead upstream, no valid SRC_URI
-# Removal on 2021-06-01.  Bug #782727.
-x11-misc/xstroke
-
 # Lars Wendler <polynomial-c@gentoo.org> (2021-04-08)
 # Masked for testing
 >=app-crypt/gnupg-2.3.0
diff --git a/profiles/updates/2Q-2021 b/profiles/updates/2Q-2021
index e2f025a02ffe..116a405d6070 100644
--- a/profiles/updates/2Q-2021
+++ b/profiles/updates/2Q-2021
@@ -1,3 +1,5 @@
 move dev-python/PyICU dev-python/pyicu
 move dev-python/python-fastimport dev-python/fastimport
 move dev-python/ebuildtester dev-util/ebuildtester
+move dev-util/robin-hood-hashing dev-cpp/robin-hood-hashing
+move dev-python/awscli app-admin/awscli
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6c89a4ce1908..8c6f969617ea 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -276,7 +276,6 @@ app-benchmarks/sysbench:drizzle - Add support for Drizzles.
 app-benchmarks/sysbench:largefile - Add support for large files.
 app-cdr/brasero:libburn - Enable dev-libs/libburn backend
 app-cdr/brasero:nautilus - Build the gnome-base/nautilus extension
-app-cdr/brasero:packagekit - Enable support for the distro-neutral package manager GUI PackageKit
 app-cdr/brasero:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 app-cdr/brasero:tracker - Enable audio playlist search using the app-misc/tracker indexer
 app-cdr/cdemu:cdemu-daemon - Pull app-cdr/cdemu-daemon dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.
@@ -778,7 +777,7 @@ app-misc/blink1:mini-tool - Build and install command-line mini-tool blink1-mini
 app-misc/blink1:server - Build and install REST API server (currently hard-coded to TCP port 8080)
 app-misc/blink1:tool - Build and install command-line tool blink1-tool
 app-misc/byobu:screen - Use app-misc/screen as the default backend
-app-misc/ca-certificates:cacert - Include root certificates from CAcert (http://www.cacert.org/) and Software in the Public Interest (http://www.spi-inc.org/)
+app-misc/ca-certificates:cacert - Include root/class3 certs from CAcert (https://www.cacert.org/)
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
 app-misc/carbon-c-relay:oniguruma - use dev-libs/oniguruma as regex implementation
 app-misc/carbon-c-relay:pcre2 - use dev-libs/libpcre2 as regex implementation
@@ -1466,7 +1465,6 @@ dev-haskell/hashtables:portable - if on, use only pure Haskell code and no GHC e
 dev-haskell/hashtables:unsafe-tricks - turn on unsafe GHC tricks
 dev-haskell/haskeline:terminfo - Use the terminfo package for POSIX consoles.
 dev-haskell/hdbc-sqlite3:splitbase - Choose the new smaller, split-up package.
-dev-haskell/hexpat:bundled-expat - Use bundled expat instead of dev-libs/expat
 dev-haskell/highlighting-kate:executable - Build the Highlight executable.
 dev-haskell/highlighting-kate:pcre-light - Use the pcre-light library instead of regex-pcre-builtin.
 dev-haskell/hlint:gpl - Use GPL libraries, specifically hscolour
@@ -1736,6 +1734,7 @@ 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)
 dev-lang/julia:system-llvm - (Try to) Use the system LLVM install. YMMV.
 dev-lang/lazarus:minimal - Don't build extra packages from the bigide component
@@ -1991,7 +1990,6 @@ dev-libs/elfutils:valgrind - Add support for memory debugging using dev-util/val
 dev-libs/ell:glib - Enable dev-libs/glib support
 dev-libs/fcgi:html - Install HTML documentation
 dev-libs/folks:telepathy - Load contacts from the Telepathy framework
-dev-libs/folks:tracker - Load contacts from app-misc/tracker index
 dev-libs/folks:utils - Build the folks-inspect utility
 dev-libs/fstrm:utils - Build fstrm utility programs
 dev-libs/gf2x:custom-tune - Extra long compile time for tuning hardware specific low-level routines
@@ -2143,8 +2141,10 @@ dev-libs/m17n-lib:gd - Build API and utilities based on media-libs/gd. This flag
 dev-libs/m17n-lib:libotf - Use dev-libs/libotf to handle OpenType fonts
 dev-libs/m17n-lib:libxml2 - Use dev-libs/libxml2 to parse XML
 dev-libs/msgpack:boost - Enable boost support
+dev-libs/ncnn:tools - Enable installation of various tools in addition to the library
+dev-libs/ncnn:vulkan - Enable vulkan compute support
 dev-libs/nettle:asm - Support assembly hand optimized crypto functions (i.e. faster run time)
-dev-libs/nss:cacert - Include root/class3 certs from CAcert (http://www.cacert.org/)
+dev-libs/nss:cacert - Include root/class3 certs from CAcert (https://www.cacert.org/)
 dev-libs/nss:utils - Install utilities included with the library
 dev-libs/ocl-icd:khronos-headers - Install Khronos OpenCL headers.
 dev-libs/onigmo:combination-explosion-check - enable combination explosion check
@@ -2220,6 +2220,7 @@ dev-libs/weston:rdp - Enable Remote Desktop Protocol compositor support
 dev-libs/weston:remoting - Enable plugin to stream output to remote hosts using media-libs/gstreamer
 dev-libs/weston:resize-optimization - Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi
 dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
+dev-libs/weston:seatd - Enable support for rootless session via sys-auth/seatd
 dev-libs/weston:wayland-compositor - Enable Wayland compositor support
 dev-libs/weston:xwayland - Enable ability support native X11 applications
 dev-libs/xapian:brass - Enabled brass backend db support
@@ -3077,6 +3078,7 @@ games-engines/scummvm:fribidi - Support for right-to-left languages via dev-libs
 games-engines/scummvm:glew - enable support for OpenGL Extension Wrangler Library (media-libs/glew)
 games-engines/scummvm:mpeg2 - enable mpeg2 codec for cutscenes
 games-engines/scummvm:net - enable cloud support via media-libs/sdl2-net
+games-engines/scummvm:sndio - Enable support for MIDI music using media-sound/sndio
 games-engines/scummvm:speech - enable text-to-speech support through app-accessibility/speech-dispatcher
 games-engines/scummvm:unsupported - enable unsupported and/or broken game engines (you're on your own)
 games-engines/solarus:doc - Install doxygen developer documentation.
@@ -3160,7 +3162,6 @@ games-puzzle/gnome-tetravex:gui - Build the gnome-tetravex graphical Gtk user in
 games-puzzle/nightsky:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/numptyphysics:user-levels - Install some fun user-created levels
 games-puzzle/pingus:music - Enable playing of background music
-games-puzzle/sgt-puzzles:gtk3 - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2
 games-puzzle/tiny-and-big:bundled-libs - Use the upstream provided bundled libraries.
 games-puzzle/world-of-goo-gog:bundled-libs - Use bundled libs
 games-puzzle/world-of-goo-hb:bundled-libs - Use bundled libs
@@ -3783,6 +3784,7 @@ mail-mta/exim:spf - Adds support for Sender Policy Framework
 mail-mta/exim:srs - Adds support for Sender Rewriting Scheme
 mail-mta/exim:srs-alt - Use mail-filter/libsrs_alt to implement SRS support
 mail-mta/exim:srs-native - Use Exim's built-in SRS support to implement SRS support
+mail-mta/exim:tdb - Use sys-libs/tdb for internal database storage (such as hints database)
 mail-mta/exim:tpda - Adds support for Transport Post-Delivery Actions
 mail-mta/msmtp:daemon - Build/install msmtpd MTA daemon
 mail-mta/msmtp:mta - Enable this to install as system-wide MTA
@@ -3969,11 +3971,6 @@ media-gfx/freecad:spreadsheet - Build the spreadsheet module and workbench to cr
 media-gfx/freecad:surface - Build the surface module and workbench
 media-gfx/freecad:techdraw - Build the techdraw module and workbench, a more advanced and feature-rich successor of the drawing workbench
 media-gfx/freecad:tux - Build the Tux module
-media-gfx/freewrl:java - Build and install java EAI/SAI support library
-media-gfx/freewrl:libeai - Build EAI C library
-media-gfx/freewrl:opencl - Enable OpenCL support
-media-gfx/freewrl:osc - Allows for OSC-based control and communication between multiple freewrl instances
-media-gfx/freewrl:rbp - Enable support for Rigid Body Physics
 media-gfx/geeqie:ffmpegthumbnailer - Enable video thumbnail support with media-video/ffmpegthumbnailer
 media-gfx/geeqie:gpu-accel - Enable GPU acceleration support - experimental
 media-gfx/geeqie:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2
@@ -3996,6 +3993,12 @@ media-gfx/graphviz:lasi - Enables PostScript output via media-libs/lasi, for plu
 media-gfx/gthumb:http - Enable webservice integration through net-libs/webkit-gtk
 media-gfx/gthumb:slideshow - Enable slideshow plugin
 media-gfx/hugin:sift - automatically align images with media-gfx/autopano-sift-C
+media-gfx/hydrus:charts - Support for bandwidth charts
+media-gfx/hydrus:cloudscraper - Support working around cloudflare anti-bot page
+media-gfx/hydrus:ffmpeg - Show duration and other information on video thumbnails
+media-gfx/hydrus:lz4 - Enable memory compression in the client
+media-gfx/hydrus:mpv - Support playing videos with libmpv
+media-gfx/hydrus:socks - Support SOCKS proxies
 media-gfx/imagemagick:corefonts - Use media-fonts/corefonts which is required by some commands
 media-gfx/imagemagick:fpx - Enable media-libs/libfpx support
 media-gfx/imagemagick:hdri - Enable High Dynamic Range Images formats
@@ -4115,9 +4118,10 @@ media-libs/gegl:lensfun - Enable support for media-libs/lensfun.
 media-libs/gegl:umfpack - Enable sparse solving via sci-libs/umfpack.
 media-libs/gmmlib:custom-cflags - Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.
 media-libs/gmtk:dconf - Enable support for gnome-base/dconf
-media-libs/grilo:network - Enable network access for media discovery using net-libs/libsoup
 media-libs/grilo:playlist - Enable support for playlists through dev-libs/totem-pl-parser
 media-libs/gst-plugins-bad:bzip2 - Enable bzip2 encoder/decoder plugin
+media-libs/gst-plugins-bad:egl - Enable EGL support
+media-libs/gst-plugins-bad:gles2 - Enable GLES2 support
 media-libs/gst-plugins-base:X - Enable ximagesink and xvimagesink plugins; build GLX platform support if USE=opengl is enabled; build x11 windowing system support if USE=egl is enabled
 media-libs/gst-plugins-base:egl - Enable EGL platform support
 media-libs/gst-plugins-base:gbm - Enable Graphics Buffer Manager based EGL windowing system support (requires egl and at least one of gles or opengl)
@@ -4480,6 +4484,7 @@ media-sound/audacity:vst - Enable VST plugin support
 media-sound/audiotools:cue - Enable CUE sheet support
 media-sound/audiotools:dvda - Enable DVD-Audio support
 media-sound/audiotools:twolame - Enable twolame support (MPEG Audio Layer 2 encoder)
+media-sound/bluez-alsa:aptx - aptX (HD) over Bluetooth (many Android compatible headphones)
 media-sound/bluez-alsa:hcitop - Enable top-like monitoring tool for HCI
 media-sound/bluez-alsa:ldac - Enable support for AOSP media-libs/libldac dispatcher
 media-sound/bluez-alsa:mpg123 - Enable support for MPEG audio playback via media-sound/mpg123
@@ -4889,6 +4894,7 @@ media-video/chaplin:transcode - Enable DVD ripping and transcoding
 media-video/clive:clipboard - Support reading from X clipboard
 media-video/clive:pager - Support pager!?
 media-video/clive:password - Support password controlled sites
+media-video/droidcam:gtk - Build the dev-cpp/gtkmm:3.0 client.
 media-video/dv2sub:kino - install kino plugin
 media-video/dvdrip:fping - Enables fping support for cluster rendering
 media-video/dvdrip:subtitles - Enables support for subtitle ripping
@@ -5099,6 +5105,10 @@ media-video/vdr:pinplugin - Support for media-plugins/vdr-pin
 media-video/vdr:resumereset - rreset resume of EOF
 media-video/vdr:ttxtsubs - support for media-plugins/vdr-ttxtsubs
 media-video/vdr:verbose - enable full output on compile
+media-video/vidify:dbus - Support local MPRIS players
+media-video/vidify:mpv - Use python-mpv as backend for vidify
+media-video/vidify:vlc - Use python-vlc as backend for vidify
+media-video/vidify:zeroconf - Use an external network player
 media-video/vlc:X - Enable support for e.g. fullscreen mode via X and the X C-language binding. It does not build a graphical interface
 media-video/vlc:aom - Enable AV1 encoding/decoding support using media-libs/libaom
 media-video/vlc:archive - Enable support for libarchive stream extractor
@@ -5460,7 +5470,6 @@ net-dns/bind:geoip2 - Enable GeoIP2 API from MaxMind
 net-dns/bind:gssapi - Enable gssapi support
 net-dns/bind:json - Enable JSON statistics channel
 net-dns/bind:lmdb - Enable LMDB support to store configuration for 'addzone' zones
-net-dns/bind:urandom - Use /dev/urandom instead of /dev/random
 net-dns/bind-tools:gssapi - Enable gssapi support
 net-dns/ddclient:examples - Install various example files, like for cron.
 net-dns/ddclient:iproute2 - Use sys-apps/iproute2 instead of sys-apps/net-tools for interaction.
@@ -6059,7 +6068,6 @@ net-libs/onion:libevent - Use dev-libs/libevent as thread poller instead of libe
 net-libs/onion:redis - Add support for redis sessions.
 net-libs/ortp:ntp-timestamp - Turn on NTP timestamping on received packet
 net-libs/ortp:srtp - Add support for Secure RTP
-net-libs/phodav:spice - Install the spice-webdavd guest agent
 net-libs/pjproject:amr - Inlcude AMR codec in the build
 net-libs/pjproject:epoll - Use /dev/epoll ioqueue on Linux (experimental)
 net-libs/pjproject:g711 - Include G.711 codecs in the build
@@ -6447,15 +6455,11 @@ net-misc/mrouted:rsrr - Enable Routing Support for Resource Reservations, for RS
 net-misc/mulk:checksum - Enable checksum verification for Metalink from dev-libs/openssl
 net-misc/mulk:metalink - Enable support for media-libs/libmetalink
 net-misc/netkit-bootparamd:libtirpc - Build against net-libs/libtirpc for RPC support
-net-misc/networkmanager:concheck - Enable connectivity checking support
 net-misc/networkmanager:connection-sharing - Use net-dns/dnsmasq and net-firewall/iptables for connection sharing
 net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting ip
 net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting ip
 net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
 net-misc/networkmanager:iwd - Use net-wireless/iwd instead of net-wireless/wpa_supplicant for wifi support by default
-net-misc/networkmanager:json - Enable JSON validation via dev-libs/jansson in libnm.
-net-misc/networkmanager:libpsl - Link against libpsl
-net-misc/networkmanager:lto - Link-time optimization
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
 net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
@@ -6463,7 +6467,6 @@ net-misc/networkmanager:ovs - Enable OpenVSwitch support
 net-misc/networkmanager:ppp - Enable support for mobile broadband and PPPoE connections using net-dialup/ppp
 net-misc/networkmanager:resolvconf - Use net-dns/openresolv for managing DNS information in /etc/resolv.conf. Generally, a symlink to /run/NetworkManager/resolv.conf is simpler. On systems running systemd-resolved, disable this flag and create a symlink to /run/systemd/resolve/stub-resolv.conf.
 net-misc/networkmanager:teamd - Enable Teamd control support
-net-misc/networkmanager:tools - Build cli tools such as nmcli, nmtui and nm_cloud_setup
 net-misc/networkmanager:wext - Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, ndiswrapper)
 net-misc/networkmanager:wifi - Enable support for wifi and 802.1x security
 net-misc/nextcloud-client:dolphin - Install the kde-apps/dolphin extension
@@ -7394,10 +7397,13 @@ sci-libs/umfpack:cholmod - Use sci-libs/cholmod for matrix ordering
 sci-libs/vtk:R - Enable support for dev-lang/R
 sci-libs/vtk:all-modules - Build all modules
 sci-libs/vtk:boost - Add support for boost
+sci-libs/vtk:cuda - Add support for CUDA
 sci-libs/vtk:gdal - Support for gdal formated data
 sci-libs/vtk:imaging - Building Imaging modules
 sci-libs/vtk:json - Support for json formatted data
+sci-libs/vtk:kits - Build kits in addition to modules
 sci-libs/vtk:offscreen - Offscreen rendering through OSMesa
+sci-libs/vtk:pegtl - Use pegtl to build parsers
 sci-libs/vtk:rendering - Building Redering modules
 sci-libs/vtk:tbb - Use dev-cpp/tbb to handle smp support
 sci-libs/vtk:views - Building Views modules
@@ -7468,7 +7474,6 @@ sci-mathematics/polymake:lrs - Enable sci-libs/lrslib interface for convex hull
 sci-mathematics/polymake:ppl - Enable dev-libs/ppl interface for convex hull computations.
 sci-mathematics/polymake:singular - Enable the interface to sci-mathematics/singular for ideal related computations.
 sci-mathematics/rstudio:server - Build and install the RStudio server
-sci-mathematics/singular:boost - Compile against external boost headers (dev-libs/boost)
 sci-mathematics/slepc:complex-scalars - Make scalars complex
 sci-mathematics/unuran:prng - Use sci-mathematics/prng library
 sci-mathematics/unuran:rngstreams - Use sci-mathematics/rngstreams library
@@ -7584,6 +7589,9 @@ sci-visualization/paraview:nvcontrol - Add NVCONTROL support for OpenGL options
 sci-visualization/paraview:offscreen - Offscreen rendering through OSMesa
 sci-visualization/paraview:plugins - Build and install additional plugins
 sci-visualization/paraview:webengine - Add support for dev-qt/qtwebengine
+sci-visualization/scidavis:assistant - Compile with QAssistant (documentation broweser) support from dev-qt/assistant.
+sci-visualization/scidavis:origin - Add support for reading OriginLab OPJ project files through sci-libs/liborigin.
+sci-visualization/scidavis:python - Build support for python scripting.
 sec-policy/selinux-base:ubac - Enable User Based Access Control (UBAC) in the SELinux policy
 sec-policy/selinux-base:unconfined - Enable support for the unconfined SELinux module
 sec-policy/selinux-base:unknown-perms - Default allow unknown classes in kernels newer than the policy (SELinux policy capability).
@@ -7888,20 +7896,7 @@ sys-block/fio:rbd - Enable Rados block device support via sys-cluster/ceph
 sys-block/fio:rdma - Enable infiniband support via sys-fabric/librdmacm
 sys-block/fio:tcmalloc - Link against dev-util/google-perftools by default which will speed up USE=rbd up to 20%
 sys-block/fio:zbc - Enable ZBC & ZAC disks via sys-block/libzbc.
-sys-block/gparted:btrfs - Include Btrfs support (sys-fs/btrfs-progs)
-sys-block/gparted:cryptsetup - Include LUKS volume support (sys-fs/cryptsetup)
-sys-block/gparted:dmraid - Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
-sys-block/gparted:f2fs - Include F2FS support (sys-fs/f2fs-tools)
-sys-block/gparted:fat - Include FAT16/FAT32 support (sys-fs/dosfstools)
-sys-block/gparted:hfs - Include HFS support (sys-fs/hfsutils)
-sys-block/gparted:jfs - Include JFS support (sys-fs/jfsutils)
-sys-block/gparted:mdadm - Support for Linux software RAID.
-sys-block/gparted:ntfs - Include NTFS support (sys-fs/ntfs3g)
-sys-block/gparted:reiser4 - Include ReiserFS4 support (sys-fs/reiser4progs)
-sys-block/gparted:reiserfs - Include ReiserFS support (sys-fs/reiserfsprogs)
-sys-block/gparted:udf - Include UDF support (sys-fs/udftools)
 sys-block/gparted:wayland - Enable interim workaround to allow running GParted under Wayland by granting permission to the X11 display using x11-apps/xhost.
-sys-block/gparted:xfs - Include XFS support (sys-fs/xfsprogs, sys-fs/xfsdump)
 sys-block/libfabric:cuda - Enable for CUDA provider
 sys-block/libfabric:efa - Enable Amazon EC2 Elastic Fabric Adapter provider
 sys-block/libfabric:rocr - Enable Radeon Open Compute provider
@@ -8645,7 +8640,6 @@ www-servers/nginx:http - Enable HTTP core support
 www-servers/nginx:http-cache - Enable HTTP cache support
 www-servers/nginx:http2 - Enable HTTP2 module support
 www-servers/nginx:libatomic - Use libatomic instead of builtin atomic operations
-www-servers/nginx:luajit - Use dev-lang/luajit instead of dev-lang/lua for lua support when building the lua http module.
 www-servers/nginx:pcre-jit - Enable JIT for pcre
 www-servers/nginx:rtmp - NGINX-based Media Streaming Server
 www-servers/nginx:ssl - Enable HTTPS module for http. Enable SSL/TLS support for POP3/IMAP/SMTP for mail.
@@ -8759,7 +8753,6 @@ x11-misc/alock:doc - Build and install manpage with app-text/asciidoc.
 x11-misc/bumblebee:bbswitch - Add dependency on sys-power/bbswitch for PM feature
 x11-misc/colord:argyllcms - Enable ArgyllCMS sensor
 x11-misc/colord:extra-print-profiles - Generate extra print profiles. Warning: significant build time and memory requirements.
-x11-misc/colord:gusb - Enable dev-libs/libgusb support, needed for colorimeter drivers
 x11-misc/compton:drm - Enable VSync with DRM_IOCTL_WAIT_VBLANK
 x11-misc/compton:opengl - Enable VSync with SGI_swap_control OpenGL extension
 x11-misc/dunst:dunstify - Experimental replacement for notify-send.
@@ -8979,7 +8972,9 @@ x11-wm/xpra:brotli - Enable brotli compression support
 x11-wm/xpra:client - Build client-side code
 x11-wm/xpra:clipboard - Enable clipboard support
 x11-wm/xpra:csc - Enable csc softscaler support
+x11-wm/xpra:ibus - Use ibus input method via app-i18n/ibus
 x11-wm/xpra:pillow - Enable pillow support
+x11-wm/xpra:pinentry - Use app-crypt/pinentry for password entry
 x11-wm/xpra:server - Build server-side code
 x11-wm/xpra:vpx - Enable vpx image format support
 x11-wm/xpra:webcam - Enable webcam support via opencv