Updating liguros repo21.1.2

43 files changed, 954 insertions, 742 deletions

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index dac55926b80b..d10aafdf6f81 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-10-24)
+# asm redc is only available on amd64,
+# ppc64. bug #750974.
+sci-mathematics/gmp-ecm custom-tune
+
+# Sam James <sam@gentoo.org> (2020-10-05)
+# Guile only supports JIT on some arches
+# (See 9.3.8 in the Guile manual)
+dev-scheme/guile jit
+
+# Sam James <sam@gentoo.org> (2020-09-20)
+# (for Mikle Kolyada <zlogene@gentoo.org>)
+# libgcrypt et al no longer support static-libs
+# Need to determine whether crypt is possible dynamically?
+sys-power/suspend crypt
+
+# Sam James <sam@gentoo.org> (2020-09-20)
+# (for Mikle Kolyada <zlogene@gentoo.org>)
+# libgcrypt et al no longer support static-libs
+# Need to determine whether dar's static use
+# is worthwhile without it.
+app-backup/dar static static-libs
+
+# Thomas Deutschmann <whissi@gentoo.org> (2020-09-07)
+# dev-util/nvidia-cuda-toolkit is only available on amd64
+app-metrics/collectd collectd_plugins_gpu_nvidia
+
 # Sam James <sam@gentoo.org> (2020-07-03)
 # Rust is only available on some arches
 # Bug #728558
@@ -34,13 +61,17 @@ sys-libs/glibc static-pie
 # dev-util/sysprof not keyworded on most arches yet
 x11-wm/mutter sysprof
 dev-libs/gjs sysprof
+dev-libs/glib sysprof
+x11-libs/gtk+ sysprof
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-02-26)
 # Vulkan support is only available on few selected arches atm.
 # Mask everywhere, unmask where appropriate.
+dev-qt/qt3d vulkan
 dev-qt/qtdeclarative vulkan
 dev-qt/qtgui vulkan
 dev-qt/qtwayland vulkan
+media-video/pipewire vulkan
 
 # dev-python/pandas is only keyworded for amd64 & x86
 sys-block/fio python gnuplot
@@ -84,10 +115,11 @@ media-video/vlc libplacebo
 # Overlay can only be built on amd64 and x86
 x11-apps/igt-gpu-tools overlay
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-11-15)
+# Thomas Deutschmann <whissi@gentoo.org> (2020-10-06)
+# - aesni plugin is only supported on amd64 and x86
 # - rdrand plugin is only supported on amd64 and x86
 # - padlock plugin is only supported on amd64 and x86
-net-vpn/strongswan strongswan_plugins_rdrand strongswan_plugins_padlock
+net-vpn/strongswan strongswan_plugins_aesni strongswan_plugins_rdrand strongswan_plugins_padlock
 
 # James Le Cuirot <chewi@gentoo.org> (2018-11-02)
 # Vulkan is only available on amd64 at present.
@@ -129,9 +161,10 @@ app-laptop/pbbuttonsd macbook
 # Requires [cuda] which is masked in most of the profiles.
 media-libs/opencv contribxfeatures2d
 
-# Thomas Deutschmann <whissi@gentoo.org> (2017-03-01)
-# dev-libs/libmaxminddb is only keyworded on amd64 and x86 at the moment
-app-admin/rsyslog mdblookup
+# Thomas Deutschmann <whissi@gentoo.org> (2020-10-22)
+# imhttp: www-servers/civetweb is only keyworded on amd64 and x86 at the moment
+# mdblookup: dev-libs/libmaxminddb is only keyworded on amd64 and x86 at the moment
+app-admin/rsyslog imhttp mdblookup
 
 # Alexis Ballier <aballier@gentoo.org> (2017-02-21)
 # spacetime is only supported on amd64 at the moment.
@@ -194,19 +227,10 @@ media-video/ffmpeg mmal
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-29)
-# JavaFX and the browser plugin are not included on some platforms.
-dev-java/oracle-jdk-bin javafx nsplugin
-dev-java/oracle-jre-bin javafx nsplugin
-
 # Ben de Groot <yngwin@gentoo.org> (2015-03-15)
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.
 media-libs/libbluray bdplus
 
-# Michał Górny <mgorny@gentoo.org> (2015-03-01)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers steam
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb tokudb
@@ -235,7 +259,7 @@ app-editors/gvim luajit racket
 # Kacper Kowalik <xarthisius@gentoo.org> (2013-08-09)
 # Doesn't work on most profiles. Easier to mask here and
 # unmask in particular profiles
-sys-apps/hwloc gl
+sys-apps/hwloc gl nvml
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-11-03)
 # Requires net-dns/unbound which is not keyworded by most arches
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 009686a62982..ba124ae0487a 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -157,7 +157,6 @@ input_devices_wacom
 
 # Robert Buchholz <rbu@gentoo.org> (2007-06-03)
 # Only works on x86 or amd64
-lcd_devices_svga
 lcd_devices_luise
 
 # Alex Legler <a3li@gentoo.org> (2009-12-07)
@@ -195,13 +194,8 @@ abi_mips_n32
 abi_mips_n64
 abi_ppc_32
 abi_ppc_64
-abi_riscv_lp64d
-abi_riscv_lp64
 abi_s390_32
 abi_s390_64
-# Mask new riscv abis as well
-abi_riscv_ilp32d
-abi_riscv_ilp32
 
 # Andrey Grozin <grozin@gentoo.org> (2014-06-25)
 # These lisps are available only on some arches
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 06fc950e677a..8b2196c89537 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to include ruby25 on 2019-07-17
-RUBY_TARGETS="ruby25"
+# Updated to include ruby26 on 2020-09-14
+RUBY_TARGETS="ruby25 ruby26 ruby27"
 
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
@@ -123,15 +123,20 @@ PYTHONDONTWRITEBYTECODE="1"
 # This MUST be kept in sync with the PYTHON_TARGETS below
 # Mike Gilbert <floppym@gentoo.org> (2018-05-23)
 # sys-apps/baslayout-2.5 needs split-usr enabled.
-BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_7 python_targets_python2_7"
+BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_8 python_targets_python2_7"
 
 # Mike Gilbert <floppym@gentoo.org> (2012-05-15)
 # Default target(s) for python-r1.eclass
-# Mikle Kolyada <zlogene@gentoo.org> (2020-05-06)
-# Updated to python3_7
+# Palica (2020-12-06)
+# Updated to python3_9
 PYTHON_TARGETS="python3_9"
 PYTHON_SINGLE_TARGET="python3_9"
 
+# Palica (2020-12-26)
+# Default target(s) for lua
+LUA_TARGETS="lua5-1 lua5-2"
+LUA_SINGLE_TARGET="lua5-2"
+
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
 # 1) do not uninstall kernel modules and therefore allow replacing them,
@@ -166,7 +171,7 @@ POSTGRES_TARGETS="postgres10 postgres11"
 # Moreover, it should only contain targets that have a stable version
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
-PHP_TARGETS="php7-2 php7-3"
+PHP_TARGETS="php7-2 php7-3 php7-4"
 
 # Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
 #
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index f22ebf46905a..839bdf1c54a9 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -6,6 +6,11 @@
 # support it already.
 sys-boot/refind gnuefi
 
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2020-12-06)
+# Doesn't build without X. Not removing IUSE from ebuild yet in hope that
+# https://github.com/TomenetGame/tomenet/issues/14 will be fixed.
+>=games-roguelike/tomenet-4.7.3 X
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-08-08)
 # Ensure tools flag is enabled for @system set
 sys-apps/kmod tools
@@ -22,6 +27,7 @@ sys-devel/gcc-config cc-wrappers
 #    https://wiki.gentoo.org/wiki/Project:Toolchain/use_native_symlinks
 sys-devel/binutils-config native-symlinks
 sys-devel/gcc-config      native-symlinks
+sys-devel/gcc-config      cc-wrappers
 
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # Require user configs unless we supply our own .config.
@@ -84,7 +90,6 @@ net-libs/webkit-gtk seccomp
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
 # All glibc versions that include RPC code are masked now.
-dev-libs/libspt libtirpc
 dev-perl/Lab-VXI11 libtirpc
 net-analyzer/argus libtirpc
 net-analyzer/snort libtirpc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 50fc3f1b8873..d5c3cd0ccde7 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,11 +6,102 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-07)
+# Waiting for unmasking of slotted Lua.
+>=app-i18n/fcitx-4.2.9.8:4 lua
+>=app-i18n/ibus-libpinyin-1.11.92 lua
+app-i18n/ibus-pinyin lua
+
+# Matt Turner <mattst88@gentoo.org> (2020-12-05)
+# Relies on gtkdoc-mktmpl which was removed from gtk-doc-1.26
+# Bug #740690
+x11-libs/colord-gtk doc
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-04)
+# Mask the experimental targets in release ebuilds.
+<dev-ml/llvm-ocaml-11 llvm_targets_AVR
+<sys-devel/clang-11 llvm_targets_AVR
+<sys-devel/llvm-11 llvm_targets_AVR
+<dev-ml/llvm-ocaml-12 llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE
+<sys-devel/clang-12 llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE
+<sys-devel/llvm-12 llvm_targets_ARC llvm_targets_CSKY llvm_targets_VE
+
+# Joonas Niilola <juippis@gentoo.org> (2020-12-03)
+# Doc building seem to be very random without any predictability, 
+# bug #734104
+media-gfx/blender doc
+
+# Marek Szuba <marecki@gentoo.org> (2020-11-30)
+# Vendored therecipe/qt violates network sandbox + uses external binary
+# Qt libraries; see https://github.com/ProtonMail/proton-bridge/issues/16
+# The qt module itself apparently can be made to build against system Qt5
+# but making it do so while vendored is a non-trivial task.
+mail-mta/protonmail-bridge gui
+
+# Michał Górny <mgorny@gentoo.org> (2020-11-29)
+# libclangformat-ide is masked for removal.
+dev-qt/qt-creator clang
+
+# Joonas Niilola <juippis@gentoo.org> (2020-11-26)
+# Still too experimental. efl's upstream can't keep up with libavif's.
+# Bug: 756733
+dev-libs/efl avif
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-25)
+# Depends on masked net-libs/libkvkontakte
+kde-apps/kipi-plugins vkontakte
+
+# Alfredo Tupone <tupone@gentoo.org> (2020-11-06)
+# waiting for lua to be slotted
+media-gfx/exact-image lua
+
+# Haelwenn (lanodan) Monnier <contact@hacktivis.me> (2020-11-03)
+# Requires >=dev-lang/lua-5.2, which is still masked.
+app-editors/vis lua
+
+# Marek Szuba <marecki@gentoo.org> (2020-10-12)
+# Requires slotted Lua, which is still masked.
+media-gfx/darktable system-lua
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-08)
+# USE=doc broken on 1.47.0
+# error: unresolved link to `crate::os::unix::ffi::OsStrExt`
+#
+# USE=miri seems to be not working on 1.48.0
+~dev-lang/rust-1.47.0 doc
+~dev-lang/rust-1.48.0 doc miri
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-27)
+# The respective dependencies are masked for removal.
+net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# The respective dependencies are masked for removal.
+~dev-db/percona-server-5.7.27.30 test
+sci-geosciences/viking mapnik
+
+# Joonas Niilola <juippis@gentoo.org> (2020-09-23)
+# Highly experimental, may cause breakages when updating. Use with 
+# caution!
+dev-libs/efl efl-one
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-20)
+# The respective dependencies are masked for removal.
+net-nntp/pan gnome-keyring
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-09)
+# The respective dependencies are masked for removal.
+media-plugins/mythplugins mythnetvision
+sys-cluster/drbd-utils heartbeat
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-09)
+# The respective dependencies are masked for removal.
+app-metrics/collectd collectd_plugins_gmond
+app-metrics/collectd collectd_plugins_onewire
+
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
 # These flags depend on dev-python/pygtk that is masked for removal.
-app-mobilephone/sobexsrv gtk
 <media-gfx/gimp-3 python
-<x11-libs/vte-0.58 python
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
 # These flags depend on packages masked for removal due to py2.
@@ -22,18 +113,8 @@ sci-geosciences/qgis grass
 # CMake checks will only allow on amd64 & x86
 dev-db/mariadb columnstore
 
-# Michał Górny <mgorny@gentoo.org> (2020-08-16)
-# dev-python/pyminuit is being removed.
-sci-visualization/veusz minuit
-
-# Michał Górny <mgorny@gentoo.org> (2020-08-01)
-# Require dev-python/twisted with py2.7.
-net-voip/telepathy-haze test
-net-voip/telepathy-salut test
-
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # dev-python/distributed is going to be last rited.
-dev-python/dask distributed
 dev-python/joblib doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-30)
@@ -44,31 +125,14 @@ www-apps/nikola websocket
 # These packages require Python 2 support in dev-python/sphinx.
 # They are generally fixable by adding py3 support and using
 # distutils_enable_sphinx to build docs.
-<dev-libs/mongo-c-driver-1 doc
-dev-python/backports-functools-lru-cache doc
-<dev-python/click-7.1.2 doc
-<=dev-python/dulwich-0.19.15 doc
-<=dev-python/futures-3.2.0 doc
-<dev-python/gevent-20 doc
-<dev-python/inflect-4 doc
-<dev-python/jaraco-itertools-5 doc
 <=dev-python/lockfile-0.12.2-r2 doc
-<=dev-python/mysql-python-1.2.5-r3 doc
-<=dev-python/mysqlclient-1.4.6 doc
 <dev-python/pep8-1.7.1-r1 doc
-<dev-python/psycopg-2.8.4 doc
-<dev-python/requests-cache-0.4.12-r1 doc
-<=sci-biology/seqan-2.4.0 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-27)
 # Requires Python 2 support in xapian-bindings which in turn require
 # Python 2 in dev-python/sphinx.
 <www-apps/roundup-3 xapian
 
-# Michał Górny <mgorny@gentoo.org> (2020-07-25)
-# Requires dev-python/beautifulsoup with py2 support.
-<=sys-cluster/charm-6.8.2 doc
-
 # Brian Dolbec <dolsen@gentoo.org> (2020-07-20)
 # Required dependencies are not yet in the Gentoo ebuild tree
 # Please file a bug if this feature is needed
