gentoo resync : 08.07.2021

23 files changed, 195 insertions, 79 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8cec410e43a7..32489d150dc4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 4b196ab45f10..418690e8ef54 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -4,6 +4,9 @@
 # Unmask the flag which corresponds to ARCH.
 -alpha
 
+# Matt Turner <mattst88@gentoo.org> (2021-07-05)
+nftables
+
 # Michał Górny <mgorny@gentoo.org> (2021-05-20)
 # Unresolved keywordreqs are getting in the way.
 # https://bugs.gentoo.org/773451
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 57a0ece94145..39fdd5ddc373 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # David Seifert <soap@gentoo.org> (2018-01-03)
@@ -57,6 +57,7 @@ games-arcade/gish-demo
 games-arcade/jardinains
 games-arcade/thinktanks-demo
 games-emulation/caps
+games-emulation/gens
 games-emulation/nestra
 <games-emulation/pcsx2-9999
 games-emulation/vgba
diff --git a/profiles/arch/arm/armv4/package.mask b/profiles/arch/arm/armv4/package.mask
index ade078378818..96b2802226b3 100644
--- a/profiles/arch/arm/armv4/package.mask
+++ b/profiles/arch/arm/armv4/package.mask
@@ -23,3 +23,4 @@ virtual/rust
 >=gnome-base/gnome-shell-3.38
 >=x11-themes/adwaita-icon-theme-3.36
 >=net-irc/polari-3.37
+>=sys-apps/bat-0.18.1
diff --git a/profiles/arch/arm/armv4t/package.mask b/profiles/arch/arm/armv4t/package.mask
index ade078378818..96b2802226b3 100644
--- a/profiles/arch/arm/armv4t/package.mask
+++ b/profiles/arch/arm/armv4t/package.mask
@@ -23,3 +23,4 @@ virtual/rust
 >=gnome-base/gnome-shell-3.38
 >=x11-themes/adwaita-icon-theme-3.36
 >=net-irc/polari-3.37
+>=sys-apps/bat-0.18.1
diff --git a/profiles/arch/arm/armv5te/package.mask b/profiles/arch/arm/armv5te/package.mask
index 76c390273490..582286839434 100644
--- a/profiles/arch/arm/armv5te/package.mask
+++ b/profiles/arch/arm/armv5te/package.mask
@@ -23,3 +23,4 @@ virtual/rust
 >=gnome-base/gnome-shell-3.38
 >=x11-themes/adwaita-icon-theme-3.36
 >=net-irc/polari-3.37
+>=sys-apps/bat-0.18.1
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 3f0c40f59f03..2635ab9f45fa 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-06-20)
-# kde-frameworks/syndication not yet keyworded, bug #796233
-kde-frameworks/knewstuff opds
-
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-12)
 # no stable virtual/jdk on this arch
 media-libs/rubberband jni
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index e9bd1aaf19cf..fe5f6d5127ad 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
+# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
+games-fps/yamagi-quake2 vulkan
+
 # Stefan Strogin <steils@gentoo.org> (2021-06-27)
 # Requires dev-python/adblock which is not keyworded on arm64 yet
 www-client/qutebrowser adblock
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index fad94c8bc5f3..e5f2e3039e40 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -24,6 +24,7 @@
 # Matt Turner <mattst88@gentoo.org> (2021-06-02)
 # dev-util/gi-docgen does not have stable keywords on hppa
 x11-libs/gdk-pixbuf gtk-doc
+x11-libs/pango gtk-doc
 
 # Sam James <sam@gentoo.org> (2021-06-01)
 # sys-apps/systemd is not stable on hppa
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index 187b4ac618af..8e2f205d60b7 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -6,7 +6,3 @@
 # around September.
 python_single_target_python3_10
 python_targets_python3_10
-
-# Michał Górny <mgorny@gentoo.org> (2021-01-07)
-# Prebuilt kernel rebuilds are supported on stable yet.
-dist-kernel
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 9f8966075dba..5b0df73f6d2b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,47 +1,59 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# sys-cluster/ucx fails to compile on this arch
+sys-cluster/slurm ucx
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# net-dialup/mgetty fails to compile on this arch
+mail-mta/courier fax
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+#   dev-db/postgresql not keyworded here yet
+dev-db/libdbi-drivers postgres
+dev-libs/cyrus-sasl postgres
+mail-mta/courier postgres
+net-libs/courier-authlib postgres
+
 # Ye Cao <ye.c@rioslab.org> (2021-07-02)
 # Dependencies not keyworded, not tested
 app-text/texlive-core xetex
 dev-python/ipython nbconvert notebook
 dev-python/matplotlib cairo excel wxwidgets
 media-sound/alsa-utils libsamplerate
