gentoo resync : 22.05.2021

32 files changed, 196 insertions, 204 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9b42fa5dbdd3..9219595152fc 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 155629c2d659..88c37c564b17 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -32,6 +32,7 @@ media-libs/openal sndio
 media-video/ffmpeg sndio
 media-sound/moc sndio
 media-sound/mpd sndio
+media-libs/libsdl2 sndio
 
 # Sam James <sam@gentoo.org> (2021-01-19)
 # Avoid pulling in a large unkeyworded dep
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index cf614be4eae8..4b196ab45f10 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,13 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Michał Górny <mgorny@gentoo.org> (2021-05-20)
+# Unresolved keywordreqs are getting in the way.
+# https://bugs.gentoo.org/773451
+# https://bugs.gentoo.org/789606
+python_targets_python3_10
+python_single_target_python3_10
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-12)
 # media-sound/jack-audio-connection-kit re-keywording timeout, bug #736725
 jack
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 09fe0a2b76ef..57a0ece94145 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -62,7 +62,6 @@ games-emulation/nestra
 games-emulation/vgba
 games-emulation/zinc
 games-emulation/zsnes
-games-fps/avp
 games-fps/etqw-bin
 games-fps/etqw-data
 games-fps/etqw-demo
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index a0a8241c9377..9b4403d62ea2 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -77,7 +77,6 @@ media-gfx/digikam:5
 media-gfx/luminance-hdr
 media-sound/frescobaldi
 media-sound/teamspeak-client:3
-media-video/orion
 >=media-video/openshot-2.5.1_p20210103
 net-analyzer/nmapsi
 net-libs/signon-ui
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 5ef64c04f901..60fadf6a77b8 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,6 +7,12 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Michał Górny <mgorny@gentoo.org> (2021-05-20)
+# Unresolved keywordreqs are getting in the way.
+# https://bugs.gentoo.org/789606
+python_targets_python3_10
+python_single_target_python3_10
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
 # sys-libs/llvm-libunwind not supported on HPPA.
 llvm-libunwind
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 50ef31ed5839..5e27c674e83c 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joshua Kinard <kumba@gentoo.org> (2021-05-20)
+# mask USE 'test' on MIPS for setuptools  and jaraco-path due to
+# the very deep dependency chain that is enabled.  Will unmask
+# on a future date.
+# Bug #774216
+dev-python/jaraco-path test
+dev-python/setuptools test
+
 # Sam James <sam@gentoo.org> (2021-02-06)
 # media-sound/sndio is not yet keyworded here
 # bug #769098, bug #769122
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index e484be4172ff..d379169c68cb 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.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-17)
+# Deps not yet tested/keyworded.
+# bug #708344
+sys-devel/llvm gold
+
 # Marek Szuba <marecki@gentoo.org> (2021-05-07)
 # Legacy interface that depends on kernel headers not available on this arch
 # as well as currently-unkeyworded dev-libs/libx86
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask
index a0ae367f6d1d..1544eb028159 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)↲
+# chromium works on ppc64le
+-www-client/chromium
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)↲
 # works on little-endian↲
 sci-mathematics/geogebra-bin
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
index 6dbcf7edfcd2..aae03ed6a798 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.stable.mask
@@ -5,19 +5,4 @@
 # openjfx:8 will never be stabilized
 # openjfx:11 probably will neither
 dev-java/openjdk:8 javafx
-dev-java/openjdk:11 javaf
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-02-27)
-# vulkan tested and works on ppc64le, but not stabilized yet
-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/pipewire vulkan
-media-video/vlc libplacebo
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-15)
-# deps are not yet stable on ppc64
-media-libs/mesa llvm video_cards_radeonsi
+dev-java/openjdk:11 javafx
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index f0718dbcb021..187b4ac618af 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -10,12 +10,3 @@ python_targets_python3_10
 # Michał Górny <mgorny@gentoo.org> (2021-01-07)
 # Prebuilt kernel rebuilds are supported on stable yet.
 dist-kernel
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-21)
-# works, but deps not stable yet
-vaapi
-
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-08-14)
-# works on ppc64le, but not yet stable
-video_cards_amdgpu
-video_cards_ast
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 5ac6b141b13f..2168b261a6c0 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -19,14 +19,9 @@ luajittex
 # virtual/opencl requires media-libs/mesa[opencl] (bug #549096)
 opencl
 
-# Agostino Sarubbo <ago@gentoo.org> (2012-12-22)
-# mask kde since is not anymore keyworded for ppc64
-kde
-
 pda
 prelude
 mono
-networkmanager
 
 # not tested on ppc64
 xmms2
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 1d47ee5b2e89..8ba483baa4cb 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,16 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-17)
+# chromium does not work on ppc64be
+www-client/chromium
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
 # only works on little-endian
 sci-mathematics/geogebra-bin
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-06)
-# segfaults building qtwebengine or chromium
-# https://bugs.gentoo.org/785751
-# https://github.com/nodejs/node/issues/38521
->=net-libs/nodejs-16
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-17)
 # Fails to build with buildmode=pie assumptions, which
 # does not work on big-endian ppc64
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 3cccc93153f3..442a3dd9af80 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -101,23 +101,10 @@ lxqt-base/lxqt-panel cpuload networkmonitor pulseaudio sysstat
 # dev-lang/luajit lacks ppc64 keyword. luajit upstream does not support ppc64
 net-analyzer/snort open-appid
 
