gentoo resync : 17.07.2021

22 files changed, 182 insertions, 114 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 84138cb0bfd3..e26c59109d36 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 41ae83a7573f..7abfa2b749c2 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-07-17)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801652
+dev-util/diffoscope haskell
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-05-07)
 # openjfx:8 will never be stabilized
 # openjfx:11 probably will neither
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 2635ab9f45fa..5646312f4808 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +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-17)
+# Java isn't available here right now
+dev-util/diffoscope pdf
+
 # Miroslav Šulc <fordfrog@gentoo.org> (2021-04-12)
 # no stable virtual/jdk on this arch
 media-libs/rubberband jni
@@ -345,7 +349,6 @@ net-vpn/strongswan strongswan_plugins_unbound
 
 # Benda Xu <heroxbd@gentoo.org> (2015-01-03)
 # not tested
-app-i18n/anthy canna-2ch
 app-i18n/scim-anthy kasumi
 
 # Markus Meier <maekke@gentoo.org> (2014-11-29)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 971f51be2dea..b65584cb4309 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -82,7 +82,6 @@ dev-python/socketpool eventlet gevent
 # These pull in:
 # - direct ruby dependency:
 app-admin/augeas test
-app-i18n/canna doc
 sys-block/thin-provisioning-tools test
 # - texlive japan modules: ruby runtime scripts
 app-text/texlive l10n_ja context
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 2168b261a6c0..0587005a8db1 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
@@ -53,11 +53,6 @@ hddtemp
 # Unmask this here, since only ppc64 can use it
 -ibm
 
-# USE=audit masked prior to testing on alpha, arm, hppa, ppc64, s390, sh.
-# Bug #184563, 2007-09-18
-# Robin H. Johnson <robbat2@gentoo.org>
-audit
-
 # unregisterised ghc arch for now.
 # no ghci - no TH
 template-haskell
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 885311c091f4..6ba073273821 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# LuaJIT does not support riscv
+app-text/texlive-core luajittex
+dev-texlive/texlive-basic luajittex
+
 # Marek Szuba <marecki@gentoo.org> (2021-07-11)
 # Causes 35 tests to fail with "fatal llvm error"
 dev-db/postgresql llvm
@@ -15,10 +20,8 @@ mail-mta/courier fax
 
 # 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
+dev-python/matplotlib wxwidgets
 
 # Marek Szuba <marecki@gentoo.org> (2021-07-02)
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
@@ -34,12 +37,10 @@ www-client/elinks samba
 app-editors/emacs gconf m17n-lib xwidgets
 #  - net-fs/openafs
 app-crypt/heimdal afs
-#  - MANY, to be reviewed
-dev-cpp/eigen doc test
+#  - sci-libs/hdf5
+dev-libs/starpu hdf5
 #  - 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
 #  - sys-cluster/ceph
 net-analyzer/rrdtool rados
 #  - sys-cluster/rdma-core | sys-fabric/ofed, sys-cluster/knem, sys-fabric/infinipath-psm, sys-fabric/librdmacm
@@ -47,10 +48,6 @@ sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_ps
 #  - 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 openexr wmf
-
 # Yixun Lan <dlan@gentoo.org> (2021-05-24)
 # Dependencies not keyworded, not tested
 dev-libs/libdbusmenu test
@@ -126,10 +123,9 @@ dev-libs/libpcre jit
 # This includes also packages which do not support python-3 or
 # do not support python-3.7 yet.
 
-app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp snmp test
+app-admin/syslog-ng amqp geoip2 kafka mongodb redis spoof-source smtp test
 app-arch/p7zip wxwidgets
 app-doc/doxygen doc
-app-editors/emacs mailutils
 app-text/asciidoc test
 app-text/ghostscript-gpl cups
 app-text/po4a test
@@ -159,7 +155,7 @@ net-irc/irssi socks5
 net-libs/gnutls doc test-full
 net-libs/ldns doc python
 net-libs/libpcap rdma