@@ -78,11 +142,6 @@ dev-python/autobahn xbr
 # media-video/pipewire:0/0.3 is only available for certain architectures
 www-client/firefox screencast
 
-# 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-3.36 screencast
-
 # Stephan Hartmann <stha09@googlemail.com> (2020-06-28)
 # Mostly intended for development and not for general use.
 >=www-client/chromium-84 headless
@@ -97,10 +156,6 @@ media-gfx/inkscape jemalloc
 # broken.
 www-client/chromium component-build
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-04)
-# Broken error[E0478]: lifetime bound not satisfied
-=dev-lang/rust-1.44.1 miri
-
 # Ben Kohler <bkohler@gentoo.org> (2020-04-29)
 # Dependency pam_wrapper missing for tests, and RESTRICT=test is already set
 net-fs/samba test
@@ -109,16 +164,15 @@ net-fs/samba test
 # Tests are very sensitive to the host environment.
 dev-util/meson test
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-22)
-# Requires dev-python/filemagic that is broken and masked for removal.
-dev-python/jira magic
-
 # Michał Górny <mgorny@gentoo.org> (2020-04-19)
 # Requires dev-vcs/ghp-import that is masked for removal.
 www-apps/nikola ghpages
 
-# Ulrich Müller <ulm@gentoo.org> (2020-04-08)
+# Ulrich Müller <ulm@gentoo.org> (2020-04-08, 2020-11-21)
 # Old versions of libjpeg-turbo have known security issues.
+# The version included with >=zoom-5.3 has an empty DT_RPATH,
+# which is insecure because the loader will search the working
+# directory when it finds an empty path.
 # Use the bundled lib on your own risk. Bug #715106.
 net-im/zoom bundled-libjpeg-turbo
 
@@ -134,30 +188,14 @@ net-analyzer/hydra ncp
 # Michał Górny <mgorny@gentoo.org> (2020-03-28)
 # Requires masked dev-vcs/bzr.  Remove the mask if breezy is packaged
 # and the package is confirmed to work with it.
-dev-vcs/cvs2svn bazaar
 <=dev-util/rosinstall-0.7.8 test
 <=dev-util/wstool-0.1.18 test
 <=dev-python/vcstools-0.1.42 test
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
-# Depends on vulnerable old version of icedtea-web #711392
-# new version is not packaged yet
-# package/useflag is not going away anytime soon,
-# just masked. unmask as needed.
-dev-java/icedtea nsplugin webstart
-dev-java/icedtea-bin nsplugin webstart
-dev-java/openjdk nsplugin webstart
-dev-java/openjdk-bin nsplugin webstart
-dev-java/openjdk-jre-bin nsplugin webstart
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-27)
 # Requires old version of dev-python/docutils.
 dev-util/buildbot doc
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-03-26)
-# Requires deprecated python2 and pygtk
-mail-client/claws-mail python
-
 # Guilherme Amadio <amadio@gentoo.org> (2020-03-16)
 # Requires dev-libs/cudnn which is only available on amd64
 sci-physics/root cudnn
@@ -175,18 +213,9 @@ dev-python/pyzmq doc
 # Unsatisfiable dep due to missing impls.
 dev-python/zeep tornado
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-29)
-# Require Python 2 support in numpydoc.
-<=dev-python/pywavelets-0.5.2-r1 doc
-
-# Michał Górny <mgorny@gentoo.org> (2020-01-29)
-# Require dev-python/epydoc which is being removed.
-<=dev-python/suds-0.6-r1 doc
-
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # Requires old split dev-python/twisted-*.
 net-irc/telepathy-idle test
-net-voip/telepathy-rakia test
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxrt is unmaintained and it's going to be removed.
@@ -202,7 +231,6 @@ dev-libs/ossp-uuid php
 dev-games/openscenegraph fox
 dev-libs/hidapi fox
 sci-mathematics/gsl-shell fox
-sys-libs/gwenhywfar fox
 
 # James Le Cuirot <chewi@gentoo.org> (2019-12-10)
 # The JIT feature only works on amd64 and x86.
@@ -235,12 +263,6 @@ sys-libs/libxcrypt split-usr system
 sys-block/open-iscsi slp
 sys-block/open-isns slp
 
-# Brian Evans <grknight@gentoo.org> (2019-10-01)
-# PHP support is broken with current version
-# Mask USE until they are fixed
-=dev-libs/xapian-bindings-1.2.25 php
-media-gfx/exact-image php
-
 # Michał Górny <mgorny@gentoo.org> (2019-09-28)
 # media-fonts/hkscs-ming is slated for removal.
 app-i18n/xcin unicode
@@ -398,7 +420,6 @@ media-video/ffmpeg appkit
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/openjdk-jre-bin:11 gentoo-vm
-dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
 
@@ -436,11 +457,6 @@ sci-libs/linux-gpib php
 # Globally mask pie use flag. Selectively unmask on specific profiles.
 sys-devel/gcc pie
 
-# Pawel Hajdan jr <phajdan.jr@gentoo.org> (2017-03-02)
-# Known build issue with system libvpx:
-# https://bugs.gentoo.org/show_bug.cgi?id=611394
->=www-client/chromium-58.0.3026.3 system-libvpx
-
 # Mike Gilbert <floppym@gentoo.org> (2017-02-16)
 # Multiple test failures.
 sys-boot/grub:2 test
@@ -470,11 +486,6 @@ net-irc/hexchat theme-manager
 app-editors/emacs:25 cairo
 app-editors/emacs:26 cairo
 
-# Michał Górny <mgorny@gentoo.org> (2016-07-05)
-# Mask system-clang support as it requires llvm-3.4 that is subject
-# to security bug cleanup, #585102.
-dev-util/intel-ocl-sdk system-clang
-
 # Matthew Brewer <tomboy64@sina.cn> (2016-06-02)
 # Acked-by: Amy Winston <amynka@gentoo.org>
 # Currently broken upstream.
@@ -496,10 +507,6 @@ dev-lang/moarvm asan
 # you're doing. This has upstream's approval.
 dev-java/icedtea cacao jamvm
 
-# Patrice Clement <monsieurp@gentoo.org> (2015-11-27)
-# Unsastified dependencies are upsetting repoman. Needs investigation.
-app-arch/cfv bittorrent
-
 # Rick Farina <zerochaos@gentoo.org> (2015-10-06)
 # forward porting this patch is non-trivial, mask for now
 >=net-wireless/wpa_supplicant-2.5 wimax
@@ -509,11 +516,6 @@ app-arch/cfv bittorrent
 # https://bugs.gentoo.org/show_bug.cgi?id=533876
 >=sci-libs/vtk-6.1.0 examples
 
-# Jason Zaman <perfinion@gentoo.org> (2015-09-06)
-# This is for cgmanager which is linux only.
-# Unmasked in default/linux/package.use.mask.
-sys-auth/consolekit cgroups
-
 # James Le Cuirot <chewi@gentoo.org> (2015-08-18)
 # gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
 # anything in the tree. The toolchain folks aren't keen to support it
@@ -552,10 +554,6 @@ sys-devel/gcc sanitize
 # mirisdr does not seem to like making releases
 <net-wireless/gr-osmosdr-9999 mirisdr
 
-# Maxim Koltsov <maksbotan@gentoo.org> (2014-08-05)
-# net-libs/tox is in mva overlay only ATM
-app-leechcraft/lc-azoth sarin
-
 # Pacho Ramos <pacho@gentoo.org> (2014-06-01)
 # Needs hardmasked lua-5.2
 >=media-plugins/grilo-plugins-0.2.12 lua
@@ -589,11 +587,6 @@ x11-libs/cairo gles2-only
 # Fails to build, haven't had time to debug
 app-doc/doxygen sqlite
 
-# Alexis Ballier <aballier@gentoo.org> (2013-05-08)
-# On behalf of Pavel Sanda <ps@twin.jikos.cz>
-# Lyx is currently not working with subversion 1.7 and needs 1.6.
-app-office/lyx subversion
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2013-04-04)
 # Broken for now (segmentation fault on play)
 gnustep-apps/cynthiune flac
@@ -618,10 +611,6 @@ net-analyzer/net-snmp pci
 # The prevent-removal USE flag is only implemented for Linux.
 sys-auth/pam_mktemp prevent-removal
 
-# Samuli Suominen <ssuominen@gentoo.org> (2012-03-20)
-# This is for udev-acl. Unmasked in default/linux/package.use.mask.
-sys-auth/consolekit acl
-
 # Bernard Cafarelli <voyageur@gentoo.org> (2012-02-08)
 # libobjc2/clang experimental support
 >=gnustep-base/gnustep-make-2.6.2 libobjc2
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 53684cd65691..02362a94077e 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,15 +4,24 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# James Le Cuirot <sam@gentoo.org> (2020-11-23)
+# Cinnamon is not stable on any architecture.
+x11-themes/arc-theme cinnamon
+
+# Sam James <sam@gentoo.org> (2020-10-09)
+# Depends on dev-libs/boost[python,numpy], not fully working atm
+# bug #733830, bug #746740, bug #753566
+media-gfx/openvdb python numpy
+media-libs/openimageio python
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-09-18)
+# openjfx:8 will never be stabilized
+dev-java/openjdk:8 javafx
+
 # Pacho Ramos <pacho@gentoo.org> (2020-08-21)
 # app-text/pandoc is hard to stabilize #737612
 sys-apps/earlyoom docs
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-08-03)
-# dev-qt/qtquicktimeline-5.15.0 not yet stable, bug 711120
-# dev-libs/libclangformat-ide not stable and unclear maintainer, bug 711120
->=dev-qt/qt-creator-4.12 clang qmldesigner
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # dev-python/wxpython:4.0 w/ py3 is not stable, bug #714566
 dev-python/matplotlib wxwidgets
@@ -20,7 +29,6 @@ dev-python/matplotlib wxwidgets
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # app-text/pandoc (dev-lang/ghc) has no stable keywords.
 app-emulation/xen-tools doc
-dev-python/notebook doc
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-util/shellcheck (dev-lang/ghc) has no stable keywords.
@@ -40,18 +48,10 @@ dev-libs/boost numpy
 # for stable systems
 dev-lang/rust miri nightly parallel-compiler system-bootstrap
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-12-18)
-# Neither sys-apps/bolt nor kde-plasma/plasma-thunderbolt are stable
-kde-plasma/plasma-meta thunderbolt
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-12-09)
 # Declared experimental, and dev-cpp/websocketpp not stable yet
 sci-libs/indilib websocket
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-11-28)
-# sci-libs/vtk is not stable anymore
-media-libs/opencv vtk
-
 # Kent Fredric <kentnl@gentoo.org> (2019-08-29)
 # Support for DBD-mysql to use mariadb is sketchy. Use DBD-MariaDB
 # instead if you can.
@@ -73,7 +73,6 @@ dev-perl/Business-ISBN barcode
 dev-perl/Template-Toolkit gd
 media-fonts/unifont utils fontforge
 media-video/vdrsync dvdr
-www-apps/bugzilla extras
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
 # sci-libs/dcmtk is not stable
@@ -97,10 +96,8 @@ media-gfx/alembic arnold maya
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# media-libs/opencv[contrib,contribdnn], net-libs/libmediawiki,
-# net-libs/libkvkontakte all not stable anywhere.
+# net-libs/libmediawiki, net-libs/libkvkontakte not stable anywhere.
 kde-apps/kipi-plugins mediawiki vkontakte
-media-gfx/digikam dnn vkontakte
 
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # sssd is only stable for amd64 and x86
@@ -118,10 +115,6 @@ net-analyzer/wireshark doc
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-03-03)
-# sci-geosciences/grass is not stable
-sci-geosciences/qgis grass
-
 # Matthias Maier <tamiko@gentoo.org> (2018-03-18)
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
@@ -175,10 +168,6 @@ kde-apps/cantor julia
 # This is stable masked as g-sorcery is being not actively developed.
 app-portage/layman g-sorcery
 
-# Michael Palimaka <kensington@gentoo.org (2017-01-26)
-# Requires testing version of media-libs/opencv
-media-libs/mlt opencv
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-01-15)
 # Has no stable reverse deps requiring this useflag
 # Stable-masking it so Boost 1.62 stabilization can go ahead
@@ -198,10 +187,6 @@ net-libs/gnutls test-full
 # on a vulnerable libgcrypt version is in tree
 dev-db/mariadb sst-xtrabackup
 
-# Sergey Popov <pinkbyte@gentoo.org> (2016-02-15)
-# Mask monitoring capabilities of Ganeti on stable branches
-app-emulation/ganeti monitoring
-
 # Pacho Ramos <pacho@gentoo.org> (2015-05-15)
 # Version compatible with current ffmpeg is not ready to be stabilized
 # bug #539212
@@ -250,7 +235,7 @@ app-emulation/xen-tools ocaml
 # Samuli Suominen <ssuominen@gentoo.org> (2014-03-19)
 # Some open source OpenCL providers cause sandbox violation while accessing /dev/dri/card*
 # from a command like eg. `/usr/bin/mogrify -version`, see bug #472766
-media-gfx/imagemagick opencl
+<media-gfx/imagemagick-7.0.10.34 opencl
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (2013-03-28)
 # Depends on unstable sci-libs/avogadrolibs
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index c0db71b19156..cdc645e5e9e6 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,20 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Michał Górny <mgorny@gentoo.org> (2020-08-22)
-# app-office/openoffice-bin is being removed.
-office_implementation_openoffice
+# This file is only for generic masks. For arch-specific masks (i.e.
+# mask everywhere, unmask on arch/*) use arch/base.
 
-# Patrick Lauer <patrick@gentoo.org> (2020-08-18)
-# pg13 is currently beta and has no keywords yet
-postgres_targets_postgres13
 
-# Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
-# consolekit is masked for removal
-consolekit
+# Alexis Ballier <aballier@gentoo.org> (2020-10-13)
+# Nothing depends on those ROS messages. dev-ros/geneus
+# is half broken in our setup where it looks for packages
+# on the filesystem and causes build failures.
+# See e.g. https://bugs.gentoo.org/741076
+ros_messages_eus
 