-# Gilles Dartiguelongue <eva@gentoo.org> (2017-08-16)
-# missing keyword on dev-python/dbusmock, bug #620024
->=gnome-base/gnome-settings-daemon-3.24 test
-
-# Michał Górny <mgorny@gentoo.org> (2017-06-28)
-# app-misc/dtach is not keyworded, and tests are restricted anyway, so
-# no point in pursuing it right now.
-app-shells/bash-completion test
-
 # Jeroen Roovers <jer@gentoo.org> (2017-01-16)
 # Incomplete support, bug #605878.
 net-vpn/tor seccomp
 
-# Jeroen Roovers <jer@gentoo.org> (2017-02-05)
-# media-libs/libilbc has not been ported to PPC64
-media-video/ffmpeg libilbc
-
 # Robin H. Johnson <robbat2@gentoo.org> (2016-11-18)
 # dev-lang/luajit lacks ppc64 keyword. luajit upstream does not support ppc64
 dev-db/redis luajit
@@ -143,10 +130,6 @@ dev-java/ant-apache-bsf python
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
 
-# Matthias Maier <tamiko@gentoo.org> (2014-12-24)
-# sys-devel/clang is not keyworded
-app-doc/doxygen clang
-
 # Michael Sterrett <mr_bones_@gentoo.org (2013-11-12)
 # Mask openmedia use flag because the content generation tools
 # are missing keywords.
@@ -170,11 +153,6 @@ www-client/seamonkey ipc
 # quesoglc is not keyworded
 x11-misc/rss-glx quesoglc
 
-# Brent Baude <ranger@gentoo.org> (2009-05-05)
-# Masking webkit from libproxy due to TOC failure on webkit
-# and stupid 64bit toolchain.
-net-libs/libproxy webkit
-
 # Joseph Jezak <josejx@gentoo.org> (2010-02-12)
 # Mask unstable pidgin deps until we can mark them stable (farsight2)
 net-im/pidgin gstreamer
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index fa4819770c32..dc1ed5ab98c9 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -62,7 +62,6 @@ ayatana
 #
 3dfx
 acpi
-lm-sensors
 rar
 hdf
 xvmc
@@ -73,7 +72,6 @@ dmi
 # Masked vaapi for PowerPC until it works on hardware available to PowerPC users (cell, etc.)
 vaapi
 
-
 ### Other flags -- Please put additional maskings below here
 
 # No keyworded versions of openafs
diff --git a/profiles/arch/riscv/package.use.force b/profiles/arch/riscv/package.use.force
index 28b2d254c048..cb405f4ea1f3 100644
--- a/profiles/arch/riscv/package.use.force
+++ b/profiles/arch/riscv/package.use.force
@@ -4,3 +4,4 @@
 # we, kinda, need this on riscv ...
 sys-devel/llvm llvm_targets_RISCV
 sys-devel/clang llvm_targets_RISCV
+dev-lang/rust llvm_targets_RISCV
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 9d94d70acc43..14b7e271a6e3 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,16 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Yixun Lan <dlan@gentoo.org> (2021-05-19)
+# Dependencies not keyworded, not tested
+dev-libs/gobject-introspection doctool test
+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
 # media-libs/libavif isn't keyworded here
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 834a60ef712c..4443d1bd9834 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -7,6 +7,21 @@
 # Unmask systemd
 -systemd
 
+# Yixun Lan <dlan@gentoo.org> (2021-05-19)
+# Unmask for more testing
+-elogind
+-gtk
+-gtk2
+-gtk3
+-introspection
+
+# Michał Górny <mgorny@gentoo.org> (2021-05-20)
+# Unresolved keywordreqs are getting in the way.
+# https://bugs.gentoo.org/773451
+# https://bugs.gentoo.org/789606
+python_targets_python3_10
+python_single_target_python3_10
+
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
 fam
@@ -17,13 +32,8 @@ valgrind
 
 # Not tested yet
 bluetooth
-elogind
 emacs
 fuse
-gtk
-gtk2
-gtk3
-introspection
 java
 kerberos
 latex
@@ -37,6 +47,7 @@ ruby
 slang
 sound
 systemtap
+webkit
 
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not keyworded.
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 8052860579a4..147753a565ce 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -200,10 +200,6 @@ media-gfx/imagemagick -heif
 # Requires dev-db/mongodb which has dropped x86 support
 dev-python/pymongo test
 
-# Bernard Cafarelli <voyageur@gentoo.org> (2018-09-27)
-# media-libs/qtav not keyworded
-media-video/orion qtav
-
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 93535b33cafd..03e3fe6d8861 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -162,7 +162,6 @@ dev-db/mariadb columnstore
 # They are generally fixable by adding py3 support and using
 # distutils_enable_sphinx to build docs.
 <=dev-python/lockfile-0.12.2-r2 doc
