gentoo resync : 21.06.2020

29 files changed, 215 insertions, 204 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0d304c6440a7..2331daeafc6b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 4f92af535a88..fa461343ce87 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Matt Turner <mattst88@gentoo.org> (2020-06-09)
 # Requires unsupported dev-python/eventlet and fails tests with gevent
 dev-python/socketpool eventlet gevent
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index e34107fa8ec5..437a4f6e1120 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -19,7 +19,6 @@ mail-client/novell-groupwise-client
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
->=app-i18n/atokx3-3.0.0
 app-accessibility/mbrola
 app-arch/stuffit
 app-benchmarks/cpuburn
diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index f678b290910d..1a044e07e74a 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
+# Force host target
+dev-libs/keystone llvm_targets_X86
+
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 5fb6fde75e42..fff4e15c9f42 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2020-06-17)
+# Unmask globally-masked flashrom drivers and tools which do work on amd64
+sys-apps/flashrom -atahpt -atapromise -internal -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv -tools
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on amd64
 app-text/texlive-core -xindy
@@ -222,10 +226,6 @@ media-libs/libbluray -bdplus
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers -steam
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb -tokudb
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index 7efbbdad1e8b..db3826895aaa 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
+# Force host target
+dev-libs/keystone llvm_targets_ARM
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-16)
 # Force the host target
 dev-lang/rust llvm_targets_ARM
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index a7d8a20cac9a..164298d09fc6 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-19)
+# Requires dev-util/dwarves.
+sys-kernel/gentoo-kernel debug
+sys-kernel/vanilla-kernel debug
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Jimi Huotari <chiitoo@gentoo.org> (2020-05-17)
 # Mask until 'app-arch/lxqt-archiver' is keyworded.
 lxqt-base/lxqt-meta archiver
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 357a73151c3a..503325f879dd 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
+# Force host target
+dev-libs/keystone llvm_targets_AArch64
+
 # Aaron Bauman <bman@gentoo.org> (2019-12-27)
 # ffmpeg does support 64 bit neon
 media-video/ffmpeg cpu_flags_arm_neon
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 456dd0d65239..66d667217fe7 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-19)
+# Requires dev-util/dwarves.
+sys-kernel/gentoo-kernel debug
+sys-kernel/vanilla-kernel debug
+
 # Sam James <sam@cmpct.info> (2020-06-11)
 # PGO works on arm64
 >=www-client/firefox-68.9.0 -pgo
@@ -198,7 +203,6 @@ net-fs/samba addc addns ads cluster python test
 # Some more unkeyworded dependencies.
 app-text/tesseract scrollview
 dev-cpp/eigen test
-kde-frameworks/frameworkintegration appstream
 mate-base/mate help
 mate-base/mate-applets-meta appindicator sensors
 mate-extra/caja-extensions gajim
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index e807056d39a4..9bdee5482a0c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2020-06-17)
+# Mask flashrom drivers and tools which only work on few architectures:
+#  - ich_descriptors_tools (USE=tools) is only compiled on amd64 and x86,
+#  - internal is presently only supported on amd64/x86 and mipsel,
+#  - the others only work on x86 due to lack of PCI-port I/O support.
+sys-apps/flashrom atahpt atapromise internal nic3com nicnatsemi nicrealtek rayer-spi satamv tools
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # Dependency is only keyworded on amd64 and x86
 app-metrics/collectd collectd_plugins_slurm
@@ -193,10 +200,6 @@ media-libs/libbluray bdplus
 # pidgin-opensteamworks is only available for amd64, ppc32 and x86
 net-im/telepathy-connection-managers steam
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# Mask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom atahpt nic3com nicnatsemi nicrealtek rayer-spi satamv
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb tokudb
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 26b24ec046b6..f634ad12e871 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Michał Górny <mgorny@gentoo.org> (2020-05-03)
 # Requires unsupported dev-python/gevent.
 dev-python/socketpool eventlet gevent
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 0ddff0f479bb..5b7962c71db5 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -7,13 +7,6 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
-# Michał Górny <mgorny@gentoo.org> (2020-05-28)
-# Target flags masked because of pending keywording requests.
-python_targets_python3_8
-python_single_target_python3_8
-python_targets_python3_9
-python_single_target_python3_9
-
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-21)
 # ruby2.4 will go away soon, avoid keywording older packages
 ruby_targets_ruby24
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 24e8d845eb52..35d799148af9 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,10 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Michał Górny <mgorny@gentoo.org> (2020-06-01)
-# Stable depgraph is not yet clean.
-python_targets_python3_7
-python_single_target_python3_7
+# Michał Górny <mgorny@gentoo.org> (2020-06-18)
+# Not ready for stable yet.
+python_targets_python3_8
+python_single_target_python3_8
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # media-libs/gstreamer is not stable for hppa
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index fd0803e771de..00290f99397f 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on ia64
 app-text/texlive-core -xindy
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index fad88c19802f..2f00ba841d82 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
+# Force host target
+dev-libs/keystone llvm_targets_PowerPC
+
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is stable on ppc
 sys-firmware/seabios -binary
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 3cf4af78fb4b..d333e1d11b64 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-19)
 # deps not keyworded on ~ppc/ppc64
 media-video/obs-studio nvenc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index fec62a38f46c..ce9b5f381cb3 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Requires dev-python/networkx.