-# This file is only for generic masks. For arch-specific masks (i.e.
-# mask everywhere, unmask on arch/*) use arch/base.
+# Michał Górny <mgorny@gentoo.org> (2020-08-22)
+# app-office/openoffice-bin is being removed.
+office_implementation_openoffice
 
 # Hans de Graaff <graaff@gentoo.org> (2020-06-13)
 # Mask Ruby 2.4 as EOL
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 81ece61c1376..ea79d69f1158 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,10 +4,9 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2020-05-25)
-# Python 3.9 is not yet stable.
-python_targets_python3_9
-python_single_target_python3_9
+# Brian Evans <grknight@gentoo.org> (2020-12-08)
+# Allow packages to add php 8.0 support while waiting on its stable
+php_targets_php8-0
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
@@ -20,5 +19,4 @@ python_single_target_pypy3
 
 # Hans de Graaff <graaff@gentoo.org> (2019-12-26)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby26
 ruby_targets_ruby27
diff --git a/profiles/desc/abi_riscv.desc b/profiles/desc/abi_riscv.desc
deleted file mode 100644
index 708fc8666fb8..000000000000
--- a/profiles/desc/abi_riscv.desc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of ABI_RISCV USE_EXPAND flags.
-
-# Keep it sorted. Please do not add anything without prior discussion
-# on gentoo-dev.
-lp64d - 64-bit (rv64) double hard-float libraries
-lp64 - 64-bit (rv64) soft-float libraries
diff --git a/profiles/desc/apache2_modules.desc b/profiles/desc/apache2_modules.desc
index 630aa0a522da..1b3ff2610ada 100644
--- a/profiles/desc/apache2_modules.desc
+++ b/profiles/desc/apache2_modules.desc
@@ -89,6 +89,7 @@ session_cookie - Provides support for the storage of user sessions on the remote
 session_dbd - Provides support for the storage of user sessions within a SQL database using the mod_dbd module
 setenvif - Allows the setting of environment variables based on characteristics of the request
 slotmem_shm - Slot-based shared memory provider
+socache_memcache - A shared object cache provider using memcached
 socache_shmcb - A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment
 speling - Attempts to correct mistaken URLs that users might have entered by ignoring capitalization and by allowing up to one misspelling
 status - Provides information on server activity and performance
diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc
index ef2d2d9f415f..11d1b8eb96b3 100644
--- a/profiles/desc/collectd_plugins.desc
+++ b/profiles/desc/collectd_plugins.desc
@@ -41,6 +41,7 @@ filecount - Build the filecount input plugin (counts the number of files in a di
 fscache - Build the fscache input plugin (collects information about the file-system based caching infrastructure for network file-systems and other slow media)
 gmond - Build the gmond input plugin (receives data from gmond, the client daemon of the Ganglia project)
 gps - Build the gps input plugin (collects number of satellites seen by a GPS receiver using sci-geosciences/gpsd)
+gpu_nvidia - Build the NVIDIA GPU input plugin (collects stats from NVIDIA GPU)
 hddtemp - Build the hddtemp input plugin (collects the temperature of disks from hddtemp daemon)
 hugepages - Build the hugepages input plugin (collects the number of used and free hugepages on Linux)
 interface - Build the interface input plugin (collects information about the traffic, packets per second and errors of interfaces)
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index 2434ef498d73..0788287d85c1 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of L10N USE_EXPAND flags.
@@ -17,6 +17,7 @@
 # id-ID - Indonesian (Indonesia)
 # kn-IN - Kannada (India)
 # nb-NO - Norwegian Bokmål (Norway)
+# ne-NP - Nepali (Nepal)
 # nn-NO - Norwegian Nynorsk (Norway)
 # pa-IN - Punjabi (India)
 # sa-IN - Sanskrit (India)
@@ -33,10 +34,10 @@ az - Azerbaijani
 be - Belarusian
 bea - Beaver
 bg - Bulgarian
+bla - Siksika
 bn - Bengali
 bn-BD - Bengali (Bangladesh)
 bn-IN - Bengali (India)
-bla - Siksika
 bo - Tibetan
 br - Breton
 brx - Bodo (India)
@@ -89,6 +90,7 @@ fil - Filipino
 fo - Faroese
 fr - French
 fr-CA - French (Canada)
+fur - Friulian
 fy - Western Frisian
 ga - Irish
 gd - Scottish Gaelic
@@ -200,6 +202,7 @@ sw - Swahili (macrolanguage)
 sw-TZ - Swahili (Tanzania)
 syc - Classical Syriac
 syr - Syriac
+szl - Silesian
 ta - Tamil
 ta-LK - Tamil (Sri Lanka)
 te - Telugu
@@ -212,6 +215,7 @@ tlh - Klingon
 tn - Tswana
 to - Tonga (Tonga Islands)
 tr - Turkish
+trs - Chicahuaxtla Triqui
 ts - Tsonga
 tsg - Tausug
 tt - Tatar
@@ -220,6 +224,7 @@ uk - Ukrainian
 ur - Urdu
 uz - Uzbek
 ve - Venda
+vec - Venetian
 vi - Vietnamese
 vls - Vlaams
 xh - Xhosa
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 88e1fc59584b..487326b67d7a 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -20,6 +20,7 @@ ddusbt - Add support for DD usb touch screen
 directgfx - Add support for output via SDL
 displaylink - Add support for displaylink based LCDs
 dpf - Add support for DPF display modulees
+dpfax - Add support for AX206 photo frames
 ea232graphic - Add support for the Electronic Assembly RS232 graphic driver
 ea65 - Add support for the VFD in the AOpen XC Cube-AV EA65 media barebone
 efn - Add support for the English Font display Network based displays
@@ -121,6 +122,7 @@ usbhub - Add support for USBHUB displays
 usblcd - Add support for USBLCD displays
 vlsys_m428 - Add support for MonCaso 320 LCD displays
 vnc - Add support for output on a vnc connection
+vssdcp - Add support for network-based vssdcp protocol LCD displays
 wincornixdorf - Add support for the WincorNixdorf serial cashier displays BA63 and BA66
 x11 - Add support for X11 displaying
 xosd - Add support for xosdlib
diff --git a/profiles/desc/llvm_targets.desc b/profiles/desc/llvm_targets.desc
index 196f296b7557..8356a09cf6ba 100644
--- a/profiles/desc/llvm_targets.desc
+++ b/profiles/desc/llvm_targets.desc
@@ -7,6 +7,7 @@ ARC - ARC (Argonaut RISC Core) embedded CPU target [EXPERIMENTAL]
 ARM - ARM CPU target
 AVR - 8-bit Atmel AVR microcontroller target [EXPERIMENTAL]
 BPF - Berkeley Packet Filter target
+CSKY - C-SKY CPU target [EXPERIMENTAL]
 Hexagon - Qualcomm Hexagon DSP target
 Lanai - Lanai CPU target
 Mips - MIPS CPU target (includes MIPS64)
diff --git a/profiles/desc/lua_single_target.desc b/profiles/desc/lua_single_target.desc
new file mode 100644
index 000000000000..c3d422e434d7
--- /dev/null
+++ b/profiles/desc/lua_single_target.desc
@@ -0,0 +1,10 @@
+# Copyright 1999-2020 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of LUA_SINGLE_TARGET USE_EXPAND flags.
+
+lua5-1 - Build for Lua 5.1 only
+lua5-2 - Build for Lua 5.2 only
+lua5-3 - Build for Lua 5.3 only
+lua5-4 - Build for Lua 5.4 only
+luajit - Build for LuaJIT only
diff --git a/profiles/desc/lua_targets.desc b/profiles/desc/lua_targets.desc
new file mode 100644
index 000000000000..75b9e0f86af2
--- /dev/null
+++ b/profiles/desc/lua_targets.desc
@@ -0,0 +1,10 @@
+# Copyright 1999-2020 Gentoo Authors.
+# Distributed under the terms of the GNU General Public License v2
+
+# This file contains descriptions of LUA_TARGETS USE_EXPAND flags.
+
+lua5-1 - Build with Lua 5.1
+lua5-2 - Build with Lua 5.2
+lua5-3 - Build with Lua 5.3
+lua5-4 - Build with Lua 5.4
+luajit - Build with LuaJIT
diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc
index 3496ec0d4679..e0fc8bcc6539 100644
--- a/profiles/desc/php_targets.desc
+++ b/profiles/desc/php_targets.desc
@@ -3,6 +3,7 @@
 
 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags
 
+php8-0 - Build against PHP 8.0
 php7-4 - Build against PHP 7.4
 php7-3 - Build against PHP 7.3
 php7-2 - Build against PHP 7.2
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 99f2521a5e98..e954c837f7a5 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -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
 
 ####################################################################
@@ -32,6 +32,279 @@
 
 #--- END OF EXAMPLES ---
 
+# Jonas Stein <jstein@gentoo.org> (2021-01-17)
+# Removal in 30 days.  
+# Fails to compile Bug #765697.
+x11-misc/rss-glx
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-11)
+# KF5 PortingAid (from kdelibs4) without any remaining revdeps. Bug #755956
+# Masked for removal in 30 days.
+kde-frameworks/kdesignerplugin
+
+# Conrad Kostecki <conikost@gentoo.org> (2021-01-10)
+# The Duke Nukem 3D demo data files will be now handled by the
+# 'games-fps/duke3d-data' package, so this package isn't
+# needed anymore. Just remove it and switch to the above one.
+# Enable use flag 'demo' for demo data files.
+# Removal in 14 days.
+games-fps/duke3d-demodata
+
+# Miroslav Šulc <fordfrog@gentoo.org> (2021-01-09)
+# media-sound/patchage used to depend on it but the dependency
+# has been dropped in v1.0.0. There are no other packages in the tree
+# depending on it. Also having issues compiling it. Removal in 30 days.
+media-libs/raul
+
+# Brian Evans <grknight@gentoo.org> (2021-01-07)
+# PHP 7.2 is security vulnerable and end-of-life
+# Please upgrade to a newer slot
+dev-lang/php:7.2
+virtual/httpd-php:7.2
+=dev-php/phpunit-5.7.15-r3
+=dev-php/PHP_CodeCoverage-4.0.7-r2
+=dev-php/PHP_TokenStream-1.4.11-r1
+
+# Joonas Niilola <juippis@gentoo.org> (2020-01-07)
+# Eterm's development stopped 2014 and upstream brought to life 
+# its successor, terminology. Eterm is unmaintained in Gentoo with 
+# multiple bugs open for a long time. Switch to any available 
+# alternative, https://packages.gentoo.org/categories/x11-terms
+# For Esetroot replacement, use feh from media-gfx/feh or wmsetbg
+# from x11-wm/windowmaker.
+# Removal in ~30 days. Bug: #764359
+x11-terms/eterm
+
+# Joonas Niilola <juippis@gentoo.org> (2020-01-07)
+# Doesn't compile, no maintainer, EAPI-5. Last version bump 3 years 
+# ago. Use any of the available alternatives, 
+# https://packages.gentoo.org/categories/x11-terms
+# Removal in ~30 days. Bug: #764353
+x11-terms/pangoterm
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-06)
+# Post-consolekit cleanup, dead upstream since 2016.
+# https://s3hh.wordpress.com/2016/06/18/whither-cgmanager/
+# Masked for removal in 30 days.
+app-admin/cgmanager
+sys-libs/libnih
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-06)
+# Abandoned upstream, countless bugs. Replaced by builtin functionality in
+# elogind or systemd. Alternative: sys-power/suspend.
+# Removal in 30 days. Bug #659616
+sys-power/pm-utils
+sys-power/pm-quirks
+
+# Michał Górny <mgorny@gentoo.org> (2021-01-05)
+# The portable version has been discontinued upstream (i.e. it is now
+# available only as tightly coupled part of OpenBSD).  The current
+# version relies on dev-libs/libressl implementation details, and can
+# not be easily ported to dev-libs/openssl.  Reported to fail to build
+# with gcc-10.  There are multiple alternative ACME clients available.
+# Removal in 30 days.  Bug #762310.
+app-crypt/acme-client
+
+# Jaco Kroon <jaco@uls.co.za> (2021-01-04)
+# media-libs/libilbc is (for every package I manage) a drop-in for
+# dev-libs/ilbc-rfc3951. The latter had net-misc/asterisk,
+# net-libs/pjproject and net-voip/yate as dependencies.
+# (All of which has been bumped to no longer have this dependency.)
+# Removal in 30 days, bug #444470
+dev-libs/ilbc-rfc3951
+
+# Jakov Smolic <jakov.smolic@sartura.hr> (2021-01-02)
+# sci-physics/cernlib fails to build with gcc-10, last release in 2006,
+# multiple open bugs, all revdeps also broken and declared EOL upstream.
+# Removal in 30 days, bug #763183
+sci-physics/cernlib
+sci-physics/cernlib-montecarlo
+sci-physics/paw
+
+# Jakov Smolic <jakov.smolic@sartura.hr> (2021-01-02)
+# Fails to build with gcc-10, no maintainer, upstream gone,
+# multiple open bugs.
+# Removal in 30 days, bug #677322, bug #707200, bug #716012
+net-dialup/diald
+
+# Conrad Kostecki <conikost@gentoo.org> (2021-01-01)
+# NetworkManager has buildin support for WireGuard,
+# this plugin is old and unmaintained, so let's drop it.
+# Removal in 30 days.
+net-vpn/networkmanager-wireguard
+
+# Stephan Hartmann <sultan@gentoo.org> (2021-01-01)
+# Fails with -fno-common, homepage gone, source gone,
+# no maintainer.
+# Removal in 30 days. See bug #706824.
+app-benchmarks/contest
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2021-01-01)
+# Needs a port to modern Cabal. No revdeps.
+# Masked for removal. bug #735788, bug #737946
+dev-haskell/hgettext
+
+# Sam James <sam@gentoo.org> (2021-01-01)
+# UnrealIRCd 4.x is EOL. Please upgrade to 5.x.
+# To be removed shortly.
+# https://www.unrealircd.org/docs/UnrealIRCd_4_EOL
+# bug 762715
+<net-irc/unrealircd-5.0.0
+
+# Michał Górny <mgorny@gentoo.org> (2021-01-01)
+# RenPy requires Python 2.7 at runtime, and py3 port has not been
+# released yet.  Even if it were, the games would probably need porting
+# anyway.
+# Removal in 30 days.  Bug #735358.
+dev-python/numpy-python2
+games-engines/renpy
+games-misc/katawa-shoujo
+games-rpg/asphyxia
+games-rpg/sakura-spirit
+games-rpg/the-royal-trap
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-30)
+# Unmaintained.  Entirely replaced by media-libs/libjpeg-turbo,
+# to the point that reverse dependencies no longer build with
+# media-libs/jpeg.  The two libraries are binary-incompatible,
+# and the current method of switching between them is incorrect.
+# Removal in 30 days.  Bug #762634.
+media-libs/jpeg
+
+# Hans de Graaff <graaff@gentoo.org> (2020-12-29)
+# These slots masked for removal in 30 days due to
+# security issues, bug 730786
+# Use a newer slot instead.
+dev-ruby/rack:2.0
+dev-ruby/rack:2.1
+
+# Jonas Stein <jstein@gentoo.org> (2020-12-29)
+# Unusable without alsa.
+# Masked for removal after 2021-02-01
+# Bug #762361
+media-sound/takcd
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
+# Dead upstream, only two revdeps.
+# Masked for removal in 30 days.
+media-libs/qt-gstreamer
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
+# Dead upstream, depends on dead media-libs/qt-gstreamer.
+# If anyone is actually using this productively, *do tell*.
+# Masked for removal in 30 days.
+kde-apps/ktp-call-ui
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
+# Depends on deprecated dev-qt/qtwebkit, abandoned upstream.
+# Alternatives: Plenty. media-sound/cantata, media-sound/clementine,
+# media-sound/elisa, media-sound/strawberry, media-sound/yarock, ...
+# Masked for removal in 30 days.
+media-sound/tomahawk
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
+# Depends on deprecated dev-qt/qtwebkit, no maintainer, bug #688852.
+# Masked for removal in 30 days.
+media-video/smtube
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-12-26)
+# Depends on deprecated dev-qt/qtwebkit, no maintainer, bug #709880.
+# Alternatives: dev-python/weasyprint, xhtml2pdf (not packaged, bug #699356)
+# Masked for removal in 30 days.
+media-gfx/wkhtmltopdf
+
+# Andrew Savchenko <bircoph@gentoo.org> (2020-12-26)
+# All docs and socket library functionality are merged back into single
+# app-admin/clsync package using USE="apidoc doc socket-library" starting
+# from clsync-0.4.5.
+# No reverse dependencies. Removal in 30 days.
+<app-admin/clsync-0.4.5
+app-doc/clsync-docs
+dev-libs/libclsync
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-22)
+# Renamed version of dev-python/pycryptodome.  The ebuild is missing
+# fixes from the original.  Maintaining and installing two copies
+# of the same thing makes little sense, so we're forcing the former
+# everywhere.
+# Removal in 14 days.
+dev-python/pycryptodomex
+
+# Eray Aslan <eras@gentoo.org> (2020-12-21)
+# Vulnerable. upgrade to >= 2.3.11.3. Masked until
+# mail-filter/dovecot_deleted_to_trash is treecleaned
+# to prevent breaking the tree (bug #756217)
+=net-mail/dovecot-2.2.36.4
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-20)
+# Requires old dev-python/unidecode.  Last commit in 2017.  No revdeps.
+# Suggested replacement: dev-python/python-slugify.
+# Removal in 30 days.  Bug #714718.
+dev-python/awesome-slugify
+
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-12-20)
+# Needs a port to haskell-src-exts compatible with ghc-8.8.
+# https://github.com/ndmitchell/derive/pull/37
+dev-haskell/derive
+app-forensics/quickfuzz
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-19)
+# Made redundant by compiler-rt's crt implementation.  No revdeps left.
+# Removal in 30 days.  Bug #760711.
+sys-libs/netbsd-csu
+
+# Mike Pagano <mpagano@gentoo.org> (2020-12-18)
+# Serious data corruption bug when using F2FS,
+# see https://bugzilla.kernel.org/show_bug.cgi?id=210765
+# Feel free to manually unmask when not using F2FS.
+=sys-kernel/gentoo-sources-5.10.0
+=sys-kernel/gentoo-sources-5.10.1
+=sys-kernel/vanilla-sources-5.10.1
+=sys-kernel/vanilla-sources-5.10.0
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2008.  Last upstream (beta) in 2014.
+# The current Gentoo version fails to install.
+# Removal in 30 days.  Bug #701044.
+net-mail/vacation
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Homepage gone.  Last bumped in 2008.  Carries multiple
+# patches.  Fails to build again.
+# Removal in 30 days.  Bug #675364.
+net-ftp/tlswrap
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Upstream gone.  Last bumped in 2007.  Fails to build, again.
+# Removal in 30 days.  Bug #648964.
+app-text/ots
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  The current Gentoo version fails to build, it needs
+# a version bump.
+# Removal in 30 days.  Bug #669452.
+net-misc/dhcpd-pools
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Unmaintained.  Last bumped in 2018.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #736050.
+dev-db/aerospike-server-community
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned upstream, circa 2013.  Vulnerable.  No revdeps.
+# Removal in 30 days.  Bug #744217.
+app-text/peg-markdown
+
+# Michał Górny <mgorny@gentoo.org> (2020-12-18)
+# Abandoned in 2008.  No reverse dependencies left.
+# Removal in 30 days.  Bug #652192.
+dev-libs/ustr
+
+# Jack Todaro <solpeth@posteo.org> (2020-12-17)
+# Old and redundant package. Has not been kept
+# up to date and no longer works. Masked for removal.
+sci-mathematics/agda-lib-ffi
+
 # Eray Aslan <eras@gentoo.org> (2020-12-14)
 # Dead. Last release in 2014. Only works with vulnerable dovecot version.
 # Recent Outlook versions should have this functionality built in.  Switch to a
