gentoo resync : 18.05.2019

32 files changed, 274 insertions, 331 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 87b8f2fd836e..6199d4fe0729 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 99f29e6cb0de..de08d9bd5eda 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -79,7 +79,7 @@ dev-db/mariadb numa
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 16f29053d761..7f5f72085961 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools -overlay
+
 # Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
 # sys-block/megactl works on x86 and amd64
 www-apps/phpsysinfo -megactl
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 28130b98e01e..1219a0ab5261 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -25,10 +25,6 @@ dev-python/async_timeout test
 dev-lang/erlang hipe
 net-im/ejabberd hipe
 
-# Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
-# media-libs/dav1d is not yet keyworded
-media-video/vlc dav1d
-
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Feb 2019)
 # (SM)BIOS/Thunderbolt outside of amd64/x86? - citation needed
 sys-apps/fwupd dell thunderbolt
@@ -147,7 +143,7 @@ dev-python/ipython test
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index be78cbcc409b..96decba1d65e 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -88,10 +88,6 @@ sci-electronics/kicad occ oce ngspice
 <app-editors/emacs-25.3-r6:25 imagemagick
 <app-editors/emacs-26.1-r3:26 imagemagick
 
-# Andreas Sturmlechner <asturm@gentoo.org> (01 Sep 2018)
-# media-libs/dav1d is not yet keyworded
-media-video/vlc dav1d
-
 # Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
 # Needs dev-libs/libmaxminddb which isn't keyworded
 app-admin/syslog-ng geoip2
@@ -267,7 +263,7 @@ app-office/libreoffice coinmp
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Alexis Ballier <aballier@gentoo.org> (31 Jul 2017)
 # Passes -mfpu=neon with neon enabled
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index ddfa051c219b..a381fbbd1cf8 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,9 +1,13 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Andreas Sturmlechner <asturm@gentoo.org> (24 Feb 2019)
-# media-libs/libsdl is not stable yet
-dev-libs/zziplib sdl
+# Aaron Bauman <bman@gentoo.org> (16 May 2019)
+# packages for these USE flags fail tests
+sci-libs/gdal hdf5
+
+# Aaron Bauman <bman@gentoo.org> (15 May 2019)
+# packages for these USE flags fail tests
+media-libs/opencv contrib_cvv contrib_hdf contrib_sfm glog gstreamer
 
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2019)
 # kde-frameworks/kconfig is not stable for arm64
@@ -39,7 +43,7 @@ dev-vcs/git doc
 # Mart Raudsepp <leio@gentoo.org> (29 May 2018)
 # sys-devel/clang, dev-libs/xapian, app-text/texlive not stable yet
 # USE=doc requires USE=latex
-app-doc/doxygen clang doxysearch latex doc
+app-doc/doxygen clang doxysearch doc
 
 # Mart Raudsepp <leio@gentoo.org> (29 May 2018)
 # virtual/opengl and media-libs/freeglut not stable yet
@@ -64,7 +68,7 @@ app-portage/layman cvs subversion test
 app-text/xmlto latex
 dev-libs/apr-util freetds odbc
 sys-apps/man-pages l10n_fr
-sys-apps/systemd cryptsetup qrcode
+sys-apps/systemd qrcode
 sys-auth/pambase pam_krb5 pam_ssh passwdqc
 sys-block/thin-provisioning-tools test
 sys-devel/distcc gssapi
@@ -92,9 +96,3 @@ net-analyzer/netcat crypt
 # Michał Górny <mgorny@gentoo.org> (07 Feb 2018)
 # sys-libs/tevent is not stable here.
 dev-libs/libverto tevent
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Jan 2018)
-# systemtap is not yet stable on arm64
-dev-libs/glib systemtap
-sys-libs/glibc systemtap
-sys-devel/gcc systemtap
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index e56a98f53154..fd75884fa377 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -20,14 +20,6 @@ musepack
 # media-libs/portaudio not stable yet
 portaudio
 
-# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
-# net-fs/samba not stable yet
-samba
-
-# Mart Raudsepp <leio@gentoo.org> (07 Feb 2019)
-# x11-misc/colord not stable yet
-colord
-
 # Mart Raudsepp <leio@gentoo.org> (18 Jan 2019)
 # x11-libs/libva not stable yet
 vaapi
@@ -58,10 +50,6 @@ gnome-keyring
 java
 
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
-# dev-db/postgresql is not stable here.
-postgres
-
-# Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
 # dev-lang/tk is not stable here.
 tk
 
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index c80bc9f0d7f1..614b36ab7581 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools overlay
+
 # Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
 # sys-block/megactl works only on amd64 and x86 so far, bug #670564
 www-apps/phpsysinfo megactl
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 21f228d2646d..e87d47208193 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -45,7 +45,7 @@ app-forensics/sleuthkit java
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=redis that is masked in this profile.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 0dbd7ed84bce..0e97607f49ae 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -49,7 +49,7 @@ media-libs/sdl-mixer midi
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index f0b27e2c7acc..1d5e95348d84 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -23,7 +23,7 @@ sys-kernel/mips-sources -ip27 -ip28 -ip30
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 582f16ad927a..e396d95c3408 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -98,7 +98,7 @@ sys-power/nut ups_drivers_nut-ipmipsu
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=opencl that is masked in this profile.
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 3c5c02df47d0..1ef0f29e32bf 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (15 May 2019)
+# sys-cluster/hpx, sci-libs/silo, sci-visualization/visit not keyworded
+sci-libs/libgeodecomp hpx silo visit
+
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Feb 2019)
 # app-text/libwpd and app-text/libwpg are not keyworded
 media-gfx/inkscape cdr visio wpg
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 888d9dd09cbe..adead94500ee 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Dependency resolution is broken because
+# sys-fs/lvm2 has no riscv keyword
+sys-fs/e2fsprogs cron
+
 # This doesn't work for (any) riscv yet.
 dev-libs/libpcre2 jit
 dev-libs/libpcre jit
@@ -25,6 +29,7 @@ dev-libs/icu doc
 dev-libs/iniparser doc
 dev-libs/libnl python
 dev-libs/libxslt python
+dev-libs/libyaml doc
 dev-python/cython doc test
 dev-python/pygments doc test
 dev-python/setuptools test
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 9be59ffbb2d9..a8c3ad7e104c 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -33,7 +33,7 @@ net-analyzer/rrdtool rados
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Robin H. Johnson <robbat2@gentoo.org> (05 Aug 2017)
 # Upstream Git is switching to PCRE2 w/ JIT.
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index cd2e9a3eb8c9..1ca4ce6f694b 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -7,7 +7,7 @@ dev-vcs/subversion ruby
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=seccomp that is masked in this profile.
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 02618bcf7b32..e34489690c43 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (05 May 2019)
+# No sparc arch support for jit.
+dev-lang/spidermonkey jit
+
 # Sergei Trofimovich <slyfox@gentoo.org> (20 Apr 2019)
 # No ffmpeg keywords on sparc
 media-sound/dir2ogg aac wma