+app-portage/nattka depgraph-order
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # clisp is keyworded on sparc
 app-text/texlive-core -xindy
@@ -34,7 +38,6 @@ dev-python/pyopengl test
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-23)
 # don't bother keywording old versions
-<dev-qt/qtgui-5.14.2 wayland
 <net-analyzer/rrdtool-1.7.2 ruby
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-22)
diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index 3e1b51eff52a..ceda2a6831b7 100644
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -1,7 +1,3 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Bernardo Meurer <bernardo@standard.ai> (2019-09-28)
-# Requires app-crypt/tpm2-tss which is pending ~x86 vide
-# https://bugs.gentoo.org/695758
->=sys-apps/fwupd-1.3.2
diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
index 1117471392cf..419fe7152f2b 100644
--- a/profiles/arch/x86/package.use.force
+++ b/profiles/arch/x86/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-18)
+# Force host target
+dev-libs/keystone llvm_targets_X86
+
 # Michał Górny <mgorny@gentoo.org> (2017-12-30)
 # We have ready-to-use configs here.
 sys-kernel/gentoo-kernel -savedconfig
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index bb07f13d64d4..42b8e3b67a29 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Thomas Deutschmann <whissi@gentoo.org> (2020-06-20)
+# media-libs/nv-codec-headers is not available for x86
+media-video/ffmpeg video_cards_nvidia
+
+# Marek Szuba <marecki@gentoo.org> (2020-06-17)
+# Unmask globally-masked flashrom drivers and tools which do work on x86
+sys-apps/flashrom -atahpt -atapromise -internal -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv -tools
+
 # Christopher Head <chead@chead.ca> (2020-06-10)
 # Requires dev-db/influxdb which is amd64-only
 dev-python/influxdb test
@@ -233,10 +241,6 @@ net-im/telepathy-connection-managers -steam
 # >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
 >x11-drivers/nvidia-drivers-346 uvm
 
-# Mike Frysinger <vapier@gentoo.org> (2014-08-04)
-# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
-
 # Yixun Lan <dlan@gentoo.org> (2014-05-21)
 # sys-fs/zfs not keyworded on x86
 sys-cluster/ceph zfs
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 214abc198c50..c8b3fcdddc14 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -98,9 +98,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 ruby24 on 2018-11-12
 # Updated to include ruby25 on 2019-07-17
-RUBY_TARGETS="ruby24 ruby25"
+RUBY_TARGETS="ruby25"
 
 # Enable extended filesystem attribute support by default.
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 174829fa3802..31ad5808bb9e 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,21 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-21)
+# Multiple runtime crashes, see bug #724672
+media-gfx/inkscape jemalloc
+
+# Sam James <sam@cmpct.info> (2020-16-06)
+# Doc build broken for now
+# Bug #679184
+media-libs/aubio doc
+
+# Stephan Hartmann <stha09@googlemail.com> (2020-16-06)
+# Mostly intended for debugging and development,
+# not recommended for general use. Build is also often
+# broken.
+www-client/chromium component-build
+
 # Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
 # requires clisp whichis keyworded on fewer arches
 app-text/texlive-core xindy
@@ -13,6 +28,7 @@ app-text/texlive-core xindy
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-05-04)
 # Broken error[E0478]: lifetime bound not satisfied
 =dev-lang/rust-1.44.0 miri
+=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
@@ -112,10 +128,6 @@ net-im/spectrum2 test
 # dev-python/pyzmq USE=doc deps are not met with python2_7
 dev-python/pyzmq doc
 
-# Michał Górny <mgorny@gentoo.org> (2020-02-24)
-# app-admin/packagekit* are masked for removal.
-kde-frameworks/frameworkintegration appstream
-
 # Michał Górny <mgorny@gentoo.org> (2020-02-08)
 # The dependency is python-single-r1 while the package (and its revdeps)
 # are python-r1.
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 388ed4586aa4..4c51769639fc 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <graaff@gentoo.org> (2020-06-13)
+# Mask Ruby 2.4 as EOL
+ruby_targets_ruby24
+
 # Ben Kohler <bkohler@gentoo.org> (2020-05-15)
 # Mask 9.4 target to match <9.5 package.mask entry
 postgres_targets_postgres9_4
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index a191b2f3777e..5483fcbd9f1a 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -25,7 +25,3 @@ x11-terms/gnome-terminal gnome-shell
 x11-themes/arc-theme gnome-shell
 x11-themes/zukitwo gnome-shell
 net-wireless/bluez user-session