@@ -45,22 +318,6 @@ mail-filter/dovecot_deleted_to_trash
 # Removal in 30 days.  Bug #720066.
 dev-python/sphinxcontrib-issuetracker
 
-# Michael Palimaka <kensington@gentoo.org> (2020-12-13)
-# Buggy. Uncooperative upstream.
-# Masked for removal in 30 days.
-x11-misc/albert
-
-# Sam James <sam@gentoo.org> (2020-12-13)
-# This new version of libcap-ng seems to (still)
-# break consumers.
-# bug #759550 (and dependent bugs)
-=sys-libs/libcap-ng-0.8.2
-
-# Hans de Graaff <graaff@gentoo.org> (2020-12-12)
-# Security issue with insecure use of /tmp, bug 743214
-# This slot masked for removal in 30 days, use slot 2 instead.
-dev-ruby/bundler:0
-
 # David Seifert <soap@gentoo.org> (2020-12-11)
 # Last MIT release in 2007, declared EOL by Intel in 2017.
 # Build and test failures, abandoned parallelism paradigm,
@@ -99,94 +356,6 @@ dev-util/creduce
 # paths.
 =net-libs/gnutls-3.7.0
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-12-07)
-# Masked for testing
->=app-shells/bash-5.1
->=sys-libs/readline-8.1
-
-# Joonas Niilola <juippis@gentoo.org> (2020-12-06)
-# Not keyworded, unmaintained, unbuildable for a long time, EAPI-5.
-# Removal in ~30 days. List sorted by their bug numbers.
-# Bugs: #752432, #752435, #752438, #752441, #752444, #752453.
-media-plugins/kodi-screensaver-crystalmorph
-media-plugins/kodi-visualization-nastyfft
-media-plugins/kodi-screensaver-rsxs
-net-wireless/qradiolink
-net-libs/liba53
-app-emulation/qt-virt-manager
-
-# Michał Górny <mgorny@gentoo.org> (2020-12-03)
-# Explicit namespace support was necessary for Python 2 only.  Empty
-# directories work best for Python 3.
-# Removal in 14 days.
-dev-python/backports
-dev-python/namespace-jaraco
-
-# Aaron Bauman <bman@gentoo.org> (2020-12-02)
-# Deprecated. Functionality is native to dev-python/pytest now
-# Removal in 14 days
-dev-python/pytest-catchlog
-
-# Joonas Niilola <juippis@gentoo.org> (2020-12-01)
-# Not maintained in Gentoo, multiple versions behind, unsafe, EAPI-5,
-# Use other kernel source / binary packages instead,
-# https://packages.gentoo.org/categories/sys-kernel
-# Removal in ~30 days.
-# Bugs: #716490 (aufs), #739782 (-ck), #757843 (-xbox)
-sys-kernel/aufs-sources
-sys-kernel/ck-sources
-sys-kernel/xbox-sources
-
-# Aaron Bauman <bman@gentoo.org> (2020-11-30)
-# EAPI=5. Multiple open bugs #603866 #713620
-# Dead upstream. Removal in 30 days.
-net-analyzer/dosdetector
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-29)
-# An awful hack-package that was dumped on others, and not touched
-# by the person adding it since.  Depends on obsolete LLVM versions
-# and needs a version bump.
-# Removal in 30 days.  Bug #734732.
-dev-libs/libclangformat-ide
-
-# David Seifert <soap@gentoo.org> (2020-11-28)
-# Last release in 2002, multiple open bugs, no maintainer, no revdeps.
-# Bug #709512, #713300, #729518, Removal in 30 days.
-app-text/cook
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-25)
-# KF5 PortingAids (from kdelibs4) without any remaining revdeps. Bug #755956
-# Masked for removal in 30 days.
-kde-frameworks/kdewebkit
-kde-frameworks/kjsembed
-kde-frameworks/kmediaplayer
-kde-frameworks/kxmlrpcclient
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-25)
-# Ddepends on deprecated dev-qt/qtwebkit and kde-frameworks/kdewebkit.
-# Barely maintained upstream and on the brink of being archived for good.
-# Patch for Qt5WebEngine exists but needs runtime testing, bug #756685
-# Masked for removal in 30 days.
-net-libs/libkvkontakte
-
-# Martin Dummer <martin.dummer@gmx.net> (2020-11-25)
-# Does not compile with kernels >=5.5, no upstream development
-# since years, for most hardware the in-kernel module
-# rtsx_pci_sdmmc should be preferred over this driver.
-# Open bugs #712484 #717184 #741909.
-# Removal in 30 days. (bug #756370)
-sys-block/rts_pstor
-
-# Sam James <sam@gentoo.org> (2020-11-25)
-# Temporary mask to fix tree breakage
-# Dependency x11-libs/pangox-compat does not exist
-=net-misc/anydesk-6.0.1
-
-# Marek Szuba <marecki@gentoo.org> (2020-11-24)
-# No releases since 2008, deprecated upstream in favour of dev-lua/ldoc,
-# unmaintained, no revdeps. Removal in 30 days (Bug #756343).
-dev-lua/luadoc
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-11-24)
 # Serious data corruption bug when using XFS, see https://www.spinics.net/lists/linux-xfs/msg47004.html
 # Feel free to manually unmask when not using XFS.
@@ -228,237 +397,12 @@ dev-lua/luadoc
 =sys-kernel/gentoo-kernel-bin-5.4.78-r1
 =sys-kernel/gentoo-kernel-bin-5.4.78
 