@@ -52,7 +56,7 @@ dev-db/mariadb numa
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
-media-libs/mesa vulkan
+media-libs/mesa vulkan vulkan-overlay
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
 # Requires USE=redis that is masked in this profile.
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index 557b71622865..478a0e323008 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -21,10 +21,6 @@
 # Requires net-libs/webkit-gtk. Not stable on sparc.
 dev-util/geany-plugins markdown
 
-# Sergei Trofimovich <slyfox@gentoo.org> (27 Apr 2019)
-# No stable dev-lang/spidermonkey on sparc, bug #668558.
-dev-python/nevow test
-
 # Sergei Trofimovich <slyfox@gentoo.org> (31 Mar 2019)
 # No stable dovecot on net-mail/dovecot, bug #634822.
 mail-filter/maildrop dovecot
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 5e038ed152ee..9fb753ae9e5f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Denis Lisov <dennis.lissov@gmail.com> (09 May 2019)
+# Overlay can only be built on amd64 and x86
+x11-apps/igt-gpu-tools -overlay
+
 # Sergei Trofimovich <slyfox@gentoo.org> (16 Mar 2019)
 # sys-block/megactl works on x86 and amd64
 www-apps/phpsysinfo -megactl
@@ -15,10 +19,6 @@ app-admin/conserver -freeipmi
 # No Spice protocol for x86
 app-emulation/nemu spice
 
-# Andreas Sturmlechner <asturm@gentoo.org> (28 Feb 2019)
-# media-libs/dav1d is not yet keyworded
-media-video/vlc dav1d
-
 # Thomas Deutschmann <whissi@gentoo.org> (15 Nov 2018)
 # - rdrand plugin is supported on x86
 # - padlock plugin is supported on x86
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 2b9d1765672f..b943c309a4ef 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2019)
+# media-libs/dav1d is not yet stable
+media-video/vlc dav1d
+
 # Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
 # Mask experimental contrib repo
 media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e18ccc6024ff..04fc8f63c525 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -24,12 +24,6 @@ net-misc/netkit-bootparamd libtirpc
 sci-astronomy/esomidas libtirpc
 sys-cluster/glusterfs libtirpc
 
-# Matt Turner <mattst88@gentoo.org> (13 Jun 2018)
-# Upstream is transitioning to Meson, but does not yet have any configuration
-# options. Until those configuration options are provided, force USE flags on
-# to avoid automagic deps.
->=x11-apps/igt-gpu-tools-1.23 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
-
 # NP-Hardass <NP-Hardass@gentoo.org> (10 Apr 2017)
 # Always force patch on appropriate variant to ensure
 # similar experience when using app-emulation/wine-any
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 36d440be9eb8..abf268d48588 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# app-accessibility/festival:
+# Outdated, EAPI=2, unmaintained, segfaults immediately.
+# See bug 634928 and bug 612980. Removal in 30 days.
+media-radio/xastir festival
+
 # Virgil Dupras <vdupras@gentoo.org> (29 Apr 2019)
 # Docs are temporarily broken. See bug #680014
 dev-python/pandas doc
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index aff54b5205d7..ceaca7eb8ee2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,17 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019)
+# needs llvm slots which are not stable #678908
+# also prone to weird compilation failures
+# masking this for now, will readjust as situation changes
+>=dev-lang/rust-1.34 system-llvm
+
+# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
+# Needs openssl 1.1 which isn't going stable for a while and blocks
+# bug #684972. See bug #685584
+>=app-text/mupdf-1.14.0-r3 ssl
+
 # Mart Raudsepp <leio@gentoo.org> (14 Apr 2019)
 # Needs media-plugins/gst-plugins-chromaprint, which is not stable
 # anywhere yet.
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index 0d2328c5a62e..6aec8e8a5edb 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -75,7 +75,7 @@ www-client/links livecd
 
 # needs udev
 media-libs/libsdl2 kms
-media-libs/mesa gbm dri3 d3d9 vulkan
+media-libs/mesa gbm dri3 d3d9 vulkan vulkan-overlay
 x11-base/xorg-drivers video_cards_radeonsi
 x11-drivers/xf86-video-ati glamor
 media-libs/gst-plugins-base gbm
diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
index 7a5a2c2e7aff..e034450bfa68 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Brian Evans <grknight@gentoo.org> (27 Feb 2019)
-# Avoids conflicts from kde-plasma/plasma-workspace
-# setting sys-fs/dbus[user-session] if bluez is installed
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
diff --git a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
index 7a5a2c2e7aff..e034450bfa68 100644
--- a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Brian Evans <grknight@gentoo.org> (27 Feb 2019)
-# Avoids conflicts from kde-plasma/plasma-workspace
-# setting sys-fs/dbus[user-session] if bluez is installed
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
diff --git a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
index 7a5a2c2e7aff..e034450bfa68 100644
--- a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Brian Evans <grknight@gentoo.org> (27 Feb 2019)
-# Avoids conflicts from kde-plasma/plasma-workspace
-# setting sys-fs/dbus[user-session] if bluez is installed
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
index 7a5a2c2e7aff..e034450bfa68 100644
--- a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2019-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Brian Evans <grknight@gentoo.org> (27 Feb 2019)
-# Avoids conflicts from kde-plasma/plasma-workspace
-# setting sys-fs/dbus[user-session] if bluez is installed
+# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
+# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
 net-wireless/bluez user-session
diff --git a/profiles/license_groups b/profiles/license_groups
index b898ad24467a..14649929f535 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 ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j 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 ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j 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 ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -65,7 +65,7 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS
 # - IF (and only if) there is an explicit inclusion requirement,
 #   USE=bindist MUST cause a copy of the license to be installed
 #   in a file location compliant with the license
-BINARY-REDISTRIBUTABLE @FREE bh-luxi bonnie Broadcom Dina freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 LSI-tw_cli MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr unRAR
+BINARY-REDISTRIBUTABLE @FREE bh-luxi bonnie Broadcom Dina freedist intel-ucode ipw2100-fw ipw2200-fw ipw3945 linux-fw-redistributable LSI-tw_cli MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware shmux SmartLabs sun-jlfgr unRAR
 
 ######################################################################
 
diff --git a/profiles/package.mask b/profiles/package.mask
index d3b5ba8aef55..e9eee11e9496 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -28,6 +28,166 @@
 ## app-misc/some-package
 
 #--- END OF EXAMPLES ---