-
-# Jason Zaman <perfinion@gentoo.org> (2019-12-01)
-# SELinux userspace 3.0 dropped python2.7 support
-kde-frameworks/frameworkintegration appstream
diff --git a/profiles/license_groups b/profiles/license_groups
index c75bfc92dcaa..c22be8106dfb 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic ipx-utils Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source shrimp SMAIL Snd SSLeay Subversion SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic ipx-utils Ispell JDOM JNIC JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source shrimp SMAIL Snd SSLeay Subversion SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index fc5f3e900dfd..91187be21389 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,12 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-02-22)
-# virtual/libstdc++ has only one sys-libs/libstdc++-v3 provider.
-# Use that instead. Or even better use none of them. It's a
-# library from 2005.
-virtual/libstdc++
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-05-17)
 # Abandoned upstream, countless bugs. Removal tracked in bug #659616
 sys-power/pm-utils
@@ -48,7 +42,7 @@ dev-python/pytest-runner
 
 # Matt Turner <mattst88@gentoo.org> (2020-03-17)
 # Deprecated GNOME 2 era packages
-# Bugs #640022, #713010, #726784
+# Bugs #640022, #713010, #726784, #728956
 dev-python/pygobject:2
 gnome-base/gnome-vfs
 gnome-base/libbonobo
@@ -112,8 +106,8 @@ dev-java/oracle-jre-bin
 # app-editors/emacs package, which makes the virtual unnecessary.
 # Packages should depend on >=app-editors/emacs-23.1:* instead.
 # See the documentation of elisp-common.eclass for details.
-# Removal (without prior masking) after the release of Emacs 27.1,
-# but not later than 2020-06-18. Bug #291296.
+# Removal (without prior masking) after ~app-editors/emacs-27.1
+# is marked stable. Bug #291296.
 virtual/emacs
 
 # Michał Górny <mgorny@gentoo.org> (2019-12-09)
@@ -122,7 +116,6 @@ virtual/emacs
 # systems need to be fixed to work without them.
 dev-python/nose-cover3
 dev-python/nosexcover
-dev-python/pytest-cov
 
 # Zac Medico <zmedico@gentoo.org> (2019-12-06)
 # These golang libraries should be vendored either by upstream or via
diff --git a/profiles/package.mask b/profiles/package.mask
index 6b7bd907768f..6dc7911e32b7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,27 +32,107 @@
 
 #--- END OF EXAMPLES ---
 