-# Fabian Groffen <grobian@gentoo.org> (2020-11-23)
-# No longer used, not really functional either, noone should be using
-# this, removal in 30 days.
-sys-kernel/xnu-headers
-sys-libs/darwin-libc-headers
-dev-libs/libmissing
-
-# David Seifert <soap@gentoo.org> (2020-11-22)
-# Upstream abandoned since 2012, tons of QA issues and
-# build bugs, esoteric NIH build system. Bug #293567, #670954,
-# #697444, #699320, #708058, #746230, Removal in 30 days.
-games-emulation/fakenes
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-21)
-# Dead upstream, depends on deprecated kde-frameworks/kmediaplayer
-# Masked for removal in 30 days.
-media-video/kmplayer
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-19)
-# These packages are maintained by the Python project, or have
-# no maintainer.  They have not been ported to Python 3.8 yet.
-# The ebuilds either lack tests entirely, or the tests fail
-# (or are broken).  They have no reverse dependencies, except for other
-# packages from the list.
-# Removal in 30 days.  Bug #755623.
-dev-python/HeapDict
-dev-python/billiard
-dev-python/celery
-dev-python/ctypesgen
-dev-python/cytoolz
-dev-python/docker-pycreds
-dev-python/dugong
-dev-python/hgdistver
-dev-python/nose-cover3
-dev-python/nose-parameterized
-dev-python/nose-show-skipped
-dev-python/pew
-dev-python/ptpython
-dev-python/pure-sasl
-dev-python/pyfltk
-dev-python/pympler
-dev-python/python-ethtool
-dev-python/python-prctl
-dev-python/python-termstyle
-dev-python/pythonz-bd
-dev-python/pywinrm
-dev-python/rednose
-dev-python/resumable-urlretrieve
-dev-python/shutilwhich
-dev-python/sortedcollections
-dev-python/sphinxcontrib-pretty-searchresults
-dev-python/subvertpy
-dev-python/vcversioner
-dev-python/xlutils
-dev-python/zict
-
-# Matt Turner <mattst88@gentoo.org> (2020-11-19)
-# Ancient packages long since deprecated in the age of udev.
-# Removal in 30 days. Bug #755617
-sys-apps/hwdata-gentoo
-sys-apps/hwsetup
-sys-libs/libkudzu
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-18)
-# Depends on deprecated QtWebKit, dead upstream.
-# Alternatives: kde-apps/okular[chm], app-text/xchm
-# Removal in 30 days.
-app-text/kchmviewer
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-18)
-# Depends on deprecated QtWebKit, no maintainer.
-# Bugs #712200 and 725388. Removal in 30 days.
-sci-misc/mendeleydesktop
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-18)
-# Upstream has switched to aiobotocore.  It's a huge hack that requires
-# a very specific botocore version, currently 3 months old.  Given that
-# boto* makes releases daily and various revdeps require newer boto3 /
-# botocore versions, this makes aiobotocore unmaintainable.
-# As a result, we'd be stuck with the old version forever.
-#
-# See also:
-# https://github.com/aio-libs/aiobotocore/issues/829
-# https://github.com/dask/s3fs/issues/357
-#
-# Removal in 30 days.  Bug #755266.
-dev-python/s3fs
-
-# Zac Medico <zmedico@gentoo.org> (2020-11-17)
-# Unit tests fail. No revdeps.
-# Removal in 30 days.  Bug #723674.
-dev-python/diff-cover
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Discontinued upstream.  No revdeps.  Use dev-python/toml instead.
-# Removal in 30 days.  Bug #755125.
-dev-python/pytoml
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# A drive-by package with one release in 2015, no revdeps and no tests.
-# The same purpose is served e.g. by dev-python/parameterized.
-# Removal in 30 days.  Bug #755122.
-dev-python/parametrized
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old dependencies of dev-python/GitPython.  The current versions (3)
-# have been renamed back to dev-python/{gitdb,smmap}.
-# Removal in 30 days.  Bug #755080.
-dev-python/gitdb2
-dev-python/smmap2
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old backport package with no revdeps.
-# Removal in 30 days.  Bug #755074.
-dev-python/funcsigs
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Fail to build with gcc-10.  No recent activity upstream.  Seems that
-# Exherbo is dead and buried.
-# Removal in 30 days.  Bug #708528.
-sys-apps/sydbox
-sys-libs/pinktrace
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Both packages provide backports that are only meaningful to Python 2
-# and have no reverse dependencies.
-# Removal in 30 days.  Bug #754984.
-dev-python/backports-csv
-dev-python/backports-os
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, needs dedicated maintainer and version bump
-# to 20.11 with new dependency dev-python/PyQtChart.
-# Bugs #607130, #701318 and #709862. Removal in 30 days.
-dev-util/eric
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream has no capacities to port away.
-# Bugs #508160, #654968 and #687840. Qt-based alternative: net-news/rssguard
-# Removal in 30 days.
-net-news/quiterss
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream did not make a release in 10 years
-# (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days.
-app-text/goldendict
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-15)
-# Fails to build.  Lots of bugs filed.  Not touched by maintainer
-# since 2018.
-# Removal in 30 days.  Bug #721990.
-media-video/cinelerra
-
-# Aisha Tammy <gentoo@aisha.cc> (2020-11-13)
-# dead packages with latest releases before 2013
-# these are superseded by other scikit packages
-# scikit-optimize, sktime
-# Removal in 30 days (Bug #749297)
-sci-libs/scikits_optimization
-sci-libs/scikits_timeseries
-
-# Jonas Stein <jstein@gentoo.org> (2020-11-12)
-# Adobe will stop distributing Flash Player after 2020-12-31.
-# Masked for removal after 2020-12-31
-# Bug #754192
-www-plugins/adobe-flash
-
 # Michał Górny <mgorny@gentoo.org> (2020-11-10)
 # This old Kodi version requires vulnerable dev-python/pillow
 # and prevents users from upgrading.  Masked for the time being.
 # Bug #729672.
-<dev-python/pillow-7
-<media-tv/kodi-19
-<media-plugins/kodi-audiodecoder-timidity-2.3
-<media-plugins/kodi-audiodecoder-sidplay-2
-<media-libs/kodi-platform-19
-<media-plugins/kodi-audiodecoder-modplug-3
-<media-plugins/kodi-audiodecoder-nosefart-3
-<media-plugins/kodi-audiodecoder-vgmstream-2
-<media-plugins/kodi-audioencoder-flac-2.1
-<media-plugins/kodi-audiodecoder-stsound-2.1
-<media-plugins/kodi-audiodecoder-snesapu-2.1
-<media-plugins/kodi-audioencoder-wav-2.1
-media-plugins/kodi-game-libretro-fceumm
 media-plugins/kodi-game-libretro-nestopia
-<media-plugins/kodi-game-libretro-2
-<media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.113
-<media-plugins/kodi-game-libretro-snes9x-1.60.0.12
 media-plugins/kodi-game-libretro-dosbox
-media-plugins/kodi-game-libretro-bnes
-<media-plugins/kodi-audioencoder-vorbis-2.1
-<media-plugins/kodi-imagedecoder-heif-1.3
-<media-plugins/kodi-imagedecoder-raw-3
-<media-plugins/kodi-inputstream-rtmp-3
-<media-plugins/kodi-audioencoder-lame-2.1
-<media-plugins/kodi-pvr-demo-6
-<media-plugins/kodi-inputstream-adaptive-2.6
-<media-plugins/kodi-pvr-dvblink-7
-<media-plugins/kodi-pvr-argustv-6
-<media-plugins/kodi-pvr-filmon-5
-<media-plugins/kodi-pvr-njoy-6
-<media-plugins/kodi-pvr-dvbviewer-6
-<media-plugins/kodi-peripheral-joystick-1.6
-<media-plugins/kodi-pvr-mediaportal-tvserver-6
-<media-plugins/kodi-pvr-iptvsimple-6
-<media-plugins/kodi-pvr-pctv-5
-<media-plugins/kodi-pvr-mythtv-7
-<media-plugins/kodi-pvr-stalker-6
-<media-plugins/kodi-pvr-hts-7
-<media-plugins/kodi-pvr-nextpvr-7
-<media-plugins/kodi-screensaver-asteroids-2.4
-<media-plugins/kodi-screensaver-biogenesis-2.3
-<media-plugins/kodi-pvr-vdr-vnsi-6
-<media-plugins/kodi-pvr-wmc-5
-<media-plugins/kodi-screensaver-greynetic-2.3
-<media-plugins/kodi-screensaver-matrixtrails-2.4
-<media-plugins/kodi-screensaver-pingpong-2.2
-<media-plugins/kodi-pvr-vbox-7
-<media-plugins/kodi-screensaver-pyro-3.1
-<media-plugins/kodi-vfs-sacd-1.3
-<media-plugins/kodi-visualization-spectrum-3.2
-<media-plugins/kodi-visualization-projectm-3
-<media-plugins/kodi-visualization-fishbmc-6
-<media-plugins/kodi-vfs-rar-3.4
-<media-plugins/kodi-vfs-libarchive-1.3
-<media-plugins/kodi-vfs-sftp-1.3
-<media-plugins/kodi-visualization-goom-3.2
-<media-plugins/kodi-pvr-vuplus-6.1
-<media-plugins/kodi-visualization-starburst-2.2
-<media-plugins/kodi-visualization-waveform-4.2
-<media-plugins/kodi-visualization-shadertoy-2.1
 
 # Alexys Jacob <ultrabug@gentoo.org> (2020-11-09)
 # Mask dev-db/mongodb versions which do not support python3 so we
@@ -496,119 +440,6 @@ kde-apps/kde-meta:5
 # emerge --noreplace kde-plasma/plasma-meta kde-apps/kdecore-meta
 kde-apps/kdebase-meta:5
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-12-10)
-# Marek Szuba <marecki@gentoo.org> (2020-10-13)
-# Ulrich Müller <ulm@gentoo.org> (2020-11-06)
-# Joonas Niilola <juippis@gentoo.org> (2020-11-07)
-# Robin H. Johnson <robbat2@gentoo.org> (2020-11-28)
-# Conrad Kostecki <conikost@gentoo.org> (2020-12-05)
-# ...and others who have not added their names here
-# All these ebuilds require slotted Lua, which is still masked.
->=app-admin/conky-1.11.4
->=app-admin/lsyncd-2.2.3
->=app-benchmarks/sysbench-1.0.20-r100
->=app-benchmarks/wrk-4.1.0-r100
->=app-crypt/cardpeek-0.8.4
->=app-crypt/ekeyd-1.1.5-r100
->=app-editors/neovim-0.4.4-r100
-=app-editors/scite-4.4.4-r10
->=app-emulation/libguestfs-1.38.6-r100
->=app-misc/worker-3.8.3-r100
->=dev-games/cegui-0.8.7-r100
-=dev-games/openscenegraph-openmw-3.4_p20200425-r100
-=dev-libs/efl-1.25.1-r10
->=dev-libs/libpeas-1.26.0-r100
-=dev-libs/libprelude-5.2.0-r10
->=dev-libs/libucl-0.8.1-r100
->=dev-lua/busted-2.0.0-r100
->=dev-lua/busted-htest-1.0.0-r100
->=dev-lua/dkjson-2.5-r100
->=dev-lua/inifile-1.0-r100
->=dev-lua/lanes-3.13.0-r100
->=dev-lua/ldoc-1.4.6-r100
->=dev-lua/lgi-0.9.2-r100
->=dev-lua/lpeg-1.0.2-r100
->=dev-lua/lua-argparse-0.6.0-r100
->=dev-lua/lua-bit32-5.3.5-r100
->=dev-lua/lua-cjson-2.1.0.8-r100
->=dev-lua/lua-openssl-0.7.8_p0-r100
->=dev-lua/lua-term-0.7-r100
->=dev-lua/lua-utf8-0.1.3-r100
->=dev-lua/lua-zlib-1.2-r100
->=dev-lua/lua_cliargs-3.0_p2-r100
->=dev-lua/LuaBitOp-1.0.2-r100
->=dev-lua/luacheck-0.23.0-r100
->=dev-lua/luacov-0.14.0-r100
->=dev-lua/luadbi-0.7.2-r100
->=dev-lua/luaevent-0.4.6-r100
-=dev-lua/luaexpat-1.3.0-r102
-=dev-lua/luaexpat-1.3.3-r102
->=dev-lua/luafilesystem-1.8.0-r100
->=dev-lua/lualdap-1.2.5-r100
->=dev-lua/luajson-1.3.4-r100
->=dev-lua/luaossl-20200709-r100
->=dev-lua/luaposix-35.0-r100
->=dev-lua/luarocks-3.4.0-r100
->=dev-lua/luasec-0.9-r100
->=dev-lua/luasocket-3.0_rc1_p20200328-r100
->=dev-lua/luassert-1.8.0-r100
->=dev-lua/luasystem-0.2.1_p0-r100
->=dev-lua/lutok-0.4-r10
->=dev-lua/luv-1.32.0.0-r100
->=dev-lua/mediator_lua-1.1.2_p0-r100
->=dev-lua/messagepack-0.5.2-r100
->=dev-lua/mpack-1.0.8-r100
->=dev-lua/penlight-1.9.2-r100
->=dev-lua/say-1.3_p1-r100
->=dev-lua/toluapp-1.0.93_p20190513-r100
->=dev-util/geany-plugins-1.37-r100
->=dev-util/hermes-2.8
-=games-action/minetest-5.3.0-r100
->=games-arcade/jvgs-0.5-r100
->=games-emulation/fceux-2.2.3-r100
->=games-engines/love-0.7.2-r100:0.7
->=games-engines/love-0.8.0-r100:0.8
->=games-engines/love-11.3-r100:0
->=games-engines/solarus-1.3.1-r100
->=games-puzzle/fish-fillets-1.0.1-r100
->=games-roguelike/crossfire-client-1.71.0-r100
->=games-roguelike/stone-soup-0.25.1-r100
->=games-rpg/kqlives-0.99-r100
->=games-rpg/sumwars-0.5.8-r100
->=games-simulation/corsix-th-0.64-r100
->=games-sports/xmoto-0.6.1-r100
->=games-strategy/hedgewars-1.0.0-r100
->=games-strategy/naev-0.7.0-r100
->=games-strategy/openra-20190314-r100
->=games-strategy/s25rttr-0.9.0_pre20200723-r100
->=games-util/slade-3.1.12a-r100
->=mail-filter/imapfilter-2.6.16-r100
->=mail-filter/rspamd-2.6-r100
->=media-gfx/geeqie-1.5.1-r1
->=media-libs/libquvi-0.9.4-r100
->=media-libs/libquvi-scripts-0.9.20131130-r100
->=media-sound/aqualung-1.1-r100
->=media-video/aegisub-3.2.2_p20160518-r100
->=media-video/vlc-3.0.11.1-r100
->=net-analyzer/rrdtool-1.7.2-r100
->=net-analyzer/snort-2.9.16-r100
->=net-analyzer/suricata-6.0.1-r100
->=net-im/prosody-0.11.7-r100
->=net-im/swift-4.0.2-r100
->=net-p2p/eiskaltdcpp-2.2.10-r100
->=sci-astronomy/celestia-1.7.0_pre20200316-r100
->=sci-libs/plplot-5.15.0-r100
->=sci-visualization/gnuplot-5.4.0-r100
->=sci-visualization/fityk-1.3.1-r100
->=sys-apps/likwid-4.3.4
->=www-apache/mod_security-2.9.3-r100
->=www-client/elinks-0.13.5-r100
->=www-client/luakit-2.2.1-r100
->=www-servers/lighttpd-1.4.55-r100
->=x11-misc/devilspie2-0.43-r100
->=x11-wm/awesome-4.3-r100
->=mail-filter/opendkim-2.10.3-r25
-
 # Azamat H. Hackimov <azamat.hackimov@gmail.com> (2020-10-06)
 # 1.3.3 is broken and failing unittests for net-im/prosody. Bug #746782.
 >=dev-lua/luaexpat-1.3.3
@@ -643,6 +474,7 @@ kde-apps/kdebase-meta:5
 # port them to Python 3.
 # Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
 games-strategy/0ad
+~games-strategy/0ad-data-0.0.24_alpha_pre20210116040036
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-09-01)
 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
@@ -661,11 +493,13 @@ dev-lang/spark
 # Alfredo Tupone <tupone@gentoo.org> (2020-08-16)
 # Ported to py3.8 but not yet released
 # Masked to allow py2.7 removal
+# Michał Górny <mgorny@gentoo.org> (2021-01-01)
+# Masking for removal to prevent eclass from crashing on these packages.
+# Removal in 30 days.
 dev-ada/langkit
 dev-ada/libadalang
 dev-ada/libadalang-tools
 dev-ada/gps
-dev-ada/gnatcoll-bindings
 dev-ada/gnatcoll-db
 
 # Mart Raudsepp <leio@gentoo.org> (2020-08-15)