+#
+# Stefan Strogin <steils@gentoo.org> (17 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #685238.
+>=net-libs/cvm-0.97
+
+# Matt Turner <mattst88@gentoo.org> (16 May 2019)
+# Not supported by the Xserver since v1.6.0 (2008)
+# Masked for removal.
+x11-apps/xtrap
+x11-libs/libXTrap
+
+# Miroslav Šulc <fordfrog@gentoo.org> (15 May 2019)
+# Depends on >=virtual/{jdk,jre}-11 which is masked
+=www-servers/tomcat-9.0.20
+
+# Brian Evans <grknight@gentoo.org> (14 May 2019)
+# MariaDB 10.0 has reached end of life and has security issues
+# dev-db/mariadb-galera users should upgrade to mariadb-10.1 or greater
+# Removal in 30 days
+dev-db/mariadb-galera
+=dev-db/mariadb-10.0*
+
+# Virgil Dupras <vdupras@gentoo.org> (13 May 2019)
+# detox has been deprecated by the release of tox 3.7.0 which duplicates the
+# feature. Removal in 30 days. Bug #685870
+dev-python/detox
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Perl 5.30 preparation block. Will be unmasked some time after the
+# actual release of Perl 5.30.0.
+=dev-lang/perl-5.30*
+~virtual/perl-Archive-Tar-2.320.0
+~virtual/perl-CPAN-2.220.0
+~virtual/perl-Compress-Raw-Bzip2-2.84.0
+~virtual/perl-Compress-Raw-Zlib-2.84.0
+~virtual/perl-DB_File-1.843.0
+~virtual/perl-Data-Dumper-2.174.0
+~virtual/perl-Devel-PPPort-3.520.0
+~virtual/perl-Digest-SHA-6.20.0
+~virtual/perl-Encode-3.10.0
+~virtual/perl-ExtUtils-CBuilder-0.280.231
+~virtual/perl-ExtUtils-Manifest-1.720.0
+~virtual/perl-ExtUtils-ParseXS-3.400.0
+~virtual/perl-File-Path-2.160.0
+~virtual/perl-File-Spec-3.780.0
+~perl-core/File-Temp-0.230.900
+~virtual/perl-File-Temp-0.230.900
+~virtual/perl-HTTP-Tiny-0.76.0
+~virtual/perl-IO-1.400.0
+~virtual/perl-IO-Compress-2.84.0
+~virtual/perl-IPC-Cmd-1.20.0
+~virtual/perl-JSON-PP-4.20.0
+~virtual/perl-Math-BigInt-1.999.816
+~virtual/perl-Math-BigInt-FastCalc-0.500.800
+~virtual/perl-Math-BigRat-0.261.400
+~virtual/perl-Module-CoreList-5.201.905.200
+~virtual/perl-Module-Load-0.340.0
+~virtual/perl-Module-Metadata-1.0.36
+~virtual/perl-Net-Ping-2.710.0
+~virtual/perl-Storable-3.150.0
+~virtual/perl-Test-Simple-1.302.162
+~virtual/perl-Thread-Queue-3.130.0
+~virtual/perl-Time-HiRes-1.976.0
+~virtual/perl-Time-Local-1.280.0
+~virtual/perl-Time-Piece-1.330.0
+~virtual/perl-Unicode-Collate-1.270.0
+~virtual/perl-bignum-0.510.0
+~virtual/perl-parent-0.237.0
+~virtual/perl-podlators-4.110.0
+~virtual/perl-threads-shared-1.600.0
+~virtual/perl-version-0.992.400
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Perl 5.24 will be removed soon. Please upgrade.
+<dev-lang/perl-5.26.2
+=virtual/perl-Archive-Tar-2.40.100_rc-r6
+=virtual/perl-B-Debug-1.230.0-r3
+=virtual/perl-CPAN-2.110.100_rc-r6
+=virtual/perl-CPAN-Meta-2.150.5-r1
+=virtual/perl-Carp-1.400.0-r1
+=virtual/perl-Compress-Raw-Bzip2-2.69.0-r1
+=virtual/perl-Compress-Raw-Zlib-2.69.0-r1
+=virtual/perl-DB_File-1.835.0-r3
+=virtual/perl-Data-Dumper-2.160.0-r1
+=virtual/perl-Devel-PPPort-3.320.0-r1
+=virtual/perl-Digest-MD5-2.540.0-r3
+=virtual/perl-Digest-SHA-5.950.100_rc-r6
+=virtual/perl-Encode-2.800.100_rc-r4
+=virtual/perl-ExtUtils-MakeMaker-7.100.200_rc-r4
+=virtual/perl-ExtUtils-ParseXS-3.310.0-r1
+=virtual/perl-File-Spec-3.630.100_rc-r4
+=virtual/perl-Filter-Simple-0.920.0-r3
+=virtual/perl-Getopt-Long-2.480.0-r1
+=virtual/perl-HTTP-Tiny-0.56.1_rc-r4
+=virtual/perl-I18N-LangTags-0.400.0-r5
+=virtual/perl-IO-1.360.100_rc-r4
+=virtual/perl-IO-Compress-2.69.1_rc-r4
+=virtual/perl-IO-Socket-IP-0.370.0-r3
+=virtual/perl-IPC-Cmd-0.920.100_rc-r6
+=virtual/perl-JSON-PP-2.273.0.100_rc-r6
+=virtual/perl-Locale-Maketext-1.260.100_rc-r6
+=virtual/perl-Math-BigInt-1.999.715-r2
+=virtual/perl-Math-BigInt-FastCalc-0.400.0-r1
+=virtual/perl-Math-BigRat-0.260.802-r1
+=virtual/perl-Math-Complex-1.590.0-r9
+=virtual/perl-Module-CoreList-5.201.709.220-r2
+=virtual/perl-Module-Load-Conditional-0.640.0-r3
+=virtual/perl-Module-Metadata-1.0.31-r1
+=virtual/perl-Net-Ping-2.430.100_rc-r6
+=virtual/perl-Parse-CPAN-Meta-1.441.700.100_rc-r4
+=virtual/perl-Perl-OSType-1.9.0-r1
+=virtual/perl-Pod-Simple-3.320.0-r1
+=virtual/perl-Safe-2.390.0-r3
+=virtual/perl-Scalar-List-Utils-1.420.200_rc-r1
+=virtual/perl-Storable-2.560.100_rc-r4
+=virtual/perl-Sys-Syslog-0.330.100_rc-r6
+=virtual/perl-Term-ANSIColor-4.40.0-r1
+=virtual/perl-Term-ReadLine-1.150.0-r3
+=virtual/perl-Test-1.280.100_rc-r4
+=virtual/perl-Test-Harness-3.360.100_rc-r3
+=virtual/perl-Test-Simple-1.1.14_p522-r2
+=virtual/perl-Thread-Queue-3.90.0-r1
+=virtual/perl-Thread-Semaphore-2.120.0-r9
+=virtual/perl-Unicode-Collate-1.140.0-r2
+=virtual/perl-XSLoader-0.220.0-r4
+=virtual/perl-bignum-0.420.100_rc-r4
+=virtual/perl-libnet-3.80.100_rc-r4
+=virtual/perl-parent-0.234.0-r1
+=virtual/perl-podlators-4.70.0-r1
+=virtual/perl-threads-2.70.0-r1
+=virtual/perl-threads-shared-1.510.0-r1
+=virtual/perl-version-0.991.600-r1
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Severely outdated, no commits since 2009, EAPI=2.
+# Bug 679686. Removal in 30 days.
+dev-lang/confluence
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Build failures, other QA issues, EAPI=2. See bug 681046
+# Removal in 30 days.
+dev-embedded/tavrasm
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
+# Outdated, EAPI=2, unmaintained, segfaults immediately.
+# See bug 634928 and bug 612980. Removal in 30 days.
+app-accessibility/festival
+app-accessibility/festival-freebsoft-utils
+app-accessibility/festival-hts
+app-accessibility/festival-fi
+app-accessibility/festival-it
+app-accessibility/festival-ru
+app-accessibility/perlbox-voice
+app-accessibility/pidgin-festival
+dev-ros/sound_play
+
+# Virgil Dupras <vdupras@gentoo.org> (10 May 2019)
+# Has very limited use and is disruptive of other tests when activated.
+# Bug #685538. Removal in 30 days.
+dev-python/pytest-relaxed
 
 # Patrice Clement <monsieurp@gentoo.org> (06 May 2019)
 # Broken build. Outdated version. No interest from the Java team to maintain