-net-misc/ntp openntpd snmp vim-syntax zeroconf
+net-misc/ntp openntpd vim-syntax zeroconf
 net-nds/openldap cxx kerberos sasl
 sys-apps/kmod doc
 sys-apps/portage apidoc
diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask
index df40319274bd..c18421fa6944 100644
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -22,10 +22,6 @@ lua_single_target_luajit
 lua_targets_lua5-2
 lua_targets_luajit
 
-# Ben Kohler <bkohler@gentoo.org> (2019-01-09)
-# no fam providers keyworded yet
-fam
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-11-27)
 # valgrind has no RISCV port.
 valgrind
@@ -35,7 +31,6 @@ bluetooth
 emacs
 fuse
 java
-kerberos
 latex
 libedit
 mono
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 737847d26d77..64d1d2f1313a 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2021-07-17)
+# Haskell isn't stable on amd64 (or anywhere)
+# bug #801652
+dev-util/diffoscope haskell
+
 # Sam James <sam@gentoo.org> (2021-03-04)
 # Dependencies not yet stable, drags in
 # large amount of fabric. bug #763954
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index eb7bc3a9dd50..aa66e55ed5b5 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -91,12 +91,12 @@ sys-libs/libcxx libcxxabi
 # the flag.
 sys-kernel/vanilla-kernel initramfs
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2019-11-06)
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
 # Upstream plans to drop libcrypt.so.1/crypt.h from glibc
 # distribution and rely on external providers like libxcrypt.
-# Gentoo will follow suit but today we are not yet ready.
-# Unmask at your risk. Bug #699422 tracks the effort.
-sys-libs/glibc crypt
+# Here we are following that path too.
+<sys-libs/glibc-2.33-r2 crypt
+>=sys-libs/libxcrypt-4.4.23-r1 system compat
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
 # <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 83513d5d82c1..925b60a9c4da 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,17 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# Several known issues (possibly with older pastix versions as well but
+# in v6 they result in clear errors):
+# * CUDA support needs testing, may or may not work as it is;
+# * With MPI enabled two tests fail (when linked against openmpi, at least)
+#   due to incorrect implementation of either MPI support itself or
+#   said tests - example_drv_facto0_d_reentrant tries to initialise MPI
+#   more than once, test_bvec_gemv_tests calls MPI_Query_thread() after
+#   invocation of MPI_FINALIZE.
+>=sci-libs/pastix-6.0.0 cuda mpi
+
 # Alfredo Tupone <tupone@gentoo.org> (2021-06-27)
 # lto does not work on dev-lang/gnat-gpl-2021
 dev-lang/gnat-gpl:10 lto
@@ -267,10 +278,12 @@ dev-python/statsmodels doc
 # broken static-linking in glibc and maybe others
 >app-shells/mksh-57-r1 static
 
-# Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
-# Collides with sys-libc/glibc[crypt]
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-sys-libs/libxcrypt split-usr system
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Upstream plans to drop libcrypt.so.1/crypt.h from glibc
+# distribution and rely on external providers like libxcrypt.
+# Here we are following that path too.
+>=sys-libs/glibc-2.33-r2 crypt
+<sys-libs/libxcrypt-4.4.23-r1 split-usr system
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)
 # net-libs/openslp is being removed.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index eaa49d098f58..7c7be35a0f19 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Sam James <sam@gentoo.org> (2021-07-12)
-# Haskell isn't stable on amd64 (or anywhere)
-# bug #801649
-dev-util/diffoscope haskell
+# Patrick McLean <chutzpah@gentoo.org> (2021-07-13)
+# Pulls in dev-libs/pmdk which has Haskell deps, a dep on rocr-runtime
+# all of which are not stable anywhere.
+sys-cluster/ceph pmdk rbd-rwl
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-05-30)
 # dev-perl/Net-Netmask-2.0.100 needs ... and ... which ends
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 1201801394bb..d805d7c7b66b 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version
+lua_single_target_lua5-2
+lua_targets_lua5-2
+
 # Hans de Graaff <graaff@gentoo.org> (2021-07-09)
 # Mask Ruby 2.5 as EOL
 ruby_targets_ruby25
