gentoo resync : 29.06.2020

22 files changed, 305 insertions, 403 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2331daeafc6b..80916f45f4fa 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 9fdbb6d97673..7c324ee2e519 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Joonas Niilola <juippis@gentoo.org> (2020-06-21)
+# sys-apps/apparmor doesn't have stable keywords.
+app-emulation/lxc apparmor
+
 # Thomas Deutschmann <whissi@gentoo.org> (2019-10-28)
 # net-libs/quiche is an early HTTP/3 implementation
 # not yet ready for everyone.
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index 96302cff734c..9bf1f42c14b7 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
 # James Le Cuirot <chewi@gentoo.org> (2016-01-09)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index ea16b137362b..983866095825 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust, which is available here
+# Bug #677018
+-net-news/newsboat
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind works on ARMv7
+-dev-util/valgrind
+
 # James Le Cuirot <chewi@gentoo.org> (2016-01-09)
 # This is built for armv6 so unmask against the wider arm mask.
 -dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/package.use.mask b/profiles/arch/arm/armv7a/package.use.mask
new file mode 100644
index 000000000000..8aea7c2c8832
--- /dev/null
+++ b/profiles/arch/arm/armv7a/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, available on armv7a
+dev-libs/rapidjson -test
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index 25991f5fd76d..764a6e7881c5 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -14,3 +14,7 @@
 -cpu_flags_arm_vfpv3
 -cpu_flags_arm_vfpv4
 -cpu_flags_arm_vfp-d32
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind works on ARMv7
+-valgrind
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 25107630e0b6..34754836d7f6 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,16 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# Needs Rust (only on >= armv6j)
+# Bug #677018
+net-news/newsboat
+
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+dev-util/valgrind
+
 # Bernardo Meurer <bernardo@standard.ai> (2019-09-28)
 # Requires app-crypt/tpm2-tss which is pending ~arm vide
 # https://bugs.gentoo.org/695758
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index db3826895aaa..442c1611b3de 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -14,8 +14,3 @@ dev-lang/rust llvm_targets_ARM
 dev-ml/llvm-ocaml llvm_targets_ARM
 sys-devel/clang llvm_targets_ARM
 sys-devel/llvm llvm_targets_ARM
-
-# Anthony G. Basile <blueness@gentoo.org> (2012-11-11)
-# Only gnome-base/gdm has stable keywording. If x11-misc/lightdm or kde-plasma/kdm
-# gets stable keyword, this line can be removed.
-x11-misc/xscreensaver gdm
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 164298d09fc6..5bc88d8bd6ba 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-27)
+# Tests require Valgrind, not available on <armv7a
+dev-libs/rapidjson test
+
 # Michał Górny <mgorny@gentoo.org> (2020-06-19)
 # Requires dev-util/dwarves.
 sys-kernel/gentoo-kernel debug
@@ -36,10 +40,6 @@ mate-base/mate bluetooth
 # Mask until gui-libs/gtk-layer-shell is keyworded
 mate-base/mate-panel wayland
 
-# Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
-# Mask until dev-libs/libfido2 is keyworded
-net-misc/openssh security-key
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
 media-gfx/gimp heif
@@ -65,10 +65,6 @@ sci-libs/pcl vtk
 # Neither sys-apps/bolt nor kde-plasma/plasma-thunderbolt are keyworded
 kde-plasma/plasma-meta thunderbolt
 
-# Michał Górny <mgorny@gentoo.org> (2019-07-13)
-# app-forensics/libewf is not keyworded here.
-app-admin/testdisk ewf
-
 # Craig Andrews <candrews@gentoo.org> (2019-07-03)
 # Unmask Raspberry Pi support on arm.
 media-tv/kodi -raspberry-pi
@@ -78,11 +74,6 @@ media-tv/kodi -raspberry-pi
 # build on arm.
 >=dev-lang/spidermonkey-60 -jit
 
-# Lars Wendler <polynomial-c@gentoo.org> (2019-04-29)
-# Requires app-text/discount and net-libs/webkit-gtk which both have
-# no keywords on arm
-dev-util/geany-plugins markdown
-
 # Patrick McLean <chutzpah@gentoo.org> (2019-04-15)
 # deps not available on platform
 sys-cluster/ceph babeltrace lttng
@@ -106,19 +97,11 @@ net-im/ejabberd hipe
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
 
-# Bernard Cafarelli <voyageur@gentoo.org> (2019-01-14)
-# Requires dev-php/pecl-imagick which is not keyworded on arm
-www-apps/nextcloud imagemagick
-
 # Davide Pesavento <pesa@gentoo.org> (2018-12-27)
 # The corresponding Qt5 modules are not keyworded on arm, and we don't want to
 # keyword them solely because of PyQt5 while there are no other in-tree users.
 dev-python/PyQt5 networkauth
 
-# Aaron W. Swenson <titanofold@gentoo.org> (2018-10-19)
-# Requires sys-devel/clang which isn’t keyworded for ARM.
-dev-db/postgresql llvm
-
 # Michał Górny <mgorny@gentoo.org> (2018-10-18)
 # Requires unported sys-libs/netbsd-csu.
 sys-devel/clang-runtime crt
@@ -132,22 +115,6 @@ dev-ruby/capybara test
 # pre-built, no ARM support
 net-wireless/gr-osmosdr sdrplay
 
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-08-10)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-app-admin/syslog-ng geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-07-04)
-# dev-libs/xxhash not keyworded for arm
-app-admin/rsyslog xxhash
-
-# Tomáš Mózes <hydrapolic@gmail.com> (2018-06-19)
-# Needs dev-libs/libmaxminddb which isn't keyworded
-www-servers/nginx nginx_modules_http_geoip2 nginx_modules_stream_geoip2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2018-06-06)
-# Needs sys-apps/fakechroot which isn't keyworded
-app-arch/rpm test
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-06-03)
 # net-wireless/soapysdr not keyworded
 net-wireless/gr-osmosdr soapy
@@ -165,14 +132,6 @@ net-libs/gnutls test-full
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-02-04)
-# Depends on not yet keyworded dev-python/geoip-python. Bug #636860
-net-p2p/deluge geoip
-
-# Amy Liffey <amynka@gentoo.org (2018-01-21)
-# dev-libs/cereal not keyworded for arm
-media-libs/opencv contribdnn
-
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Moved from use.mask since they are flags local to one package.
 media-tv/tvheadend hdhomerun
@@ -259,19 +218,10 @@ dev-db/mariadb -jdbc
 sci-mathematics/octave graphicsmagick
 media-gfx/zbar graphicsmagick
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2016-06-14) on behalf of
-# Nicholas Vinson <nvinso234@gmail.com> (proxy-maint)
-# net-firewall/nftables[doc] requires dblatex which is not keyworded
-net-firewall/nftables doc
-
 # Amy Winston <amynka@gentoo.org> (2016-06-12)
 # does not build on arm at all (upstream bug)
 dev-scheme/racket futures jit
 
-# Patrick McLean <chutzpah@gentoo.org> (2016-05-12)
-# Tests require dev-python/tox which isn't keyworded on arm
-sys-cluster/ceph test
-
 # Thomas Deutschmann <whissi@gentoo.org> (2016-03-19)
 # Unkeyworded deps, bug #564274
 app-metrics/collectd collectd_plugins_gmond