@@ -130,15 +290,6 @@ dev-python/gst-python:0.10
 media-libs/gnonlin:0.10
 net-libs/farstream:0.1
 
-# Patrice Clement <monsieurp@gentoo.org> (19 Apr 2019)
-# Another round of abandoned Java libraries that must go.
-# Removal in 30 days.
-dev-java/lucene-analyzers
-dev-java/sun-java3d-bin
-dev-java/sun-dtdparser
-dev-java/stax
-app-misc/bfm
-
 # Virgil Dupras <vdupras@gentoo.org> (26 Apr 2019)
 # Should have been removed with django-cms a while back but wasn't.
 # Removal in 30 days. Bug #683862
@@ -165,10 +316,6 @@ sec-policy/selinux-perdition
 # Removal in 30 days.  Bug #684340.
 app-admin/lsat
 
-# Lars Wendler <polynomial-c@gentoo.org> (24 Apr 2019)
-# Breaks current available net-ftp/filezilla releases (#684282)
-=dev-libs/libfilezilla-0.16.0
-
 # Alon Bar-Lev <alonbl@gentoo.org> (24 Apr 2019)
 # Commercial. Upstream does not provide sources any more.
 # Tend to break per kernel upgrades.
@@ -362,99 +509,6 @@ dev-util/cucumber-expressions:5.0
 >=dev-util/boost-build-1.70.0
 >=net-mail/libpst-0.6.66-r2
 
-# Patrice Clement <monsieurp@gentoo.org> (14 Apr 2019)
-# Old, unmaintained and sometimes abandoned Java libraries/programs.
-# Removal in 30 days.
-dev-java/idm-console-framework
-dev-java/matrix-toolkits-java
-dev-java/sat4j-pseudo
-dev-java/sat4j-core
-dev-java/swarmcache
-dev-java/dbus-java
-dev-java/jinklevel
-dev-java/proguard
-dev-java/nailgun
-dev-java/jgroups
-dev-java/libmso
-dev-java/jicmp
-media-sound/jtagger
-app-admin/389-console
-
-# Michał Górny <mgorny@gentoo.org> (14 Apr 2019)
-# The ebuild violates EAPI and relies on STRIP_MASK.  The default
-# behavior makes it capable of executing arbitrary commands when running
-# files from untrusted sources.  Last maintainer activity in 2015.  Last
-# upstream release in 2011.
-# Removal in 30 days.  Bug #651430.
-app-text/active-dvi
-
-# Michał Górny <mgorny@gentoo.org> (14 Apr 2019)
-# The ebuild violates EAPI and relies on STRIP_MASK.  Also has
-# suspicious USE=debug logic.  Not touched since 2016.
-# Removal in 30 days.  Bug #651450.
-dev-util/cyclo
-
-# Michał Górny <mgorny@gentoo.org> (14 Apr 2019)
-# The ebuild violates EAPI and relies on STRIP_MASK.  Also has
-# suspicious USE=debug logic.  Not touched since 2016.
-# Removal in 30 days.  Bug #651446.
-dev-util/cccc
-
-# Michał Górny <mgorny@gentoo.org> (14 Apr 2019)
-# Integrated into dev-python/python-ldap-3.0+, and declared a deprecated
-# fork by upstream.  No reverse dependencies left.
-# Removal in 30 days.  Bug #668066.
-dev-python/pyldap
-
-# Aaron Bauman <bman@gentoo.org> (13 Apr 2019)
-# Unmaintained in Gentoo and outstanding vulnerability
-# Masked for removal in 30 days. Bug #522578
-dev-libs/ace
-net-proxy/bfilter
-
-# Ulrich Müller <ulm@gentoo.org> (13 Apr 2019)
-# Last release in 2001, HOMEPAGE and SRC_URI are gone.
-# Byte-compilation with recent Emacs versions fails.
-# Masked for removal in 30 days, bug #683248.
-app-emacs/prom-wl
-
-# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
-# Unmaintained.  Contains vulnerable code and a large number of unsolved
-# (upstream) issues.  The current version is from 2004, and carries
-# some local patches.  Last upstream commits are from 2013, and involve
-# three successive branches, the 0.7.x not having a release since 2004,
-# and the two remaining branches never seeing a single release.
-# The suggested alternatives are net-analyzer/{netcat,openbsd-netcat}.
-# Removal in 30 days.  Bug #601742.
-net-analyzer/gnu-netcat
-
-# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
-# net-libs/ftplib: Unmaintained.  The ebuild suffers build failures due
-# to broken multilib conversion.  Last bumped in 2014, and needs local
-# patches to even work.  Obscure library with only two revdeps.
-#
-# media-video/hasciicam: Unmaintained.  The only unconditional revdep
-# of ftplib.  Upstream's FTP is down, and the current release is
-# no newer than 2011.  Upstream removed ftplib usage afterwards,
-# so a snapshot could help.
-#
-# Removal in 30 days.  Bug #520026.
-media-video/hasciicam
-net-libs/ftplib
-
-# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
-# Unmaintained.  Does not build (again).  Last release in 2000.  Carries
-# a large number of patches already.
-# Removal in 30 days.  Bug #637484.
-net-misc/netkit-rwho
-
-# Michał Górny <mgorny@gentoo.org> (13 Apr 2019)
-# Apparently this was last updated in 2012.  It's unclear if the proxied
-# maintainer actually ever maintained it since it was imported in 2010.
-# The HOMEPAGE is now empty.  app-admin/pass is a good alternative.
-# Removal in 30 days.  Bug #682914.
-app-crypt/sgeps
-
 # Hans de Graaff <graaff@gentoo.org> (13 Apr 2019)
 # Old ruby24-only slots of Rails-related packages
 # These no longer have reverse dependencies or newer
@@ -471,138 +525,10 @@ dev-ruby/sprockets-rails:2.3
 dev-ruby/uglifier:0
 dev-ruby/uglifier:3
 