-# Aaron Bauman <bman@gentoo.org> (2020-06-11)
-# outstanding vulns. RCE. rdeps masked.
-# maintainer ignored w/irrelevant comment.
-# removal in 30 days. bug #719084
-net-analyzer/ntopng
-net-analyzer/pmacct
-net-libs/nDPI
-
-# Lars Wendler <polynomial-c@gentoo.org> (2020-06-10)
-# At least alsactl is broken:
-#   double free or corruption (fasttop)
-# https://bugs.gentoo.org/727838
-=media-libs/alsa-lib-1.2.3
-=media-sound/alsa-utils-1.2.3
-
-# Mikle Kolyada <zlogene@gentoo.org> (2020-06-08)
-# This version has critical changes.
-# Do NOT unmask it unless you are completly
-# sure about what you are doing!
-# This can make your system unbootable!
-~sys-libs/pam-1.4.0
+# Sergei Trofimovich <slyfox@gentoo.org> (2020-06-21)
+# virtual/libstdc++ has only one sys-libs/libstdc++-v3 provider.
+# Use that instead. Or even better use none of them. It's a
+# library from 2005. Removal in 30 days.
+virtual/libstdc++
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-20)
+# Stuck on Python 2, depends on deprecated dev-python/pygobject:2
+media-libs/pymemphis
+
+# Ulrich Müller <ulm@gentoo.org> (2020-06-20)
+# Unmaintained upstream, included with TeX Live.
+# Use >=dev-texlive/texlive-metapost-2020-r1 as replacement.
+# Removal in 30 days. Bug #728904.
+dev-tex/feynmf
+
+# Aaron Bauman <bman@gentoo.org> (2020-06-20)
+# Py2 only
+# Removal in 14 days
+app-crypt/openvpn-blacklist
+app-forensics/volatility
+<=dev-libs/distorm64-3.4.2
+app-misc/yagtd
+app-text/pylize
+app-vim/easytags
+app-vim/notes
+dev-db/metakit
+dev-python/backports-ssl-match-hostname
+dev-python/backports-shutil_get_terminal_size
+dev-python/backports-shutil_which
+dev-python/python-wpactrl
+dev-util/bakefile
+dev-vcs/git-deps
+dev-vcs/git-remote-hg
+games-board/scid
+games-emulation/openmsx
+games-kids/childsplay
+games-mud/lyntin
+games-sports/ski
+mail-filter/tmda
+media-video/subdl
+media-sound/cplay
+media-sound/tunapie
+net-firewall/dshieldpy
+net-mail/offlineimap
+net-misc/switzerland
+net-wireless/multimode
+sci-biology/last
+sci-chemistry/hollow
+sci-chemistry/modeller
+sci-chemistry/pymol-plugins-msms
+sci-geosciences/tilecache
+sci-libs/deap
+sci-libs/pycifrw
+www-apps/curator
+x11-apps/whyteboard
+x11-plugins/purple-plugin_pack
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-18)
+# Games depending on dead gnome-base/libgnomeui.
+# games-board/gnono: Bug #726788, last release 2007, abandoned upstream.
+# games-puzzle/gtetrinet: Bug #726798 last release 2006, abandoned upstream.
+# games-board/mt_gtk_client: Bug #726808, last commit 17 years ago.
+# games-board/sirius: Bug #726814, last release 15 years ago, dead upstream.
+games-board/gnono
+games-puzzle/gtetrinet
+games-board/mt_gtk_client
+games-board/sirius
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-18)
+# Depends on dead gnome-base/libgnomeui. Really, no one else is packaging
+# this, last (and only) release in 2006, abandoned upstream. Bug #726790
+dev-embedded/gnome-avrdude
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Maintainer unresponsive.  Stuck on py3.6.  Pending version bump.
+# Failing tests.
+# Removal in 30 days.  Bug #718990.
+dev-python/hglib
+
+# Michał Górny <mgorny@gentoo.org> (2020-06-14)
+# Unmaintained since at least 2014.  The current release is 1.5 dev
+# branch from 2010.  Upstream had a few stable 1.4 releases since
+# but 1.5 seems to be dead.  Multiple build failures reported,
+# and an ebuild vulnerability.
+# Removal in 30 days.  Bug #728186.
+app-mobilephone/kannel
+app-mobilephone/kannel-sqlbox
+
+# Hans de Graaff <graaff@gentoo.org> (2020-06-14)
+# Ruby 2.4 is no longer supported by upstream and no longer gets
+# security updates since the 2.4.10 release. Use ruby 2.5 or later
+# instead.
+dev-lang/ruby:2.4
+dev-ruby/did_you_mean:2.4
+
+# Mikle Kolyada <zlogene@gentoo.org> (2020-06-13)
+# multiple forks.
+# Merged into the app-text/texlive-core package
+# Removal in 30 days.
+app-text/xindy
 
 # Aaron Bauman <bman@gentoo.org> (2020-06-07)
 # py2 only. dead upstream. m-n. rdep.
@@ -90,21 +170,6 @@ net-nds/389-ds-base
 dev-libs/389-adminutil
 dev-libs/svrcore
 
-# Aaron Bauman <bman@gentoo.org> (2020-06-03)
-# py2 only. dead upstream. m-n. rdep.
-# Masked for removal in 15 days
-app-cdr/sync2cd
-app-text/getxbook
-dev-python/assets
-dev-python/bz2file
-dev-python/kid
-dev-python/jaxml
-dev-python/python-urljr
-dev-python/selectors34
-dev-python/stomper
-dev-python/YURL
-x11-themes/fvwm-crystal
-
 # Stefan Strogin <steils@gentoo.org> (2020-06-03)
 # Masked for testing
 >=dev-libs/libressl-3.2.0
@@ -149,10 +214,6 @@ dev-python/py2play
 dev-python/pyopenal
 dev-python/soya
 
-# Matthew Thode <prometheanfire@gentoo.org> (2020-05-31)
-# remove unused package on 2020-06-14
-app-admin/pdk
-
 # James Le Cuirot <chewi@gentoo.org> (2020-05-31)
 # Now merged into media-libs/dumb with the allegro USE flag. This
 # package was added before EAPI 2 and USE-dependencies. Removal in 30
@@ -207,69 +268,12 @@ dev-python/pygtksourceview
 # Not useful anymore now that metasploit has been removed.
 app-eselect/eselect-metasploit
 