-sci-libs/fftw mpi
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-02)
+# Yixun Lan <dlan@gentoo.org> (2021-05-24)
+#   net-fs/samba not keyworded here yet
+app-misc/mc samba
+gnome-base/gvfs samba
+net-libs/libsoup samba
+www-client/elinks samba
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
 # Dependencies not keyworded here yet:
 #  - gnome-base/gconf, dev-libs/libotf & dev-libs/m17n-lib, net-libs/webkit-gtk
 app-editors/emacs gconf m17n-lib xwidgets
 #  - net-fs/openafs
 app-crypt/heimdal afs
-#  - dev-util/cmocka  (note: tests are restricted anyway)
-app-crypt/mit-krb5 test
 #  - MANY, to be reviewed
 dev-cpp/eigen doc test
-#  - mail-mta/courier | net-mail/courier-imap, dev-db/postgresql
-dev-libs/cyrus-sasl authdaemond postgres
+#  - dev-python/pygraphviz & sci-libs/gdal, dev-python/pandas
+dev-python/networkx extras pandas
 #  - sci-libs/umfpack (and a lot of its own deps in turn)
 dev-python/scipy sparse
 #  - dev-db/libdbi, sys-cluster/ceph
 net-analyzer/rrdtool dbi rados
-#  - virtual/mpi[fortran]
-sci-libs/arpack mpi
-#  - net-fs/samba, dev-libs/tre
-www-client/elinks samba tre
+#  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
+sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_psm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_dynamic-sl openmpi_ofed_features_rdmacm openmpi_ofed_features_udcm
+#  - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
+sys-cluster/slurm hdf5 ofed slurmdbd
 
 # Ye Cao <ye.c@rioslab.org> (2021-06-24)
 # Dependencies not keyworded, not tested
 media-gfx/imagemagick fftw openexr wmf
 
-# Marek Szuba <marecki@gentoo.org> (2021-06-21)
-# net-fs/samba not keyworded here, not tested
-app-misc/mc samba
-
-# Marek Szuba <marecki@gentoo.org> (2021-05-31)
-# dev-python/networkx not keyworded here
-app-portage/nattka depgraph-order
-
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
 dev-libs/libdbusmenu test
@@ -53,7 +65,7 @@ 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
+gnome-base/gvfs bluray cdda gnome-online-accounts google mtp ios test zeroconf
 sys-power/upower ios
 net-libs/webkit-gtk gstreamer
 xfce-base/xfce4-settings colord libcanberra
@@ -99,10 +111,6 @@ app-crypt/pinentry efl
 # Dependency not keyworded on this arch.
 app-text/enchant voikko
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-12-07)
-# No riscv keyword in sys-apps/hwloc
-sys-process/htop hwloc
-
 # Patrick McLean <chutzpah@gentoo.org> (2020-04-16)
 # dev-python/breathe not keyworded here, mask to facilitate
 # keywording dev-libs/libfido2
@@ -123,7 +131,6 @@ dev-libs/libpcre jit
 
 app-admin/syslog-ng amqp dbi geoip2 kafka mongodb redis spoof-source smtp snmp test
 app-arch/p7zip wxwidgets
-app-crypt/gnupg wks-server
 app-crypt/mit-krb5 doc
 app-doc/doxygen doc
 app-editors/emacs mailutils
@@ -131,7 +138,6 @@ app-misc/pax-utils python
 app-text/asciidoc test
 app-text/ghostscript-gpl cups
 app-text/po4a test
-dev-libs/boost mpi
 dev-libs/check subunit
 dev-libs/libgcrypt doc
 dev-python/argcomplete test
@@ -148,9 +154,7 @@ dev-util/catalyst iso
 dev-util/pkgconf test
 dev-vcs/git cvs highlight subversion
 dev-vcs/mercurial zsh-completion
-media-libs/freetype harfbuzz
 media-libs/harfbuzz doc