-<dev-python/pep8-1.7.1-r1 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-27)
 # Requires Python 2 support in xapian-bindings which in turn require
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/eapi b/profiles/default/linux/ppc64le/17.0/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/parent b/profiles/default/linux/ppc64le/17.0/desktop/gnome/parent
new file mode 100644
index 000000000000..6589a0e01478
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/eapi b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/parent b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..44f88d3e2df0
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/systemd
diff --git a/profiles/desc/ada_target.desc b/profiles/desc/ada_target.desc
index daf92ab9facb..e633b1a19318 100644
--- a/profiles/desc/ada_target.desc
+++ b/profiles/desc/ada_target.desc
@@ -5,4 +5,4 @@ gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 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
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 6fd532d95a53..526bf6e292bf 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -6,5 +6,5 @@
 python3_7 - Build with Python 3.7
 python3_8 - Build with Python 3.8
 python3_9 - Build with Python 3.9
-python3_10 - Build with Python 3.9
+python3_10 - Build with Python 3.10
 pypy3 - Build with PyPy3
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index c8f235afbef1..45bd08d58a8c 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -49,6 +49,7 @@ gnome-extra/gnome-shell-extension-bluetooth-quick-connect
 gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen
 gnome-extra/gnome-shell-extension-dash-to-panel
 gnome-extra/gnome-shell-extension-desktop-icons
+gnome-extra/gnome-shell-extension-desktop-icons-ng
 gnome-extra/gnome-shell-extension-gsconnect
 gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
diff --git a/profiles/license_groups b/profiles/license_groups
index 106bc24e2ffe..16f9e0632a1b 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -16,12 +16,12 @@
 GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FSFAP FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3-with-font-exception GPL-3+-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
 
 # Free software licenses approved by the FSF
-FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 Zend-2.0
+FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 EUPL-1.2 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL-1.0 Zend-2.0
 
 # 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 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
 
 # Misc licenses that are probably free software, i.e. follow the
 # Free Software Definition at https://www.gnu.org/philosophy/free-sw.html
@@ -39,7 +39,7 @@ FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
 
 # FSF-approved licenses for "free documentation" and "works of
 # practical use besides software and documentation" (including fonts)
-FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ FreeArt GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL OFL-1.1 OPL
+FSF-APPROVED-OTHER Arphic CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0 FDL-1.1 FDL-1.1+ FDL-1.2 FDL-1.2+ FDL-1.3 FDL-1.3+ Free-Art-1.2 Free-Art-1.3 FreeArt GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ IPAfont OFL OFL-1.1 OPL
 
 # Misc licenses for free documents and other works (including fonts)
 # that follow the definition at https://freedomdefined.org/ but are NOT
@@ -65,13 +65,17 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 # - IF (and only if) there is an explicit inclusion requirement,
 #   USE=bindist MUST cause a copy of the license to be installed
 #   in a file location compliant with the license
-BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON linux-fw-redistributable LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr unRAR
+BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 ISSL JSON linux-fw-redistributable LSI-tw_cli Mellanox-AS-IS MicroChip-SDCC no-source-code NVIDIA-r1 NVIDIA-r2 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr unRAR
 
 ######################################################################
 
 # 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 protonmail-bridge-EULA 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 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