-# Christoph Junghans <junghans@gentoo.org> (2020-05-19)
-# multiple vulnerabilities (CVE-2019-{3463,3464,1000018})
-# bug #699842. Masked for removal in 30 days.
-app-shells/rssh
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-19)
-# Stuck on Python 2 and pygtk, last revdep on dev-python/matplotlib[gtk2],
-# last release in 2011, bug #705650. Masked for removal in 30 days.
-sci-chemistry/nmrdepaker
-
-# Michał Górny <mgorny@gentoo.org> (2020-05-18)
-# Unmaintained and vulnerable.  Last commit in 2015.  Stuck on Python 2.
-# All reverse dependencies removed restkit support upstream.
-# Removal in 30 days.  Bug #544228.
-dev-python/restkit
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-17)
-# Depends on deprecated x11-libs/pangox-compat, commercial software that
-# since 2017 does no longer support Linux. Bugs #694920, #720848
-# Masked for removal in 30 days.
-app-i18n/atokx3
-
-# Michał Górny <mgorny@gentoo.org> (2020-05-15)
-# Dead split packages from the dead PEAK project.  All but one had last
-# release in 2010 or earlier, bytecodeassembler had one bugfix release
-# in 2017.  They're all stuck on Python 2 and have no reverse
-# dependencies except one another.
-# Removal in 30 days.  Bug #723290.
-dev-python/addons
-dev-python/bytecodeassembler
-dev-python/decoratortools
-dev-python/extremes
-dev-python/importing
-dev-python/peak-rules
-dev-python/pyprotocols
-dev-python/symboltype
-
 # Aaron W. Swenson <titanofold@gentoo.org> (2020-05-15)
 # PostgreSQL 9.4 series is EOL. Migrate your database cluster to a more recent
 # version.
 # Removal after 2020-06-14.
 <dev-db/postgresql-9.5
 
-# Michał Górny <mgorny@gentoo.org> (2020-05-11)
-# Causes downgrades of multiple Python packages.  Not touched since
-# initial commit, waiting for a bump to the final release.  Maintainer
-# unresponsive.  Upstream recommends installing in a virtualenv.
-# Removal in 30 days.  Bug #710406.
-acct-group/octoprint
-acct-user/octoprint
-www-apps/octoprint
-
-# Brian Dolbec <dolsen@gentoo.org> (2020-05-08)
-# Unmaintained.  Stuck on Python 3.6.  The only revdep
-# is masked for removal.  Newer buildbot no longer depends on it.
-# Removal in 30 days.  Bug #719518.
-dev-python/ramlfications
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2020-05-02)
-# Included in recent texlive versions. Please uninstall.
-# Removal in 30 days.
-dev-tex/revtex
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-04-30)
 # Requires <OpenSSL-1.1.x. Please migrate to
 # >=dev-db/mysql-5.7. Masked for removal in 30 days.
@@ -279,24 +283,6 @@ dev-tex/revtex
 # Masked for testing
 >=dev-libs/gjs-1.64
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-26)
-# Unmaintained.  Stuck on Python 3.6.  No revdeps.
-# Removal in 30 days.  Bug #719604.
-dev-python/txtorcon
-
-# Michał Górny <mgorny@gentoo.org> (2020-04-22)
-# Effectively unmaintained and stuck on Python 3.6.
-#
-# dev-python/bokeh does not work because of missing dependencies
-# (bug #607778).  It has no reverse dependencies
-#
-# dev-python/flexx tries to fetch data from Internet during build.
-# Its only revdep is dev-python/bokeh.
-#
-# Removal in 30 days.  Bug #607778.
-dev-python/bokeh
-dev-python/flexx
-
 # Michael Orlitzky <mjo@gentoo.org> (2020-04-19)
 # Stuck on Python 3.6, support for which already required
 # backporting patches to a release from 2014. Upstream's git
@@ -304,18 +290,6 @@ dev-python/flexx
 # release. Bug 718326. Removal whenever it becomes an issue.
 mail-filter/pyzor
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-19)
-# Unmaintained.  Stuck on Python 3.6.  Needs version bump.
-# Removal in 30 days.  Bug #718458.
-net-proxy/mitmproxy
-
-# Michał Górny <mgorny@gentoo.org> (2020-04-19)
-# Unmaintained.  Stuck on Python 3.6.  In need of bump since 2016.
-# Removal in 30 days.  Bug #718426.
-net-analyzer/ripe-atlas-tools
-net-libs/ripe-atlas-sagan
-www-client/ripe-atlas-cousteau
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-04-18)
 # Unmaintained, vulnerable oracle java ebuilds, even fetching distfiles
 # requires agreement to restrictive license
@@ -334,10 +308,6 @@ games-util/pogo-manager-bin
 net-p2p/bisq
 sci-mathematics/geogebra
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-04-02)
-# Introduced new privsep (chroot) feature. Masked for testing.
->=net-misc/dhcpcd-9.0.0
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-29)
 # Unmaintained, seriously outdated, vulnerable.  Multiple bugs reported.
 # Stuck on Python 3.6.
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index e2455cec220c..9e5da406ed25 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,13 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Fabian Groffen <grobian@gentoo.org> (2018-11-12)
-# these versions of binutils produces shared libraries with symbol lookup
-# errors, probably a versioning problem, confirmed on Solaris 10 and
-# OpenIndiana (11)
-# For instance XML-Parser generates lookup errors when importing from Perl
-=sys-devel/binutils-2.32*
-
 # Fabian Groffen <grobian@gentoo.org> (2014-01-14)
 # util-linux has no business on Solaris systems
 sys-apps/util-linux
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cd478f6fae30..47f5dbd6f81f 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1066,6 +1066,7 @@ app-office/kmymoney:holidays - Enable kde-frameworks/kholidays integration
 app-office/kmymoney:quotes - Enable Online Stock Quote retrieval
 app-office/kmymoney:weboob - Enable import of online banking transactions extracted by www-client/weboob
 app-office/kraft:pim - Enable support for KDE PIM resources integration