@@ -321,10 +271,6 @@ media-video/ffmpeg -mmal
 # unkeyworded deps, bug #552330
 app-portage/g-sorcery bson
 
-# Markos Chandras <hwoarang@gentoo.org> (2015-04-18)
-# samba-4 not keyworded on arm
-sys-auth/sssd samba
-
 # Alexis Ballier <aballier@gentoo.org> (2015-04-02)
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
@@ -410,10 +356,6 @@ app-emulation/xen-tools system-qemu doc
 # Needs sci-physics/bullet tested #499974
 dev-libs/efl physics
 
-# Jason A. Donenfeld <zx2c4@gentoo.org> (2014-01-27)
-# luajit isn't keyworded for arm yet, which is a bummer
-net-im/prosody jit
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
@@ -426,10 +368,6 @@ net-im/telepathy-connection-managers sipe
 # Missing keywords, bug #478254
 gnome-base/gnome classic extras
 
-# Benda Xu <heroxbd@gentoo.org> (2013-10-31)
-# Missing keywords from dev-ml/lablgtk, bug #487722
-net-p2p/mldonkey gtk guionly
-
 # Markus Meier <maekke@gentoo.org> (2013-09-15)
 # Unkeyworded deps, bug #481462
 dev-python/ipython nbconvert
@@ -450,11 +388,6 @@ app-admin/conky cmus irc lua-cairo lua-imlib lua-rsvg moc xmms2
 # Not tested
 media-libs/devil allegro nvtt
 
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (2013-07-13)
-# requires net-misc/freerdp which is not keyworded on arm
-# screen-sharing requires rdp flag
-dev-libs/weston rdp screen-sharing
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2013-05-27)
 # Firmware loader not keyworded yet
 sci-libs/linux-gpib firmware
@@ -464,7 +397,9 @@ sci-libs/linux-gpib firmware
 media-gfx/povray mkl
 
 # Benda Xu <heroxbd@gentoo.org> (2013-04-01)
-# dev-ml/lablgtk not keyworded
+# Sam James <sam@cmpct.info> (2020-06-29)
+# net-misc/x11-ssh-askpass nor
+# net-misc/ssh-askpass-fullscreen keyworded
 net-misc/unison gtk
 
 # Julian Ospald <hasufell@gentoo.org> (2013-03-31)
@@ -514,14 +449,6 @@ app-office/libreoffice libreoffice_extensions_scripting-beanshell libreoffice_ex
 # No java on ARM
 net-analyzer/wireshark bcg729 maxminddb
 
-# Markus Meier <maekke@gentoo.org> (2012-07-25)
-# no stable media-video/vlc yet, bug #401313
-media-libs/phonon vlc
-
-# Michael Sterrett <mr_bones_@gentoo.org> (2012-03-04)
-# arm is missing keywords for >=dev-libs/json-glib-0.12
-app-admin/syslog-ng json
-
 # Anthony G. Basile <blueness@gentoo.org> (2011-12-21)
 # Mask the vde flag on tinc because net-misc/vde is not
 # keyworded for arm
@@ -534,25 +461,13 @@ dev-qt/qtdeclarative -jit
 dev-qt/qtscript -jit
 dev-qt/qtwebkit -jit
 
-# Sebastian Pipping <sping@gentoo.org> (2011-02-22)
-# No media-sound/lilypond here, yet (bug #356069)
-app-text/asciidoc test
-
-# Jim Ramsay <lack@gentoo.org> (2008-11-05)
-# app-admin/gkrellm may pull in net-libs/libntlm, which is not keyworded
-app-admin/gkrellm ntlm
-
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# Ultrabug <ultrabug@gentoo.org> (2011-09-05)
-# missing keyword for net-libs/zeromq
-app-admin/rsyslog zeromq
-
 # Ian Whyman <thev00d00@gentoo.org> (2016-05-22)
 # RPI support on arm
 dev-libs/libcec -raspberry-pi
 
 # Ian Whyman <thev00d00@gentoo.org> (2017-09-05)
-# missing keywords dev-lang/duktape media-libs/lastfmlib
-net-misc/gerbera javascript lastfm
+# missing keywords media-libs/lastfmlib
+net-misc/gerbera lastfm
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 89059484015f..d197a96abbbb 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@cmpct.info> (2020-06-28)
+# Deps not yet stable
+# Migrated from package.use.mask
+app-text/asciidoc test
+media-libs/phonon vlc
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+app-arch/rpm test
+net-misc/openssh security-key
+dev-util/geany-plugins markdown
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-11-02)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -35,10 +46,6 @@ gnome-base/gvfs mtp
 # Needs net-libs/webkit-gtk which is not stable, bug #663248
 app-editors/emacs xwidgets
 
-# Mikle Kolyada <zlogene@gentoo.org> (2018-07-16)
-# No stable qtnetwork
-net-irc/znc test
-
 # Akinori Hattori <hattya@gentoo.org> (2018-06-23)
 # No stable Java
 dev-db/qdbm java
@@ -83,10 +90,6 @@ media-libs/libbluray java
 # Requires app-emulation/xen-tools which is not stable on arm
 app-metrics/collectd collectd_plugins_java collectd_plugins_xencpu
 
-# Michael Palimaka <kensington@gentoo.org> (2017-03-19)
-# Required media-plugins/gst-plugins-x264 is not stable
-media-plugins/gst-plugins-meta x264
-
 # Michael Weber <xmw@gentoo.org> (2017-03-01)
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index feb40f29c013..e31a1ee7d7ff 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -8,6 +8,11 @@
 -cpu_flags_arm_iwmmxt
 -cpu_flags_arm_iwmmxt2
 
+# Sam James <sam@cmpct.info> (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+valgrind
+
 # Matt Turner <mattst88@gentoo.org> (2020-02-02)
 # Neither dev-python/pymongo nor dev-libs/mongo-c-driver are keyworded
 mongodb
@@ -28,10 +33,6 @@ acpi
 # net-wireless/wimax not tested
 wimax
 
-# Markus Meier <maekke@gentoo.org> (2010-08-21)
-# app-antivirus/clamav not tested
-clamav
-
 # Kacper Kowalik <xarthisius@gentoo.org> (2010-08-09)
 # cblas-external as virtual/cblas is also masked
 cblas-external
@@ -44,10 +45,6 @@ xfs
 # Fails to build/work
 openexr
 
-# Samuli Suominen <drac@gentoo.org>
-# media-gfx/gimp not tested.
-gimp
-
 # No hardware to test by the team
 ios
 ipod
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 4060fc294115..965bf85ebb41 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,13 +4,17 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Sam James <sam@cmpct.info> (2020-06-29)
+# media-gfx/gimp not yet stable
+gimp
+
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not yet stable.
 appindicator
 ayatana
 
 # Mike Gilbert <floppym@gentoo.org> (2017-06-08)