@@ -12,12 +18,6 @@ ruby_targets_ruby25
 # 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.
-canna
-canna-2ch
-
 # Brian Evans <grknight@gentoo.org> (2021-01-07)
 # PHP 7.2 is security vulnerable and end-of-life
 # Please upgrade to a newer slot
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 2cdc63f8b852..afb5ebda7f3e 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hank Leininger <hlein@korelogic.com> (2021-07-14)
+# Uses glibc-specific rexec(3) function, bug #715898
+net-misc/netkit-rsh
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # David Seifert <soap@gentoo.org> (2021-02-08)
 # nvidia-drivers only works against glibc.
 x11-drivers/nvidia-drivers
@@ -36,6 +44,13 @@ dev-libs/elfutils
 # Linux debugger needs a port to musl.
 app-emulation/dosemu
 
+# Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
+# No source builds for musl
+app-emulation/firecracker
+
+# Old undated blocks of masks
+#
+
 sys-libs/uclibc-ng
 sys-libs/glibc
 
@@ -47,8 +62,8 @@ sys-fs/udev
 # systemd sources fail to build without glibc
 sys-boot/systemd-boot
 
-# Ian Stakenvicius, 2017-06-14
-# on behalf of mozilla@gentoo.org
+# Ian Stakenvicius <axs@gentoo.org> (2017-06-14)
+# (on behalf of <mozilla@gentoo.org>)
 # Mask firefox-54 and above as it requires rust
 # now, and rust reportedly will not build yet.
 >=www-client/firefox-54.0
@@ -57,7 +72,3 @@ sys-boot/systemd-boot
 dev-lang/rust-bin
 mail-client/thunderbird-bin
 www-client/firefox-bin
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-03-20)
-#  No source builds for musl
-app-emulation/firecracker
diff --git a/profiles/features/musl/package.use.force b/profiles/features/musl/package.use.force
index c26a7ba83f24..da728fcc47ae 100644
--- a/profiles/features/musl/package.use.force
+++ b/profiles/features/musl/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
+
 # Force system-libevent use flag on mozilla packages, since the building of
 # bundled libevent cannot accomodate a system without sysctl.h
 # See bug 574830 for more info.
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index afdd59ca5f50..58cd6477116c 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
 # James Le Cuirot <chewi@gentoo.org> (2020-05-16)
 # execinfo.h is required for debug.
 dev-games/cegui debug
diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 76ef2455b35a..5423535d0fc9 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -1,5 +1,5 @@
 # -*- mode: shell-script; -*-
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RAP specific patches pending upstream:
@@ -109,4 +109,11 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then
     ebegin "Prefixifying ext/iconv/config.m4 paths"
     sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4
     eend $?
+elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; then
+    einfo "Removing Debian magic..."
+    for f in Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake; do
+	ebegin "  Updating $f"
+	sed -i -e 's,EXISTS "/etc/debian_version",FALSE,' "${S}"/$f
+	eend $?
+    done
 fi
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
index fe51d352f2f1..ba157ac6b0c5 100644
--- a/profiles/features/uclibc/package.mask
+++ b/profiles/features/uclibc/package.mask
@@ -5,6 +5,10 @@ sys-libs/musl
 sys-libs/glibc
 sys-libs/pam
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Mask the libxcrypt-based virtual
+~virtual/libcrypt-2
+
 # Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
 # Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
 sys-apps/systemd-tmpfiles
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
new file mode 100644
index 000000000000..82ca48bfea6c
--- /dev/null
+++ b/profiles/features/uclibc/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 2021 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
+# Do not force system install for libxcrypt here
+>=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
index 1c6069c30db8..b3f8a9ebe24a 100644
--- a/profiles/features/uclibc/package.use.mask
+++ b/profiles/features/uclibc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org>
+# Restore mask here that is gone elsewhere
+sys-libs/libxcrypt split-usr system
+
 # Anthony G. Basile <blueness@gentoo.org>
 # sanitize is broken on at least all hardened uclibc
 sys-devel/gcc sanitize