-sys-libs/libomp hwloc
 sys-libs/libcxx libcxxabi libunwind static-libs
 sys-libs/libcxxabi libunwind
 media-gfx/graphviz devil svg pdf
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index 719b190a828c..1da3c44b0864 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -15,6 +15,17 @@
 -gtk3
 -introspection
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-05)
+# dev-lang/lua:5.2 and dev-lang/luajit known not to work here
+lua_single_target_lua5-2
+lua_single_target_luajit
+lua_targets_lua5-2
+lua_targets_luajit
+# dev-lang/lua:5.1 needs run-time testing, it passes build-time tests
+# but its test suite is much less comprehensive than that of 5.2+
+lua_single_target_lua5-1
+lua_targets_lua5-1
+
 # Ben Kohler <bkohler@gentoo.org> (2019-01-09)
 # no fam providers keyworded yet
 fam
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 3d6c0da55827..db99db7e76b6 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2021-07-04)
+# Needed until media-libs/libsdl2[vulkan] is unmasked on this arch.
+games-fps/yamagi-quake2 vulkan
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
 # Feature currently relies on amd64 prebuilt binaries.
 media-video/obs-studio browser
@@ -57,11 +61,6 @@ sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo
 sys-libs/compiler-rt-sanitizers -gwp-asan
 sys-libs/compiler-rt-sanitizers -profile
 
-# Alexey Sokolov <alexey+gentoo@asokolov.org> (2020-10-28)
-# dev-qt/linguist-tools-5.15.0 and 5.15.1 OOM with bad_alloc.
-# bug #751418
->=sci-astronomy/stellarium-0.20.3 nls
-
 # Sam James <sam@gentoo.org> (2020-10-05)
 # Guile only supports JIT on some arches
 # (See 9.3.8 in the Guile manual)
diff --git a/profiles/base/package.mask b/profiles/base/package.mask
index c103679ebe56..6f21ce80d960 100644
--- a/profiles/base/package.mask
+++ b/profiles/base/package.mask
@@ -1,2 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (06.07.2021)
+# Root privilege escalation, CVE-2017-18925, bug 751415
+sys-apps/opentmpfiles
+
+# (above is added here instead of in ../package.mask so x86 musl can
+# override it for the moment)
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d37141e9b8b4..12955cfde540 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Aaron W. Swenson <titanofold@gentoo.org> (2021-07-05)
+# PostgreSQL 9.5 masked for removal
+postgres_targets_postgres9_5
+
 # David Seifert <soap@gentoo.org> (2021-06-20)
 # Abandoned upstream, last release 17 years ago, unmaintained, tons of
 # QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
diff --git a/profiles/default/linux/ppc64/17.0/systemd/eapi b/profiles/default/linux/ppc64/17.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64/17.0/systemd/parent b/profiles/default/linux/ppc64/17.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/ppc64/17.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/default/linux/x86/17.0/musl/package.mask b/profiles/default/linux/x86/17.0/musl/package.mask
new file mode 100644
index 000000000000..48c3e6db7a7e
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/musl/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2
+
+# Sam James <sam@gentoo.org> (2021-07-06)
+# Forces -fstack-protector, masking for now to allow stage3s to be built.
+# Masking this forces sys-apps/opentmpfiles to provide virtual/tmpfiles.
+# bug #800893
+# Temporarily unmask opentmpfiles here to get working stages.
+sys-apps/systemd-tmpfiles
+-sys-apps/opentmpfiles
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index d92f83aeac0e..845b9573adfb 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -11,6 +11,7 @@ kde-plasma/plasma-firewall
 app-admin/gnome-abrt
 >=dev-libs/libreport-2.9
 games-util/gamemode
+gnome-extra/gnome-logs
 gnome-extra/gnome-user-share
 
 # Göktürk Yüksek <gokturk@gentoo.org> (2016-11-09)
@@ -24,35 +25,10 @@ www-misc/profile-sync-daemon
 # systemd has no support in the SELinux policy at the moment.
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_systemd.3F
 app-admin/systemdgenie
-app-eselect/eselect-gnome-shell-extensions
 app-office/wps-office
 sys-apps/systemd
 app-admin/calamares
 dev-python/python-systemd
-gnome-base/gdm
-gnome-base/gnome
-gnome-base/gnome-applets
-gnome-base/gnome-extra-apps
-gnome-base/gnome-flashback
-gnome-base/gnome-light
-gnome-base/gnome-panel
-gnome-base/gnome-shell
-gnome-extra/chrome-gnome-shell
-gnome-extra/gnome-logs
-gnome-extra/gnome-shell-extensions
-gnome-extra/gnome-shell-frippery
-gnome-extra/gnome-shell-extensions-topicons-plus
-gnome-extra/gnome-shell-extension-appindicator
-gnome-extra/gnome-shell-extension-applications-overview-tooltip
-gnome-extra/gnome-shell-extension-bing-wallpaper
-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-shell-extension-pop-shell
-gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
 gnome-extra/pch-session
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index fa0016533bcc..40676d30d5c5 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -14,14 +14,10 @@ net-analyzer/wireshark sdjournal
 # Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
 app-emulation/libvirt firewalld
 gnome-base/gdm wayland