-# dev-lang/python:3.7 is not stable.
+# dev-lang/python:3.8 is not stable.
 python_targets_python3_8
 python_single_target_python3_8
 
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 162d49381dc7..0a595e2b137a 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Lars Wendler <polynomial-c@gentoo.org> (2020-06-25)
+# Missing keyword. Requires dev-util/cmake which also lacks keyword and
+# possibly a whole bunch of its deps as well
+# See https://bugs.gentoo.org/729582
+>=net-misc/rsync-3.2.0 lz4
+
 # Lars Wendler <polynomial-c@gentoo.org> (2020-05-10)
 # Missing keyword
 media-libs/freetype brotli
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index d266201073f1..846b87f7de0d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-06-24)
+# Don't let people lose 'cc' or 'f77' by accident.
+sys-devel/gcc-config cc-wrappers
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-05-24)
 # Many base packages still rely on unqualified tools.
 # To contain the breakage flags are masked. Once most packages
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 31ad5808bb9e..ac3815a08433 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,15 +6,19 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mart Raudsepp <leio@gentoo.org> (2020-06-28)
+# media-video/pipewire:0/0.3 is ongoing work, 0.2 on mutter-3.34
+# is not worth trying to get to work.
+x11-wm/mutter screencast
+
+# Stephan Hartmann <stha09@googlemail.com> (2020-06-28)
+# Mostly intended for development and not for general use.
+>=www-client/chromium-84 headless
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-21)
 # Multiple runtime crashes, see bug #724672
 media-gfx/inkscape jemalloc
 
-# Sam James <sam@cmpct.info> (2020-16-06)
-# Doc build broken for now
-# Bug #679184
-media-libs/aubio doc
-
 # Stephan Hartmann <stha09@googlemail.com> (2020-16-06)
 # Mostly intended for debugging and development,
 # not recommended for general use. Build is also often
diff --git a/profiles/desc/sane_backends.desc b/profiles/desc/sane_backends.desc
index 0e6808352690..e78df8a25857 100644
--- a/profiles/desc/sane_backends.desc
+++ b/profiles/desc/sane_backends.desc
@@ -29,6 +29,7 @@ dmc - SANE_BACKENDS setting for building the dmc backend
 epjitsu - SANE_BACKENDS setting for building the epjitsu backend
 epson - SANE_BACKENDS setting for building the epson backend
 epson2 - SANE_BACKENDS setting for building the epson2 backend
+escl - SANE_BACKENDS setting for building the escl backend
 fujitsu - SANE_BACKENDS setting for building the fujitsu backend
 genesys - SANE_BACKENDS setting for building the genesys backend
 gt68xx - SANE_BACKENDS setting for building the gt68xx backend
@@ -69,6 +70,7 @@ plustek_pp - SANE_BACKENDS setting for building the plustek_pp backend
 pnm - SANE_BACKENDS settings for building the pnm test backend, considered a possible security risk
 qcam - SANE_BACKENDS setting for building the qcam backend
 ricoh - SANE_BACKENDS setting for building the ricoh backend
+ricoh2 - SANE_BACKENDS setting for building the ricoh2 backend
 rts8891 - SANE_BACKENDS setting for building the rts8891 backend
 s9036 - SANE_BACKENDS setting for building the s9036 backend
 sceptre - SANE_BACKENDS setting for building the sceptre backend
diff --git a/profiles/package.mask b/profiles/package.mask
index 6dc7911e32b7..5c8ce3cc6cbb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,191 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-29)
+# Unmaintained in Gentoo.  Multiple unresolved vulnerabilities.
+# Suggested replacement: sys-apps/portage (just kidding).
+# Removal in 30 days.  Bug #711134.
+sys-apps/pacman
+
+# Aaron Bauman <bman@gentoo.org> (2020-06-28)
+# More Py2 only stuff. Plz see -dev ML for discussions
+# Remove bindings, port to Py3, etc
+# Removal in 30 days
+app-arch/deltarpm
+app-crypt/virtualsmartcard
+app-text/duali
+app-text/duali-data
+app-text/mftrace
+app-text/queequeg
+app-text/referencer
+dev-libs/libmacaroons
+dev-libs/tut
+dev-python/elib-intl
+dev-python/eunuchs
+dev-python/medusa
+dev-python/misaka
+dev-python/python-iwscan
+dev-util/confix
+dev-util/qmtest
+dev-util/unrpyc
+games-engines/gemrb
+media-sound/lilycomp
+media-video/tovid
+net-dns/maradns
+net-irc/irker
+net-mail/archivemail
+net-mail/getmail
+net-nds/nsscache
+net-wireless/airpwn
+sci-chemistry/bkchem
+sci-chemistry/propka
+sci-chemistry/pymol-plugins-bni-tools
+sci-chemistry/pymol-plugins-emovie
+sci-chemistry/viewmol
+sci-libs/chemkit
+sys-apps/x86info
+www-misc/surl
+x11-wm/plwm
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-28)
+# WIP PipeWire ebuild, breaks all current revdeps in ebuild repository
+# sys-apps/xdg-desktop-portal-1.7.2 depends on masked PipeWire >=0.3
+~media-video/pipewire-0.3.6
+~sys-apps/xdg-desktop-portal-1.7.2
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-28)
+# Obsolete package.
+# Does not build.
+# Dead upstream and only gentoo ships it.
+# Removal in 30 days.
+app-misc/scope
+
+# Mart Raudsepp <leio@gentoo.org> (2020-06-27)
+# Disappeared upstream and download locations. Potential replacements:
+# media-sound/quimup, xfce-extra/xfce4-mpc-plugin, media-sound/xfmpc
+# Bug 729822. Removal in 30 days.
+media-sound/guimup
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-26)
+# Has been a part of dev-texlive/texlive-pictures
+# for a long time. Removal in 30 days.
+dev-tex/circuit_macros
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-25)
+# Stuck on Python 2, no maintainer; rgain3 fork available for sb. taking over
+# at https://github.com/chaudum/rgain - masked for removal in 30 days.
+media-sound/rgain
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-25)
+# Stuck on Python 2, m-n, we have no shortage on note taking applications.
+# Masked for removal in 30 days.
+x11-misc/nts
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-25)
+# Included with TeX Live. Last version bump in 2003.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/cdcover
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-25)
+# Included with TeX Live. Last version bump in 2008.
+# Use dev-texlive/texlive-latexrecommended as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/translator
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo package is
+# unmaintained and had its last version bump in 2004.
+# Use dev-texlive/texlive-bibtexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/harvard
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2005.
+# Use dev-texlive/texlive-fontsrecommended as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/tipa
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2006 or earlier.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/flabels
+dev-tex/floatflt
+dev-tex/lazylist
+dev-tex/newlfm
+dev-tex/polytable
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2011.
+# Use dev-texlive/texlive-pictures as replacement.
+# Removal in 30 days. Bug #729470.
+dev-tex/curve
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2006. Fails to build.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #719304.
+dev-tex/ellipsis
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Fails to install.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #708870.
+dev-tex/rcsinfo
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. Last version bump in 2005. Fails to build.
+# Use dev-texlive/texlive-latexextra as replacement.
+# Removal in 30 days. Bug #709310.
+dev-tex/texpower
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo packages are
+# unmaintained and had their last version bump in 2010 or earlier.
+# Use >=dev-texlive/texlive-latexextra-2020-r2 as replacement.
+# Removal in 30 days. Bug #729394.
+dev-tex/currvita
+dev-tex/envlab
+dev-tex/europecv
+dev-tex/g-brief
+dev-tex/leaflet
+dev-tex/svninfo
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-24)
+# Included with TeX Live. The separate Gentoo package is
+# unmaintained and had its last version bump in 2008.
+# Use >=dev-texlive/texlive-pictures-2020-r2 as replacement.
+# Removal in 30 days. Bug #729394.
+dev-tex/dot2texi
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-24)
+# A thin wrapper to run pytest via setup.py that must not be used
+# in Gentoo packages.  Calling 'setup.py test' is deprecated upstream
+# anyway.  Just call 'pytest' directly.  The last revdep is last rited.
+# Removal in 30 days.  Bug #729376.
+dev-python/pytest-runner
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-23)
+# Python 2 only.
+#
+# Relax involves implementation conflicts between dependencies.  Even
+# if you can get past them, it requires Numdifftools, and...
+#
+# Numdifftools fails with modern versions of setuptools, most likely
+# because it uses pyscaffold that is broken.  There are newer versions
+# that removed pyscaffold support but they have new dependencies that
+# do not support py2 and porting them back is just not worth the effort.
+# Its only revdep is relax.
+#
+# Pyscaffold is just broken and required only by old versions
+# of Numdifftools.
+#
+# Removal in 30 days.  Bug #704032.
+dev-python/Numdifftools
+dev-python/pyscaffold
+sci-chemistry/relax
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-06-21)
 # virtual/libstdc++ has only one sys-libs/libstdc++-v3 provider.
 # Use that instead. Or even better use none of them. It's a