@@ -694,59 +528,6 @@ net-analyzer/ntopng
 net-analyzer/pmacct
 net-libs/nDPI
 
-# Jaco Kroon <jaco@uls.co.za> (2020-07-20)
-# Asterisk 11 is EOL. All users should migrate to asterisk 13.
-# Removal unspecified, will remain for the foreseeable future. If you need
-# help migrating, contact jkroon in #gentoo-voip on freenode.
-=net-misc/asterisk-11*
-=net-misc/asterisk-g729-11*
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2020-07-15)
-# In preparation; do not use yet.
-=dev-lang/perl-5.32*
-~virtual/perl-Archive-Tar-2.360.0
-~virtual/perl-autodie-2.320.0
-~virtual/perl-Compress-Raw-Bzip2-2.93.0
-~virtual/perl-Compress-Raw-Zlib-2.93.0
-~virtual/perl-CPAN-2.270.0
-~virtual/perl-DB_File-1.853.0
-~virtual/perl-Devel-PPPort-3.570.0
-~virtual/perl-Digest-MD5-2.550.100_rc
-~virtual/perl-Dumpvalue-1.210.0
-~virtual/perl-Encode-3.60.0
-~virtual/perl-Exporter-5.740.0
-~virtual/perl-ExtUtils-CBuilder-0.280.234
-~virtual/perl-ExtUtils-MakeMaker-7.440.0
-~virtual/perl-Filter-Simple-0.960.0
-~virtual/perl-Getopt-Long-2.510.0
-~virtual/perl-I18N-LangTags-0.440.0
-~virtual/perl-IO-1.430.0
-~virtual/perl-IO-Compress-2.93.0
-~virtual/perl-IPC-Cmd-1.40.0
-~virtual/perl-JSON-PP-4.40.0
-~virtual/perl-Math-BigInt-1.999.818
-~virtual/perl-Math-BigInt-FastCalc-0.500.900
-~virtual/perl-Module-CoreList-5.202.6.200
-~virtual/perl-Module-Load-Conditional-0.700.0
-~virtual/perl-Module-Metadata-1.0.37
-~virtual/perl-Net-Ping-2.720.0
-~virtual/perl-parent-0.238.0
-~virtual/perl-podlators-4.140.0
-~virtual/perl-Pod-Simple-3.400.0
-~virtual/perl-Safe-2.410.0
-~virtual/perl-Scalar-List-Utils-1.550.0
-~virtual/perl-Socket-2.29.0
-~virtual/perl-Storable-3.210.0
-~virtual/perl-Sys-Syslog-0.360.0
-~virtual/perl-Term-ANSIColor-5.10.0
-~virtual/perl-Test-Simple-1.302.175
-~virtual/perl-Thread-Queue-3.140.0
-~virtual/perl-threads-2.250.0
-~virtual/perl-threads-shared-1.610.0
-~virtual/perl-Time-HiRes-1.976.400
-~virtual/perl-Time-Piece-1.340.100
-~virtual/perl-Unicode-Normalize-1.270.0
-
 # Mart Raudsepp <leio@gentoo.org> (2020-06-06)
 # Meson port does not handle multilib yet and has issues
 # regarding runstatedir (not using /run).
@@ -783,10 +564,6 @@ net-misc/gnome-remote-desktop
 # Needs news item, known breakages that need to be handled first, bug 698922
 >=x11-libs/pango-1.43
 
-# Robin H. Johnson <robbat2@gentoo.org> (2020-01-26)
-# EAPI conversion caused some regressions, need to redesign old ebuilds.
-=dev-lang/lua-5.1.5-r5
-
 # Andrew Ammerlaan <andrewammerlaan@riseup.net> (2020-01-26)
 # Proxy Maintainers <proxy-maint@gentoo.org>
 # v3.6.4 uses huge amounts of memory: Bug #705682
@@ -911,19 +688,6 @@ app-admin/amazon-ec2-init
 # Masked for proper testing. (Major updates in the code).
 ~dev-perl/PortageXS-0.2.12
 
-# Matti Bickel <mabi@gentoo.org> (2014-04-22)
-# Masked slotted lua for testing
-# William Hubbs <williamh@gentoo.org> (2016-08-07)
-# Taking this mask since Mabi is retired
-# consolidating all slotted lua masks
-app-eselect/eselect-lua
->=dev-lang/lua-5.1.5-r100
-
-# Samuli Suominen <ssuominen@gentoo.org> (2012-03-06)
-# Masked for testing since this is known to break nearly
-# every reverse dependency wrt bug 407091
->=dev-lang/lua-5.2.0
-
 # Mike Gilbert <floppym@gentoo.org> (2014-03-04)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.
diff --git a/profiles/package.mask/liguros-workarounds b/profiles/package.mask/liguros-workarounds
index fceba0f79847..8ce366384a1c 100644
--- a/profiles/package.mask/liguros-workarounds
+++ b/profiles/package.mask/liguros-workarounds
@@ -1,17 +1,3 @@
-# liguros/bugs#123 - make-4.3 backwards incompatible changes
-# https://gitlab.com/liguros/bugs/issues/123
-# https://bugs.gentoo.org/706074
-#=sys-devel/make-4.3
-
-# multiple packages have problems with gcc-10
-# also failing with LTO enabled
-# https://bugs.gentoo.org/706426
-#>=sys-devel/gcc-10.0
-
-# masking sys-apps/sandbox-2.20 as it fails in subway pre-stage1 generation
-# https://gitlab.com/liguros/bugs/-/issues/195
-#=sys-apps/sandbox-2.20
-
 # masking html2text as it segfaults in stage1 generation
 # https://gitlab.com/liguros/bugs/-/issues/198
 =app-text/html2text-2.0.0
diff --git a/profiles/updates/1Q-2015 b/profiles/updates/1Q-2015
deleted file mode 100644
index 385d0a0f7af3..000000000000
--- a/profiles/updates/1Q-2015
+++ /dev/null
@@ -1,9 +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
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 077e1c7e4623..8d28a9e60438 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -1,11 +1,44 @@
 slotmove net-irc/kvirc 4 0
+move x11-apps/xtitle x11-misc/xtitle
+move kde-base/kde-meta kde-apps/kde-meta
+move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize
+move media-video/nvenc media-video/nvidia_video_sdk
+move dev-python/socksipy dev-python/PySocks
 slotmove <sci-libs/libint-2 0 1
 slotmove >=sci-libs/libint-2 0 2
+move dev-ml/pa_test dev-ml/ppx_assert
+move dev-ml/custom_printf dev-ml/ppx_custom_printf
+move sci-mathematics/csdp sci-libs/coinor-csdp
+move dev-perl/ImageInfo dev-perl/Image-Info
+move dev-perl/ImageSize dev-perl/Image-Size
+move media-tv/xbmc media-tv/kodi
+move dev-perl/locale-maketext-fuzzy dev-perl/Locale-Maketext-Fuzzy
+move dev-perl/crypt-cbc dev-perl/Crypt-CBC
+move dev-perl/crypt-des-ede3 dev-perl/Crypt-DES_EDE3
+move dev-perl/crypt-dh dev-perl/Crypt-DH
+move dev-perl/crypt-dsa dev-perl/Crypt-DSA
+move dev-perl/crypt-idea dev-perl/Crypt-IDEA
+move dev-perl/crypt-random dev-perl/Crypt-Random
+move dev-perl/crypt-primes dev-perl/Crypt-Primes
+move dev-perl/crypt-rsa dev-perl/Crypt-RSA
+move dev-perl/net-server dev-perl/Net-Server
+move dev-perl/net-sftp dev-perl/Net-SFTP
+move dev-perl/net-ssh-perl dev-perl/Net-SSH-Perl
+move dev-perl/DateManip dev-perl/Date-Manip
+move dev-perl/wxperl dev-perl/Wx
 slotmove sys-devel/binutils 0 2.25.1
+move sys-fs/sshfs-fuse net-fs/sshfs
+move dev-perl/perl-tk dev-perl/Tk
+move dev-perl/mogilefs-server dev-perl/MogileFS-Server
+move dev-perl/ogg-vorbis-header dev-perl/Ogg-Vorbis-Header
+move dev-perl/p5-Palm dev-perl/Palm
 slotmove sys-devel/gcc 4.5 4.5.4
 slotmove sys-devel/gcc 4.6 4.6.4
 slotmove sys-devel/gcc 4.7 4.7.4
 slotmove sys-devel/gcc 4.8 4.8.5
 slotmove sys-devel/gcc 4.9 4.9.3
 slotmove sys-devel/gcc 5 5.3.0
+move dev-perl/Period dev-perl/Time-Period
+move dev-perl/perltidy dev-perl/Perl-Tidy
 slotmove app-i18n/kcm-fcitx 0 4
+move dev-haskell/wxhaskell dev-haskell/wx
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index 04d59dfbc6e1..cde2ff095b42 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -1 +1,30 @@
+move net-libs/libkpeople kde-frameworks/kpeople
+move dev-libs/uchardet app-i18n/uchardet
+move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
+move app-cdr/k3b kde-apps/k3b
+move net-misc/badvpn net-vpn/badvpn
+move net-firewall/ipsec-tools net-vpn/ipsec-tools
+move net-misc/libreswan net-vpn/libreswan
+move net-misc/logmein-hamachi net-vpn/logmein-hamachi
+move net-misc/openconnect net-vpn/openconnect
+move net-misc/openfortivpn net-vpn/openfortivpn
+move net-misc/openvpn net-vpn/openvpn
+move net-misc/strongswan net-vpn/strongswan
+move net-misc/tinc net-vpn/tinc
+move net-misc/vpnc net-vpn/vpnc
+move net-misc/vpncwatch net-vpn/vpncwatch
+move net-misc/vtun net-vpn/vtun
+move net-misc/isatapd net-vpn/isatapd
+move net-misc/iodine net-vpn/iodine
+move net-misc/corkscrew net-vpn/corkscrew
+move net-misc/httptunnel net-vpn/httptunnel
+move net-misc/nstx net-vpn/nstx
+move net-misc/6tunnel net-vpn/6tunnel
+move net-misc/i2pd net-vpn/i2pd
+move net-misc/tor net-vpn/tor
+move net-p2p/i2p net-vpn/i2p
+move net-libs/rb_libtorrent net-libs/libtorrent-rasterbar
+move dev-perl/gtk2-perl dev-perl/Gtk2
+move dev-haskell/hdbc-sqlite dev-haskell/hdbc-sqlite3
+move net-dialup/pptpd net-vpn/pptpd
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 73e5b12f31db..1919388c157a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -1,2 +1,21 @@
+move app-portage/kuroo4 app-portage/kuroo
 slotmove app-portage/kuroo 4 0
+move dev-cpp/gsl dev-cpp/ms-gsl
 slotmove =dev-util/cucumber-core-3.1.0 3.0 3.1
+move app-admin/restart_services app-admin/restart-services
+move dev-libs/purpose kde-frameworks/purpose
+move x11-proto/xorgproto x11-base/xorg-proto
+move games-action/trine-bin games-action/trine
+move app-admin/bind_exporter app-metrics/bind_exporter
+move app-admin/elasticsearch_exporter app-metrics/elasticsearch_exporter
+move app-admin/mongodb_exporter app-metrics/mongodb_exporter
+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 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
+move net-analyzer/prometheus-redis_exporter app-metrics/redis_exporter
+move net-analyzer/prometheus-uwsgi_exporter app-metrics/uwsgi_exporter
+move net-analyzer/prometheus-pushgateway app-metrics/pushgateway
diff --git a/profiles/updates/1Q-2019 b/profiles/updates/1Q-2019
new file mode 100644
index 000000000000..a9a9b9c687dc
--- /dev/null
+++ b/profiles/updates/1Q-2019
@@ -0,0 +1,17 @@
+move dev-libs/sway gui-wm/sway
+move dev-libs/swayidle gui-apps/swayidle
+move dev-libs/swaylock gui-apps/swaylock
+move dev-libs/wlroots gui-libs/wlroots
+move dev-libs/wl-clipboard gui-apps/wl-clipboard
+move net-misc/networkmanager-fortisslvpn net-vpn/networkmanager-fortisslvpn
+move net-misc/networkmanager-libreswan net-vpn/networkmanager-libreswan
+move net-misc/networkmanager-openconnect net-vpn/networkmanager-openconnect
+move net-misc/networkmanager-openvpn net-vpn/networkmanager-openvpn
+move net-misc/networkmanager-pptp net-vpn/networkmanager-pptp
+move net-misc/networkmanager-strongswan net-vpn/networkmanager-strongswan
+move net-misc/networkmanager-vpnc net-vpn/networkmanager-vpnc
+move net-misc/networkmanager-sstp net-vpn/networkmanager-sstp
+move gnome-extra/gnome-tweak-tool gnome-extra/gnome-tweaks
+move app-portage/eclass-manpages app-doc/eclass-manpages
+move app-editors/latexila app-editors/gnome-latex
+move dev-libs/rttr dev-cpp/rttr
diff --git a/profiles/updates/1Q-2020 b/profiles/updates/1Q-2020
index 2698139ae1a1..7d48f8803caa 100644
--- a/profiles/updates/1Q-2020
+++ b/profiles/updates/1Q-2020
@@ -1 +1,12 @@
+move dev-libs/range-v3 dev-cpp/range-v3
+move dev-python/neovim-python-client dev-python/pynvim
+move games-action/openastromenace games-action/astromenace
+move dev-python/matplotlib2tikz dev-python/tikzplotlib
+move dev-python/pep257 dev-python/pydocstyle
+move dev-python/pyzor mail-filter/pyzor
+move dev-python/python-sqlparse dev-python/sqlparse
+move dev-python/git-python dev-python/GitPython
+move www-servers/automx2 net-mail/automx2
+move dev-python/pysnmp-apps net-analyzer/snmpclitools
+move net-im/slack-bin net-im/slack
 slotmove sys-libs/libunwind 7 0
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
deleted file mode 100644
index 377a56837c26..000000000000
--- a/profiles/updates/2Q-2015
+++ /dev/null
@@ -1,9 +0,0 @@
-slotmove dev-libs/libdbusmenu 3 0
-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
-slotmove =dev-ruby/vcr-2.9.3 0 2
-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
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 5101c602aedc..c80acc659837 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -1,3 +1,57 @@
+move dev-perl/math-pari dev-perl/Math-Pari
+move kde-base/khelpcenter kde-apps/khelpcenter
+move kde-plasma/khelpcenter kde-apps/khelpcenter
+move dev-perl/set-scalar dev-perl/Set-Scalar
+move dev-perl/string-crc32 dev-perl/String-CRC32
+move net-im/ktp-common-internals kde-apps/ktp-common-internals
+move net-im/ktp-accounts-kcm kde-apps/ktp-accounts-kcm
+move net-im/ktp-approver kde-apps/ktp-approver
+move net-im/ktp-auth-handler kde-apps/ktp-auth-handler
+move net-im/ktp-call-ui kde-apps/ktp-call-ui
+move net-im/ktp-contact-list kde-apps/ktp-contact-list
+move net-im/ktp-contact-runner kde-apps/ktp-contact-runner
+move net-im/ktp-desktop-applets kde-apps/ktp-desktop-applets
+move net-im/ktp-filetransfer-handler kde-apps/ktp-filetransfer-handler
+move net-im/ktp-kded-module kde-apps/ktp-kded-module
+move net-im/ktp-send-file kde-apps/ktp-send-file
+move net-im/ktp-text-ui kde-apps/ktp-text-ui
+move net-im/kde-telepathy-meta kde-apps/plasma-telepathy-meta
+move dev-perl/Time-modules dev-perl/Time-ParseDate
+move dev-perl/text-template dev-perl/Text-Template
+move dev-perl/text-wrapper dev-perl/Text-Wrapper
+move dev-perl/tie-encryptedhash dev-perl/Tie-EncryptedHash
+move dev-perl/yaml dev-perl/YAML
+move app-dicts/myspell-de-alt app-dicts/myspell-de_1901
+move kde-plasma/kwayland kde-frameworks/kwayland
+move x11-themes/xcursor-neutral x11-themes/neutral-xcursors
+move app-crypt/letsencrypt app-crypt/certbot
+move app-crypt/letsencrypt-apache app-crypt/certbot-apache
 slotmove >=dev-php/pecl-apcu-5.0 0 7