+DEPRECATED FreeArt
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index a019112810d7..06f530345160 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,16 +32,105 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+# not do anything and will only lead to confusion and possibly breakage.
+# See also: https://bugs.gentoo.org/790764
+# Removal in 30 days.
+app-eselect/eselect-QtPy
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-20)
+# no non-masked consumer, removal in 30 days
+# see bug: https://bugs.gentoo.org/786852
+dev-java/sun-jimi
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-20)
+# no non-masked consumer, removal in 30 days
+# see bug: https://bugs.gentoo.org/786828
+dev-java/squareness-jlf
+
+# Sam James <sam@gentoo.org> (2021-05-20)
+# Need to ditch Meson or investigate consumers.
+# https://bugs.gentoo.org/791163
+=dev-libs/tinyxml2-8.1.0
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-19)
+# no consumer, removal in 30 days
+# see bug: https://bugs.gentoo.org/784065
+dev-java/werken-xpath
+
+# Zac Medico <zmedico@gentoo.org> (2021-05-16)
+# Obsoleted by go modules. Masked for removal in 30 days. Bug #790470.
+dev-go/godep
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-05-16)
+# no consumer, does not compile, not with jdk-11
+# and not even with openjdk:8
+# see bug: https://bugs.gentoo.org/790551
+dev-java/freemarker
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-05-16)
+# Mask gcc-7 branch (ended upstream support). Please switch
+# to a freshed gcc branch.
+<sys-devel/gcc-8
+<dev-util/nvidia-cuda-toolkit-10
+<dev-util/nvidia-cuda-sdk-10
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-05-16)
+# Mask gcc-6 branch (ended upstream support). Please switch
+# to a freshed gcc branch.
+<sys-devel/gcc-7
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-15)
+# Dead upstream, homepage missing, EAPI=5, no systemd units.
+# https://bugs.gentoo.org/790413 , #434900, #552760
+# Use any of or combination of the following instead:
+# sys-apps/rng-tools
+# sys-apps/haveged
+# app-crypt/jitterentropy-rngd
+sys-apps/timer_entropyd
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
+# Dead upstream, dead downstream, GTK+2 based.  Bug #770898
+# Removal on 2021-06-14.
+app-editors/amyedit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
+# Unmaintained, GTK+2-based, dubiously duplicating app-mobilephone/gnokii[X]
+# Removal on 2021-06-14. Bug #769032
+app-mobilephone/gnocky
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
+# Long-standing bugs, GTK+2-based, last revdep of media-libs/libexif-gtk.
+# Alternative: media-gfx/shotwell
+# Removal on 2021-06-14.  Bugs #560032, #740020, #769095
+media-gfx/gtkam
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
+# Unmaintained, pending version bump request since 2014, no revdeps.
+# Removal on 2021-06-14.  Bug #507760
+media-libs/libexif-gtk
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-05-15)
+# Unmaintained, dead upstream since 2004, no hope to port away from GTK+2.
+# Removal on 2021-06-14.  Bug #769110
+media-gfx/gimageview
+
+# Michał Górny <mgorny@gentoo.org> (2021-05-15)
+# Relies on dev-python/astunparse that is broken with Python 3.8+
+# and abandoned upstream.  The current version is also broken
+# 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-httpexample
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2021-05-09)
 # Unmaintained, last revdep of dev-perl/gtk2-spell, bugs #724796, #769296
 # Removal on 2021-06-08
 app-misc/gcstar
 dev-perl/gtk2-spell
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-09)
-# Work in progress, do not use yet
-=dev-lang/perl-5.34*
-
 # David Seifert <soap@gentoo.org> (2021-05-09)
 # All revdeps masked, last release in 1999, needs to do now.
 # Bug #772815, removal in 30 days.
@@ -405,11 +494,6 @@ dev-java/jarbundler
 # see bug: https://bugs.gentoo.org/786234
 dev-java/j2ssh
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-27)
-# Unmaintained, dead service, EAPI-5.
-# Removal on 2021-05-14
-app-misc/mediacrush-cli
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-27)
 # library with no consumer
 # removal in 30 days
@@ -556,27 +640,10 @@ dev-dotnet/notify-sharp
 # Removal on 2021-05-22.  Bug #784983.
 dev-python/idna-ssl
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-21)
-# no consumers, last commit 2017
-# see: https://bugs.gentoo.org/784836
-# removal in 30 days
-dev-java/apt-mirror
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-21)
-# java library, no consumers
-# see: https://bugs.gentoo.org/784830
-# removal in 30 days
-dev-java/ant-owanttask
-
 # 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
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-21)
-# java library, no consumers
-# see: https://bugs.gentoo.org/784812
-dev-java/ini4j
-
 # 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.
@@ -587,67 +654,11 @@ net-nntp/pan
 # Removal on 2021-07-01.  Bug #784221.
 x11-apps/amlc
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-18)
-# our version is outdated with security issues, new version
-# uses gradle to build which we don't support atm,
-# also being a web framework deployable to application servers,
-# we have no usage for it, and nothing depends on it
-# removal in 30 days
-dev-java/tapestry
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-18)
-# the project has been abandoned and the developement
-# is now under name SpotBugs
-# see: https://github.com/findbugsproject/findbugs
-dev-util/findbugs
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-18)
-# obsolete deps, not used by any package
-# removal in 30 days
-dev-java/classmate
-dev-java/commons-configuration
-dev-java/commons-jelly
-dev-java/ezmorph
-dev-java/ical4j
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-04-18)
 # dev-java/xerces-2.12.1 depends on masked >=virtual/{jdk,jre}-11
 # https://bugs.gentoo.org/782697
 >=dev-java/xerces-2.12.1
 
-# Michał Górny <mgorny@gentoo.org> (2021-04-17)
-# Superseded by dev-python/pycodestyle.  Last revdep masked for removal.
-# Removal on 2021-05-17.  Bug #783369.
-dev-python/pep8
-
-# Michał Górny <mgorny@gentoo.org> (2021-04-17)
-# Dead.  Upstream repo gone.  Requires obsolete dev-python/pep8.
-# No revdeps.
-# Removal on 2021-05-17.  Bug #783366.
-dev-python/pytest-pep8
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-16)
-# Dubious usefulness in current Plasma 5, unmaintained upstream, depends on
-# even less maintained and chronically broken libraries with many open bugs.
-# media-gfx/icc-examin: Bug #740010
-# media-libs/libXcm: Bugs #525326, #724808
-# media-libs/oyranos: Bugs #702158, #705364, #780057
-# app-admin/elektra: Bugs #601992, #656168
-# Removal on 2021-05-16
-kde-misc/kolor-manager
-app-admin/elektra
-media-gfx/icc-examin
-media-gfx/synnefo
-media-libs/libXcm
-media-libs/openicc
-media-libs/oyranos
-
-# Bernard Cafarelli <voyageur@gentoo.org> (2021-04-15)
-# Abandoned upstream, does not work with current API,
-# does not compile with current mpv
-# Removal on 2021-05-15, bug #782601
-media-video/orion
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-04-15)
 # dev-java/jcodings-1.0.55 depends on masked >=virtual/{jdk,jre}-11
 # dev-java/joni-2.1.41 depends on masked >=virtual/{jdk,jre}-11