@@ -40,6 +225,7 @@ virtual/libstdc++
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-20)
 # Stuck on Python 2, depends on deprecated dev-python/pygobject:2
+# Masked for removal in 30 days.
 media-libs/pymemphis
 
 # Ulrich Müller <ulm@gentoo.org> (2020-06-20)
@@ -66,7 +252,6 @@ dev-python/python-wpactrl
 dev-util/bakefile
 dev-vcs/git-deps
 dev-vcs/git-remote-hg
-games-board/scid
 games-emulation/openmsx
 games-kids/childsplay
 games-mud/lyntin
@@ -96,6 +281,7 @@ x11-plugins/purple-plugin_pack
 # games-puzzle/gtetrinet: Bug #726798 last release 2006, abandoned upstream.
 # games-board/mt_gtk_client: Bug #726808, last commit 17 years ago.
 # games-board/sirius: Bug #726814, last release 15 years ago, dead upstream.
+# Masked for removal in 30 days.
 games-board/gnono
 games-puzzle/gtetrinet
 games-board/mt_gtk_client
@@ -104,6 +290,7 @@ games-board/sirius
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-18)
 # Depends on dead gnome-base/libgnomeui. Really, no one else is packaging
 # this, last (and only) release in 2006, abandoned upstream. Bug #726790
+# Masked for removal in 30 days.
 dev-embedded/gnome-avrdude
 
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
@@ -134,12 +321,6 @@ dev-ruby/did_you_mean:2.4
 # Removal in 30 days.
 app-text/xindy
 
-# Aaron Bauman <bman@gentoo.org> (2020-06-07)
-# py2 only. dead upstream. m-n. rdep.
-# Masked for removal in 15 days
-net-misc/charm
-sys-cluster/polysh
-
 # Jonas Stein <jstein@gentoo.org> (2020-06-07)
 # Last rite unusable package.
 # Removal after 2020-08-01
@@ -255,14 +436,6 @@ dev-python/gql
 # Masked for removal in 30 days.
 dev-ruby/rack-mount
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-23)
-# Obsolete GNOME 2 era packages, stuck on Python 2 and pygtk,
-# bugs #640022, #708094. Masked for removal in 30 days.
-dev-python/gconf-python
-dev-python/gnome-python-base
-dev-python/pygtksourceview
-<app-text/cherrytree-0.39.2
-
 # Hans de Graaff <graaff@gentoo.org> (2020-05023)
 # Masked for removal in 30 days.
 # Not useful anymore now that metasploit has been removed.
@@ -308,30 +481,6 @@ games-util/pogo-manager-bin
 net-p2p/bisq
 sci-mathematics/geogebra
 
-# Michał Górny <mgorny@gentoo.org> (2020-03-29)
-# Unmaintained, seriously outdated, vulnerable.  Multiple bugs reported.
-# Stuck on Python 3.6.
-# Removal in 30 days.  Bug #711702.
-app-metrics/buildbot-prometheus
-<dev-util/buildbot-2.7.0
-<dev-util/buildbot-console-view-2.7.0
-<dev-util/buildbot-grid-view-2.7.0
-<dev-util/buildbot-pkg-2.7.0
-<dev-util/buildbot-waterfall-view-2.7.0
-<dev-util/buildbot-worker-2.7.0
-<dev-util/buildbot-wsgi-dashboards-2.7.0
-<dev-util/buildbot-www-2.7.0
-
-# Joshua Kinard <kumba@gentoo.org> (2020-03-28)
-# In Linux ~4.18, IPX (Internetwork Packet eXchange) protocol and
-# NCPFS (NetWare Core Protocol Filesystem) support was removed due
-# to lack of maintenance.  Due to both being dead from a technology
-# standpoint and lack of any upstream activity, mask the below
-# packages and remove in 75 days.
-# Bug #681820
-net-fs/ncpfs
-net-misc/ipx-utils
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
 # Vulnerable old version of icedtea-web #711392
 # new version is not packaged yet
@@ -402,12 +551,6 @@ www-plugins/passff
 =app-editors/emacs-27.0.50_pre*
 ~app-editors/emacs-27.0.90
 