-# Hans de Graaff <graaff@gentoo.org> (13 Apr 2019)
-# No longer maintained upstream. Does not work
-# with ruby25.
-# Masked for removal in 30 days.
-dev-ruby/celluloid
-dev-ruby/celluloid-essentials
-dev-ruby/celluloid-extras
-dev-ruby/celluloid-fsm
-dev-ruby/celluloid-io
-dev-ruby/celluloid-pool
-dev-ruby/celluloid-supervision
-
-# Aaron Bauman <bman@gentoo.org> (12 Apr 2019)
-# Multiple security vulnerabilities
-# No revbumps in several years.
-# Removal in 30 days. Bug #675682
-dev-java/jackson-databind
-app-text/languagetool
-app-vim/languagetool
-dev-java/jackson-dataformat-xml
-dev-java/jackson-dataformat-yaml
-dev-java/jackson-module-jaxb-annotations
-
-# Virgil Dupras <vdupras@gentoo.org> (12 Apr 2019)
-# Dead upstream, no revdeps.
-# Removal in 30 days. Bug #683146
-dev-python/readme
-
-# Georgy Yakovlev  (11 Apr 2019)
-# Rust provides zsh completion.
-# This one is old, unmaintained obsolete version.
-# Removal in 30 days.
-app-shells/rust-zshcomp
-
-# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
-# Unresolved vulnerability.  Last apparent upstream activity in 2015,
-# with the code last touched in 2010.  Local patches are already
-# necessary for it to build.
-# Removal in 30 days.  Bug #630254.
-media-sound/aacplusenc
-
-# Michał Górny <mgorny@gentoo.org> (10 Apr 2019)
-# Fails to build for more than 3 years.  The project has been abandoned
-# upstream, with the current (and last) release made in 2010.
-# The author itself suggests media-gfx/eog as a replacement, though
-# there is a plenty of other image viewers worth considering.
-# Removal in 30 days.  Bug #561392.
-media-gfx/gliv
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Obsolete XFCE library with its remaining dependencies.  In all cases,
-# the relevant plugins have been abandoned upstream and the upstream
-# repository is dead or not to be found.  All of them are unlikely
-# to be ported away from libxfcegui4 and/or into GTK+3.
-# Removal in 30 days.  Bug #590306.
-xfce-base/libxfcegui4
-xfce-extra/xfce4-gvfs-mount
-xfce-extra/xfce4-linelight-plugin
-xfce-extra/xfce4-messenger-plugin
-xfce-extra/xfce4-modemlights-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked deprecated upstream.  Still uses xfce-base/libxfcegui4.
-# Unlikely to be ported to GTK+3.
-# Removal in 30 days.  Bug #682956.
-app-text/xfbib
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked deprecated upstream.  Uses xfce-base/libxfcegui4.  Unlikely
-# to be ported to GTK+3.
-# Removal in 30 days.  Bug #682954.
-xfce-extra/xfce4-cellmodem-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked deprecated upstream.  Uses xfce-base/libxfcegui4.  Unlikely
-# to be ported to GTK+3.  Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #682950.
-xfce-extra/xfswitch-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Unofficial plugin abandoned upstream.  The only release is from 2014,
-# last commits are from 2015.  Little chances of porting to GTK+3.
-# Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #682940.
-xfce-extra/xfce4-soundmenu-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked deprecated upstream.  Uses xfce-base/libxfcegui4.  Little
-# chances of porting to GTK+3.  Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #682938.
-xfce-extra/xfce4-wmdock-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked as deprecated upstream.  Does not build against modern kernels.
-# Little chances of GTK+3 port.  Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #604134.
-xfce-extra/xfce4-radio-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Marked as deprecated upstream.  Little chances of GTK+3 port.
-# Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #682934.
-xfce-extra/xfce4-quicklauncher-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Unofficial panel plugin whose upstream disappeared and sources are
-# nowhere to be found.  Possibly does not even work (#499156).
-# Unlikely to be ported to GTK+3.  Still uses xfconf.eclass.
-# Removal in 30 days.  Bug #682930.
-xfce-extra/xfce4-playercontrol-plugin
-
-# Michał Górny <mgorny@gentoo.org> (09 Apr 2019)
-# Unofficial panel plugin that has been abandoned upstream.
-# Last activity in 2013.  Unlikely to be ported to GTK+3.  Ebuild still
-# uses xfconf.eclass.
-# Removal in 30 days.  Bug #682928.
-xfce-extra/xfce4-netspeed-plugin
-
-# Hans de Graaff <graaff@gentoo.org> (8 Apr 2019)
-# Ruby 2.3 is no longer maintained and only receives security patches
-# until March 2019. Please use Ruby 2.4 or newer instead.
-# Masked for removal in 30 days
-dev-lang/ruby:2.3
-dev-ruby/did_you_mean:1
-
+# Robin H. Johnson <robbat2@gentoo.org> (25 Mar 2019)
 # Requires >=dev-lang/lua-5.3 which is masked
 sys-apps/likwid
 
-# Andreas Sturmlechner <asturm@gentoo.org> (23 Mar 2019)
-# Everything breaks again. bug #681336
->=app-text/poppler-0.75.0
-
 # Miroslav Šulc <fordfrog@gentoo.org> (19 Mar 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.17
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 999c2f6ee0b4..4ca2d473d009 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -10,10 +10,12 @@
 =app-crypt/gnupg-2.2.14
 
 # Fabian Groffen <grobian@gentoo.org> (12 Nov 2018)
-# this version of binutils produces shared libraries with symbol lookup
+# 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.31.1*
+=sys-devel/binutils-2.32*
 
 # Fabian Groffen <grobian@gentoo.org> (14 Jan 2014)
 # util-linux has no business on Solaris systems
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 416ac4198eec..ab875c596b6d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -319,6 +319,7 @@ app-crypt/gnupg-pkcs11-scd:proxy - Build the gnupg-pkcs11-scd-prox
 app-crypt/gpgme:common-lisp - Install common-lisp files
 app-crypt/hashcat:brain - Enable the hashcat brain
 app-crypt/heimdal:hdb-ldap - Adds support for LDAP as a database backend
+app-crypt/heimdal:lmdb - Add support for using dev-db/lmdb for lookup tables
 app-crypt/heimdal:otp - Adds support for one-time passwords
 app-crypt/heimdal:pkinit - Adds support for PKINIT for the initial ticket
 app-crypt/hmaccalc:fips - Enable NSS FIPS mode and support only the FIPS-compliant functions
@@ -1036,7 +1037,6 @@ app-misc/lirc:gtk - Include GTK support which enables the use of lirc-setup
 app-misc/lirc:inputlirc - Add a dependency on app-misc/inputlircd
 app-misc/lirc:uinput - Enable support for uinput
 app-misc/mc:edit - Compile and install the mcedit application
-app-misc/mc:mclib - Compile and install the libmc.so shared library
 app-misc/mc:sftp - Add support for sftp (uses net-libs/libssh2 for it).
 app-misc/mc:slang - Use sys-libs/slang instead of sys-libs/ncurses.
 app-misc/mc:xdg - Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc
@@ -1055,8 +1055,10 @@ app-misc/pip3line:distorm - Compile the Distorm plugin
 app-misc/pip3line:qscintilla - Use QScintilla for more efficient text display
 app-misc/pip3line:ssl - Compile the plugin adding miscellaneous hashes from OpenSSL
 app-misc/recoll:camelcase - Enable indexing for camelCase sentences and words