diff --git a/profiles/package.mask b/profiles/package.mask
index 221b957f41ca..c8ae98b46fec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,70 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2021-07-17)
+# Deprecated upstream, replaced with factory_bot.
+# Last release in 2017, no dependencies.
+# Masked for removal in 30 days.
+dev-ruby/factory_girl
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-17)
+# Deprecated upstream, no longer needed with rspec 2+
+# Last release in 2016, factory_girl was last dependency.
+# Masked for removal in 30 days.
+dev-ruby/bourne
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-07-16)
+# library with no consumer, multiple vulnerabilities
+# removal in 30 days (bug #713098)
+dev-java/xmlrpc
+
+# Kai Krakow <hurikhan77+bgo@gmail.com> (2021-07-16)
+# To be replaced by net-p2p/go-ipfs, no migration needed.
+# Simply deselect the masked package and install the replacement.
+# Masked for removal in 30 days. Bug #802381
+net-p2p/go-ipfs-bin
+
+# Hans de Graaff <graaff@gentoo.org> (2021-07-15)
+# Dead upstream, no longer maintained, last release in 2013.
+# No dependencies.
+# Masked for removal in 30 days.
+dev-ruby/spork
+
+# John Helmert III <ajak@gentoo.org> (2021-07-14)
+# Dead upstream, unfixed security issue.
+# Removal on 2021-08-13.  Bugs #755896, #781467.
+net-proxy/polipo
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-14)
+# New, considerably refactored major version with a new build system.
+# Masked for further testing.
+>=sci-libs/pastix-6.0.0
+
+# Marco Scardovi <marco@scardovi.vom> (2021-07-13)
+# These packages were only ported for netbox. Not useful for anything else
+# No revdeps. Removal in 30 days (Bug #801991)
+dev-python/markuppy
+dev-python/tablib
+
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-07-12)
+# Version 3.3.0 suffers from ridiculously high CPU usage, this version has
+# therefore been retracted upstream.
+# https://github.com/RocketChat/Rocket.Chat.Electron/issues/2068
+# https://github.com/RocketChat/Rocket.Chat.Electron/issues/2070
+=net-im/rocketchat-desktop-bin-3.3.0
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# No releases since March 2015, no upstream repo activity since November
+# 2019. Unmaintained in Gentoo. Depends on effectively EOLed Lua 5.2,
+# fails to build against any other version. Removal in 30 days (Bug #801883)
+app-crypt/cardpeek
+
+# Marek Szuba <marecki@gentoo.org> (2021-07-12)
+# Effectively EOL, no packages in the tree strictly require this
+# particular version. Removal, of both the ebuilds and target support,
+# in 30 days (bug #801865).
+dev-lang/lua:5.2
+
 # Craig Andrews <candrews@gentoo.org> (2021-07-10)
 # Masked until November, 2021
 # This release adds enforcement of the Taproot protocol change to the Bitcoin
@@ -235,16 +299,6 @@ dev-java/jcodings
 dev-java/joni
 dev-java/jvyamlb
 
-# 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.
-app-dicts/canna-cannadic
-app-dicts/canna-2ch
-app-emacs/yc
-app-i18n/canna
-app-i18n/canfep
-app-i18n/im-canna
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-20)
 # no consumer, removal in 30 days
 # see bug: https://bugs.gentoo.org/796587
@@ -289,29 +343,6 @@ sys-apps/rescan-scsi-bus
 # Removal on 2021-07-15.
 media-sound/sc2mpd
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-06-14)
-# The original Python Language Server by Palantir is no longer actively
-# developed [1]. Development on a language server for Python is continued by
-# the Spyder IDE community under a new name and in a new package. To continue
-# using pyls, please switch to the maintained forks [2]:
-# dev-python/python-language-server --> dev-python/python-lsp-server
-# dev-python/python-jsonrpc-server --> dev-python/python-lsp-jsonrpc
-# dev-python/pyls-black --> dev-python/python-lsp-black
-# -
-# Note that dev-python/pyls-spyder has already switched to the new language
-# server as of version 0.4.0. Users of the Spyder IDE will automatically
-# switch to the new language server when upgrading to version 4.2.5-r1 or
-# 5.0.4-r1. Manual adjustments to the settings may be required in certain
-# configurations [3].
-# -
-# Masked for removal in 30 days (2021-07-14).
-# [1] https://github.com/palantir/python-language-server/issues/935
-# [2] https://bugs.gentoo.org/795924
-# [3] https://bugs.gentoo.org/783615
-dev-python/python-language-server
-dev-python/python-jsonrpc-server
-dev-python/pyls-black
-
 # Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-06-14)
 # DeprecatedDep jre-1.3, upstream dead,removal in 30 days
 # see bug: https://bugs.gentoo.org/787410