-# David Seifert <soap@gentoo.org> (2019-12-08)
-# Unmaintained, build hangs, tons of other build failures, missing
-# dependencies.  Bug #663794, #666916, #666922, #667062, #678068,
-# #681678, #684420, #694488. Removal in 30 days.
-dev-db/clickhouse
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
deleted file mode 100644
index 25811ee168da..000000000000
--- a/profiles/updates/1Q-2015
+++ /dev/null
@@ -1,58 +0,0 @@
-slotmove sys-firmware/iwl3160-ucode 0 7
-slotmove sys-firmware/iwl3160-ucode 1 8
-slotmove sys-firmware/iwl3160-ucode 2 9
-slotmove sys-firmware/iwl3160-ucode 3 10
-slotmove sys-firmware/iwl7260-ucode 0 7
-slotmove sys-firmware/iwl7260-ucode 1 8
-slotmove sys-firmware/iwl7260-ucode 2 9
-slotmove sys-firmware/iwl7260-ucode 3 10
-slotmove dev-ruby/tilt 2.0.1 2
-move app-vim/zencoding-vim app-vim/emmet
-move app-admin/lxqt-admin lxqt-base/lxqt-admin
-move net-misc/lxqt-openssh-askpass lxqt-base/lxqt-openssh-askpass
-move media-fonts/libertine-ttf media-fonts/libertine
-move dev-qt/qtdocumentation dev-qt/qt-docs
-move app-admin/eselect-audicle app-eselect/eselect-audicle
-move app-admin/eselect-awk app-eselect/eselect-awk
-move app-admin/eselect-blas app-eselect/eselect-blas
-move app-admin/eselect-cblas app-eselect/eselect-cblas
-move app-admin/eselect-cdparanoia app-eselect/eselect-cdparanoia
-move app-admin/eselect-chuck app-eselect/eselect-chuck
-move app-admin/eselect-ctags app-eselect/eselect-ctags
-move app-admin/eselect-emacs app-eselect/eselect-emacs
-move app-admin/eselect-fontconfig app-eselect/eselect-fontconfig
-move app-admin/eselect-gnome-shell-extensions app-eselect/eselect-gnome-shell-extensions
-move app-admin/eselect-infinality app-eselect/eselect-infinality
-move app-admin/eselect-java app-eselect/eselect-java
-move app-admin/eselect-lapack app-eselect/eselect-lapack
-move app-admin/eselect-lcdfilter app-eselect/eselect-lcdfilter
-move app-admin/eselect-lib-bin-symlink app-eselect/eselect-lib-bin-symlink
-move app-admin/eselect-lua app-eselect/eselect-lua
-move app-admin/eselect-metasploit app-eselect/eselect-metasploit
-move app-admin/eselect-miniaudicle app-eselect/eselect-miniaudicle
-move app-admin/eselect-mpg123 app-eselect/eselect-mpg123
-move app-admin/eselect-mpost app-eselect/eselect-mpost
-move app-admin/eselect-notify-send app-eselect/eselect-notify-send
-move app-admin/eselect-oodict app-eselect/eselect-oodict
-move app-admin/eselect-opencascade app-eselect/eselect-opencascade
-move app-admin/eselect-opencl app-eselect/eselect-opencl
-move app-admin/eselect-opengl app-eselect/eselect-opengl
-move app-admin/eselect-package-manager app-eselect/eselect-package-manager
-move app-admin/eselect-pdftex app-eselect/eselect-pdftex
-move app-admin/eselect-php app-eselect/eselect-php
-move app-admin/eselect-pinentry app-eselect/eselect-pinentry
-move app-admin/eselect-postgresql app-eselect/eselect-postgresql
-move app-admin/eselect-python app-eselect/eselect-python
-move app-admin/eselect-rails app-eselect/eselect-rails
-move app-admin/eselect-renpy app-eselect/eselect-renpy
-move app-admin/eselect-ruby app-eselect/eselect-ruby
-move app-admin/eselect-rust app-eselect/eselect-rust
-move app-admin/eselect-sh app-eselect/eselect-sh
-move app-admin/eselect-sndpeek app-eselect/eselect-sndpeek
-move app-admin/eselect-timezone app-eselect/eselect-timezone
-move app-admin/eselect-timidity app-eselect/eselect-timidity
-move app-admin/eselect-unison app-eselect/eselect-unison
-move app-admin/eselect-vdr app-eselect/eselect-vdr
-move app-admin/eselect-vi app-eselect/eselect-vi
-move app-admin/eselect-wxwidgets app-eselect/eselect-wxwidgets
-move app-admin/eselect-xvmc app-eselect/eselect-xvmc
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 7e9994d3a46c..1919388c157a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -13,7 +13,6 @@ move app-admin/nginx-vts-exporter app-metrics/nginx-vts-exporter
 move app-admin/prom2json app-metrics/prom2json
 move net-analyzer/prometheus app-metrics/prometheus
 move net-analyzer/prometheus-alertmanager app-metrics/alertmanager