+app-misc/recoll:chm - Enable CHM file support via dev-python/pychm
 app-misc/recoll:inotify - Use the Linux Kernel notification subsystem for monitoring file alterations in realtime
 app-misc/recoll:session - Stop monitoring file alterations when X11 session terminates
+app-misc/recoll:webengine - Use dev-qt/qtwebengine for fancy result list display
 app-misc/rlwrap:debug - Enable debug
 app-misc/screen:multiuser - Enable multiuser support (by setting correct permissions)
 app-misc/screen:nethack - Express error messages in nethack style
@@ -2006,7 +2008,6 @@ dev-java/oracle-jre-bin:commercial - Install features requiring a commercial lic
 dev-java/oracle-jre-bin:headless-awt - Don't install the X backend for AWT, needed by some GUIs (used to be X flag)
 dev-java/oracle-jre-bin:javafx - Install JavaFX libraries
 dev-java/oracle-jre-bin:jce - Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files
-dev-java/proguard:ant - Ant task for using ProGuard in build.xml scripts
 dev-java/rxtx:lfd - Installs and uses LockFileServer daemon (lfd)
 dev-java/sbt:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
 dev-lang/bas:lr0 - Use the LR0 parser instead of the recursive descending parser
@@ -2122,7 +2123,6 @@ dev-lang/qu-prolog:pedro - Pedro subscription/notification communications system
 dev-lang/rakudo:clang - Use Clang to compile the MoarVM backend
 dev-lang/rakudo:moar - Use the MoarVM as backend
 dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby.
-dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality).
 dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed
 dev-lang/rust:cargo - Install cargo component
 dev-lang/rust:clippy - Install clippy component
@@ -2145,8 +2145,6 @@ dev-lang/swi-prolog:yaml - Use libyaml for YAML pack
 dev-lang/swig:ccache - build ccache-swig(a fast compiler cache)
 dev-lang/vala:valadoc - Installs valadoc documentation generation tool
 dev-lang/yap:R - Enable support for connecting R to Prolog
-dev-libs/ace:ciao - Include Component Intergraced Ace ORB into the build of ace
-dev-libs/ace:tao - Include the ACE ORB (CORBA stuff) (called tao) into the build of ace
 dev-libs/actor-framework:benchmarks - Due to the number of out-of-tree deps, these only get installed as docs
 dev-libs/actor-framework:boost - Make use of Boost's ASIO functionality
 dev-libs/actor-framework:cash - Build the C Actor Shell for introspection and debugging
@@ -3081,6 +3079,7 @@ dev-texlive/texlive-basic:luajittex - Add support for LuaJitTeX: LuaTeX based on
 dev-util/android-ndk:legacy-toolchains - Install legacy toolchains
 dev-util/android-ndk:target-32 - Support for 32-bit targets
 dev-util/android-ndk:target-64 - Support for 64-bit targets
+dev-util/android-studio:custom-jdk - Install and use Android Studio's custom JRE.
 dev-util/anjuta:devhelp - Enable devhelp integration
 dev-util/anjuta:glade - Build glade plugin for anjuta
 dev-util/anjuta:packagekit - Use packagekit to search for missing tools
@@ -3099,8 +3098,6 @@ dev-util/bustle:threaded - Build with support for multithreaded execution.
 dev-util/catalyst:ccache - Enables ccache support
 dev-util/catalyst:iso - Pulls in the depends for building iso images
 dev-util/catalyst:system-bootloader - Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar
-dev-util/cccc:apidoc - Build software docs with doxygen/graphviz and metrics with cccc
-dev-util/cccc:mfc - Add patch for MFC dialect options
 dev-util/clion:custom-jdk - Install and use IntelliJ's custom JRE.
 dev-util/cmake:server - Enable cmake-server support.
 dev-util/cmake:system-jsoncpp - Use system copy of dev-libs/jsoncpp instead of bundled one.
@@ -3344,6 +3341,7 @@ games-action/minetest:spatial - Enable SpatialIndex AreaStore backend
 games-action/solar2:bundled-libs - Use the upstream provided bundled libraries.
 games-action/supermariowar:server - Compile and install Super Mario War server files
 games-action/supertuxkart:fribidi - Support for right-to-left languages
+games-action/supertuxkart:nettle - Use dev-libs/nettle crypto backend
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
 games-action/supertuxkart:wiimote - Support for wiimote input devices
 games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
@@ -3953,6 +3951,7 @@ lxqt-base/lxqt-meta:sddm - Install x11-misc/sddm display manager
 lxqt-base/lxqt-meta:ssh-askpass - Install lxqt-base/lxqt-openssh-askpass user password prompt tool
 lxqt-base/lxqt-meta:sudo - Install lxqt-base/lxqt-sudo
 lxqt-base/lxqt-meta:terminal - Install x11-terms/qterminal package
+lxqt-base/lxqt-meta:trash - Install gnome-base/gvfs to enable 'trash' functionality in x11-misc/pcmanfm-qt
 lxqt-base/lxqt-panel:clock - Build clock plugin
 lxqt-base/lxqt-panel:colorpicker - Build colorpicker plugin
 lxqt-base/lxqt-panel:cpuload - Build cpuload plugin
@@ -4189,8 +4188,10 @@ mate-base/mate:notification - Force notification daemon to default to MATE's not
 mate-base/mate:themes - Install MATE Desktop's themes; if you use other themes, you can disable this to spare some space and time.
 mate-base/mate-applets-meta:appindicator - Pull in mate-extra/mate-indicator-applet for AppIndicator applet
 mate-base/mate-applets-meta:sensors - Pull in mate-extra/mate-sensors-applet for hw sensors applet
+mate-base/mate-control-center:accountsservice - Add support for AccountsService
 mate-base/mate-control-center:appindicator - Add support for AppIndicator
 mate-base/mate-session-manager:xtrans - Build with Xtrans support; WARNING: Disabling this flag will result in ICE binding on all interfaces
+mate-base/mate-settings-daemon:rfkill - build support for rfkill
 mate-extra/caja-extensions:cdr - Add an extension to burn files to cds using app-cdr/brasero.
 mate-extra/caja-extensions:gajim - Add an extension to support net-im/gajim.
 mate-extra/caja-extensions:image-converter - Add image conversion support.
@@ -4618,7 +4619,7 @@ media-libs/opensubdiv:cuda - Enable NVIDIA CUDA Toolkit support through dev-util
 media-libs/opensubdiv:opencl - Enable OpenCL support through virtual/opencl.
 media-libs/opensubdiv:ptex - Adds support for faster per-face texture mapping through media-libs/ptex.
 media-libs/opensubdiv:tbb - Enable multithreading with the Intel Threads Building Blocks through dev-cpp/tbb.
-media-libs/opus:custom-modes - Build with custom-modes.
+media-libs/opus:custom-modes - Enable non-Opus modes, e.g. 44.1 kHz and 2^n frames
 media-libs/opusfile:fixed-point - Enable fixed-point arithmetic operations
 media-libs/opusfile:float - Enable floating point arithmetic operations
 media-libs/opusfile:http - Enable http connections