+move sys-apps/microcode-data sys-firmware/intel-microcode
 slotmove >=dev-php/pecl-rrd-2.0 0 7
 slotmove >=dev-php/pecl-oauth-2.0 0 7
+move sys-infiniband/dapl sys-fabric/dapl
+move sys-infiniband/ibacm sys-fabric/ibacm
+move sys-infiniband/infiniband-diags sys-fabric/infiniband-diags
+move sys-infiniband/infinipath-psm sys-fabric/infinipath-psm
+move sys-infiniband/libcxgb3 sys-fabric/libcxgb3
+move sys-infiniband/libcxgb4 sys-fabric/libcxgb4
+move sys-infiniband/libehca sys-fabric/libehca
+move sys-infiniband/libibcm sys-fabric/libibcm
+move sys-infiniband/libibmad sys-fabric/libibmad
+move sys-infiniband/libibumad sys-fabric/libibumad
+move sys-infiniband/libibverbs sys-fabric/libibverbs
+move sys-infiniband/libipathverbs sys-fabric/libipathverbs
+move sys-infiniband/libmlx4 sys-fabric/libmlx4
+move sys-infiniband/libmlx5 sys-fabric/libmlx5
+move sys-infiniband/libmthca sys-fabric/libmthca
+move sys-infiniband/libnes sys-fabric/libnes
+move sys-infiniband/libocrdma sys-fabric/libocrdma
+move sys-infiniband/librdmacm sys-fabric/librdmacm
+move sys-infiniband/ofed sys-fabric/ofed
+move sys-infiniband/opensm sys-fabric/opensm
+move sys-infiniband/perftest sys-fabric/perftest
+move sys-infiniband/qperf sys-fabric/qperf
+move sys-infiniband/rds-tools sys-fabric/rds-tools
+move sys-infiniband/srptools sys-fabric/srptools
+move sys-block/btrace sys-block/blktrace
diff --git a/profiles/updates/2Q-2017 b/profiles/updates/2Q-2017
new file mode 100644
index 000000000000..bd65135796d5
--- /dev/null
+++ b/profiles/updates/2Q-2017
@@ -0,0 +1,4 @@
+move kde-misc/kio_gopher kde-misc/kio-gopher
+move dev-python/pyconstruct dev-python/construct
+move dev-erlang/p1_pam dev-erlang/epam
+move perl-core/Package-Constants dev-perl/Package-Constants
diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018
index 1b57fdd01a6e..b5253a73af32 100644
--- a/profiles/updates/2Q-2018
+++ b/profiles/updates/2Q-2018
@@ -1 +1,18 @@
+move app-admin/collectd app-metrics/collectd
+move app-metrics/prometheus-mysqld_exporter app-metrics/mysqld_exporter
+move gnome-extra/gnome-builder dev-util/gnome-builder
+move kde-apps/kstars sci-astronomy/kstars
+move media-video/kamoso kde-apps/kamoso
+move app-backup/kbackup kde-apps/kbackup
+move x11-proto/xcb-proto x11-base/xcb-proto
+move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin
+move ros-meta/geometry_experimental ros-meta/geometry2
 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7
+move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts
+move media-libs/vulkan-tools dev-util/vulkan-tools
+move games-strategy/ufo-ai games-strategy/ufoai
+move kde-apps/okteta app-editors/okteta
+move games-puzzle/triptych-demo games-puzzle/triptych
+move media-sound/teamspeak-client-bin media-sound/teamspeak-client
+move media-sound/teamspeak-server-bin media-sound/teamspeak-server
+move sci-chemistry/mdanalysis sci-chemistry/MDAnalysis
diff --git a/profiles/updates/2Q-2019 b/profiles/updates/2Q-2019
new file mode 100644
index 000000000000..7e275607af8f
--- /dev/null
+++ b/profiles/updates/2Q-2019
@@ -0,0 +1,3 @@
+move net-nds/gss-proxy net-nds/gssproxy
+move app-emacs/anything app-emacs/helm
+move games-fps/prboom games-fps/prboom-plus
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index c8970fe8b5a2..2bbf947be5fa 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -1 +1,11 @@
+move dev-libs/yaml-cpp dev-cpp/yaml-cpp
+move dev-python/rnc2rng app-text/rnc2rng
+move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb
 slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4
+move kde-misc/gmailfeed kde-misc/ultimate-gmail-feed
+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/updates/3Q-2015 b/profiles/updates/3Q-2015
index 12803152320c..404e8df9827e 100644
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -1,9 +1,20 @@
+move dev-perl/inline-files dev-perl/Inline-Files
+move dev-perl/locale-maketext-lexicon dev-perl/Locale-Maketext-Lexicon
 slotmove dev-util/kdevelop-pg-qt 0 4
+move x11-plugins/bitlbee-steam net-im/bitlbee-steam
+move media-video/kdenlive kde-apps/kdenlive
+move kde-plasma/baloo kde-frameworks/baloo
+move kde-plasma/kfilemetadata kde-frameworks/kfilemetadata
+move kde-plasma/kio-extras kde-apps/kio-extras
 slotmove =sys-libs/ncurses-5.9-r3 5 0
 slotmove =sys-libs/ncurses-5.9-r4 5 0
+move kde-base/baloo-widgets kde-apps/baloo-widgets
+move dev-python/pyDeComp dev-python/pydecomp
 slotmove =dev-ruby/packetfu-1.1.9* 0 1.1.9
 slotmove =dev-ruby/packetfu-1.1.10* 0 1.1.10
 slotmove =dev-ruby/packetfu-1.1.11* 0 1.1.11
+move dev-perl/text-autoformat dev-perl/Text-Autoformat
+move dev-perl/text-reform dev-perl/Text-Reform
 slotmove =dev-dotnet/dbus-sharp-0.7* 0 1.0
 slotmove =dev-dotnet/dbus-sharp-0.8* 0 2.0
 slotmove =dev-dotnet/dbus-sharp-glib-0.5* 0 1.0
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 9da5edc2f70c..ca92a00e33c3 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1,3 +1,23 @@
+move kde-base/kactivitymanagerd kde-plasma/kactivitymanagerd
+move app-portage/cpuinfo2cpuflags app-portage/cpuid2cpuflags
 slotmove >=dev-php/pecl-mailparse-3.0 0 7
+move dev-perl/class-loader dev-perl/Class-Loader
+move x11-apps/xkbset x11-misc/xkbset
+move dev-perl/convert-ascii-armour dev-perl/Convert-ASCII-Armour
+move net-misc/ksshaskpass kde-plasma/ksshaskpass
+move dev-perl/convert-pem dev-perl/Convert-PEM
 slotmove >=dev-php/pecl-yaml-2.0.0_rc1 0 7
+move dev-perl/regexp-common dev-perl/Regexp-Common
+move dev-php/PEAR-PHP_CodeSniffer dev-php/PHP_CodeSniffer
+move kde-apps/kgamma kde-plasma/kgamma
 slotmove =sci-geosciences/osm-gps-map-0.7.3 2 0
+move sys-fs/btfs net-fs/btfs
+move sys-fs/s3fs net-fs/s3fs
+move sys-fs/s3backer net-fs/s3backer
+move sys-fs/sshfs net-fs/sshfs
+move app-vim/rust-mode app-vim/rust-vim
+move dev-perl/data-buffer dev-perl/Data-Buffer
+move dev-perl/dbix-searchbuilder dev-perl/DBIx-SearchBuilder
+move dev-perl/digest-bubblebabble dev-perl/Digest-BubbleBabble
+move dev-perl/digest-md2 dev-perl/Digest-MD2
+move app-admin/swatch app-admin/swatchdog
diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017
index 911ed5569f82..e33c4396852c 100644
--- a/profiles/updates/3Q-2017
+++ b/profiles/updates/3Q-2017
@@ -1,4 +1,10 @@
+move app-vim/llvm-vim sys-devel/llvm-common
+move dev-libs/kirigami kde-frameworks/kirigami
 slotmove kde-frameworks/kirigami 2 5
+move app-i18n/libtomoe-gtk app-i18n/tomoe-gtk
+move dev-libs/libchewing app-i18n/libchewing
+move media-gfx/pydot dev-python/pydot
+move x11-plugins/wmMoonClock x11-plugins/wmmoonclock
 slotmove app-i18n/fcitx 0 4
 slotmove app-i18n/fcitx-anthy 0 4
 slotmove app-i18n/fcitx-chewing 0 4
@@ -15,3 +21,4 @@ slotmove app-i18n/fcitx-table-extra 0 4
 slotmove app-i18n/fcitx-unikey 0 4
 slotmove app-i18n/kcm-fcitx 4 4-plasma4
 slotmove app-i18n/kcm-fcitx 5 4-plasma5
+move dev-libs/dfxml app-forensics/dfxml
diff --git a/profiles/updates/3Q-2018 b/profiles/updates/3Q-2018
new file mode 100644
index 000000000000..a78539b959a0
--- /dev/null
+++ b/profiles/updates/3Q-2018
@@ -0,0 +1,3 @@
+move app-crypt/sbsigntool app-crypt/sbsigntools
+move x11-apps/radeontop app-misc/radeontop
+move gnome-extra/authenticator sys-auth/authenticator
diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019
index 90347eab8ad0..c7b908862734 100644
--- a/profiles/updates/3Q-2019
+++ b/profiles/updates/3Q-2019
@@ -1 +1,7 @@
+move media-plugins/kipi-plugins kde-apps/kipi-plugins
+move kde-misc/yakuake kde-apps/yakuake
+move kde-apps/kjots app-text/kjots
+move app-arch/upx-ucl app-arch/upx
 slotmove app-text/docbook-xml-simple-dtd 0 4.1.2.4