-move dev-util/buildbot-prometheus app-metrics/buildbot-prometheus
 move net-analyzer/prometheus-node_exporter app-metrics/node_exporter
 move net-analyzer/prometheus-blackbox_exporter app-metrics/blackbox_exporter
 move net-analyzer/prometheus-snmp_exporter app-metrics/snmp_exporter
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
deleted file mode 100644
index b17009f42e3c..000000000000
--- a/profiles/updates/2Q-2015
+++ /dev/null
@@ -1,162 +0,0 @@
-move dev-perl/config-general dev-perl/Config-General
-move dev-util/pkgcore-checks dev-util/pkgcheck
-slotmove dev-libs/libdbusmenu 3 0
-move dev-perl/log-dispatch dev-perl/Log-Dispatch
-move dev-libs/extra-cmake-modules kde-frameworks/extra-cmake-modules
-slotmove kde-frameworks/extra-cmake-modules 0 5
-slotmove =dev-lang/scala-2.9* 0 2.9
-slotmove =dev-lang/scala-2.10* 0 2.10
-slotmove =dev-lang/scala-2.11* 0 2.11
-move dev-perl/Cgi-Simple dev-perl/CGI-Simple
-move net-mail/git-mailz dev-vcs/git-mailz
-move dev-perl/extutils-depends dev-perl/ExtUtils-Depends
-move dev-perl/class-returnvalue dev-perl/Class-ReturnValue
-slotmove =dev-ruby/vcr-2.9.3 0 2
-move kde-base/analitza kde-apps/analitza
-move kde-base/ark kde-apps/ark
-move kde-base/artikulate kde-apps/artikulate
-move kde-base/audiocd-kio kde-apps/audiocd-kio
-move kde-base/blinken kde-apps/blinken
-move kde-base/bomber kde-apps/bomber
-move kde-base/bovo kde-apps/bovo
-move kde-base/cantor kde-apps/cantor
-move kde-base/cervisia kde-apps/cervisia
-move kde-base/dolphin kde-apps/dolphin
-move kde-base/dragon kde-apps/dragon
-move kde-base/ffmpegthumbs kde-apps/ffmpegthumbs
-move kde-base/filelight kde-apps/filelight
-move kde-base/granatier kde-apps/granatier
-move kde-base/gwenview kde-apps/gwenview
-move kde-base/juk kde-apps/juk
-move kde-base/kajongg kde-apps/kajongg
-move kde-base/kalgebra kde-apps/kalgebra
-move kde-base/kalzium kde-apps/kalzium
-move kde-base/kamera kde-apps/kamera
-move kde-base/kanagram kde-apps/kanagram
-move kde-base/kapman kde-apps/kapman
-move kde-base/kapptemplate kde-apps/kapptemplate
-move kde-base/kate kde-apps/kate
-move kde-base/katomic kde-apps/katomic
-move kde-base/kblackbox kde-apps/kblackbox
-move kde-base/kblocks kde-apps/kblocks
-move kde-base/kbounce kde-apps/kbounce
-move kde-base/kbreakout kde-apps/kbreakout
-move kde-base/kbruch kde-apps/kbruch
-move kde-base/kcachegrind kde-apps/kcachegrind
-move kde-base/kcalc kde-apps/kcalc
-move kde-base/kcharselect kde-apps/kcharselect
-move kde-base/kcolorchooser kde-apps/kcolorchooser
-move kde-base/kcron kde-apps/kcron
-move kde-base/kdeaccessibility-meta kde-apps/kdeaccessibility-meta
-move kde-base/kdeadmin-meta kde-apps/kdeadmin-meta
-move kde-base/kdebase-meta kde-apps/kdebase-meta
-move kde-base/kde-dev-scripts kde-apps/kde-dev-scripts
-move kde-base/kde-dev-utils kde-apps/kde-dev-utils
-move kde-base/kdeedu-meta kde-apps/kdeedu-meta
-move kde-base/kdegames-meta kde-apps/kdegames-meta
-move kde-base/kdegraphics-meta kde-apps/kdegraphics-meta
-move kde-base/kdegraphics-mobipocket kde-apps/kdegraphics-mobipocket
-move kde-base/kdemultimedia-meta kde-apps/kdemultimedia-meta
-move kde-base/kdenetwork-filesharing kde-apps/kdenetwork-filesharing
-move kde-base/kdenetwork-meta kde-apps/kdenetwork-meta
-move kde-base/kdesdk-kioslaves kde-apps/kdesdk-kioslaves
-move kde-base/kdesdk-meta kde-apps/kdesdk-meta
-move kde-base/kdeutils-meta kde-apps/kdeutils-meta
-move kde-base/kdf kde-apps/kdf
-move kde-base/kdialog kde-apps/kdialog
-move kde-base/kdiamond kde-apps/kdiamond
-move kde-base/keditbookmarks kde-apps/keditbookmarks
-move kde-base/kfind kde-apps/kfind
-move kde-base/kfloppy kde-apps/kfloppy
-move kde-base/kfourinline kde-apps/kfourinline
-move kde-base/kgamma kde-plasma/kgamma
-move kde-base/kgeography kde-apps/kgeography
-move kde-base/kget kde-apps/kget
-move kde-base/kgoldrunner kde-apps/kgoldrunner
-move kde-base/kgpg kde-apps/kgpg
-move kde-base/khangman kde-apps/khangman
-move kde-base/kig kde-apps/kig
-move kde-base/kigo kde-apps/kigo
-move kde-base/killbots kde-apps/killbots
-move kde-base/kimagemapeditor kde-apps/kimagemapeditor
-move kde-base/kiriki kde-apps/kiriki
-move kde-base/kiten kde-apps/kiten
-move kde-base/kjumpingcube kde-apps/kjumpingcube
-move kde-base/klettres kde-apps/klettres
-move kde-base/klickety kde-apps/klickety
-move kde-base/klines kde-apps/klines
-move kde-base/kmag kde-apps/kmag
-move kde-base/kmahjongg kde-apps/kmahjongg
-move kde-base/kmines kde-apps/kmines
-move kde-base/kmix kde-apps/kmix
-move kde-base/kmousetool kde-apps/kmousetool
-move kde-base/kmouth kde-apps/kmouth
-move kde-base/kmplot kde-apps/kmplot
-move kde-base/knavalbattle kde-apps/knavalbattle
-move kde-base/knetwalk kde-apps/knetwalk
-move kde-base/kolf kde-apps/kolf
-move kde-base/kollision kde-apps/kollision
-move kde-base/kolourpaint kde-apps/kolourpaint
-move kde-base/kompare kde-apps/kompare
-move kde-base/konqueror kde-apps/konqueror
-move kde-base/konquest kde-apps/konquest
-move kde-base/konsole kde-apps/konsole
-move kde-base/kopete kde-apps/kopete
-move kde-base/kpat kde-apps/kpat
-move kde-base/kqtquickcharts kde-apps/kqtquickcharts
-move kde-base/krdc kde-apps/krdc
-move kde-base/kreversi kde-apps/kreversi
-move kde-base/krfb kde-apps/krfb
-move kde-base/kruler kde-apps/kruler
-move kde-base/kshisen kde-apps/kshisen
-move kde-base/ksirk kde-apps/ksirk
-move kde-base/ksnakeduel kde-apps/ksnakeduel
-move kde-base/kspaceduel kde-apps/kspaceduel
-move kde-base/ksquares kde-apps/ksquares
-move kde-base/ksudoku kde-apps/ksudoku
-move kde-base/ksystemlog kde-apps/ksystemlog
-move kde-base/kteatime kde-apps/kteatime
-move kde-base/ktimer kde-apps/ktimer
-move kde-base/ktouch kde-apps/ktouch
-move kde-base/ktuberling kde-apps/ktuberling
-move kde-base/kturtle kde-apps/kturtle
-move kde-base/kubrick kde-apps/kubrick
-move kde-base/kwalletmanager kde-apps/kwalletmanager
-move kde-base/kwordquiz kde-apps/kwordquiz
-move kde-base/kwrite kde-apps/kwrite
-move kde-base/libkcddb kde-apps/libkcddb
-move kde-base/libkcompactdisc kde-apps/libkcompactdisc
-move kde-base/libkdcraw kde-apps/libkdcraw
-move kde-base/libkdegames kde-apps/libkdegames
-move kde-base/libkexiv2 kde-apps/libkexiv2
-move kde-base/libkipi kde-apps/libkipi
-move kde-base/libkmahjongg kde-apps/libkmahjongg
-move kde-base/libkomparediff2 kde-apps/libkomparediff2
-move kde-base/libksane kde-apps/libksane
-move kde-base/lokalize kde-apps/lokalize
-move kde-base/lskat kde-apps/lskat
-move kde-base/marble kde-apps/marble
-move kde-base/okular kde-apps/okular
-move kde-base/oxygen-icons kde-frameworks/oxygen-icons
-move kde-base/palapeli kde-apps/palapeli
-move kde-base/parley kde-apps/parley
-move kde-base/picmi kde-apps/picmi
-move kde-base/poxml kde-apps/poxml
-move kde-base/print-manager kde-apps/print-manager
-move kde-base/rocs kde-apps/rocs
-move kde-base/step kde-apps/step
-move kde-base/svgpart kde-apps/svgpart
-move kde-base/sweeper kde-apps/sweeper
-move kde-base/thumbnailers kde-apps/thumbnailers
-move kde-base/umbrello kde-apps/umbrello
-move kde-base/zeroconf-ioslave kde-apps/zeroconf-ioslave
-move dev-db/pygresql dev-python/pygresql
-slotmove =net-libs/phodav-0.4* 0 1.0
-slotmove =net-libs/phodav-2.0* 0 2.0
-slotmove =dev-ruby/temple-0.7.5 0 0.7
-move perl-core/CGI dev-perl/CGI
-move perl-core/Module-Build dev-perl/Module-Build
-move perl-core/Module-Pluggable dev-perl/Module-Pluggable
-move media-gfx/assimp media-libs/assimp
-move kde-plasma/bluez-qt kde-frameworks/bluez-qt
-move dev-java/scala-bin dev-lang/scala-bin
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 53af3e0cc8d4..41f95c93bbee 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -8,3 +8,5 @@ move dev-vcs/cli dev-util/github-cli
 move mail-filter/pypolicyd-spf mail-filter/spf-engine
 move dev-python/mimeparse dev-python/python-mimeparse
 move app-misc/cargo-license dev-util/cargo-license
+move dev-python/argon2_cffi dev-python/argon2-cffi
+move gnome-extra/nautilus-actions gnome-extra/filemanager-actions
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 47f5dbd6f81f..057aff16e7cd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -555,9 +555,6 @@ app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
 app-emulation/lxc:apparmor - Enable AppArmor support
 app-emulation/lxc:templates - Install old style templates through app-emulation/lxc-templates
 app-emulation/lxc:tools - Build and install additional command line tools
-app-emulation/lxd:daemon - Build the system daemon, not just the client tool
-app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS
-app-emulation/lxd:tools - Build and install optional tools
 app-emulation/nemu:network-map - Adds possibility of exporting network map to SVG
 app-emulation/nemu:ovf - Adds support for OVA/OVF import
 app-emulation/nemu:savevm - Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)
@@ -1330,12 +1327,6 @@ dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-
 dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
 dev-cpp/sourcetrail:examples - Install example projects.
 dev-db/aerospike-server-community:tools - Install extra tools