@@ -659,12 +670,6 @@ media-video/orion
 # Removal on 2021-06-01.  Bug #782904.
 x11-themes/gtk-engines-aurora
 
-# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-14)
-# java libraries not used by any other package,
-# masked for removal
-dev-java/odfdom
-dev-java/saaj
-
 # Jonas Stein <jstein@gentoo.org> (2021-04-14)
 # Open bugs, dead upstream.
 # Removal on 2021-06-01.  Bug #782730.
@@ -692,12 +697,6 @@ x11-misc/xstroke
 #   https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf
 sys-devel/autoconf:2.71
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2021-03-14)
-# Dead upstream. No revdeps.
-# Removal in 60 days to allow people extra time
-# for transitioning out. Bug #776262.
-app-admin/lastpass-cli
-
 # Sam James <sam@gentoo.org> (2021-03-03)
 # Doesn't seem to sync clock correctly
 # in some cases.
@@ -797,11 +796,6 @@ dev-lang/spark
 # Mask until sys-libs/libxcrypt[system] is unmasked
 >=virtual/libcrypt-2
 
-# Andrew Ammerlaan <andrewammerlaan@riseup.net> (2020-01-26)
-# v3.6.4 uses huge amounts of memory: Bug #705682
-# v3.6.1 is the latest version without this issue
->=dev-libs/libsass-3.6.2
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
@@ -879,8 +873,8 @@ sys-devel/automake:1.10
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-libs/glibc-2.32-r3
-<sys-devel/binutils-2.34
-<sys-devel/binutils-hppa64-2.34
+<sys-devel/binutils-2.35.2
+<sys-devel/binutils-hppa64-2.35.2
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
 # This package has some dangerous quality and security issues, but
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index e8a4791818f5..f3b1c6b3e573 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -164,8 +164,8 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop			stable
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome		stable
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/desktop/gnome/systemd	stable
 ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian		stable
-ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	stable
+#ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian		stable
+#ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/little-endian/systemd	stable
 
 # PPC/PPC64 flat Profiles
 # @MAINTAINER: gyakovlev@gentoo.org, ppc64@gentoo.org, musl@gentoo.org
@@ -187,6 +187,8 @@ ppc64		default/linux/ppc64/17.0/musl				exp
 ppc64		default/linux/ppc64/17.0/musl/hardened			exp
 ppc64		default/linux/ppc64le/17.0				stable
 ppc64		default/linux/ppc64le/17.0/desktop			stable
+ppc64		default/linux/ppc64le/17.0/desktop/gnome		dev
+ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd	dev
 ppc64		default/linux/ppc64le/17.0/desktop/plasma		dev
 ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd	dev
 ppc64		default/linux/ppc64le/17.0/systemd			stable
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
index 22893db01ab9..20199b3e162c 100644
--- a/profiles/updates/4Q-2018
+++ b/profiles/updates/4Q-2018
@@ -4,4 +4,3 @@ move dev-libs/mini-xml dev-libs/mxml
 move x11-misc/xembedsniproxy kde-plasma/xembed-sni-proxy
 move x11-apps/intel-gpu-tools x11-apps/igt-gpu-tools
 move games-board/knights kde-apps/knights
-move media-gfx/icc_examin media-gfx/icc-examin
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c19b4c9b31f4..6c89a4ce1908 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -58,11 +58,6 @@ app-admin/diamond:redis - Enable Redis support
 app-admin/diradm:automount - Support for automount data in LDAP
 app-admin/diradm:irixpasswd - Support for storing separate IRIX passwords
 app-admin/doas:persist - Adds support for "persist" feature (experimental)
-app-admin/elektra:augeas - Enable plugin for reading and writing configuration files with help from Augeas
-app-admin/elektra:ini - Enable new, advanced ini support
-app-admin/elektra:simpleini - Enable simpleini support
-app-admin/elektra:uname - Enable uname information for the key database
-app-admin/elektra:yajl - Enable yajl support
 app-admin/gkrellm:X - Build both the X11 gui (gkrellm) and the server (gkrellmd). Disabling this flag builds the server only
 app-admin/gkrellm:gnutls - Enable SSL support for mail checking with net-libs/gnutls (overrides 'ssl' USE flag)
 app-admin/gkrellm:hddtemp - Enable monitoring harddrive temperatures via app-admin/hddtemp
@@ -79,8 +74,6 @@ app-admin/keepassxc:ccache - Use dev-util/ccache to build keepassxc
 app-admin/keepassxc:keeshare - Enable KeeShare sharing integration
 app-admin/keepassxc:network - Enable network support
 app-admin/keepassxc:yubikey - Enable database unlocking via YubiKey.