+app-office/libreoffice:base - Enable full support for LibreOffice Base databases (involves additional bundled libs)
 app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
 app-office/libreoffice:mariadb - Prefer mariadb connector over mysql connector
@@ -1118,6 +1119,7 @@ app-portage/layman:mercurial - Support dev-vcs/mercurial based overlays
 app-portage/layman:squashfs - Support mounting squashfs image overlays locally read-only
 app-portage/layman:subversion - Support dev-vcs/subversion based overlays
 app-portage/layman:sync-plugin-portage - Install the sys-apps/portage sync module
+app-portage/nattka:depgraph-order - Process packages in depgraph order whenever possible.
 app-portage/pfl:network-cron - Adds a cron job which does a weekly submit of the package database
 app-portage/portage-utils:qmanifest - Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing
 app-portage/portage-utils:qtegrity - Build qtegrity applet, this adds additional dependencies for OpenSSL
@@ -1162,7 +1164,6 @@ app-text/evince:postscript - Enable support for PostScript and Adobe Illustrator
 app-text/evince:spell - Enable inline spell check for annotations via app-text/gspell
 app-text/evince:t1lib - Enable the Type-1 fonts for the built-in DVI viewer (media-libs/t1lib)
 app-text/evince:xps - Enable XPS viewer using app-text/libgxps
-app-text/getxbook:ocr - Use app-text/tesseract for optical character recognition
 app-text/ghostscript-gpl:unicode - Add support for unicode passwords via net-dns/libidn
 app-text/groonga:abort - Enable query abortion
 app-text/groonga:benchmark - Build benchmark programs
@@ -1262,7 +1263,6 @@ app-text/texlive:science - Add typesetting support for natural and computer scie
 app-text/texlive:tex4ht - Add support for dev-tex/tex4ht (for converting (La)TeX to (X)HTML, XML and OO.org)
 app-text/texlive:texi2html - Add support for app-text/texi2html which converts texi files to HTML
 app-text/texlive:xetex - Add support for XeTeX macros (dev-texlive/texlive-xetex)
-app-text/texlive:xindy - Add support for app-text/xindy, a flexible indexing system
 app-text/texlive-core:luajittex - Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.
 app-text/texlive-core:xetex - Add support for XeTeX: a TeX system with Unicode and modern font technologies.
 app-text/texlive-core:xindy - Add support for Xindy: A general-purpose index processor.
@@ -2423,7 +2423,6 @@ dev-perl/Config-Any:ini - Install dev-perl/Config-Tiny to support decoding INI c
 dev-perl/Config-Any:json - Install support libraries to support decoding JSON config files
 dev-perl/Config-Any:xml - Install support libraries to support decoding XML config files
 dev-perl/Config-Any:yaml - Install support libraries to support decoding YAML config files
-dev-perl/Convert-UUlib:system-uulib - Use dev-libs/uulib instead of bundled version.
 dev-perl/Cookie-Baker:xs - Install dev-perl/Cookie-Baker-XS for accelerated performance
 dev-perl/Coro:ev - Build support for using dev-perl/EV as an event-loop via Coro::EV
 dev-perl/Coro:event - Build support for using dev-perl/Event as an event-loop via Coro::Event
@@ -2614,7 +2613,6 @@ dev-python/pyyaml:libyaml - enable support for C implementation using libyaml
 dev-python/pyzmq:draft - Enable draft API support
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/rdflib:redland - enable support for Redland triplestore
-dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython
 dev-python/rfc3986:idna - enable support for the IDNA specification (RFC 5891)
 dev-python/shiboken2:docstrings - Expose documentation as Python docstrings (recommended)
 dev-python/shiboken2:numpy - Implicitly convert passed NumPy arrays to Qt lists
@@ -3016,7 +3014,6 @@ dev-util/unrpyc:proto0 - Use pickle protocol 0 for un-rpyc module. May be useful
 dev-util/unrpyc:proto1 - Use pickle protocol 1 for un-rpyc module. Default if no protocol is selected
 dev-util/unrpyc:proto2 - Use pickle protocol 2 for un-rpyc module
 dev-util/vulkan-tools:cube - Build the cube/cubepp demos