+gnome-base/gnome-extra-apps share
 net-firewall/fwknop firewalld
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 >=x11-wm/mutter-3.22 wayland
-x11-misc/xscreensaver gdm
-x11-misc/gpaste gnome
-x11-terms/gnome-terminal gnome-shell
-x11-themes/arc-theme gnome-shell
-x11-themes/zukitwo gnome-shell
 net-wireless/bluez user-session
 
 # Brian Dolbec <dolsen@gentoo.org> (2014-09-17)
diff --git a/profiles/package.mask b/profiles/package.mask
index ef7be0a96414..8efa2137c149 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,100 @@
 
 #--- END OF EXAMPLES ---
 
+# Pacho Ramos <pacho@gentoo.org> (2021-07-08)
+# Doesn't support Gnome 40, use gnome-shell-extension-desktop-icons-ng
+# instead. Removal in 30 days.
+gnome-extra/gnome-shell-extension-desktop-icons
+
+# Pacho Ramos <pacho@gentoo.org> (2021-07-08)
+# Doesn't support Gnome 40, use gnome-shell-extension-appindicator instead
+# (also supports legacy tray icons). Removal in 30 days.
+gnome-extra/gnome-shell-extensions-topicons-plus
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-07)
+# Security bug CVE-2015-9284, bug 761960. Use slot 2 instead.
+# Masked for removal in 30 days.
+dev-ruby/omniauth:0
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-06)
+# Obsolete slot, no dependencies. Use dev-ruby/http:4 instead.
+# Masked for removal in 30 days.
+dev-ruby/http:3
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-06)
+# Last release in 2013, no tests, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/nagios
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-06)
+# Last release in 2013, no tests, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/notify
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-06)
+# Last release in 2013, all dependencies have switched to rash_alt.
+# Masked for removal in 30 days.
+dev-ruby/rash
+
+# Michał Górny <mgorny@gentoo.org> (2021-07-06)
+# Upstream changed license to GPL-3+ in order to deliberately cause
+# incompatiblity with revdep licenses.  Mask until the situation
+# is resolved.  Bug #791259.
+>=media-libs/libopenaptx-0.2.1
+
+# Aaron W. Swenon <titanofold@gentoo.org> (2021-07-05)
+# PostgreSQL 9.5 has reached end of life and will no longer receive any
+# updates -- security or otherwise -- from upstream or Gentoo.
+#
+# You should migrate immediately.
+#     https://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Post-9.0_Migration
+#
+# For more information about PostgreSQL's versioning policy, see:
+#     https://www.postgresql.org/support/versioning/
+#
+# Removal after 2021-08-04.
+dev-db/postgresql:9.5
+
+# Michał Górny <mgorny@gentoo.org> (2021-07-06)
+# Various Python 2-specific backports.  All the reverse dependencies
+# (except for deps between these packages) have been eliminated.
+# Removal on 2021-08-05.  Bug #800698.
+dev-python/contextlib2
+dev-python/linecache2
+dev-python/pathlib2
+dev-python/traceback2
+dev-python/unittest2
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-07-05)
+# The platform is outdated and not maintained anymore.
+# Mask for removal in 30 days.
+dev-haskell/haskell-platform
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-04)
+# severely broken nfs
+# possibly depper problem due to bug in mm/page_alloc
+# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ff4b2b4014cbffb3d32b22629252f4dc8616b0fe
+# feel free to unmask if required, but be aware of
+# possible silent data corruption
+=sys-kernel/gentoo-sources-5.13.0
+=sys-kernel/vanilla-sources-5.13.0
+
+# Matt Turner <mattst88@gentoo.org> (2021-07-04)
+# Not used by any package. Has not worked for a very long time
+# as far as I can tell.
+# Removal on 2021-08-04
+app-eselect/eselect-xvmc
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-04)
+# Last release in 2016, failing tests, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/shotgun
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-04)
+# Last release in 2012, no working tests, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/source_map
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2021-07-02)
 # Outdated, not really maintained. Grab it if you like.
 # Masked for removal in 30 days. bug #800097.
@@ -326,11 +420,6 @@ dev-python/csv23
 ~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