-app-admin/lastpass-cli:X - Use x11-misc/xclip or x11-misc/xsel to copy passwords to the clipboard.
-app-admin/lastpass-cli:pinentry - Use app-crypt/pinentry to prompt for passwords.
 app-admin/logrotate:acl - Installs acl support
 app-admin/logrotate:cron - Installs cron file
 app-admin/logrotate:selinux - Installs Security Enhanced Linux support
@@ -260,6 +253,7 @@ app-backup/bareos:sql-pooling - Enable SQL pooling support
 app-backup/bareos:storage-daemon - Install storage daemon (bareos-sd)
 app-backup/btrbk:lsbtr - Enable the lsbtr command-line tool
 app-backup/btrbk:mbuffer - Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality
+app-backup/dar:argon2 - Enable password hashing algorithm from app-crypt/argon2
 app-backup/dar:dar32 - Enables --enable-mode=32 option, which replace infinite by 32 bit integers
 app-backup/dar:dar64 - Enables --enable-mode=64 option, which replace infinite by 64 bit integers
 app-backup/dar:gcrypt - Enables strong encryption support
@@ -387,6 +381,7 @@ app-editors/emacs:gsettings - Use gsettings (dev-libs/glib) to read the system f
 app-editors/emacs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs:harfbuzz - Use media-libs/harfbuzz as text shaping engine
 app-editors/emacs:imagemagick - Use media-gfx/imagemagick for image processing
+app-editors/emacs:jit - Compile with Emacs Lisp native compiler support via libgccjit
 app-editors/emacs:json - Compile with native JSON support using dev-libs/jansson
 app-editors/emacs:libxml2 - Use dev-libs/libxml2 to parse XML instead of the internal Lisp implementations
 app-editors/emacs:mailutils - Retrieve e-mail using net-mail/mailutils instead of the internal movemail substitute
@@ -803,6 +798,7 @@ app-misc/gcstar:stats - Enable statistics reporting
 app-misc/gcstar:tellico - Enable support for kde-misc/tellico files
 app-misc/geoclue:modemmanager - Enable geolocation through 3G or GPS enabled hardware through net-misc/modemmanager.
 app-misc/geoclue:zeroconf - Enable retrieval of GPS location from Android devices with https://wiki.gnome.org/Apps/GeoclueShare
+app-misc/gramps:berkdb - Support BerkeleyDB-based family trees produced by older versions of Gramps
 app-misc/gramps:geo - Enable rendering of geographical data using sci-geosciences/osm-gps-map
 app-misc/gramps:rcs - Adds support for family tree archives via dev-vcs/rcs
 app-misc/gramps:reports - All external software that is needed for graphical reports will be installed