@@ -324,12 +355,6 @@ media-gfx/povtree
 >=dev-lang/ocaml-4.12
 =dev-ml/camlp4-4.12
 
-# Tomáš Mózes <hydrapolic@gmail.com> (2021-06-10)
-# Based on unsupported grub-legacy, replaced by
-# pvgrub2.
-# Removal on 2021-07-08.  Bug #790668.
-app-emulation/xen-pvgrub
-
 # Sam James <sam@gentoo.org> (2021-06-10)
 # Fails to build with modern libetpan. Unmaintained.
 # See bug #699570, bug #448574.
@@ -621,11 +646,6 @@ kde-apps/kdebase-meta:5
 # Mask for testing revdeps.
 >=dev-games/mygui-3.4.0
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-07)
-# Mask until sys-libs/libxcrypt[system] is unmasked
-# (NOTE: Likely needs to be moved to musl + uclibc profiles, not dropped entirely)
-~virtual/libcrypt-2
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
@@ -712,12 +732,6 @@ sys-devel/automake:1.10
 # use. See bugs 603346 and 604998 for more information.
 app-admin/amazon-ec2-init
 
-# Michał Górny <mgorny@gentoo.org> (2016-11-17)
-# New version masked for testing. It supports source-window buffer size
-# over 2G but it 'currently performs 3-5% slower and has 1-2% worse
-# compression'.
->=dev-util/xdelta-3.1.0
-
 # Robin H. Johnson <robbat2@gentoo.org> (2014-08-04)
 # Masked for testing, presently fails upstream testsuite:
 # FAIL:07:02:35 (00:00:00) db_dump/db_load(./TESTDIR.3/recd001.db:child killed: kill signal): expected 0, got 1
diff --git a/profiles/use.desc b/profiles/use.desc
index 271a22f65be8..1e80f0ad87a0 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -35,7 +35,6 @@ build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating
 bzip2 - Use the bzlib compression library
 cairo - Enable support for the cairo graphics library
 calendar - Add support for calendars (not using mcal!)
-canna - Add support for the Canna kana to kanji conversion engine
 caps - Use Linux capabilities library to control privilege
 cdb - Add support for the CDB database engine from the author of qmail
 cdda - Add Compact Disk Digital Audio (Standard Audio CD) support
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0dd7d0dd2379..74a2d5db2ee3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -715,8 +715,6 @@ app-forensics/libewf:fuse - Enable fuse support for ewfmount
 app-forensics/libewf:uuid - Enable UUID support in the ewftools
 app-forensics/sleuthkit:aff - Enable extra aff formats
 app-forensics/sleuthkit:ewf - Enable libewf support
-app-i18n/anthy:canna-2ch - Enable support for app-dicts/canna-2ch
-app-i18n/canna:canuum - Build canuum
 app-i18n/fcitx:autostart - Enable XDG-compatible autostart of Fcitx
 app-i18n/fcitx:enchant - Enable Enchant backend (using app-text/enchant) for spelling hinting
 app-i18n/fcitx:gtk2 - Install input method module for GTK+ 2
@@ -1648,6 +1646,7 @@ dev-java/commons-logging:avalon-framework - Add optional support for avalon-fram
 dev-java/commons-logging:avalon-logkit - Add optional support for avalon-logkit
 dev-java/commons-logging:log4j - Add optional support for log4j
 dev-java/commons-logging:servletapi - Add optional support for servletapi