-
 # Andrey Grozin <grozin@gentoo.org> (2021-05-25)
 # DEPENDs on sci-libs/proj-8
 # Unmask after unmasking proj-8
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 6328acc2d092..3f917d7f4b0e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -181,6 +181,7 @@ ppc64		default/linux/powerpc/ppc64/17.0/64bit-userland/developer		stable
 ppc64		default/linux/ppc64/17.0				exp
 #ppc64		 default/linux/ppc64/17.0/desktop			exp
 #ppc64		 default/linux/ppc64/17.0/desktop/gnome			exp
+ppc64		default/linux/ppc64/17.0/systemd			exp
 #ppc64		 default/linux/ppc64/17.0/desktop/gnome/systemd		exp
 #ppc64		 default/linux/ppc64/17.0/developer			exp
 ppc64		default/linux/ppc64/17.0/musl				exp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dab6cc86c028..4f0d7bea508f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2049,6 +2049,7 @@ dev-libs/libevent:malloc-replacement - Support for replacing the memory manageme
 dev-libs/libevent:mbedtls - Support for net-libs/mbedtls encryption
 dev-libs/libevent:ssl - Support for dev-libs/openssl encryption
 dev-libs/libevent:verbose-debug - Support for verbose debug logging
+dev-libs/libffi:exec-static-trampoline - Don't rely on dynamic code generation for trampolines.
 dev-libs/libffi:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libffi:pax_kernel - DEPRECATED alias for 'pax-kernel'. Do not use.
 dev-libs/libffi-compat:pax-kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
@@ -2140,7 +2141,9 @@ dev-libs/libzip:mbedtls - Use net-libs/mbedtls as TLS provider
 dev-libs/libzip:tools - Install binary tools to compare, modify and merge zip files
 dev-libs/link-grammar:aspell - Adds support for app-text/aspell spell checker
 dev-libs/link-grammar:hunspell - Adds support for app-text/hunspell spell checker
+dev-libs/log4cplus:explicit-initialization - Require explicit initialization
 dev-libs/log4cplus:iconv - Use inconv for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
+dev-libs/log4cplus:server - Build the logging server
 dev-libs/log4cplus:working-c-locale - Use the C99 locale facilities for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cplus:working-locale - Use C++'s std::locale for wchar_t <-> char conversions. See also log4cplus's unicode.txt documentation
 dev-libs/log4cxx:smtp - Offer SMTP support via net-libs/libesmtp
@@ -3024,6 +3027,7 @@ games-emulation/dosbox:core-inline - Enable memory-increasing inlines for better
 games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/openglide
 games-emulation/dosbox-staging:dynrec - Use recompiling cpu core instead of dynamic x86/x64 specific cpu core
 games-emulation/dosbox-staging:fluidsynth - use media-sound/fluidsynth for MIDI emulation
+games-emulation/dosbox-staging:mt-32 - use media-libs/munt-mt32emu for MT-32 emulation
 games-emulation/dosbox-staging:network - Enable networking features (modem, ipx)
 games-emulation/dosbox-staging:opus - Support compressed audio tracks (.opus) used with CDROM images
 games-emulation/generator:sdlaudio - Enable SDL Audio
@@ -3146,6 +3150,7 @@ games-fps/yamagi-quake2:client - Build client
 games-fps/yamagi-quake2:ctf - Build support for the 'Capture The Flag' addon
 games-fps/yamagi-quake2:rogue - Build support for the 'Ground Zero' Mission Pack
 games-fps/yamagi-quake2:softrender - Build software renderer
+games-fps/yamagi-quake2:vulkan - Build experimental Vulkan renderer
 games-fps/yamagi-quake2:xatrix - Build support for the 'The Reckoning' Mission Pack
 games-kids/gcompris:kiosk - Enable kiosk mode by default (for use by small children or on a self-service host machine)
 games-misc/little-inferno:bundled-libs - Use bundled libraries.
@@ -3322,6 +3327,7 @@ gnome-extra/synapse:plugins - Build support for plugins using net-libs/rest
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
 gnustep-apps/sogo:activesync - Build the ActiveSync support code
+gnustep-apps/sogo:sodium - Enable support for Argon2 password schemes using dev-libs/libsodium
 gnustep-base/gnustep-back-art:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-cairo:xim - Enable X11 XiM input method
 gnustep-base/gnustep-back-xlib:xim - Enable X11 XiM input method