@@ -1443,7 +1439,6 @@ dev-haskell/comonad:indexed-traversable - You can disable the use of the `indexe
 dev-haskell/contravariant:semigroups - You can disable the use of the `semigroups` package using `-f-semigroups`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:statevar - You can disable the use of the `StateVar` package using `-f-StateVar`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:tagged - You can disable the use of the `tagged` package on older versons of GHC using `-f-tagged`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
-dev-haskell/cpu:executable - build 'cpuid' tool
 dev-haskell/criterion:embed-data-files - Embed the data files in the binary for a relocatable executable
 dev-haskell/crypto-api:all-cpolys - Build all the CMAC polynomes up to 10000 bits instead of just the usual ones
 dev-haskell/cryptonite:integer-gmp - Whether or not to use GMP for some functions
@@ -1937,6 +1932,7 @@ dev-libs/aws-sdk-cpp:unity-build - Build using a single unified .cpp file for ea
 dev-libs/aws-sdk-cpp:waf - The Web Application Firewall (WAF) can monitor web requests that are forwarded to Amazon CloudFront distributions or an Application Load Balancer. Can also be used to block or allow requests based on conditions such as the IP addresses that requests originate from or values in the requests. Also enables fms, network-firewall, waf-regional and wafv2
 dev-libs/aws-sdk-cpp:wellarchitected - Use the AWS Well-Architected Tool to review your workloads against current AWS architectural best practices. The AWS Well-Architected Tool measures the workload and provides recommendations on how to improve your architecture.
 dev-libs/bitset:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations
+dev-libs/boehm-gc:large - optimize for large heap size (also increases max root sets)x
 dev-libs/boost:context - Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it
 dev-libs/boost:debug - Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.
 dev-libs/boost:doc - Install the full API documentation documentation. This takes over 200MB of extra disk space.
@@ -2378,8 +2374,8 @@ dev-python/QtPy:network - Pull in bindings for the QtNetwork module
 dev-python/QtPy:opengl - Pull in bindings for the QtOpenGL module
 dev-python/QtPy:positioning - Pull in bindings for the QtPositioning module
 dev-python/QtPy:printsupport - Pull in bindings for the QtPrintSupport module
-dev-python/QtPy:qml - Pull in QtQml module
-dev-python/QtPy:quick - Pull in QtQuick and QtQuickWidgets modules
+dev-python/QtPy:pyqt5 - Use dev-python/PyQt5 as Qt for Python implementation
+dev-python/QtPy:pyside2 - Use dev-python/pyside2 as Qt for Python implementation
 dev-python/QtPy:sensors - Pull in bindings for the QtSensors module
 dev-python/QtPy:serialport - Pull in bindings for the QtSerialPort module
 dev-python/QtPy:sql - Pull in bindings for the QtSql module
@@ -2394,7 +2390,6 @@ dev-python/QtPy:xml - Pull in QtXml module
 dev-python/QtPy:xmlpatterns - Pull in bindings for the QtXmlPatterns module
 dev-python/autobahn:scram - Add support for WAMP-SCRAM authentication
 dev-python/autobahn:xbr - Add support for XBR decentralized data markets and etherium blockchain
-dev-python/cryptography:idna - enable support for the old, deprecated IDNA specification (RFC 3490)
 dev-python/ctypescrypto:gost - Build with support for GOST Message Authentication Code
 dev-python/cvxopt:dsdp - Use interior point library sci-libs/dsdp
 dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
@@ -4215,6 +4210,7 @@ media-libs/libsdl2:haptic - Enable the haptic (force feedback) subsystem
 media-libs/libsdl2:ibus - Enable support for app-i18n/ibus
 media-libs/libsdl2:joystick - Control joystick support (disable at your own risk)
 media-libs/libsdl2:kms - Build the KMSDRM video driver
+media-libs/libsdl2:sndio - Enable support for the media-sound/sndio backend
 media-libs/libsdl2:sound - Control audio support (disable at your own risk)
 media-libs/libsdl2:tslib - Build with tslib support for touchscreen devices
 media-libs/libsdl2:video - Control video support (disable at your own risk)
@@ -4461,6 +4457,8 @@ media-sound/alsa-utils:ncurses - install utils that use ncurses (e.g. alsamixer)
 media-sound/alsaplayer:id3tag - Enables ID3 tagging with id3tag library
 media-sound/amsynth:dssi - Enable support for DSSI Soft Synth Interface
 media-sound/amsynth:lv2 - Add support for Ladspa V2
+media-sound/amsynth:nsm - Build support for Non Session Manager
+media-sound/amsynth:vst - Build VST plug-in
 media-sound/apulse:sdk - Install PulseAudio headers and pkg-config files. Be aware apulse is not a full PulseAudio replacement by design and some functionality may be missing.
 media-sound/aqualung:ifp - Enable support for iRiver iFP portable audio players
 media-sound/aqualung:lua - Enable support for programmable title formatting with dev-lang/lua
@@ -4647,6 +4645,7 @@ media-sound/ncmpc:outputs-screen - Enable the outputs screen
 media-sound/ncmpc:search-screen - Enable search screen
 media-sound/ncmpc:song-screen - Enable song viewer screen
 media-sound/ncmpcpp:clock - Enable clock screen
+media-sound/ncmpcpp:lto - Build with link-time optimisation
 media-sound/ncmpcpp:outputs - Enable outputs screen
 media-sound/ncmpcpp:visualizer - Enable visualizer screen with sound wave/frequency spectrum modes
 media-sound/patchage:jack-dbus - Use Jack via D-Bus instead of libjack
@@ -5045,9 +5044,6 @@ media-video/obs-studio:ssl - Build with TLS/SSL support for RTMPS connections.
 media-video/obs-studio:vlc - Build with VLC media source support.
 media-video/ogmrip:ogm - Support for OGM container format
 media-video/ogmrip:srt - Support for SRT subtitle format
-media-video/orion:mpv - Use the media-video/mpv player (upstream default)
-media-video/orion:qtav - Use the media-libs/qtav player
-media-video/orion:qtmedia - Use the dev-qt/qtmultimedia
 media-video/peek:keybinder - Enable support for global hotkeys using dev-libs/keybinder
 media-video/pipewire:aac - AAC over Bluetooth (iPhone compatible headphones)
 media-video/pipewire:aptx - aptX (HD) over Bluetooth (many Android compatible headphones)
@@ -5426,6 +5422,7 @@ net-analyzer/zabbix:static - Build statically linked binaries
 net-analyzer/zmap:mongo - Add support for storing in a mongo DB via dev-db/mongodb
 net-analyzer/zmap:redis - Add support for storing in a redis DB via dev-libs/hiredis
 net-dialup/accel-ppp:ipoe - Build IPoE kernel module
+net-dialup/accel-ppp:libtomcrypt - Support crypto algorithms through dev-libs/libtomcrypt instead of dev-libs/openssl
 net-dialup/accel-ppp:shaper - Support for traffic shaping
 net-dialup/accel-ppp:valgrind - Compile in valgrind hints
 net-dialup/freeradius:memcached - Include dev-libs/libmemcached in caching drivers
@@ -5978,7 +5975,7 @@ net-libs/libgsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-li
 net-libs/libiio:aio - Enable asynchronous IO support
 net-libs/libisds:openssl - Use dev-libs/openssl as crypto backend instead of app-crypt/gpgme and dev-libs/libgcrypt
 net-libs/libmicrohttpd:epoll - Use epoll() system call
-net-libs/libmicrohttpd:thread-names - Assign thread names to internal threads
+net-libs/libmicrohttpd:thread-names - Assign thread names to internal threads, useful for dependent apps debugging
 net-libs/libnids:glib - Use dev-libs/glib for multiprocessing support
 net-libs/libnids:libnet - Include code requiring net-libs/libnet
 net-libs/libnma:pkcs11 - Enable PKCS#11 support in certificate chooser via app-crypt/gcr
@@ -7158,6 +7155,7 @@ sci-geosciences/qgis:netcdf - Enable MDAL support for GRIB and XMDF formats
 sci-geosciences/qgis:opencl - Enable OpenCL support
 sci-geosciences/qgis:polar - Enable support for the polar coordinate system via x11-libs/qwtpolar
 sci-geosciences/qgis:qml - Enable support Qml-based plugins using dev-qt/qtdeclarative
+sci-geosciences/qgis:serial - Enable support for serial GPS using dev-qt/qtserialport
 sci-geosciences/viking:geoclue - Use app-misc/geoclue to determine current location
 sci-geosciences/viking:libexif - Use media-libs/libexif for EXIF support
 sci-geosciences/viking:oauth - Enable OAuth authentication for OSM
@@ -7686,7 +7684,7 @@ sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:flashrom - Enable flashrom plugin via sys-apps/flashrom
 sys-apps/fwupd:gusb - Enable dev-libs/libgusb support
 sys-apps/fwupd:nvme - Build and install NVMe plugin
-sys-apps/fwupd:redfish - Install redfish plugin
+sys-apps/fwupd:spi - Install Intel-SPI plugin
 sys-apps/fwupd:synaptics - Install synaptics plugin
 sys-apps/fwupd:thunderbolt - Install Thunderbolt plugin
 sys-apps/fwupd:tpm - Install Trusted Platform Module plugin
@@ -7872,14 +7870,12 @@ sys-auth/polkit:elogind - Use sys-auth/elogind for session tracking
 sys-auth/polkit:systemd - Use sys-apps/systemd for session tracking
 sys-auth/ssh-ldap-pubkey:schema - Install a copy of the LPK schema, only needed on LDAP servers.
 sys-auth/sssd:acl - Build and use the cifsidmap plugin
-sys-auth/sssd:autofs - Build helper to let net-fs/autofs use sssd provided information
 sys-auth/sssd:locator - Install sssd's Kerberos plugin
-sys-auth/sssd:manpages - Build man pages with dev-libs/libxslt
 sys-auth/sssd:netlink - Add support for netlink protocol via dev-libs/libnl
 sys-auth/sssd:nfsv4 - Add support for the nfsv4 idmapd plugin provided by net-libs/libnfsidmap
 sys-auth/sssd:pac - Add Privileged Attribute Certificate Support for Kerberos
-sys-auth/sssd:ssh - Build helper to let net-misc/openssh use sssd provided information
 sys-auth/sssd:sudo - Build helper to let app-admin/sudo use sssd provided information
+sys-auth/sssd:systemtap - Enable SystemTAP/DTrace tracing
 sys-auth/sssd:valgrind - Depend on dev-util/valgrind for test suite
 sys-block/f3:extra - Build the additional f3probe, f3brew and f3fix utility (requires sys-block/parted and virtual/udev)
 sys-block/fio:aio - Enable AIO ioengine
@@ -8267,7 +8263,6 @@ sys-fs/lvm2:sanlock - Enable lvmlockd with support for sanlock
 sys-fs/lvm2:thin - Support for thin volumes
 sys-fs/mtpfs:mad - Enable handling of MP3's metadata
 sys-fs/multipath-tools:rbd - Enable Rados block device support via sys-cluster/ceph
-sys-fs/ntfs3g:external-fuse - Use external FUSE library instead of internal one. Must be disabled for unprivileged mounting to work.
 sys-fs/ntfs3g:ntfsdecrypt - Build and install the ntfsdecrypt application.
 sys-fs/ntfs3g:ntfsprogs - Include internal version of ntfsprogs.
 sys-fs/quota:netlink - Compile daemon receiving quota messages via netlink
@@ -8473,7 +8468,7 @@ virtual/mpi:romio - Enable romio, a high-performance portable MPI-IO
 virtual/mysql:embedded - Build embedded server (libmysqld)
 virtual/mysql:server - Build server (mysqld)
 virtual/podofo-build:boost - Add support for boost
-virtual/podofo-build:tools - Build and install commandline tools.
+virtual/podofo-build:tools - Build and install commandline tools
 virtual/ssh:minimal - Prefer net-misc/dropbear over net-misc/openssh
 virtual/wine:staging - Enable Wine-Staging's Patchset
 www-apache/mod_backtrace:unwind - Use sys-libs/libunwind to provide better resolution of function names.