@@ -5072,7 +5073,9 @@ media-sound/xwax:fallback - Sets runtime dependencies to support decoding "other
 media-sound/xwax:jack - Adds support for audio input/output via the JACK Audio Connection Kit.
 media-sound/xwax:mp3 - Sets runtime dependencies to support decoding MP3 audio.
 media-sound/xwax:oss - Adds support for OSS (open sound system) audio input/output.
-media-sound/yarock:phonon - Use media-libs/phonon backend instead of media-video/vlc
+media-sound/yarock:mpv - Enable media-video/mpv backend
+media-sound/yarock:phonon - Enable media-libs/phonon backend
+media-sound/yarock:vlc - Enable media-video/vlc backend
 media-sound/yoshimi:lv2 - Add support for Ladspa V2
 media-sound/zynaddsubfx:dssi - Enable support for DSSI Soft Synth Interface
 media-tv/gentoo-vdr-scripts:nvram - Add support for using nvram-wakeup to set wakeup time in bios
@@ -5407,6 +5410,7 @@ media-video/vlc:gme - Enable support for media-libs/game-music-emu for playing v
 media-video/vlc:gstreamer - Enable GStreamer based decoding support (currently supports only video decoding)
 media-video/vlc:kate - Adds support for Ogg Kate subtitles via libkate
 media-video/vlc:kms - Enable kernel mode setting video output plugin via x11-libs/libdrm
+media-video/vlc:libplacebo - Enable support for GPU accelerated video rendering with media-libs/libplacebo
 media-video/vlc:libtar - Uses libtar instead of the built-in tar reader for reading custom skins
 media-video/vlc:libtiger - Enable Ogg Kate subtitles rendering using libtiger
 media-video/vlc:linsys - Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards
@@ -5485,6 +5489,9 @@ net-analyzer/greenbone-security-assistant:extras - Pdf results, extra fonts, htm
 net-analyzer/hexinject:experimental - Install experimental packets.tcl
 net-analyzer/hexinject:tools - Install hex2raw and prettypacket tools
 net-analyzer/httping:tfo - Enable support for TCP Fast Open
+net-analyzer/hydra:gcrypt - Enable radmin2 support through dev-libs/libgcrypt
+net-analyzer/hydra:libssh - Enable SSH support through net-libs/libssh
+net-analyzer/hydra:mongodb - MongoDB support through dev-libs/libmongo-client
 net-analyzer/hydra:ncp - NCP protocol (NetWare) support through net-fs/ncpfs
 net-analyzer/icinga:contrib - additional scripts
 net-analyzer/icinga:eventhandler - Adds support for running custom scripts whenever a host or service state change occurs
@@ -7034,10 +7041,12 @@ net-p2p/retroshare:control-socket - Enables API via Unix socket support
 net-p2p/retroshare:feedreader - Enables the Feedreader plugin
 net-p2p/retroshare:gnome-keyring - Enables potentially insecure autologin capability via Gnome Keyring
 net-p2p/retroshare:gui - Enables the GUI version of RetroShare
-net-p2p/retroshare:settings-api - Enables settings control via API
+net-p2p/retroshare:jsonapi - Enables the new RetroShare JSON API
+net-p2p/retroshare:service - Enables the new RetroShare service controllable only through JSON API
 net-p2p/retroshare:sqlcipher - Enables GXS database encryption via SQLCipher
 net-p2p/retroshare:voip - Enables VOIP plugin
 net-p2p/retroshare:webui - Enables Web interface and API support
+net-p2p/retroshare:xapian - Enables GXS content indexing and search through Xapian
 net-p2p/rtorrent:daemon - Uses app-misc/screen to daemonize this application
 net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr/libexec/syncthing/.
 net-p2p/transmission:lightweight - Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)
@@ -7268,6 +7277,7 @@ net-wireless/hostapd:logwatch - Install support files for sys-apps/logwatch
 net-wireless/hostapd:netlink - Adding support for using netlink to create VLANs
 net-wireless/hostapd:wps - Add support for Wi-Fi Protected Setup
 net-wireless/iwd:client - Enable iwctl client tool
+net-wireless/iwd:crda - Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support
 net-wireless/iwd:monitor - Enable iwmon monitor tool
 net-wireless/iwd:ofono - Enable support for oFono SIM authentication
 net-wireless/iwd:wired - Enable ethernet authentication daemon
@@ -7918,6 +7928,7 @@ sys-apps/flashrom:gfxnvidia - Enable NVIDIA programmer
 sys-apps/flashrom:internal - Enable internal/onboard support
 sys-apps/flashrom:internal_dmi - Enable internal DMI decoding rather than use sys-apps/dmidecode
 sys-apps/flashrom:it8212 - Support for ITE IT8212F ATA/RAID controllers
+sys-apps/flashrom:jlink_spi - Support for SEGGER J-Link and compatible devices
 sys-apps/flashrom:linux_mtd - Enable support for Linux mtd SPI flash devices
 sys-apps/flashrom:linux_spi - Enable support for Linux userspace spidev interface
 sys-apps/flashrom:mstarddc_spi - Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays
@@ -8363,6 +8374,7 @@ sys-devel/gcc:go - Build the GCC Go language frontend.
 sys-devel/gcc:graphite - Add support for the framework for loop optimizations based on a polyhedral intermediate representation
 sys-devel/gcc:jit - Enable libgccjit so other applications can embed gcc for Just-In-Time compilation. This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.
 sys-devel/gcc:libssp - Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)
+sys-devel/gcc:lto - Build using Link Time Optimizations (LTO)
 sys-devel/gcc:mpx - Enable support for Intel Memory Protection Extensions (MPX)
 sys-devel/gcc:mudflap - Add support for mudflap, a pointer use checking library
 sys-devel/gcc:nopie - Disable PIE support (NOT FOR GENERAL USE)
@@ -8488,6 +8500,7 @@ sys-fs/dmraid:klibc - Compile against dev-libs/klibc
 sys-fs/dmraid:led - Enable LED support
 sys-fs/dmraid:mini - Create a minimal binary suitable for early boot environments
 sys-fs/dosfstools:compat - Install symlinks for legacy names of the tools
+sys-fs/e2fsprogs:cron - Install e2scrub_all cron script
 sys-fs/e2fsprogs:fuse - Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems
 sys-fs/ecryptfs-utils:gpg - Enable app-crypt/gnupg key module
 sys-fs/ecryptfs-utils:openssl - Enable dev-libs/openssl key module
@@ -8806,7 +8819,6 @@ www-client/elinks:gopher - Enable support for the gopher protocol
 www-client/elinks:mouse - Make elinks to grab all mouse events
 www-client/elinks:tre - Enable support for regex searches via dev-libs/tre
 www-client/elinks:xml - Enable support for bookmarks via dev-libs/expat
-www-client/falkon:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 www-client/firefox:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream.
 www-client/firefox:clang - Use Clang compiler instead of GCC
 www-client/firefox:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported)
@@ -8988,15 +9000,21 @@ www-servers/xsp:net35 - use .NET 3.5 Framework
 www-servers/xsp:net40 - use .NET 4.0 Framework
 www-servers/xsp:net45 - use .NET 4.5 Framework
 x11-apps/copyq:webkit - enables the application to use advanced HTML rendering and fetching remote images and other data