-dev-db/clickhouse:client - Build CLI client.
-dev-db/clickhouse:kafka - Enables support for kafka consumer.
-dev-db/clickhouse:mongodb - Enabled support for MongoDB-based dictionaries
-dev-db/clickhouse:server - Build server.
-dev-db/clickhouse:tools - Build various tools, like benchmark, copier, etc.
-dev-db/clickhouse:zookeeper - Enable support for clustering (based on Zookeeper).
 dev-db/etcd:server - Installs etcd daemon
 dev-db/firebird:server - Install the server components of Firebird, not just the client
 dev-db/firebird:xinetd - Install ClassicServer
@@ -1893,6 +1884,7 @@ dev-lang/go:system-bootstrap - Bootstrap using previously installed dev-lang/go
 dev-lang/icon:iplsrc - install the icon programming library source
 dev-lang/janet:static-libs - install janet static library archive, you must enable this flag for using `jpm build`
 dev-lang/jsonnet:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
+dev-lang/julia:system-llvm - (Try to) Use the system LLVM install. YMMV.
 dev-lang/lazarus:minimal - Don't build extra packages from the bigide component
 dev-lang/logtalk:fop - Support for generating pdf documentation using fop
 dev-lang/logtalk:xslt - Support for generating html documentation using xslt
@@ -2404,9 +2396,11 @@ dev-ml/ocaml-cohttp:lwt - Enables support for the dev-ml/lwt cooperative light-w
 dev-ml/ocaml-cstruct:async - Support for asynchronous execution
 dev-ml/ocaml-cstruct:lwt - Enable threads via lwt
 dev-ml/ocaml-cstruct:ppx - Enable the ppx syntax extension
+dev-ml/ocaml-fileutils:ocamlopt - Whether the OCaml native code compiler is used. Must be set globally and match dev-lang/ocaml.
 dev-ml/ocamlnet:httpd - Enables net-httpd web server component
 dev-ml/ocamlnet:zip - Enables netzip support to read/write gzip data using object channels
 dev-ml/pgocaml:camlp4 - Enable PG'Ocaml syntax extension.
+dev-ml/stdlib-shims:ocamlopt - Whether the OCaml native code compiler is used. Must be set globally and match dev-lang/ocaml.
 dev-ml/tyxml:camlp4 - Enables the camlp4 syntax extension (deprecated)
 dev-ml/tyxml:ppx - Enables the ppx syntax extension (preferred)
 dev-ml/uutf:utftrip - Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.
@@ -2723,6 +2717,7 @@ dev-qt/qt-docs:serialbus - Install documentation for dev-qt/qtserialbus
 dev-qt/qt-docs:serialport - Install documentation for dev-qt/qtserialport
 dev-qt/qt-docs:speech - Install documentation for dev-qt/qtspeech
 dev-qt/qt-docs:sql - Install documentation for dev-qt/qtsql
+dev-qt/qt-docs:timeline - Install documentation for dev-qt/qtquicktimeline
 dev-qt/qt-docs:virtualkeyboard - Install documentation for dev-qt/qtvirtualkeyboard
 dev-qt/qt-docs:webchannel - Install documentation for dev-qt/qtwebchannel
 dev-qt/qt-docs:webengine - Install documentation for dev-qt/qtwebengine
@@ -2809,6 +2804,7 @@ dev-ruby/ruby-sdl:image - Enable media-libs/sdl-image support
 dev-ruby/ruby-sdl:mixer - Enable media-libs/sdl-mixer support
 dev-ruby/ruby-sdl:sge - Enable sdl-sge support
 dev-ruby/rubygems:server - Install support for the rubygems server
+dev-ruby/vcr:json - Add support for casettes serialized with JSON
 dev-scheme/gauche:mbedtls - Enable support for net-libs/mbedtls
 dev-scheme/gauche-gl:cg - Enable NVidia Cg binding
 dev-scheme/guile:debug-freelist - Include garbage collector freelist debugging code
@@ -3050,7 +3046,6 @@ dev-vcs/git:webdav - Adds support for push'ing to HTTP/HTTPS repositories via DA
 dev-vcs/git-annex:assistant - Enable git-annex assistant and watch command
 dev-vcs/git-annex:benchmark - Enable benchmarking
 dev-vcs/git-annex:concurrentoutput - Use concurrent-output library (experimental)
-dev-vcs/git-annex:magicmime - Use libmagic to determine file MIME types
 dev-vcs/git-annex:network-uri - Get Network.URI from the network-uri package.
 dev-vcs/git-annex:pairing - Enable pairing of git annex repositories
 dev-vcs/git-annex:s3 - Enable Amazon S3 remote
@@ -3420,6 +3415,9 @@ gnome-extra/evolution-data-server:berkdb - sys-libs/db support needed to migrate
 gnome-extra/evolution-data-server:gnome-online-accounts - Enable net-libs/gnome-online-accounts based Google authentication support
 gnome-extra/evolution-data-server:oauth - Enable internal OAuth2 authentication support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
 gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
+gnome-extra/filemanager-actions:caja - Install the mate-base/caja extension
+gnome-extra/filemanager-actions:nautilus - Install the gnome-base/nautilus extension
+gnome-extra/filemanager-actions:nemo - Install the gnome-extra/nemo extension
 gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI PackageKit
 gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
 gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
@@ -4325,7 +4323,6 @@ media-libs/mesa:llvm - Enable LLVM backend for Gallium3D.
 media-libs/mesa:lm-sensors - Enable Gallium HUD lm-sensors support.
 media-libs/mesa:opencl - Enable the Clover Gallium OpenCL state tracker.
 media-libs/mesa:osmesa - Build the Mesa library for off-screen rendering.
-media-libs/mesa:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
 media-libs/mesa:valgrind - Compile in valgrind memory hints
 media-libs/mesa:vdpau - Enable the VDPAU acceleration interface for the Gallium3D Video Layer.
 media-libs/mesa:vulkan - Enable Vulkan drivers
@@ -4798,12 +4795,14 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
 media-sound/split2flac:mac - Add support for Monkey's Audio files
 media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
 media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:pulseaudio - Constrols the dependency on pulseaudio or apulse
 media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
 media-sound/supercollider:emacs - Enable the SCEL user interface
 media-sound/supercollider:gedit - Enable the SCED user interface
 media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
+media-sound/supercollider:webengine - Enable the internal help system using QtWebengine
 media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
 media-sound/traverso:lv2 - Add support for Ladspa V2
@@ -5103,6 +5102,10 @@ 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:alsa - Install PipeWire alsa device for playback and record
+media-video/pipewire:jack - Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire
+media-video/pipewire:pulseaudio - Enable emulation to be able to run PulseAudio applications on top of PipeWire
+media-video/pipewire:vulkan - Enable vulkan spa plugin integration
 media-video/qmplay2:audiofilters - Build with AudioFilters module
 media-video/qmplay2:avdevice - Build FFmpeg module with libavdevice suport
 media-video/qmplay2:avresample - Use libavresample instead of libswresample