+move sys-apps/lm_sensors sys-apps/lm-sensors
+move net-misc/networkmanager-wireguard net-vpn/networkmanager-wireguard
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index 46464e83b494..9d7504fc580d 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -1,5 +1,148 @@
+move games-action/d1x-rebirth games-action/dxx-rebirth
+move games-action/d2x-rebirth games-action/dxx-rebirth
+move app-dicts/sword-abbott app-dicts/sword-Abbott
+move app-dicts/sword-acv app-dicts/sword-ACV
+move app-dicts/sword-afr1953 app-dicts/sword-Afr1953
+move app-dicts/sword-akjv app-dicts/sword-AKJV
+move app-dicts/sword-alb app-dicts/sword-Alb
+move app-dicts/sword-aleppo app-dicts/sword-Aleppo
+move app-dicts/sword-amtract app-dicts/sword-AmTract
+move app-dicts/sword-arasvd app-dicts/sword-AraSVD
+move app-dicts/sword-armeastern app-dicts/sword-ArmEastern
+move app-dicts/sword-armwestern app-dicts/sword-ArmWestern
+move app-dicts/sword-asv app-dicts/sword-ASV
+move app-dicts/sword-barnes app-dicts/sword-Barnes
+move app-dicts/sword-bashautin app-dicts/sword-BasHautin
+move app-dicts/sword-bbe app-dicts/sword-BBE
+move app-dicts/sword-bulveren app-dicts/sword-BulVeren
+move app-dicts/sword-burjudson app-dicts/sword-BurJudson
+move app-dicts/sword-byz app-dicts/sword-Byz
+move app-dicts/sword-cbc app-dicts/sword-CBC
+move app-dicts/sword-chamorro app-dicts/sword-Chamorro
+move app-dicts/sword-clarke app-dicts/sword-Clarke
+move app-dicts/sword-common app-dicts/sword-Common
+move app-dicts/sword-cro app-dicts/sword-CroSaric
+move app-dicts/sword-czebkr app-dicts/sword-CzeBKR
+move app-dicts/sword-daily app-dicts/sword-Daily
+move app-dicts/sword-darby app-dicts/sword-Darby
+move app-dicts/sword-diaglott app-dicts/sword-Diaglott
+move app-dicts/sword-drc app-dicts/sword-DRC
+move app-dicts/sword-dtn app-dicts/sword-DTN
+move app-dicts/sword-dutkant app-dicts/sword-DutKant
+move app-dicts/sword-dutsvv app-dicts/sword-DutSVV
+move app-dicts/sword-easton app-dicts/sword-Easton
+move app-dicts/sword-esperanto app-dicts/sword-Esperanto
+move app-dicts/sword-farsiopv app-dicts/sword-FarOPV
+move app-dicts/sword-finbiblia app-dicts/sword-FinBiblia
+move app-dicts/sword-finney app-dicts/sword-Finney
+move app-dicts/sword-finpr app-dicts/sword-FinPR
+move app-dicts/sword-frebbb app-dicts/sword-FreBBB
+move app-dicts/sword-frecrampon app-dicts/sword-FreCrampon
+move app-dicts/sword-fremartin app-dicts/sword-FreBDM1744
+move app-dicts/sword-fresegond app-dicts/sword-FreSegond1910
+move app-dicts/sword-geneva app-dicts/sword-Geneva
+move app-dicts/sword-geneva1599 app-dicts/sword-Geneva1599
+move app-dicts/sword-gerelb1871 app-dicts/sword-GerElb1871
+move app-dicts/sword-gerelb1905 app-dicts/sword-GerElb1905
+move app-dicts/sword-gerlut1545 app-dicts/sword-GerLut1545
+move app-dicts/sword-gersch app-dicts/sword-GerSch
+move app-dicts/sword-greekhebrew app-dicts/sword-GreekHebrew
+move app-dicts/sword-hebrewgreek app-dicts/sword-HebrewGreek
+move app-dicts/sword-heretics app-dicts/sword-Heretics
+move app-dicts/sword-hitchcock app-dicts/sword-Hitchcock
+move app-dicts/sword-hunkar app-dicts/sword-HunKar
+move app-dicts/sword-institutes app-dicts/sword-Institutes
+move app-dicts/sword-isbe app-dicts/sword-ISBE
+move app-dicts/sword-isv app-dicts/sword-ISV
+move app-dicts/sword-itadio app-dicts/sword-ItaDio
+move app-dicts/sword-itarive app-dicts/sword-ItaRive
+move app-dicts/sword-jfb app-dicts/sword-JFB
+move app-dicts/sword-josephus app-dicts/sword-Josephus
+move app-dicts/sword-jps app-dicts/sword-JPS
+move app-dicts/sword-jst app-dicts/sword-JST
+move app-dicts/sword-jubilee2000 app-dicts/sword-Jubilee2000
+move app-dicts/sword-kjv app-dicts/sword-KJV
+move app-dicts/sword-klv app-dicts/sword-KLV
+move app-dicts/sword-klven_iklingon app-dicts/sword-KLVen_iklingon
+move app-dicts/sword-klviklingon_en app-dicts/sword-KLViklingon_en
+move app-dicts/sword-lightfoot app-dicts/sword-Lightfoot
+move app-dicts/sword-litv app-dicts/sword-LITV
+move app-dicts/sword-luther app-dicts/sword-Luther
+move app-dicts/sword-mak app-dicts/sword-MAK
+move app-dicts/sword-manxgaelic app-dicts/sword-ManxGaelic
+move app-dicts/sword-mhc app-dicts/sword-MHC
+move app-dicts/sword-mhcc app-dicts/sword-MHCC
+move app-dicts/sword-mkjv app-dicts/sword-MKJV
+move app-dicts/sword-montgomery app-dicts/sword-Montgomery
+move app-dicts/sword-murdock app-dicts/sword-Murdock
+move app-dicts/sword-nave app-dicts/sword-Nave
+move app-dicts/sword-norsk app-dicts/sword-Norsk
+move app-dicts/sword-orthodoxy app-dicts/sword-Orthodoxy
+move app-dicts/sword-packard app-dicts/sword-Packard
+move app-dicts/sword-personal app-dicts/sword-Personal
+move app-dicts/sword-peshitta app-dicts/sword-Peshitta
+move app-dicts/sword-pilgrim app-dicts/sword-Pilgrim
+move app-dicts/sword-pnt app-dicts/sword-PNT
+move app-dicts/sword-practice app-dicts/sword-Practice
+move app-dicts/sword-rkjnt app-dicts/sword-RKJNT
+move app-dicts/sword-rnkjv app-dicts/sword-RNKJV
+move app-dicts/sword-robinson app-dicts/sword-Robinson
+move app-dicts/sword-rotherham app-dicts/sword-Rotherham
+move app-dicts/sword-rusmakarij app-dicts/sword-RusMakarij
+move app-dicts/sword-rwebster app-dicts/sword-RWebster
+move app-dicts/sword-rwp app-dicts/sword-RWP
+move app-dicts/sword-saoa app-dicts/sword-SAOA
+move app-dicts/sword-scofield app-dicts/sword-Scofield
+move app-dicts/sword-scotsgaelic app-dicts/sword-ScotsGaelic
+move app-dicts/sword-sme app-dicts/sword-SME
+move app-dicts/sword-smith app-dicts/sword-Smith
+move app-dicts/sword-sparv app-dicts/sword-SpaRV
+move app-dicts/sword-sparvg2004 app-dicts/sword-SpaRVG
+move app-dicts/sword-spavnt app-dicts/sword-SpaVNT
+move app-dicts/sword-spurious app-dicts/sword-Spurious
+move app-dicts/sword-strongsgreek app-dicts/sword-StrongsGreek
+move app-dicts/sword-strongshebrew app-dicts/sword-StrongsHebrew
+move app-dicts/sword-swahili app-dicts/sword-Swahili
+move app-dicts/sword-tagalog app-dicts/sword-Tagalog
+move app-dicts/sword-tcr app-dicts/sword-TCR
+move app-dicts/sword-tdavid app-dicts/sword-TDavid
+move app-dicts/sword-tfg app-dicts/sword-TFG
+move app-dicts/sword-tisch app-dicts/sword-Tisch
+move app-dicts/sword-torrey app-dicts/sword-Torrey
+move app-dicts/sword-tr app-dicts/sword-TR
+move app-dicts/sword-tsk app-dicts/sword-TSK
+move app-dicts/sword-twenty app-dicts/sword-Twenty
+move app-dicts/sword-tyndale app-dicts/sword-Tyndale
+move app-dicts/sword-ukjv app-dicts/sword-UKJV
+move app-dicts/sword-ukrainian app-dicts/sword-Ukrainian
+move app-dicts/sword-uma app-dicts/sword-Uma
+move app-dicts/sword-vulgate app-dicts/sword-Vulgate
+move app-dicts/sword-vulgate_hebps app-dicts/sword-Vulgate_HebPs
+move app-dicts/sword-webster app-dicts/sword-Webster
+move app-dicts/sword-webstersdict app-dicts/sword-Webster1913
+move app-dicts/sword-wesley app-dicts/sword-Wesley
+move app-dicts/sword-weymouth app-dicts/sword-Weymouth
+move app-dicts/sword-whnu app-dicts/sword-WHNU
+move app-dicts/sword-wlc app-dicts/sword-WLC
+move app-dicts/sword-wulfila app-dicts/sword-Wulfila
+move app-dicts/sword-wycliffe app-dicts/sword-Wycliffe
+move app-dicts/sword-ylt app-dicts/sword-YLT
+move dev-python/pyicu dev-python/PyICU
+move app-dicts/sword-Cro app-dicts/sword-CroSaric
+move app-dicts/sword-FarsiOPV app-dicts/sword-FarOPV
+move app-dicts/sword-FreMartin app-dicts/sword-FreBDM1744
+move app-dicts/sword-FreSegond app-dicts/sword-FreSegond1910
+move app-dicts/sword-SpaRVG2004 app-dicts/sword-SpaRVG
+move app-dicts/sword-WebstersDict app-dicts/sword-Webster1913
+move media-libs/ladspa-cmt media-plugins/cmt-plugins
+move dev-libs/luise-bin dev-libs/luise
 slotmove ~app-editors/emacs-27.0.90 27-vcs 27
 slotmove ~app-editors/emacs-27.0.91 27-vcs 27
 slotmove =app-editors/emacs-27.1_rc* 27-vcs 27
+move net-misc/ntpclient net-misc/sntpd
 slotmove <media-sound/teamspeak-client-5 0 3
 slotmove dev-haskell/network 3 0
+move sci-libs/scipy dev-python/scipy
+move dev-perl/frontier-rpc dev-perl/Frontier-RPC
+move sci-libs/Rtree sci-libs/rtree
+move sci-libs/Shapely sci-libs/shapely
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 39223b888878..0640fe75b8f7 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -1,8 +1,26 @@
 slotmove =dev-ruby/mysql2-0.4* 0.3 0.4
+move sys-apps/cv sys-apps/progress
 slotmove =dev-ruby/recog-2.0.6 2 2.0.6
 slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
 slotmove =dev-python/pyfltk-1.3.3 1 0
+move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
 slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2
+move dev-perl/module-info dev-perl/Module-Info
+move kde-base/akonadiconsole kde-apps/akonadiconsole
+move kde-base/akregator kde-apps/akregator
+move kde-base/calendarjanitor kde-apps/calendarjanitor
+move kde-base/kaddressbook kde-apps/kaddressbook
+move kde-base/kalarm kde-apps/kalarm
+move kde-base/kdepim-meta kde-apps/kdepim-meta
+move kde-base/kdepim-runtime kde-apps/kdepim-runtime
+move kde-base/kleopatra kde-apps/kleopatra
+move kde-base/kmail kde-apps/kmail
+move kde-base/knotes kde-apps/knotes
+move kde-base/konsolekalendar kde-apps/konsolekalendar
+move kde-base/kontact kde-apps/kontact
+move kde-base/korganizer kde-apps/korganizer
+move kde-base/libkdepim kde-apps/libkdepim
+move kde-base/libkleo kde-apps/libkleo
 slotmove =dev-embedded/libftdi-1* 0 1
 slotmove =dev-embedded/libftdi-9999 0 1
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index c0f9ca32835c..8731c54eb5b3 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -1,2 +1,29 @@
+move net-analyzer/ipv6-toolkit net-analyzer/ipv6toolkit
+move x11-apps/xvfb-run x11-misc/xvfb-run
+move kde-misc/plasma-nm kde-plasma/plasma-nm
+move app-office/akonadi-server kde-apps/akonadi
+move net-wireless/bluedevil kde-plasma/bluedevil
+move kde-base/kdeplasma-addons kde-plasma/kdeplasma-addons
+move kde-misc/milou kde-plasma/milou
+move kde-misc/kde-gtk-config kde-plasma/kde-gtk-config
+move kde-base/powerdevil kde-plasma/powerdevil
+move kde-base/kwrited kde-plasma/kwrited
+move kde-base/kmenuedit kde-plasma/kmenuedit
+move kde-base/khotkeys kde-plasma/khotkeys
+move kde-base/kinfocenter kde-plasma/kinfocenter
+move kde-base/ksysguard kde-plasma/ksysguard
+move dev-perl/google-api-adwords-perl dev-perl/Google-Ads-AdWords-Client
+move kde-misc/kscreen kde-plasma/kscreen
+move x11-libs/libkscreen kde-plasma/libkscreen
 slotmove media-sound/cantata 4 0
-slotmove dev-python/pyinsane 0 1
+move kde-base/systemsettings kde-plasma/systemsettings
+move kde-base/kfilemetadata kde-frameworks/kfilemetadata
+move kde-base/baloo kde-frameworks/baloo
+move kde-base/kwin kde-plasma/kwin
+move media-sound/kwave kde-apps/kwave
+move app-misc/ddctool app-misc/ddcutil
+move media-libs/prison kde-frameworks/prison
+move kde-base/kactivities kde-frameworks/kactivities
+move kde-base/plasma-workspace kde-plasma/plasma-workspace
+move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig
+move kde-base/krosspython kde-apps/kross-interpreters
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
new file mode 100644
index 000000000000..b319f5b973c5
--- /dev/null
+++ b/profiles/updates/4Q-2017
@@ -0,0 +1,7 @@
+move dev-ml/ocaml-dns dev-ml/dns
+move dev-perl/HTML-Format dev-perl/HTML-Formatter
+move dev-perl/MARC-XML dev-perl/MARC-File-XML
+move dev-perl/MARC-file-XML dev-perl/MARC-File-XML
+move dev-util/gogland dev-util/goland
+move app-crypt/zuluCrypt app-crypt/zulucrypt
+move dev-perl/RadiusPerl dev-perl/Authen-Radius
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
index f8573dda6ffb..22893db01ab9 100644
--- a/profiles/updates/4Q-2018
+++ b/profiles/updates/4Q-2018
@@ -1 +1,7 @@
 slotmove dev-libs/girara 3 0
+move dev-python/CommonMark dev-python/commonmark
+move dev-libs/mini-xml dev-libs/mxml
+move x11-misc/xembedsniproxy kde-plasma/xembed-sni-proxy
+move x11-apps/intel-gpu-tools x11-apps/igt-gpu-tools
+move games-board/knights kde-apps/knights
+move media-gfx/icc_examin media-gfx/icc-examin
diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019
index e832bc036e01..55d4ca511320 100644
--- a/profiles/updates/4Q-2019
+++ b/profiles/updates/4Q-2019
@@ -1 +1,7 @@
+move dev-libs/rlottie media-libs/rlottie
+move dev-util/repo dev-vcs/repo
+move media-video/gnome-mpv media-video/celluloid
+move app-admin/graylog2 app-admin/graylog
+move media-libs/libclthreads dev-libs/libclthreads
+move media-libs/libclxclient x11-libs/libclxclient
 slotmove net-misc/teamviewer 15 0
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
new file mode 100644
index 000000000000..0c667f5c3224
--- /dev/null
+++ b/profiles/updates/4Q-2020
@@ -0,0 +1,7 @@
+move acct-group/openldap acct-group/ldap
+move acct-user/openldap acct-user/ldap
+move x11-apps/copyq x11-misc/copyq
+slotmove media-gfx/gimp 2 0
+move dev-python/scikit-learn sci-libs/scikit-learn
+move sci-libs/scikits_learn sci-libs/scikit-learn
+move sci-libs/scikits_image sci-libs/scikit-image