-dev-util/vulkan-tools:vulkaninfo - Build the vulkaninfo utility
 dev-vcs/cssc:valgrind - Enable usage of dev-util/valgrind in tests
 dev-vcs/cvs:server - Enable server support
 dev-vcs/cvs2svn:bazaar - Support for dev-vcs/bzr
@@ -3333,7 +3330,6 @@ games-simulation/openttd:openmedia - Enables the free open media sets: OpenGFX,
 games-simulation/train-valley:gui - Install the GUI for configuring screen resolution and input
 games-sports/speed-dreams:xrandr - Enable support for the X xrandr extension
 games-sports/xmoto:double-precision - more precise calculations at the expense of speed
-games-sports/xmoto:editor - Depend on inkscape, scripts to convert svg to level (svg2lvl)
 games-strategy/0ad:editor - Include Atlas scenario editor projects
 games-strategy/0ad:lobby - Enable the use of net-libs/gloox and the multiplayer lobby
 games-strategy/0ad:nvtt - Support for some uncompressed data formats via media-gfx/nvidia-texture-tools (might be needed for some mods)
@@ -3982,6 +3978,7 @@ media-fonts/sil-gentium:compact - Also install more compact version of the font.
 media-fonts/terminus-font:a-like-o - Changes view of letter 'a' - a looks like o (see homepage)
 media-fonts/terminus-font:center-tilde - Place the '~' character vertically centered on the line instead of to the top.
 media-fonts/terminus-font:distinct-l - ll2 variant with more distinctive l (lowercase L)
+media-fonts/terminus-font:otf - Install Open Type Font (OTF) (required for HarfBuzz backend)
 media-fonts/terminus-font:pcf - Install Portable Compiled Font (PCF) (required for X11)
 media-fonts/terminus-font:pcf-unicode-only - Remove non-unicode PCF fonts that could be problematic. See bug #520222.
 media-fonts/terminus-font:psf - Install PC Screen Font (PSF) with unicode data (for linux console)
@@ -4036,8 +4033,10 @@ media-gfx/cura:usb - Access 3D printers via USB
 media-gfx/darktable:flickr - Add support for uploading photos to flickr
 media-gfx/darktable:geolocation - Enable geotagging support
 media-gfx/darktable:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
+media-gfx/darktable:lto - Enable link-time optimisations in the RawSpeed library
 media-gfx/darktable:opencl - Enable opencl support
 media-gfx/darktable:pax_kernel - Triggers paxmarking of main darktable binary
+media-gfx/darktable:tools - Install tools for generating base curves and noise profiles
 media-gfx/digikam:addressbook - Enable akonadi contact integration
 media-gfx/digikam:dnn - Build neural network faces engine module
 media-gfx/digikam:heif - Enable support for ISO/IEC 23008-12:2017 HEIF files using media-libs/x265
@@ -4130,6 +4129,7 @@ media-gfx/librecad:tools - Build additional tool programs: tff2lff
 media-gfx/luminance-hdr:fits - Enable support for the FITS format
 media-gfx/mandelbulber:opencl - Enable GPU rendering support using OpenCL
 media-gfx/nomacs:opencv - Build support for media-libs/opencv
+media-gfx/nomacs:plugins - Build plugins
 media-gfx/nvidia-texture-tools:cg - Enable NVIDIA C graphics compiler toolkit plug-in
 media-gfx/nvidia-texture-tools:glew - Enable support for The OpenGL Extension Wrangler Library (media-libs/glew)
 media-gfx/openclipart:gzip - Compresses clip art using gzip
@@ -4167,7 +4167,6 @@ media-libs/alsa-lib:thread-safety - thread-safe API functions
 media-libs/alure:dumb - Enable media-libs/dumb module library support
 media-libs/alure:fluidsynth - Enables Fluidsynth MIDI software synthesis
 media-libs/assimp:samples - Build viewer library
-media-libs/assimp:tools - Build assimp tool binary
 media-libs/aubio:double-precision - Compile in double precision mode.
 media-libs/avidemux-core:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
 media-libs/avidemux-core:system-ffmpeg - Use the ffmpeg provided by the system.
@@ -5654,10 +5653,7 @@ net-fs/autofs:sasl - Enable SASL support in the LDAP module
 net-fs/cifs-utils:ads - Enable Active Directory support and create cifs.idmap binary - idmap support
 net-fs/cifs-utils:caps - Enable sys-libs/libcap-ng support
 net-fs/cifs-utils:creds - cifs credentials support
-net-fs/cvmfs:aufs - Use AUFS instead of OverlayFS for the server
-net-fs/cvmfs:preload - Install the cvmfs cache preloader for distributed file systems
 net-fs/cvmfs:server - Install the cvmfsd program and init script