@@ -5593,6 +5596,7 @@ net-dns/pdns:remote - Use a generic socket or pipe as a backend (via JSON RPC re
 net-dns/pdns:sodium - Use dev-libs/libsodium for cryptography
 net-dns/pdns:tinydns - Use a TinyDNS CDB database as backend.
 net-dns/pdns:tools - Build optional tools (dnsscan, dnsscope, etc..).
+net-dns/pdns-recursor:dnstap - Enable support for dnstap
 net-dns/pdns-recursor:protobuf - Enable support for dev-libs/protobuf.
 net-dns/pdns-recursor:sodium - Use dev-libs/libsodium for cryptography
 net-dns/pdnsd:isdn - Linux-only: check status of ippp interfaces with ISDN-specific system calls.
@@ -6180,7 +6184,6 @@ net-libs/webkit-gtk:webgl - Build support for the WebGL HTML API using virtual/o
 net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
 net-libs/xrootd:fuse - Enable the sys-fs/fuse filesystem driver
 net-libs/xrootd:http - Enable http protocol support
-net-libs/xrootd:rbd - Enable rados block device support via sys-cluster/ceph
 net-libs/zeromq:drafts - Build draft API, which may change at any time without any notice, and is therefore not recommended for normal use.
 net-libs/zeromq:pgm - Build PGM (Pragmatic General Multicast)extention, a protocol for reliable multicast transport of data over IP networks.
 net-libs/zeromq:sodium - Use dev-libs/libsodium for cryptography
@@ -6725,6 +6728,7 @@ net-nds/389-ds-base:pam-passthru - Enable pam-passthru plugin - for simple and f
 net-nds/389-ds-base:presence - Enable presence plugin - non-standard syntax validation
 net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
 net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
+net-nds/nsscache:s3 - Support for S3-based NSS sources
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:kinit - Enable support for kerberos init
 net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code
@@ -6829,11 +6833,8 @@ net-p2p/xmr-stak-rx:cuda - Enable NVIDIA CUDA toolkit support
 net-p2p/xmr-stak-rx:hwloc - Enable CPU affinity support via hwloc
 net-p2p/xmr-stak-rx:opencl - Enable OpenCL support
 net-p2p/xmr-stak-rx:webserver - Enable internal webserver
-net-print/cups:java - Add support for the Java interpeter in the web server CGIs.
 net-print/cups:lprng-compat - Do not install lp... binaries so cups and lprng can coexist.
-net-print/cups:python - Add support for the Python interpeter in the web server CGIs.
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
-net-print/cups-filters:ipp_autosetup - Let cups-browsed automatically set up IPP network printers by default.
 net-print/cups-filters:pclm - Enable PCLm support
 net-print/dymo-cups-drivers:usb_modeswitch - Include usb_modeswitch for some hardware (bug #601242)
 net-print/fax4cups:efax - Install net-misc/efax backend
@@ -7104,10 +7105,14 @@ net-wireless/uhd:usrp1 - support USRP1 hardware
 net-wireless/uhd:usrp2 - support USRP2, N200, N210 hardware
 net-wireless/uhd:utils - utilities needed to list, query, calibrate, or update FPGA/Firmware
 net-wireless/uhd:x300 - support X300, X310 hardware
+net-wireless/urh:airspy - use native backend which directly uses net-wireless/airspy
+net-wireless/urh:audio - use a soundcard instead of an sdr
 net-wireless/urh:bladerf - use native backend which directly uses net-wireless/bladerf
 net-wireless/urh:hackrf - use native backend which directly uses net-libs/libhackrf
+net-wireless/urh:limesdr - use native backend which directly uses net-wireless/limesuite
 net-wireless/urh:plutosdr - use native backend which directly uses net-libs/libiio
 net-wireless/urh:rtlsdr - use native backend which directly uses net-wireless/rtl-sdr
+net-wireless/urh:sdrplay - use native backend which directly uses net-wireless/sdrplay
 net-wireless/urh:uhd - use native backend which directly uses net-wireless/uhd
 net-wireless/wepattack:john - Build with app-crypt/johntheripper support
 net-wireless/wireless-tools:multicall - Build the most commonly used tools as one binary
@@ -8298,6 +8303,7 @@ sys-devel/gcc:vtv - Build support for virtual table verification (a C++ hardenin
 sys-devel/gcc-apple:bootstrap - !DO NOT SET THIS FLAG YOURSELF! avoids need for autoconf during bootstrap stage2
 sys-devel/gcc-apple:objc - Build support for the Objective C code language
 sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
+sys-devel/gcc-config:cc-wrappers - Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.
 sys-devel/gcc-config:native-symlinks - Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.
 sys-devel/gdb:client - Install the main "gdb" program (most people want this)
 sys-devel/gdb:lzma - Support lzma compression in ELF debug info
@@ -8700,6 +8706,8 @@ www-apps/wordpress:themes - Installs themes (including default theme)
 www-client/chromium:closure-compile - Enable closure type-checking for Chrome's web technology-based UI. Requires Java.
 www-client/chromium:component-build - Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.
 www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
+www-client/chromium:headless - Build Ozone only with headless backend, NOT RECOMMENDED for general use.
+www-client/chromium:ozone - Enable Ozone platform abstraction layer with X11 backend.
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable proprietary codecs like H.264, MP3
 www-client/chromium:suid - Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels
@@ -8707,6 +8715,7 @@ www-client/chromium:system-ffmpeg - Use system ffmpeg instead of the bundled one
 www-client/chromium:system-icu - Use system icu instead of the bundled one
 www-client/chromium:system-libvpx - Use system libvpx instead of the bundled one
 www-client/chromium:tcmalloc - Use bundled tcmalloc instead of system malloc
+www-client/chromium:wayland - Enable Wayland backend for Ozone.
 www-client/chromium:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
 www-client/dillo:xembed - Enable X11 XEmbed support
 www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
@@ -8750,7 +8759,6 @@ www-client/netsurf:bmp - BMP bitmap image support (media-libs/libnsbmp)
 www-client/netsurf:duktape - Use duktape.org javascript engine
 www-client/netsurf:gtk - Build GTK3 GUI
 www-client/netsurf:gtk2 - Build GTK2 GUI
-www-client/netsurf:pdf-writer - PDF output support (media-libs/libharu)
 www-client/netsurf:psl - Use public suffix list via media-libs/libnspsl
 www-client/netsurf:rosprite - RISC OS Sprite bitmap image support (media-libs/librosprite)
 www-client/netsurf:svgtiny - SVG image support via media-libs/svgatiny instead of gnome-base/librsvg
@@ -8994,7 +9002,9 @@ x11-misc/xmobar:mpd - Support mpd plugin
 x11-misc/xmobar:mpris - Enables MPRIS v1, v2 support
 x11-misc/xmobar:timezone - Enables localized date support
 x11-misc/xmobar:uvmeter - Plugin to show UV data for Australia.
+x11-misc/xscreensaver:gdk-pixbuf - Include support for the x11-libs/gdk-pixbuf library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well
 x11-misc/xscreensaver:gdm - Use gdmflexiserver from gnome-base/gdm instead of x11-misc/lightdm
+x11-misc/xscreensaver:locking - Compile in support for locking the display
 x11-misc/xscreensaver:new-login - Enable user switching support using gdmflexiserver (x11-misc/lightdm)
 x11-misc/xsr:cursor - Capture mouse cursor using x11-misc/xdotool, and place them on the screenshots using media-gfx/imagemagick
 x11-misc/xss-lock:man - Build and install man pages