@@ -3703,6 +3709,7 @@ mail-client/neomutt:smime-classic - Build classic-smime backend to support S/MIM
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
 mail-client/roundcube:change-password - Allow users to change passwords through Roundcube
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
+mail-client/roundcube:fileinfo - Use the dev-lang/php fileinfo extension to guess the mime_type of attachments
 mail-client/roundcube:ldap - Add dependencies to support connecting to an LDAP address book server
 mail-client/s-nail:kerberos - If network is enabled, this adds support for GSSAPI login on IMAP through virtual/krb5.
 mail-client/s-nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
@@ -3864,7 +3871,7 @@ media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o
 media-fonts/terminus-font:center-tilde - Place the '~' character vertically centered on the line instead of to the top.
 media-fonts/terminus-font:distinct-l - ll2 variant with more distinctive l (lowercase L)
 media-fonts/terminus-font:otf - Install Open Type Font (OTF) (required for HarfBuzz backend)
-media-fonts/terminus-font:pcf - Install Portable Compiled Font (PCF) (required for X11)
+media-fonts/terminus-font:pcf - Install Portable Compiled Font (PCF) (X11 bitmap fonts)
 media-fonts/terminus-font:pcf-unicode-only - Remove non-unicode PCF fonts that could be problematic. See bug #520222.
 media-fonts/terminus-font:psf - Install PC Screen Font (PSF) with unicode data (for linux console)
 media-fonts/terminus-font:quote - Changes view of quotes: symmetric ` and ' instead of asymmetric one (see homepage)
@@ -6473,12 +6480,14 @@ 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: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:connection-sharing - Support connection sharing (uses net-dns/dnsmasq)
+net-misc/networkmanager:dhclient - Use dhclient from net-misc/dhcp for getting an IP via DHCP
+net-misc/networkmanager:dhcpcd - Use net-misc/dhcpcd for getting an IP
 net-misc/networkmanager:elogind - Use sys-auth/elogind for session tracking
+net-misc/networkmanager:iptables - Use net-firewall/iptables for connection sharing
 net-misc/networkmanager:iwd - Use net-wireless/iwd instead of net-wireless/wpa_supplicant for wifi support by default
 net-misc/networkmanager:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
+net-misc/networkmanager:nftables - Use net-firewall/nftables for connection sharing
 net-misc/networkmanager:nss - Use dev-libs/nss for cryptography
 net-misc/networkmanager:ofono - Use net-misc/ofono for telephony support.
 net-misc/networkmanager:ovs - Enable OpenVSwitch support
@@ -6489,6 +6498,7 @@ net-misc/networkmanager:wext - Enable support for the deprecated Wext (Wireless
 net-misc/networkmanager:wifi - Enable support for wifi and 802.1x security
 net-misc/nextcloud-client:dolphin - Install the kde-apps/dolphin extension
 net-misc/nextcloud-client:nautilus - Install the gnome-base/nautilus extension
+net-misc/nextcloud-client:webengine - Enable old Flow1 login using dev-qt/qtwebengine
 net-misc/ntp:openntpd - Allow ntp to be installed alongside openntpd
 net-misc/ntp:parse-clocks - Add support for PARSE clocks
 net-misc/ntp:samba - Provide support for Samba's signing daemon (needed for Active Directory domain controllers)
@@ -7436,6 +7446,7 @@ sci-mathematics/agda:stdlib - Install the standard library.
 sci-mathematics/bertini:optimization - Accept upstream's choices for -O option.
 sci-mathematics/cgal:mpfi - Enable support for multiple recision interval arithmetic via sci-libs/mpfi
 sci-mathematics/cgal:ntl - Enable support for dev-libs/ntl
+sci-mathematics/cgal:shared - Build shared library
 sci-mathematics/cvc4:cln - Use sci-libs/cln
 sci-mathematics/cvc4:proofs - Support for proof generation
 sci-mathematics/cvc4:replay - Turn on the replay feature
@@ -8208,6 +8219,7 @@ sys-fs/cryptsetup:nettle - Use dev-libs/nettle crypto backend
 sys-fs/cryptsetup:openssl - Use dev-libs/openssl crypto backend
 sys-fs/cryptsetup:pwquality - Use dev-libs/libpwquality for password quality checking
 sys-fs/cryptsetup:reencrypt - Build cryptsetup-reencrypt
+sys-fs/cryptsetup:ssh - Build cryptsetup-ssh for experimental support of token via SSH-server
 sys-fs/cryptsetup:urandom - Use /dev/urandom instead of /dev/random
 sys-fs/dmraid:intel_led - Enable Intel LED support
 sys-fs/dmraid:led - Enable LED support