+dev-java/dom4j:jaxen - Includes org.jaxen.dom4j package
 dev-java/ecj-gcj:native - Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.
 dev-java/eclipse-ecj:ant - Support using ecj in Ant builds via dev-java/ant-eclipse-ecj
 dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
@@ -1698,6 +1697,7 @@ dev-java/openjfx:media - Compile media module, based on gstreamer-minimal (does
 dev-java/openjfx:source - Install JavaFX sources
 dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
 dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
+dev-lang/R:lto - Use link-time optimization for R and its recommended packages.
 dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
 dev-lang/crystal:blocking-stdio-hack - Keep STDIO file descriptors in blocking mode.
 dev-lang/crystal:debug - Build each module as a separate object file. Speeds build up.
@@ -1770,6 +1770,7 @@ dev-lang/nqp:moar - Build the MoarVM backend (experimental/broken)
 dev-lang/ocaml:flambda - Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining.
 dev-lang/ocaml:spacetime - Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information.
 dev-lang/perl:ithreads - Enable Perl threads, has some compatibility problems
+dev-lang/php:apparmor - Support FPM application confinement through sys-libs/libapparmor
 dev-lang/php:argon2 - Enable password hashing algorithm from app-crypt/argon2
 dev-lang/php:bcmath - Add support for libbcmath
 dev-lang/php:cli - Enable CLI SAPI
@@ -2411,7 +2412,6 @@ dev-python/cvxopt:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-python/drf-yasg:validation - Enable swagger spec validation using swagger-spec-validator
 dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
 dev-python/falcon:cython - Build cython-based python modules
-dev-python/gmpy:mpir - Use sci-libs/mpir as gmp implementation
 dev-python/hiredis:system-libs - Use dev-libs/hiredis from system
 dev-python/hypothesis:cli - Install a CLI tool used to write tests.
 dev-python/icalendar:doc - Generate examples and other extra documentation
@@ -3155,16 +3155,13 @@ games-misc/xcowsay:fortune - Enable support for fortune cookies via games-misc/f
 games-mud/tf:atcp - enable ATCP support.
 games-mud/tf:gmcp - enable GMCP support.
 games-mud/tf:option102 - enable telnet option 102 support.
-games-puzzle/cuyo:music - Enable playing of background music
 games-puzzle/gnome-tetravex:cli - Build the gnome-tetravex-cli command-line interface
 games-puzzle/gnome-tetravex:gui - Build the gnome-tetravex graphical Gtk user interface
 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/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
-games-puzzle/xlogical:alt_gfx - Use alternate graphics which are closer to the original Amiga version
 games-roguelike/FTL:bundled-libs - Use bundled libraries.
 games-roguelike/angband:sound - Enable and install sounds
 games-roguelike/stone-soup:ncurses - Enable for console (uses ncurses) based build. (can be enabled on top of tiles)
@@ -4554,6 +4551,9 @@ media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
 media-sound/dir2ogg:wma - Add support for wma files through mplayer
 media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
 media-sound/drumstick:network - Build Network RT backend
+media-sound/easyeffects:bs2b - Enable use of media-libs/libbs2b
+media-sound/easyeffects:calf - Enable use of media-plugins/calf for adding various FX
+media-sound/easyeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
 media-sound/easytag:nautilus - Build gnome-base/nautilus extension
 media-sound/ecasound:lv2 - Add support for Ladspa V2
 media-sound/ecasound:oil - Use dev-libs/liboil for inner loop optimizations
@@ -4705,7 +4705,6 @@ media-sound/pulseaudio-modules-bt:native-headset - Build with native HSP (Headse
 media-sound/pulseaudio-modules-bt:ofono-headset - Build with oFono HFP (Hands Free Profile) headset for bluez 5, requires net-misc/ofono.
 media-sound/pulseeffects:bs2b - Enable use of media-libs/libbs2b
 media-sound/pulseeffects:calf - Enable use of media-plugins/calf for adding various FX
-media-sound/pulseeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
 media-sound/pulseeffects:rubberband - Enable usse of media-libs/rubberband for the pitch shifting FX
 media-sound/qmidiarp:lv2 - Enables Ladspa V2 plugins.
 media-sound/qmmp:analyzer - Enable visual analyzer
@@ -5514,7 +5513,6 @@ net-dns/getdns:getdns-server-mon - Add getdns_server_mon tool
 net-dns/getdns:libev - Enable dev-libs/libev support
 net-dns/getdns:libevent - Enable dev-libs/libevent support
 net-dns/getdns:libuv - Enable dev-libs/libuv support
-net-dns/getdns:nettle - Use dev-libs/nettle as crypto backend
 net-dns/getdns:stubby - Add Stubby DNS Privacy Deamon
 net-dns/getdns:unbound - Enable net-dns/unbound libraries support
 net-dns/hash-slinger:ipsec - Enable support for IPSECKEY records (ipseckey)
@@ -7321,6 +7319,8 @@ sci-libs/lis:saamg - Build the Smoothed Aggregation Algebraic MultiGrid precondi
 sci-libs/mathgl:hdf - Add support for the Hierarchical Data Format v.4 sci-libs/hdf
 sci-libs/mathgl:octave - Add bindings for sci-mathematics/octave
 sci-libs/matio:sparse - Extend formats for sparse matrix (not matlab)
+sci-libs/metis:double-precision - Use double- rather than single-precision floating-point representation
+sci-libs/metis:int64 - Use 64- rather than 32-bit integer representation (needed for > 2^31 vertices)
 sci-libs/mpir:cpudetection - Enables runtime cpudetection (useful for bindist, compatability on other CPUs)
 sci-libs/mumps:metis - Enable matrix ordering with METIS (sci-libs/metis, sci-libs/parmetis)
 sci-libs/mumps:scotch - Enable matrix ordering with sci-libs/scotch
@@ -7352,8 +7352,12 @@ sci-libs/p4est:romio - Build with support for the ROMIO MPI-IO component
 sci-libs/p4est:vtk-binary - Enable binary vtk output. If disabled vtk files will be written in ASCII text format.
 sci-libs/parmetis:double-precision - Floating-point operation done as double precision
 sci-libs/parmetis:int64 - Build the 64 bits integer library (needed for > 2^31 vertices)
-sci-libs/pastix:int64 - Build the 64 bits integer library
-sci-libs/pastix:starpu - Build and link with dev-libs/starpu
+sci-libs/pastix:cuda - Enable GPU support using CUDA kernels
+sci-libs/pastix:fortran - Install the Fortran interface
+sci-libs/pastix:int64 - Use 64- rather than 32-bit integer representation
+sci-libs/pastix:metis - Enable matrix ordering with sci-libs/metis
+sci-libs/pastix:scotch - Enable matrix ordering with sci-libs/scotch
+sci-libs/pastix:starpu - Enable support for ther dev-libs/starpu runtime
 sci-libs/pcl:cuda - Adds support for NVIDIA CUDA.
 sci-libs/pcl:openni - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI.
 sci-libs/pcl:openni2 - Adds support for Kinect-like 3D sensors devices with dev-libs/OpenNI2 (should be preferred over openni).
@@ -7959,7 +7963,6 @@ sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
 sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
 sys-boot/silo:tilo-only - Install only the tilo netboot tool
 sys-boot/vboot-utils:libzip - Use dev-libs/libzip.
-sys-boot/woeusb:minimal - Install only woeusb tool
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
 sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesystem built on top of ceph
 sys-cluster/ceph:diskprediction - Enable local diskprediction module to predict disk failures
@@ -8441,6 +8444,7 @@ sys-process/systemd-cron:yearly - Support /etc/cron.yearly
 sys-process/tini:args - Enable argument parsing.
 virtual/blas:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/cblas:eselect-ldso - Enable runtime library switching by eselect and ld.so.
+virtual/jdk:headless-awt - Don't install the X backend for AWT, needed by some GUIs
 virtual/lapack:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/lapacke:eselect-ldso - Enable runtime library switching by eselect and ld.so.
 virtual/linux-sources:firmware - Install linux kernel firmware