-net-fs/cvmfs:test-programs - Install unit test programs
 net-fs/libnfs:utils - Build/install nfs-{cat,ls,cp} utils
 net-fs/netatalk:pgp - Add support pgp authentication module
 net-fs/netatalk:quota - Add support for user quota on various filesystems
@@ -6101,7 +6097,8 @@ net-libs/libupnp:blocking-tcp - Do not use async socket calls.
 net-libs/libupnp:reuseaddr - Allow clean restarts by binding the socket with SO_REUSEADDR.
 net-libs/libupnp:samples - Install sample applications.
 net-libs/libvncserver:24bpp - Enable 24bpp support
-net-libs/libvncserver:gcrypt - Enable support for additional authentication methods via dev-libs/libgcrypt
+net-libs/libvncserver:filetransfer - Enable support for TightVNC's file transfer protocol
+net-libs/libvncserver:gcrypt - Use dev-libs/libgcrypt as crypto backend
 net-libs/libvncserver:lzo - Enable LZO support via dev-libs/lzo instead of using internal miniLZO implementation
 net-libs/libwebsockets:access-log - Support generating Apache-compatible access logs
 net-libs/libwebsockets:cgi - Include CGI (spawn process with network-connected stdin/out/err) APIs
@@ -6470,7 +6467,6 @@ net-misc/hylafaxplus:pam - hfaxd authentication via PAM
 net-misc/icecast:kate - Add karaoke and text encapsulation support for Ogg files
 net-misc/icecast:logrotate - Install support files for app-admin/logrotate?
 net-misc/icecast:yp - Build support for yp public directory listings
-net-misc/iperf:profiling - Install profiled iperf3 binary iperf3_profile
 net-misc/iputils:SECURITY_HAZARD - Allow non-root users to flood (ping -f). This is generally a very bad idea.
 net-misc/iputils:arping - Build and install arping -- tool for sending ARP requests to peers (see also net-analyzer/arping)
 net-misc/iputils:clockdiff - Build and install clockdiff -- tool for comparing clocks via ICMP packets
@@ -6639,6 +6635,8 @@ net-misc/remmina:spice - Support connecting to SPICE-enabled virtual machines
 net-misc/remmina:ssh - Enable support for SSH/SFTP protocol
 net-misc/remmina:telepathy - Enable telepathy support
 net-misc/rsync:stunnel - Provide helper scripts for using rsync via >=net-misc/stunnel-4
+net-misc/rsync:system-zlib - Use system zlib instead of bundled one. This is incompatible with older rsync releases!
+net-misc/rsync:xxhash - Enable dev-libs/xxhash support for hashing
 net-misc/rygel:tracker - Install dependencies for the tracker plugin
 net-misc/rygel:transcode - Install dependencies for transcoding support
 net-misc/scponly:chroot - Enables adding and configuring an 'scponlyc' chrooted user
@@ -6785,7 +6783,6 @@ net-p2p/fms:frost - Add support for frost boards
 net-p2p/fms:ssl - Add support for FCP connection over SSL
 net-p2p/freenet:nss - Use nss for crypto operations, if it is the fastest way
 net-p2p/go-ethereum:devtools - Build Ethereum development tools (evm, abigen, puppeth, ...)
-net-p2p/go-ethereum:opencl - Add OpenCL GPU mining support
 net-p2p/ktorrent:bwscheduler - Schedule upload and download limits over a period of a week
 net-p2p/ktorrent:downloadorder - Specify the download order of a multi-file torrent
 net-p2p/ktorrent:infowidget - Displays general information about a torrent in several tabs
@@ -8428,6 +8425,7 @@ sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app
 sys-fs/squashfs-tools-ng:tools - Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools
 sys-fs/squashfs-tools-ng:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
 sys-fs/udev:kmod - Enable kernel module loading/unloading support using sys-apps/kmod
+sys-fs/udisks:daemon - Build the system daemon, not just the client tool
 sys-fs/udisks:elogind - Use sys-auth/elogind for session tracking
 sys-fs/udisks:lvm - Add support for Logical Volume Management via sys-fs/lvm2.
 sys-fs/udisks:systemd - Support sys-apps/systemd's logind
@@ -8924,7 +8922,6 @@ x11-libs/qwt:designer - Installs dev-qt/designer plugin.
 x11-libs/qwt:mathml - Use the MathML renderer of the Qt solutions package.
 x11-libs/tslib:evdev - Build experimental input module
 x11-libs/tslib:uinput - Provide alternative ts_uinput evdev device
-x11-libs/vte:glade - Provide integration with dev-util/glade.
 x11-libs/wxGTK:gstreamer - Enable the wxMediaCtrl class for playing audio and video through gstreamer.
 x11-libs/wxGTK:sdl - Use Simple Directmedia Layer (media-libs/libsdl) for audio.
 x11-misc/alock:doc - Build and install manpage with app-text/asciidoc.