+x11-apps/igt-gpu-tools:X - Enable intel-gpu-overlay xlib/cairo backend
 x11-apps/igt-gpu-tools:chamelium - Enables support for building Chamelium tests
 x11-apps/igt-gpu-tools:glib - Support reading config files via glib helpers
+x11-apps/igt-gpu-tools:man - Build and install man pages
+x11-apps/igt-gpu-tools:overlay - Build the intel-gpu-overlay utility
+x11-apps/igt-gpu-tools:runner - Build the test runner
 x11-apps/igt-gpu-tools:valgrind - Support valgrind annotations
 x11-apps/igt-gpu-tools:xrandr - Enable support for the X RandR extension
+x11-apps/igt-gpu-tools:xv - Enable intel-gpu-overlay xv backend
 x11-apps/mesa-progs:egl - Build EGL utilities
 x11-apps/mesa-progs:gles2 - Build OpenGL ES 2 utilities
 x11-apps/xdm:consolekit - Enable native sys-auth/consolekit support
 x11-apps/xdpyinfo:dmx - Builds support for Distributed Multiheaded X x11-base/xorg-server
 x11-apps/xinit:minimal - Control dependencies on legacy apps (xterm, twm, ...). Safe to enable if you use a modern desktop environment.
+x11-apps/xinit:twm - Control dependencies on legacy apps (xterm, twm, ...). Safe to disable if you use a modern desktop environment.
 x11-apps/xsm:rsh - This allows the use of rsh (remote shell) and rcp (remote copy).
 x11-base/xorg-server:dmx - Build the Distributed Multiheaded X server
 x11-base/xorg-server:elogind - Use elogind to get control over framebuffer when running as regular user
@@ -9124,7 +9142,6 @@ x11-misc/wbar:gtk - Enables the gtk-based wbar-config GUI
 x11-misc/x11vnc:xdamage - Enable support for the Xdamage library
 x11-misc/x11vnc:xfixes - Enable support for the Xfixes library
 x11-misc/x11vnc:xrandr - Enable support for the X xrandr extension
-x11-misc/x11vnc:xtrap - Enable support for the XTrap library
 x11-misc/xkbset:tk - Install the dev-perl/Tk based xkbset-gui utility
 x11-misc/xlockmore:vtlock - Enables support for virtual terminal locking
 x11-misc/xlockmore:xlockrc - Enables xlockrc for people without PAM
@@ -9175,20 +9192,15 @@ x11-terms/mlterm:wayland - Enable support for Wayland
 x11-terms/mrxvt:menubar - Enable mrxvt menubar
 x11-terms/mrxvt:utempter - REcords user logins. Useful on multi-user systems
 x11-terms/rxvt-unicode:256-color - Enable 256 color support
-x11-terms/rxvt-unicode:alt-font-width - Calculate the font width using a different method
 x11-terms/rxvt-unicode:blink - Enable blinking text
-x11-terms/rxvt-unicode:buffer-on-clear - Store visible output to history buffer when clearing the screen with ctrl-l. Read https://bbs.archlinux.org/viewtopic.php?id=129302
 x11-terms/rxvt-unicode:fading-colors - Enable colors fading when off focus
-x11-terms/rxvt-unicode:focused-urgency - Enable the urgent flag when a terminal window is focused
 x11-terms/rxvt-unicode:font-styles - Enable support for bold and italic fonts
 x11-terms/rxvt-unicode:gdk-pixbuf - Enable transparency support using x11-libs/gdk-pixbuf
 x11-terms/rxvt-unicode:iso14755 - Enable ISO-14755 support
 x11-terms/rxvt-unicode:mousewheel - Enable scrolling via mouse wheel or buttons 4 and 5
 x11-terms/rxvt-unicode:perl - Enable perl script support. You can still disable this at runtime with -pe ""
-x11-terms/rxvt-unicode:secondary-wheel - Support for wheel scrolling on secondary screens (like mutt). Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
 x11-terms/rxvt-unicode:unicode3 - Use 21 instead of 16 bits to represent unicode characters
 x11-terms/rxvt-unicode:utmp - Enable utmp support
-x11-terms/rxvt-unicode:wcwidth - Enable wide char width support
 x11-terms/rxvt-unicode:wtmp - Enable wtmp support
 x11-terms/terminator:libnotify - Enables desktop notifications viadev-python/notify-python
 x11-terms/terminology:extras - Install additional testing tools
@@ -9244,6 +9256,7 @@ x11-wm/e16:xsync - Enable X Sync support
 x11-wm/e16:zoom - Support resolution change of current window (zoom) usingx11-libs/libXxf86vm (xvidtune)
 x11-wm/echinus:xrandr - Enable support for multihead configuration
 x11-wm/enlightenment:packagekit - Enable module for package manager integration
+x11-wm/enlightenment:xwayland - Enable XWayland application support
 x11-wm/fluxbox:bidi - Enable bidirectional language support with dev-libs/fribidi
 x11-wm/fluxbox:slit - Enables the Fluxbox slit (or dock)
 x11-wm/fluxbox:systray - Enables the system tray in the Fluxbox toolbar
@@ -9300,17 +9313,9 @@ xfce-base/xfwm4:xpresent - Enable the XPresent extension for sync to vblank
 xfce-extra/tumbler:odf - Enable support for .odf thumbnailers by using gnome-extra/libgsf
 xfce-extra/xfce4-clipman-plugin:qrcode - Enable support for media-gfx/qrencode
 xfce-extra/xfce4-mpc-plugin:libmpd - Build using media-libs/libmpd backend, instead of native fallback which is preferred
-xfce-extra/xfce4-playercontrol-plugin:audacious - Enable Audacious support
-xfce-extra/xfce4-playercontrol-plugin:mpd - Enable Music Player Daemon support
 xfce-extra/xfce4-power-manager:panel-plugin - Build the power management plugin for the XFCE panel
 xfce-extra/xfce4-pulseaudio-plugin:keybinder - Enable support for global hotkeys using dev-libs/keybinder.
 xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raising media player windows using x11-libs/libwnck.
 xfce-extra/xfce4-screensaver:consolekit - Enable ConsoleKit support
 xfce-extra/xfce4-screensaver:locking - Enable screen locking support
-xfce-extra/xfce4-soundmenu-plugin:glyr - Enable music metadata searchengine support using media-libs/glyr
-xfce-extra/xfce4-soundmenu-plugin:keybinder - Enable shortcut support using dev-libs/keybinder
-xfce-extra/xfce4-soundmenu-plugin:lastfm - Enable last.fm support using media-libs/libclastfm
 xfce-extra/xfce4-taskmanager:gtk3 - Use GTK+3 instead of GTK+2
-xfce-extra/xfswitch-plugin:gdm - Compatibility with gnome-base/gdm only
-xfce-extra/xfswitch-plugin:lightdm - Compatibility with x11-misc/lightdm only
-xfce-extra/xfswitch-plugin:lxdm - Compatibility with lxde-base/lxdm only