gentoo resync : 25.08.2018

36 files changed, 306 insertions, 166 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9c391e600303..e860340fb23c 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 c3eb7a952f02..0686776d2811 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Virgil Dupras <vdupras@gentoo.org> (23 Aug 2018)
+# Depends on vulnerable version of paramiko. Bug #664346
+dev-vcs/bzr sftp
+
 # Joonas Niilola <juippis@gmail.com> (17 Jun 2018)
 # Optional dependency not available for this arch
 dev-libs/efl vlc
diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index 38084be13819..de8e767da626 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
+# app-text/mupdf stable alpha keyword was dropped in bug #658618
+net-print/cups-filters pdf
+
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-libs/webkit-gtk which is not stable (yet?), bug #663248
 app-editors/emacs xwidgets
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 0d52a2c83111..854c69e7b48b 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -48,7 +48,6 @@ dev-python/pycurl test
 
 # Michał Górny <mgorny@gentoo.org> (21 Feb 2018)
 # More unkeyworded dependencies.
-media-libs/xine-lib fusionsound
 media-video/ffmpeg frei0r sofalizer
 
 # Michał Górny <mgorny@gentoo.org> (19 Feb 2018)
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 58c01717f093..d23d8f51b19e 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -147,7 +147,6 @@ sci-biology/foldingathome
 sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-electronics/eagle
-sci-libs/ipp
 sys-libs/lib-compat-loki
 
 
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 5f73f3af51e5..0d8a24f11979 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -17,9 +17,6 @@ app-emulation/wine-any test
 # Requires sys-boot/grub:0 which is masked here.
 sys-apps/memtest86+ floppy
 
-# Intel Integrated Primitive (sci-libs/ipp) support
-media-libs/opencv ipp
-
 # Alexis Ballier <aballier@gentoo.org> (13 Aug 2009)
 # Requires wine
 media-sound/lmms vst
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 1d1a39a0266b..3de9fb1595e4 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
+# Unmask iwd support where net-wireless/iwd is keyworded
+net-misc/connman -iwd
+
+# Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2018)
+# Dependency sys-cluster/ceph is keyworded for amd64
+net-fs/samba -ceph
+
 # Göktürk Yüksek <gokturk@gentoo.org> (6 Jul 2018)
 # Dependency app-crypt/jitterentropy is keyworded for amd64
 sys-apps/rng-tools -jitterentropy
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index c702ac7c47ee..b1feae993652 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -42,29 +42,18 @@ net-mail/dovecot textcat
 dev-db/mariadb galera
 
 # Alexis Ballier <aballier@gentoo.org> (30 May 2017)
-# No stable libtar yet
-<media-video/vlc-2.3 libtar
-
-# Alexis Ballier <aballier@gentoo.org> (30 May 2017)
 # No stable fluidsynth yet
 media-libs/sdl-mixer fluidsynth
 media-sound/mpd fluidsynth
-<media-video/vlc-2.3 fluidsynth
 
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
 <=media-video/ffmpeg-3.3.6 frei0r sofalizer
 
-# Alexis Ballier <aballier@gentoo.org> (26 May 2017)
-# No musepack-tools stable yet
-media-video/vlc musepack
-media-plugins/gst-plugins-meta:0.10 musepack
-media-sound/mpd musepack
-
 # Alexis Ballier <aballier@gentoo.org> (18 Apr 2017)
-# No gst-plugins-vp8:0.10 stable
-media-plugins/gst-plugins-meta:0.10 vpx
+# No gst-plugins-vp8:0.10, gst-plugins-musepack:0.10 stable
+media-plugins/gst-plugins-meta:0.10 musepack vpx
 
 # Michael Weber <xmw@gentoo.org> (1 Apr 2017)
 # no stable jdk
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 5b3f724a4e79..59de8efcb03b 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -92,18 +92,6 @@ dev-libs/libverto tevent
 dev-libs/glib systemtap
 sys-libs/glibc systemtap
 
-# Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
-# idn: Needs net-dns/libidn2 which is not stabilized yet on arm64
-# gnutls: Needs net-libs/gnutls which is not stabilized yet on arm64
-net-misc/wget idn gnutls
-
 # Michael Weber <xmw@gentoo.org> (29 Mar 2017)
 # unstable deps mesa llvm et al.
 x11-libs/cairo gles2 opengl
-
-# Michael Weber <xmw@gentoo.org> (29 Mar 2017)
-# unstable deps
-media-libs/freetype X harfbuzz
-app-text/poppler introspection
-x11-libs/pango introspection
-media-libs/harfbuzz introspection
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 13505fe222d8..289a5dd245fd 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
+# Mask iwd support until net-wireless/iwd is keyworded
+net-misc/connman iwd
+
 # Rick Farina <zerochaos@gentoo.org> (27 Jun 2018)
 # Catalyst only has support for assembling bootloader on some arches
 dev-util/catalyst system-bootloader
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 9e3b7b3e2365..0adc136a831d 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -207,10 +207,6 @@ app-text/texlive pdfannotextractor
 # Mask doc-pdf because of Java dependencies (bug #347259)
 net-analyzer/wireshark doc-pdf
 
-# Jeroen Roovers <jer@gentoo.org> (25 Nov 2010)
-# No support for sci-libs/ipp on HPPA (bug #340269)
-media-libs/opencv ipp
-
 # Justin Lecher <jlec@gentoo.org> (13 Aug 2010)
 # MKL not available on this arch
 media-gfx/povray mkl
diff --git a/profiles/arch/powerpc/package.use b/profiles/arch/powerpc/package.use
index 6195ca57993e..c2c9780861c3 100644
--- a/profiles/arch/powerpc/package.use
+++ b/profiles/arch/powerpc/package.use
@@ -1,6 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Luca Barbato <lu_zero@gentoo.org> (12 Aug 2018)
+# Default to PowerPC OpenFirmware
+sys-boot/grub:2 grub_platforms_ieee1275
+
 # Doug Goldstein <cardoe@gentoo.org> (29 Oct 2012)
 # Enable the native arch as the default qemu target
 app-emulation/qemu qemu_softmmu_targets_ppc
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index a36770e86d76..4f7e375b08a0 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Luca Barbato <lu_zero@gentoo.org> (12 Aug 2018)
+# grub pc is not supported on powerpc
+sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen
+
 # Pacho Ramos <pacho@gentoo.org> (27 May 2018)
 # kde-frameworks/kdelibs4support not keyworded on ppc
 # Michał Górny <mgorny@gentoo.org> (09 Jul 2018)
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index fcff1116df40..8c7d8c317799 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
+# app-text/mupdf stable ppc/ppc64 keywords were dropped in bug #658618
+net-print/cups-filters pdf
+
 # Ulrich Müller <ulm@gentoo.org> (09 Aug 2018)
 # Needs net-mail/mailutils and net-libs/webkit-gtk which are not
 # stable (yet?), bug #663248
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index 08880aaf3493..5f10d31b0393 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (15 Aug 2018)
+# media-libs/libsidplay:2 appears to be broken, bug #660288
+media-video/vlc sid
+
 # Andreas Sturmlechner <asturm@gentoo.org> (12 Jun 2018)
 # Requires not yet stable dev-qt/qtpositioning:5
 sci-astronomy/stellarium gps
diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask
index 333c0ac220cb..c42283edd845 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Virgil Dupras <vdupras@gentoo.org> (12 Aug 2018)
+# ppc64 stabilization is too long and make us miss our security target delay
+# on bug #662780. Masking app-emulation/lxc and revdeps until it is stabilized.
+app-emulation/lxc
+app-emulation/lxc-templates
+dev-python/python3-lxc
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (21 Feb 2018)
 # Mozc supports only little-endian architectures.
 app-i18n/mozc
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 268b8bfe3b91..344b208bf468 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -120,9 +120,6 @@ lcd_devices_stv5730
 # Both
 lcd_devices_t6963
 
-# Intel Integrated Primitive (sci-libs/ipp) support
-ipp
-
 # dev-lang/orc doesn't play nice
 schroedinger
 
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 6f9c3f8869d8..5894d1bd8a81 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -17,6 +17,13 @@ dev-util/ninja zsh-completion
 net-analyzer/nmap zenmap
 # no lua support for vim
 app-editors/vim luajit lua
+# not keyworded yet
+media-gfx/imagemagick raw
+dev-db/mariadb numa
+# ipython is not really tested
+dev-python/restkit cli
+# not tested yet
+app-misc/mc samba
 
 
 # Michał Górny <mgorny@gentoo.org> (08 Aug 2017)
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 40fa9bb94a5c..857429e6c954 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -42,6 +42,7 @@ clang
 rtmp
 metalink
 lucene
+valgrind
 
 # This file contains a list of useflags that cannot be used on s390.
 bluetooth
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index e5b715438875..f58e550d4698 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Virgil Dupras <vdupras@gentoo.org> (18 Aug 2018)
+# app-text/mupdf stable sparc keyword was dropped in bug #658618
+net-print/cups-filters pdf
+
 # Andreas Sturmlechner <asturm@gentoo.org> (7 May 2018)
 # sci-visualization/gnuplot is not stable.
 app-admin/sysstat isag
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c9a3ef9916d8..4a5ba549d97c 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,14 @@
 
 # This file requires >=portage-2.1.1
 
+# Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
+# Unmask iwd support where net-wireless/iwd is keyworded
+net-misc/connman -iwd
+
+# Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2018)
+# Dependency sys-cluster/ceph is keyworded for x86
+net-fs/samba -ceph
+
 # Rick Farina <zerochaos@gentoo.org> (27 Jun 2018)
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7074d96eb53f..4955c74c2124 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -35,7 +35,6 @@ net-wireless/gnuradio qt4
 
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # dev-libs/DirectFB is being removed (#606194)
-media-libs/xine-lib fusionsound
 www-plugins/gnash directfb
 
 # Michał Górny <mgorny@gentoo.org> (13 Jun 2018)
@@ -101,7 +100,8 @@ media-plugins/vdr-music graphtft
 # Lars Wendler <polynomial-c@gentoo.org> (14 Mar 2018)
 # Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having
 # no active upstream anymore.
-net-fs/samba dmapi
+# sys-cluster/ceph is only available on amd64 & x86, unmask per arch
+net-fs/samba dmapi ceph
 
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Mask local USE flag to satisfy repoman
@@ -173,6 +173,7 @@ sci-physics/root qt4
 # Depends on >=icu-59, still masked.
 >=www-client/chromium-62.0.3202.9 system-icu
 >=www-client/firefox-56.0 system-icu
+>=mail-client/thunderbird-60.0 system-icu
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (9 Sep 2017)
 # Potentially destructive. Use it only if you know what you're doing.
@@ -608,10 +609,6 @@ net-analyzer/net-snmp pci
 # The prevent-removal USE flag is only implemented for Linux.
 sys-auth/pam_mktemp prevent-removal
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (25 Mai 2012)
-# Requires icc which does not emerge (distfile unavailable)
-media-libs/opencv ipp
-
 # Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012)
 # This is for udev-acl. Unmasked in default/linux/package.use.mask.
 sys-auth/consolekit acl
@@ -671,7 +668,7 @@ media-sound/pulseaudio system-wide
 net-proxy/squid ipf-transparent pf-transparent
 
 # Alexis Ballier <aballier@gentoo.org> <16 Feb 2011>
-# Win32 specific useflags for vlc. Can be used for cross-compiling.
-media-video/vlc directx dxva2
+# Win32 specific useflag for vlc. Can be used for cross-compiling.
+media-video/vlc directx
 # Mac OSX / iPhone OS specific useflags
-media-video/vlc audioqueue macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+media-video/vlc macosx-qtkit
diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
index ca094ce4cf1a..884da6e0f60a 100644
--- a/profiles/default/bsd/package.use.mask
+++ b/profiles/default/bsd/package.use.mask
@@ -71,7 +71,7 @@ www-client/links livecd
 
 # needs udev
 media-libs/libsdl2 kms
-media-libs/mesa gbm dri3 d3d9
+media-libs/mesa gbm dri3 d3d9 vulkan
 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/powerpc/ppc64/13.0/package.use.stable.mask b/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask
index 57af4cfcc5b4..5db2201ccef7 100644
--- a/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask
+++ b/profiles/default/linux/powerpc/ppc64/13.0/package.use.stable.mask
@@ -1,6 +1,2 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Tom Wijsman <TomWij@gentoo.org (16 Mar 2014)
-# Mask unstable USE flags on media-video/vlc, see security bug #499806.
-media-video/vlc chromaprint gnutls opus
diff --git a/profiles/default/linux/powerpc/ppc64/17.0/package.use.stable.mask b/profiles/default/linux/powerpc/ppc64/17.0/package.use.stable.mask
index 57af4cfcc5b4..5db2201ccef7 100644
--- a/profiles/default/linux/powerpc/ppc64/17.0/package.use.stable.mask
+++ b/profiles/default/linux/powerpc/ppc64/17.0/package.use.stable.mask
@@ -1,6 +1,2 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-
-# Tom Wijsman <TomWij@gentoo.org (16 Mar 2014)
-# Mask unstable USE flags on media-video/vlc, see security bug #499806.
-media-video/vlc chromaprint gnutls opus
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index f674b76e8e1e..01e61b866575 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -111,7 +111,6 @@ sci-biology/foldingathome
 sci-electronics/eagle
 sci-chemistry/cara-bin
 sci-chemistry/mars
-sci-libs/ipp
 sys-libs/lib-compat-loki
 
 # AMD64 Team; <amd64@gentoo.org>
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
index e537cc0fa319..fb926138685d 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc
@@ -2,5 +2,14 @@
 
 if [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == configure ]]; then
     einfo "Removing utimensat outputs..."
-    sed -i '/UTIMENSAT=/d' ${S}/Source/kwsys/CMakeLists.txt
+    sed -e '/UTIMENSAT=/d' -i ${S}/Source/kwsys/CMakeLists.txt || die
+elif [[ ${CATEGORY}/${PN} == dev-qt/qtcore && ${EBUILD_PHASE} == configure ]]; then
+    einfo "Removing pipe2 definitions..."
+    sed -e '/define.*HAVE_PIPE2/d' -i ${S}/src/3rdparty/forkfd/forkfd.c || die
+    einfo "Removing utimensat calls..."
+    sed -e '/_POSIX_VERSION/s/defined(_POSIX_VERSION)/0/' -i ${S}/qmake/library/ioutils.cpp || die
 fi
+
+# Local Variables:
+# mode: shell-script
+# End:
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index fd047b076a7d..19621c773d9d 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -135,6 +135,5 @@ sci-electronics/eagle
 sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-chemistry/xdsstat-bin
-sci-libs/ipp
 sys-libs/lib-compat-loki
 <sys-boot/grub-1.99
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.use.mask b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
index 860395ef07fa..35d2b1b04a48 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.use.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.use.mask
@@ -11,6 +11,3 @@ app-emulation/xen-tools ovmf
 # Mike Frysinger <vapier@gentoo.org> (12 Aug 2016)
 # Requires sys-boot/grub:0 which is masked here.
 sys-apps/memtest86+ floppy
-
-# Intel Integrated Primitive (sci-libs/ipp) support
-media-libs/opencv ipp
diff --git a/profiles/license_groups b/profiles/license_groups
index 9fb680107ae9..79b88fbf04f1 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x AMD-GPU-PRO-EULA ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS ubiquiti UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index b926fd34e6c3..19702998f14a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,33 @@
 
 #--- END OF EXAMPLES ---
 
+# Virgil Dupras <vdupras@gentoo.org> (23 Aug 2018)
+# Vulnerable and can't be removed yet because of alpha. Bug #664346
+<dev-python/paramiko-2.4.1
+
+# Bernard Cafarelli <voyageur@gentoo.org> (20 Aug 2018)
+# Requires >=dev-libs/openssl-1.1.0
+>=net-misc/nextcloud-client-2.5.0_beta1
+
+# Michael Orlitzky <mjo@gentoo.org> (16 Aug 2018)
+# Obsolete! Use net-analyzer/nagios-icinga-openvpn instead.
+# Will be removed in 30 days (bug 663774).
+net-analyzer/nagios-check_openvpn-simple
+
+# Sergey Popov <pinkbyte@gentoo.org> (16 Aug 2018)
+# Upstream is dead, no consumers in tree
+# Masked for removal in 30 days
+dev-python/pyfire
+
+# Bernard Cafarelli <voyageur@gentoo.org> (13 Aug 2018)
+# Beta release with new features, masked for testing
+=app-text/tesseract-4.0.0_beta*
+
+# Virgil Dupras <vdupras@gentoo.org> (12 Aug 2018)
+# django-pipeline hasn't been maintained and has been broken for a while.
+# No revdep. Removal in 30 days. Bug #649838
+dev-python/django-pipeline
+
 # Ulrich Müller <ulm@gentoo.org> (07 Aug 2018)
 # Fails to build with emacs-26.1. Last release in 2003, last commit
 # to upstream CVS in 2010. Masked for removal in 30 days. Bug #663030.
@@ -73,42 +100,15 @@ media-plugins/emotion_generic_players
 media-plugins/evas_generic_loaders
 x11-themes/ethemes
 
-# Virgil Dupras <vdupras@gentoo.org> (22 Jul 2018)
-# Depends on an unsupported version of django (1.8, will be removed soon) and
-# is rendered obsolete by the direct inclusion of django support in
-# >=dev-python/celery-4.0. Removal in 30 days. Bug #661804
-dev-python/django-celery
-
-# Mart Raudsepp <leio@gentoo.org> (16 Jul 2018)
-# Obsolete early GNOME 2 era print libraries. Applications
-# use printing support found directly in x11-libs/gtk+ now.
-# Removal in 30 days. Bug #352952
-gnome-base/libgnomeprintui
-gnome-base/libgnomeprint
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jul 2018)
 # Parallel-installable old versions with no remaining consumers
 # in main tree. Use applications ported to wxGTK:3.0 and
-# wxpython:3.0 instead. Bug #661284
+# wxpython:3.0 instead.
+# Please keep this package.mask entry until at least 16th Oct 2018
+# for extra notification of the unmerge need. Bug #661284
 x11-libs/wxGTK:2.8
 dev-python/wxpython:2.8
 
-# Corentin Pazdera <nado@troglodyte.be> (12 Jul 2018)
-# Pulseeffects depends on atoms only found in gnome overlay
->=media-sound/pulseeffects-4.0.0
-
-# Michał Górny <mgorny@gentoo.org> (12 Jul 2018)
-# Abandoned upstream, no reverse dependencies.  Collides with
-# dev-python/promises (that has revdeps).
-# Removal in 30 days.  Bug #651156.
-dev-python/promise
-
-# Jonas Stein <jstein@gentoo.org> (10 Jul 2018)
-# Package is not maintained, has a broken SRC_URI and 
-# we may not mirror the files.
-# Removal on (10 Aug 2018) Bug #660750
-media-sound/neroaac
-
 # Kent Fredric <kentnl@gentoo.org> (10 Jul 2018)
 # Perl 5.28 Staging block
 =dev-lang/perl-5.28.0
@@ -160,24 +160,6 @@ media-sound/neroaac
 =virtual/perl-threads-2.220.0
 =virtual/perl-version-0.992.300
 
-# Andreas Schuerch <nativemad@gentoo.org> (10 Jul 2018)
-# Packages have open bugs and mayor component is not working since years
-# Removal in 30 days. Bug 608540
-net-misc/guacamole-server
-www-apps/guacamole
-
-# Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2018)
-# Hasn’t been updated in years, upstream’s download source is blank, and depends
-# on an outdated twisted-core (Bug 660668). Removal after 2018-08-08.
-dev-python/pgasync
-
-# Louis Sautier <sbraz@gentoo.org> (8 July 2018)
-# Superseded, respectively by dev-python/setuptools_scm
-# and dev-python/jaraco-* + dev-python/tempora.
-# Removal in a month. See https://bugs.gentoo.org/582728
-dev-python/hgtools
-dev-python/jaraco-utils
-
 # Brian Dolbec <dolsen@gentoo.org> (4 July 2018)
 # No longer needed, newer gpg-2 versions have simple cli options
 # for generating new keys and doing key maintenance. Removal in a month
@@ -200,10 +182,6 @@ sys-apps/paludis
 # a month
 net-vpn/miredo
 
-# Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
-# Doesn't run, cannot bump it (#651146). Removal in a month.
-games-emulation/hatari
-
 # Mart Raudsepp <leio@gentoo.org> (16 Jun 2018)
 # No upstream (website disappeared), no upstream plugin maintainer,
 # and pretty much a fringe format anyway.
@@ -247,10 +225,6 @@ media-libs/libglvnd
 =dev-libs/libressl-2.7*
 =dev-libs/libressl-2.8*
 
-# Andreas Sturmlechner <asturm@gentoo.org> (26 Apr 2018)
-# Package version depends on Qt-5.10 that was/is/will not be in tree.
->=sci-misc/mendeleydesktop-1.18
-
 # Alexis Ballier <aballier@gentoo.org> (21 Apr 2018)
 # Needs porting of revdeps
 # See: https://bugs.gentoo.org/653678
@@ -499,10 +473,6 @@ media-plugins/gst-plugins-ffmpeg
 # Needs openssl-1.1
 >=dev-libs/opencryptoki-3.6
 
-# Bernard Cafarelli <voyageur@gentoo.org> (30 Jan 2017)
-# Alpha release with new features, masked for testing
-=app-text/tesseract-4.00.00_alpha*
-
 # Jeroen Roovers <jer@gentoo.org> (12 Jan 2017)
 # Use x11-drivers/nvidia-drivers[tools] instead.
 media-video/nvidia-settings
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index dc46d3335f60..5c1cfd747f90 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -25,10 +25,6 @@ media-gfx/tachyon mpi
 # gdb server is not supported on this platform
 sys-devel/gdb server
 
-# Fabian Groffen <grobian@gentoo.org> (16 Feb 2011)
-# De-mask of OSX-specific USE-flags that are useful for VLC
-media-video/vlc -audioqueue -macosx-dialog-provider -macosx-eyetv -macosx-quartztext
-
 # Fabian Groffen <grobian@gentoo.org> (08 Jan 2011)
 # Darwin has libuuid from util-linux
 x11-libs/libSM -uuid
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index c532d52bae54..3d6363bbb236 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -10,6 +10,7 @@ sys-devel/gcc -pie
 # that prevent the >=icu-59 dependency
 >=www-client/chromium-62.0.3202.9 -system-icu
 >=www-client/firefox-56.0 -system-icu
+>=mail-client/thunderbird-60.0 -system-icu
 
 # Mike Gilbert <floppym@gentoo.org> (05 Aug 2018)
 # Fails to build.
diff --git a/profiles/updates/3Q-2018 b/profiles/updates/3Q-2018
index 692c402ac5f1..d5265767d8fc 100644
--- a/profiles/updates/3Q-2018
+++ b/profiles/updates/3Q-2018
@@ -1 +1,2 @@
 move app-crypt/sbsigntool app-crypt/sbsigntools
+move x11-apps/radeontop app-misc/radeontop
diff --git a/profiles/updates/4Q-2014 b/profiles/updates/4Q-2014
index b8ba9c673fa2..ab0f4ef5d3cc 100644
--- a/profiles/updates/4Q-2014
+++ b/profiles/updates/4Q-2014
@@ -8,4 +8,3 @@ move net-zope/zc-buildout dev-python/zc-buildout
 move net-zope/zope-interface dev-python/zope-interface
 move media-gfx/photo media-gfx/photoqt
 move dev-db/postgresql-base dev-db/postgresql
-move dev-db/pgasync dev-python/pgasync
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cab6a2a629c0..7ba11e6766fa 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -380,6 +380,7 @@ app-editors/emacs:games - Support shared score files for games
 app-editors/emacs:gconf - Use gnome-base/gconf to read the system font name
 app-editors/emacs:gfile - Use gfile (dev-libs/glib) for file notification
 app-editors/emacs:gsettings - Use gsettings (dev-libs/glib) to read the system font name
+app-editors/emacs:gtk2 - Prefer version 2 of the GIMP Toolkit to version 3 (x11-libs/gtk+)
 app-editors/emacs:gtk3 - Prefer version 3 of the GIMP Toolkit to version 2 (x11-libs/gtk+)
 app-editors/emacs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs:imagemagick - Use media-gfx/imagemagick for image processing
@@ -395,7 +396,7 @@ app-editors/emacs-vcs:games - Support shared score files for games
 app-editors/emacs-vcs:gconf - Use gnome-base/gconf to read the system font name
 app-editors/emacs-vcs:gfile - Use gfile (dev-libs/glib) for file notification
 app-editors/emacs-vcs:gsettings - Use gsettings (dev-libs/glib) to read the system font name
-app-editors/emacs-vcs:gtk3 - Prefer version 3 of the GIMP Toolkit to version 2 (x11-libs/gtk+)
+app-editors/emacs-vcs:gtk2 - Prefer version 2 of the GIMP Toolkit to version 3 (x11-libs/gtk+)
 app-editors/emacs-vcs:gzip-el - Compress bundled Emacs Lisp source
 app-editors/emacs-vcs:imagemagick - Use media-gfx/imagemagick for image processing
 app-editors/emacs-vcs:json - Compile with native JSON support using dev-libs/jansson
@@ -470,6 +471,7 @@ app-emulation/buildah:ostree - Enables dependencies for handling of OSTree image
 app-emulation/containerd:apparmor - Support for AppArmor
 app-emulation/containerd:btrfs - Support for BTRFS snapshot driver
 app-emulation/containerd:cri - Support for Kubernetes CRI
+app-emulation/containers-storage:ostree - Enables dependencies for handling of OSTree images.
 app-emulation/cri-o:btrfs - Enables dependencies for the "btrfs" graph driver, including necessary kernel flags.
 app-emulation/cri-o:device-mapper - Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags.
 app-emulation/cri-o:ostree - Enables dependencies for handling of OSTree images.
@@ -506,6 +508,7 @@ app-emulation/ganeti:restricted-commands - Enable restricted commands in the nod
 app-emulation/ganeti:xen - Enable Xen support
 app-emulation/hyperd:libvirt - Enable support for KVM via libvirt
 app-emulation/hyperd:xen - Enable support for the Xen Hypervisor
+app-emulation/libcacard:passthrough - Enable smartcard passthrough support via sys-apps/pcsc-lite
 app-emulation/libguestfs:erlang - Build Erlang bindings
 app-emulation/libguestfs:fuse - Enable image mount support via fuse
 app-emulation/libguestfs:inspect-icons - Use media-gfx/icoutilsfor acces icon file in image and inspect it
@@ -536,10 +539,12 @@ app-emulation/libvirt:virtualbox - Support management of VirtualBox virtualisati
 app-emulation/libvirt:wireshark-plugins - Build the net-analyzer/wireshark plugin for the Libvirt RPC protocol
 app-emulation/libvirt:xen - Support management of Xen virtualisation (app-emulation/xen)
 app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
+app-emulation/lxc:apparmor - Enable AppArmor support
 app-emulation/lxc:cgmanager - Enable support for cgroup management using app-admin/cgmanager
 app-emulation/lxc:templates - Install old style templates through app-emulation/lxc-templates
 app-emulation/lxd:daemon - Build the system daemon, not just the client tool
-app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS.
+app-emulation/lxd:dnsmasq - Depend on dnsmasq to provide DHCP and DNS
+app-emulation/lxd:tools - Build and install optional tools
 app-emulation/nemu:ovf - Adds support for OVA/OVF import
 app-emulation/nemu:savevm - Adds support for QEMU savevm snapshots (experimental, QEMU must be patched)
 app-emulation/nemu:vnc-client - Adds support for external VNC client
@@ -1934,7 +1939,6 @@ dev-java/logback:tomcat - Builds Apache Tomcat support
 dev-java/lucene:contrib - Include extra functionality from contrib/
 dev-java/miglayout:swt - Add support for the SWT toolkit.
 dev-java/oracle-jdk-bin:commercial - Install features requiring a commercial license for production use
-dev-java/oracle-jdk-bin:derby - Install bundled Derby (Java database)
 dev-java/oracle-jdk-bin:gentoo-vm - Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)
 dev-java/oracle-jdk-bin:gtk2 - Enable GTK+ 2 support in JavaFX
 dev-java/oracle-jdk-bin:gtk3 - Enable GTK+ 3 support in JavaFX
@@ -2100,6 +2104,157 @@ dev-libs/apr-util:libressl - Use dev-libs/libressl instead of dev-libs/openssl f
 dev-libs/apr-util:nss - Install apr_crypto_nss module
 dev-libs/apr-util:openssl - Install apr_crypto_openssl module
 dev-libs/atcore:gui - Build test GUI
+dev-libs/aws-sdk-cpp:aws_targets_AWSMigrationHub - SDK Support for AWS AWSMigrationHub
+dev-libs/aws-sdk-cpp:aws_targets_access-management - SDK Support for AWS access-management
+dev-libs/aws-sdk-cpp:aws_targets_acm - SDK Support for AWS acm
+dev-libs/aws-sdk-cpp:aws_targets_acm-pca - SDK Support for AWS acm-pca
+dev-libs/aws-sdk-cpp:aws_targets_alexaforbusiness - SDK Support for AWS alexaforbusiness
+dev-libs/aws-sdk-cpp:aws_targets_apigateway - SDK Support for AWS apigateway
+dev-libs/aws-sdk-cpp:aws_targets_application-autoscaling - SDK Support for AWS application-autoscaling
+dev-libs/aws-sdk-cpp:aws_targets_appstream - SDK Support for AWS appstream
+dev-libs/aws-sdk-cpp:aws_targets_appsync - SDK Support for AWS appsync
+dev-libs/aws-sdk-cpp:aws_targets_athena - SDK Support for AWS athena
+dev-libs/aws-sdk-cpp:aws_targets_autoscaling - SDK Support for AWS autoscaling
+dev-libs/aws-sdk-cpp:aws_targets_autoscaling-plans - SDK Support for AWS autoscaling-plans
+dev-libs/aws-sdk-cpp:aws_targets_batch - SDK Support for AWS batch
+dev-libs/aws-sdk-cpp:aws_targets_budgets - SDK Support for AWS budgets
+dev-libs/aws-sdk-cpp:aws_targets_ce - SDK Support for AWS ce
+dev-libs/aws-sdk-cpp:aws_targets_cloud9 - SDK Support for AWS cloud9
+dev-libs/aws-sdk-cpp:aws_targets_clouddirectory - SDK Support for AWS clouddirectory
+dev-libs/aws-sdk-cpp:aws_targets_cloudformation - SDK Support for AWS cloudformation
+dev-libs/aws-sdk-cpp:aws_targets_cloudfront - SDK Support for AWS cloudfront
+dev-libs/aws-sdk-cpp:aws_targets_cloudhsm - SDK Support for AWS cloudhsm
+dev-libs/aws-sdk-cpp:aws_targets_cloudhsmv2 - SDK Support for AWS cloudhsmv2
+dev-libs/aws-sdk-cpp:aws_targets_cloudsearch - SDK Support for AWS cloudsearch
+dev-libs/aws-sdk-cpp:aws_targets_cloudsearchdomain - SDK Support for AWS cloudsearchdomain
+dev-libs/aws-sdk-cpp:aws_targets_cloudtrail - SDK Support for AWS cloudtrail
+dev-libs/aws-sdk-cpp:aws_targets_codebuild - SDK Support for AWS codebuild
+dev-libs/aws-sdk-cpp:aws_targets_codecommit - SDK Support for AWS codecommit
+dev-libs/aws-sdk-cpp:aws_targets_codedeploy - SDK Support for AWS codedeploy
+dev-libs/aws-sdk-cpp:aws_targets_codepipeline - SDK Support for AWS codepipeline
+dev-libs/aws-sdk-cpp:aws_targets_codestar - SDK Support for AWS codestar
+dev-libs/aws-sdk-cpp:aws_targets_cognito-identity - SDK Support for AWS cognito-identity
+dev-libs/aws-sdk-cpp:aws_targets_cognito-idp - SDK Support for AWS cognito-idp
+dev-libs/aws-sdk-cpp:aws_targets_cognito-sync - SDK Support for AWS cognito-sync
+dev-libs/aws-sdk-cpp:aws_targets_comprehend - SDK Support for AWS comprehend
+dev-libs/aws-sdk-cpp:aws_targets_config - SDK Support for AWS config
+dev-libs/aws-sdk-cpp:aws_targets_connect - SDK Support for AWS connect
+dev-libs/aws-sdk-cpp:aws_targets_core - SDK Support for AWS core
+dev-libs/aws-sdk-cpp:aws_targets_cur - SDK Support for AWS cur
+dev-libs/aws-sdk-cpp:aws_targets_datapipeline - SDK Support for AWS datapipeline
+dev-libs/aws-sdk-cpp:aws_targets_dax - SDK Support for AWS dax
+dev-libs/aws-sdk-cpp:aws_targets_devicefarm - SDK Support for AWS devicefarm
+dev-libs/aws-sdk-cpp:aws_targets_directconnect - SDK Support for AWS directconnect
+dev-libs/aws-sdk-cpp:aws_targets_discovery - SDK Support for AWS discovery
+dev-libs/aws-sdk-cpp:aws_targets_dms - SDK Support for AWS dms
+dev-libs/aws-sdk-cpp:aws_targets_ds - SDK Support for AWS ds
+dev-libs/aws-sdk-cpp:aws_targets_dynamodb - SDK Support for AWS dynamodb
+dev-libs/aws-sdk-cpp:aws_targets_dynamodbstreams - SDK Support for AWS dynamodbstreams
+dev-libs/aws-sdk-cpp:aws_targets_ec2 - SDK Support for AWS ec2
+dev-libs/aws-sdk-cpp:aws_targets_ecr - SDK Support for AWS ecr
+dev-libs/aws-sdk-cpp:aws_targets_ecs - SDK Support for AWS ecs
+dev-libs/aws-sdk-cpp:aws_targets_eks - SDK Support for AWS eks
+dev-libs/aws-sdk-cpp:aws_targets_elasticache - SDK Support for AWS elasticache
+dev-libs/aws-sdk-cpp:aws_targets_elasticbeanstalk - SDK Support for AWS elasticbeanstalk
+dev-libs/aws-sdk-cpp:aws_targets_elasticfilesystem - SDK Support for AWS elasticfilesystem
+dev-libs/aws-sdk-cpp:aws_targets_elasticloadbalancing - SDK Support for AWS elasticloadbalancing
+dev-libs/aws-sdk-cpp:aws_targets_elasticloadbalancingv2 - SDK Support for AWS elasticloadbalancingv2
+dev-libs/aws-sdk-cpp:aws_targets_elasticmapreduce - SDK Support for AWS elasticmapreduce
+dev-libs/aws-sdk-cpp:aws_targets_elastictranscoder - SDK Support for AWS elastictranscoder
+dev-libs/aws-sdk-cpp:aws_targets_email - SDK Support for AWS email
+dev-libs/aws-sdk-cpp:aws_targets_es - SDK Support for AWS es
+dev-libs/aws-sdk-cpp:aws_targets_events - SDK Support for AWS events
+dev-libs/aws-sdk-cpp:aws_targets_firehose - SDK Support for AWS firehose
+dev-libs/aws-sdk-cpp:aws_targets_fms - SDK Support for AWS fms
+dev-libs/aws-sdk-cpp:aws_targets_gamelift - SDK Support for AWS gamelift
+dev-libs/aws-sdk-cpp:aws_targets_glacier - SDK Support for AWS glacier
+dev-libs/aws-sdk-cpp:aws_targets_glue - SDK Support for AWS glue
+dev-libs/aws-sdk-cpp:aws_targets_greengrass - SDK Support for AWS greengrass
+dev-libs/aws-sdk-cpp:aws_targets_guardduty - SDK Support for AWS guardduty
+dev-libs/aws-sdk-cpp:aws_targets_health - SDK Support for AWS health
+dev-libs/aws-sdk-cpp:aws_targets_iam - SDK Support for AWS iam
+dev-libs/aws-sdk-cpp:aws_targets_identity-management - SDK Support for AWS identity-management
+dev-libs/aws-sdk-cpp:aws_targets_importexport - SDK Support for AWS importexport
+dev-libs/aws-sdk-cpp:aws_targets_inspector - SDK Support for AWS inspector
+dev-libs/aws-sdk-cpp:aws_targets_iot - SDK Support for AWS iot
+dev-libs/aws-sdk-cpp:aws_targets_iot-data - SDK Support for AWS iot-data
+dev-libs/aws-sdk-cpp:aws_targets_iot-jobs-data - SDK Support for AWS iot-jobs-data
+dev-libs/aws-sdk-cpp:aws_targets_iot1click-devices - SDK Support for AWS iot1click-devices
+dev-libs/aws-sdk-cpp:aws_targets_iot1click-projects - SDK Support for AWS iot1click-projects
+dev-libs/aws-sdk-cpp:aws_targets_iotanalytics - SDK Support for AWS iotanalytics
+dev-libs/aws-sdk-cpp:aws_targets_kinesis - SDK Support for AWS kinesis
+dev-libs/aws-sdk-cpp:aws_targets_kinesis-video-archived-media - SDK Support for AWS kinesis-video-archived-media
+dev-libs/aws-sdk-cpp:aws_targets_kinesis-video-media - SDK Support for AWS kinesis-video-media
+dev-libs/aws-sdk-cpp:aws_targets_kinesisanalytics - SDK Support for AWS kinesisanalytics
+dev-libs/aws-sdk-cpp:aws_targets_kinesisvideo - SDK Support for AWS kinesisvideo
+dev-libs/aws-sdk-cpp:aws_targets_kms - SDK Support for AWS kms
+dev-libs/aws-sdk-cpp:aws_targets_lambda - SDK Support for AWS lambda
+dev-libs/aws-sdk-cpp:aws_targets_lex - SDK Support for AWS lex
+dev-libs/aws-sdk-cpp:aws_targets_lex-models - SDK Support for AWS lex-models
+dev-libs/aws-sdk-cpp:aws_targets_lightsail - SDK Support for AWS lightsail
+dev-libs/aws-sdk-cpp:aws_targets_logs - SDK Support for AWS logs
+dev-libs/aws-sdk-cpp:aws_targets_machinelearning - SDK Support for AWS machinelearning
+dev-libs/aws-sdk-cpp:aws_targets_macie - SDK Support for AWS macie
+dev-libs/aws-sdk-cpp:aws_targets_marketplace-entitlement - SDK Support for AWS marketplace-entitlement
+dev-libs/aws-sdk-cpp:aws_targets_marketplacecommerceanalytics - SDK Support for AWS marketplacecommerceanalytics
+dev-libs/aws-sdk-cpp:aws_targets_mediaconvert - SDK Support for AWS mediaconvert
+dev-libs/aws-sdk-cpp:aws_targets_medialive - SDK Support for AWS medialive
+dev-libs/aws-sdk-cpp:aws_targets_mediapackage - SDK Support for AWS mediapackage
+dev-libs/aws-sdk-cpp:aws_targets_mediastore - SDK Support for AWS mediastore
+dev-libs/aws-sdk-cpp:aws_targets_mediastore-data - SDK Support for AWS mediastore-data
+dev-libs/aws-sdk-cpp:aws_targets_mediatailor - SDK Support for AWS mediatailor
+dev-libs/aws-sdk-cpp:aws_targets_meteringmarketplace - SDK Support for AWS meteringmarketplace
+dev-libs/aws-sdk-cpp:aws_targets_mobile - SDK Support for AWS mobile
+dev-libs/aws-sdk-cpp:aws_targets_mobileanalytics - SDK Support for AWS mobileanalytics
+dev-libs/aws-sdk-cpp:aws_targets_monitoring - SDK Support for AWS monitoring
+dev-libs/aws-sdk-cpp:aws_targets_mq - SDK Support for AWS mq
+dev-libs/aws-sdk-cpp:aws_targets_mturk-requester - SDK Support for AWS mturk-requester
+dev-libs/aws-sdk-cpp:aws_targets_neptune - SDK Support for AWS neptune
+dev-libs/aws-sdk-cpp:aws_targets_opsworks - SDK Support for AWS opsworks
+dev-libs/aws-sdk-cpp:aws_targets_opsworkscm - SDK Support for AWS opsworkscm
+dev-libs/aws-sdk-cpp:aws_targets_organizations - SDK Support for AWS organizations
+dev-libs/aws-sdk-cpp:aws_targets_pi - SDK Support for AWS pi
+dev-libs/aws-sdk-cpp:aws_targets_pinpoint - SDK Support for AWS pinpoint
+dev-libs/aws-sdk-cpp:aws_targets_polly - SDK Support for AWS polly
+dev-libs/aws-sdk-cpp:aws_targets_pricing - SDK Support for AWS pricing
+dev-libs/aws-sdk-cpp:aws_targets_queues - SDK Support for AWS queues
+dev-libs/aws-sdk-cpp:aws_targets_rds - SDK Support for AWS rds
+dev-libs/aws-sdk-cpp:aws_targets_redshift - SDK Support for AWS redshift
+dev-libs/aws-sdk-cpp:aws_targets_rekognition - SDK Support for AWS rekognition
+dev-libs/aws-sdk-cpp:aws_targets_resource-groups - SDK Support for AWS resource-groups
+dev-libs/aws-sdk-cpp:aws_targets_resourcegroupstaggingapi - SDK Support for AWS resourcegroupstaggingapi
+dev-libs/aws-sdk-cpp:aws_targets_route53 - SDK Support for AWS route53
+dev-libs/aws-sdk-cpp:aws_targets_route53domains - SDK Support for AWS route53domains
+dev-libs/aws-sdk-cpp:aws_targets_s3 - SDK Support for AWS s3
+dev-libs/aws-sdk-cpp:aws_targets_s3-encryption - SDK Support for AWS s3-encryption
+dev-libs/aws-sdk-cpp:aws_targets_sagemaker - SDK Support for AWS sagemaker
+dev-libs/aws-sdk-cpp:aws_targets_sagemaker-runtime - SDK Support for AWS sagemaker-runtime
+dev-libs/aws-sdk-cpp:aws_targets_sdb - SDK Support for AWS sdb
+dev-libs/aws-sdk-cpp:aws_targets_secretsmanager - SDK Support for AWS secretsmanager
+dev-libs/aws-sdk-cpp:aws_targets_serverlessrepo - SDK Support for AWS serverlessrepo
+dev-libs/aws-sdk-cpp:aws_targets_servicecatalog - SDK Support for AWS servicecatalog
+dev-libs/aws-sdk-cpp:aws_targets_servicediscovery - SDK Support for AWS servicediscovery
+dev-libs/aws-sdk-cpp:aws_targets_shield - SDK Support for AWS shield
+dev-libs/aws-sdk-cpp:aws_targets_sms - SDK Support for AWS sms
+dev-libs/aws-sdk-cpp:aws_targets_snowball - SDK Support for AWS snowball
+dev-libs/aws-sdk-cpp:aws_targets_sns - SDK Support for AWS sns
+dev-libs/aws-sdk-cpp:aws_targets_sqs - SDK Support for AWS sqs
+dev-libs/aws-sdk-cpp:aws_targets_ssm - SDK Support for AWS ssm
+dev-libs/aws-sdk-cpp:aws_targets_states - SDK Support for AWS states
+dev-libs/aws-sdk-cpp:aws_targets_storagegateway - SDK Support for AWS storagegateway
+dev-libs/aws-sdk-cpp:aws_targets_sts - SDK Support for AWS sts
+dev-libs/aws-sdk-cpp:aws_targets_support - SDK Support for AWS support
+dev-libs/aws-sdk-cpp:aws_targets_swf - SDK Support for AWS swf
+dev-libs/aws-sdk-cpp:aws_targets_text-to-speech - SDK Support for AWS text-to-speech
+dev-libs/aws-sdk-cpp:aws_targets_transcribe - SDK Support for AWS transcribe
+dev-libs/aws-sdk-cpp:aws_targets_transfer - SDK Support for AWS transfer
+dev-libs/aws-sdk-cpp:aws_targets_translate - SDK Support for AWS translate
+dev-libs/aws-sdk-cpp:aws_targets_waf - SDK Support for AWS waf
+dev-libs/aws-sdk-cpp:aws_targets_waf-regional - SDK Support for AWS waf-regional
+dev-libs/aws-sdk-cpp:aws_targets_workdocs - SDK Support for AWS workdocs
+dev-libs/aws-sdk-cpp:aws_targets_workmail - SDK Support for AWS workmail
+dev-libs/aws-sdk-cpp:aws_targets_workspaces - SDK Support for AWS workspaces
+dev-libs/aws-sdk-cpp:aws_targets_xray - SDK Support for AWS xray
 dev-libs/beignet:ocl-icd - Enable compatibility with the dev-libs/ocl-icd OpenCL ICD loader
 dev-libs/beignet:ocl20 - Enable experimental OpenCL 2.0 support on Skylake and newer architectures
 dev-libs/bitset:jemalloc - Use dev-libs/jemalloc for allocations
@@ -2142,13 +2297,14 @@ dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
 dev-libs/efl:ivi - Enable ivi-shell support
 dev-libs/efl:libuv - Enable dev-libs/libuv support
-dev-libs/efl:luajit - USE dev-lang/lua instead of dev-lang/luajit
+dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
 dev-libs/efl:oldlua - USE dev-lang/lua instead of dev-lang/luajit
 dev-libs/efl:physics - Enable Bullet physics effects and support
 dev-libs/efl:pixman - Enable PixMan for software rendering
 dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
+dev-libs/efl:system-lz4 - Use system liblz4 instead of bundled one
 dev-libs/efl:tga - Enable Tga image loader
 dev-libs/efl:tslib - Enable x11-libs/tslib for touchscreen events
 dev-libs/efl:unwind - Enable debug support via sys-libs/libunwind
@@ -2449,6 +2605,7 @@ dev-ml/zarith:mpir - Use MPIR library instead of GMP.
 dev-perl/App-Nopaste:browser - Spawn browser with pasted page
 dev-perl/App-Nopaste:clipboard - copying of URLs with -x/--copy
 dev-perl/App-Nopaste:github - Github authentication
+dev-perl/App-Nopaste:gitlab - Ensure git is installed for reading/passing GitLab authentication
 dev-perl/App-Nopaste:pastebin - pastebin.com support
 dev-perl/Business-ISBN:barcode - Install dev-perl/GD-Barcode for rendering ISBN numbers as barcodes
 dev-perl/Config-Any:conf - Install dev-perl/Config-General to support decoding .conf/.cnf files
@@ -2687,7 +2844,6 @@ dev-python/twisted-core:serial - include serial port support
 dev-python/vatnumber:vies - Enable VIES
 dev-python/ws4py:client - Install client modules
 dev-python/ws4py:server - Install server modules
-dev-python/wxpython:doc - Install HTML wxWidgets docs and wxpython API reference.
 dev-python/wxpython:examples - Install interactive demo module browser and sample applets.
 dev-python/zeep:async - Add async support
 dev-python/zeep:tornado - Add tornado support
@@ -3681,6 +3837,7 @@ mail-client/balsa:crypt - Adds support for GnuPG encryption
 mail-client/balsa:rubrica - Adds support for rubrica addressbook
 mail-client/claws-mail:archive - Enable archiving plugin
 mail-client/claws-mail:bogofilter - Build mail-filter/bogofilter plugin
+mail-client/claws-mail:dillo - Enable dillo html viewer plugin
 mail-client/claws-mail:gdata - Enable plugin for access to Google data providers
 mail-client/claws-mail:gtk3 - Build support for GTK+3
 mail-client/claws-mail:libcanberra - Enable sound notification in connection with USE=notification
@@ -4097,7 +4254,7 @@ media-gfx/nvidia-texture-tools:cuda - Enable NVIDIA CUDA toolkit support
 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
 media-gfx/openexr_viewers:cg - Add support for nvidia's cg shaders
-media-gfx/openvdb:abi3-compat - Enables compatibility with the old 3.x ABI. enabled by dfault.
+media-gfx/openvdb:abi3-compat - Disables newer features to maintain compatibility with ABI3. Enabled by default.
 media-gfx/photoqt:devil - Support additional image formats using media-libs/devil
 media-gfx/photoqt:exiv2 - Use media-gfx/exiv2 as optional dependency
 media-gfx/photoqt:freeimage - Support additional iamge formats using media-libs/freeimage
@@ -4109,6 +4266,7 @@ media-gfx/pqiv:archive - Enable support for images in archives and cbX comic boo
 media-gfx/pstoedit:emf - Enable media-libs/libemf support
 media-gfx/pstoedit:flash - Enable media-libs/ming SWF support
 media-gfx/pstoedit:pptx - Enable support for generating PowerPoint pptx files
+media-gfx/qimgv:video - Add support for gif/webm playback via libmpv
 media-gfx/qiv:magic - Use libmagic to determine mimetypes
 media-gfx/sigal:s3 - Enables support for the Amazon S3 service.
 media-gfx/simple-scan:colord - Support color management using x11-misc/colord
@@ -4125,6 +4283,7 @@ media-gfx/yafaray:fasttrig - Enable trigonometric approximations to make code fa
 media-gfx/yafaray:opencv - Use media-libs/opencv
 media-libs/a52dec:djbfft - Prefer D.J. Bernstein's library for fourier transforms
 media-libs/allegro:dumb - Enable media-libs/dumb module library support
+media-libs/allegro:opus - Enable Opus codec support
 media-libs/allegro:physfs - Enable physfs support
 media-libs/allegro:vga - Enables the VGA graphics driver
 media-libs/alsa-lib:alisp - Enable support for ALISP (ALSA LISP) interpreter for advanced features.
@@ -4326,7 +4485,6 @@ media-libs/opencv:eigen - Enable usage of dev-cpp/eigen for computations
 media-libs/opencv:gdal - Enable support for sci-libs/gdal library
 media-libs/opencv:gflags - Use Google's C++ argument parsing library
 media-libs/opencv:glog - Use Google's C++ loggin library
-media-libs/opencv:ipp - Enable Intel Integrated Primitive support
 media-libs/opencv:opencl - Add support for OpenCL
 media-libs/opencv:tesseract - Use Google's OCR Engine
 media-libs/opencv:testprograms - Build and install programs for testing OpenCV (performance)
@@ -4384,6 +4542,7 @@ media-libs/speex:vbr - Enable VBR support.
 media-libs/svgalib:kernel-helper - Build the helper kernel module
 media-libs/taglib:boost - Use dev-libs/boost instead of GCC built-ins
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
+media-libs/urt:tools - Install tools
 media-libs/vigra:valgrind - Enable valgrind in make check
 media-libs/vulkan-loader:demos - Build vulkan demos and vulkaninfo
 media-libs/vulkan-loader:layers - Build the vulkan layers
@@ -4402,7 +4561,6 @@ media-libs/x265:power8 - Enable support for Power 8 assembly optimizations.
 media-libs/xine-lib:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray
 media-libs/xine-lib:dxr3 - Enable support for DXR3 mpeg acceleration cards.
 media-libs/xine-lib:flac - Build the media-libs/flac based FLAC demuxer and decoder. This flag is not needed for playing FLAC content, neither standalone nor in Ogg container (OggFLAC), but might have better support for exotic features like 24-bit samples or 96kHz sample rates.
-media-libs/xine-lib:fusionsound - Enable support for the Fusion audio sub system
 media-libs/xine-lib:gtk - Build the gdkpixbuf-based image decoder plugin.
 media-libs/xine-lib:imagemagick - Build the ImageMagick-based image decoder plugin.
 media-libs/xine-lib:mad - Build the media-libs/libmad based mp3 decoder. This mp3 decoder has superior support compared to the one coming from FFmpeg that is used as a fallback. If you experience any bad behaviour with mp3 files (skipping, distorted sound) make sure you enabled this USE flag.
@@ -4678,6 +4836,8 @@ media-sound/mumble:rnnoise - Enable alternative noise suppression option based o
 media-sound/mumble:speech - Enable text-to-speech support in Mumble.
 media-sound/murmur:ice - Use dev-libs/Ice to enable remote control capabilities.
 media-sound/musescore:portmidi - Enable support for building against media-libs/portmidi
+media-sound/musescore:vorbis - Enable SoundFont support using media-libs/libvorbis
+media-sound/musescore:webengine - Use dev-qt/qtwebengine for embedded web browser
 media-sound/ncmpc:artist-screen - Enable artist screen
 media-sound/ncmpc:chat-screen - Enable the chat screen
 media-sound/ncmpc:colors - Enable color support
@@ -4777,7 +4937,7 @@ media-sound/supercollider:gedit - Enable the SCED user interface
 media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
 media-sound/supercollider:server - Build with internal server
 media-sound/supercollider:vim - Enable the SCVIM user interface
-media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service.
+media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
 media-sound/tomahawk:hatchet - Enable support for the synchronisation through Hatchet
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
 media-sound/traverso:lv2 - Add support for Ladspa V2
@@ -5143,31 +5303,23 @@ media-video/vdr:ttxtsubs - support for media-plugins/vdr-ttxtsubs
 media-video/vdr:vasarajanauloja - replacement for the liemikuutio patch, adds some nice must haves features
 media-video/vdr:wareagleicon - Replace original icon set in menu
 media-video/vdr:yaepg - Enables support for the vdr-yaepg plugin
-media-video/vlc:X - Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface
+media-video/vlc:X - Enable support for e.g. fullscreen mode via X and the X C-language binding. It does not build a graphical interface
 media-video/vlc:aom - Enable experimental support for AV1 codec
 media-video/vlc:archive - Enable support for libarchive stream extractor
 media-video/vlc:aribsub - Enable support for decoding ARIB STD-B24 subtitles
-media-video/vlc:atmo - Enable support for AtmoLight (homebrew Ambient Lighting Technology)
-media-video/vlc:audioqueue - Enable AudioQueue audio module for Mac OS X
-media-video/vlc:avcodec - Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg
-media-video/vlc:avformat - Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg
 media-video/vlc:bluray - Enable libbluray for Blu-ray disc support
 media-video/vlc:chromaprint - Enable libchromaprint for Chromaprint based audio fingerprinter support
 media-video/vlc:chromecast - Enable experimental support for Google Chromecast
 media-video/vlc:dc1394 - Enable IIDC cameras support
-media-video/vlc:directx - Enable Win32 DirectX support
+media-video/vlc:directx - Enable Win32 DirectX, D3D11va and DxVA2 support
 media-video/vlc:dvbpsi - Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via media-libs/libdvbpsi
-media-video/vlc:dxva2 - Enable Win32 DxVA2 support
 media-video/vlc:encode - Enable streaming-output support and videolan manager to control multiple streams from within one instance
 media-video/vlc:faad - Enable AAC audio decoding library support via media-libs/faad2
 media-video/vlc:fdk - Enable the Fraunhofer AAC codec library
 media-video/vlc:fluidsynth - Enable Fluidsynth MIDI software synthesis (with external sound fonts)
 media-video/vlc:gcrypt - Enable cryptography support via libgcrypt
 media-video/vlc:gme - Enable support for media-libs/game-music-emu for playing various video game music formats
-media-video/vlc:gnome - Adds support for GNOME's filesystem abstraction layer, gnome-base/gnome-vfs. This flag is not GUI-related
-media-video/vlc:growl - Enable growl notification support (over UDP for remote access and native on OSX)
 media-video/vlc:gstreamer - Enable GStreamer based decoding support (currently supports only video decoding)
-media-video/vlc:httpd - Enable a web based interface for vlc
 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:libtar - Uses libtar instead of the built-in tar reader for reading custom skins
@@ -5175,11 +5327,8 @@ 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
 media-video/vlc:live - Enable live555 streaming media support (client support for rtsp)
 media-video/vlc:lua - Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things
-media-video/vlc:macosx-dialog-provider - Enable Mac OS X dialog module
-media-video/vlc:macosx-eyetv - Enable Mac OS X EyeTV (TNT Tuner) module
 media-video/vlc:macosx-notifications - Enable Mac OS X notifications module (formerly growl)
 media-video/vlc:macosx-qtkit - Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module
-media-video/vlc:macosx-quartztext - Enable Mac OS X quartz text module
 media-video/vlc:matroska - Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)
 media-video/vlc:mpeg - Add libmpeg2 support for mpeg-1 and mpeg-2 video streams
 media-video/vlc:nfs - Enable support for nfs protocol via net-fs/libnfs
@@ -5199,16 +5348,12 @@ media-video/vlc:sid - Adds support for playing C64 SID files through media-libs/
 media-video/vlc:skins - Enable support for the skins2 interface
 media-video/vlc:soxr - Enable SoX Resampler support via media-libs/soxr
 media-video/vlc:srt - Enable support for Secure Reliable Transport (SRT) via net-libs/srt
-media-video/vlc:swscale - Enable image scaling and conversion via libswscale (part of FFmpeg)
 media-video/vlc:tremor - Enable tremor, a fixed-point version of the Ogg Vorbis decoder
 media-video/vlc:twolame - Enable twolame support (MPEG Audio Layer 2 encoder)
 media-video/vlc:upnp - Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink
-media-video/vlc:vcdx - Enable VCD with navigation via libvcdinfo (depends on cdio)
-media-video/vlc:vlm - New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC
 media-video/vlc:vpx - Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK
 media-video/vlc:wma-fixed - Enable fixed point WMA decoder
 media-video/vlc:x265 - Support X265 Encoder
-media-video/vlc:xcb - Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678
 media-video/vlc:zeroconf - Enable support for zero-configuration networking via avahi
 media-video/vlc:zvbi - Enable support for teletext subtitles via the zvbi library
 media-video/webcamoid:headers - Install development headers
@@ -5527,7 +5672,6 @@ net-dialup/ppp:ipv6 - Enables support for IP version 6
 net-dialup/ppp:pam - Enables PAM (Pluggable Authentication Modules) support
 net-dialup/ppp:radius - Enables RADIUS support
 net-dialup/xl2tpd:dnsretry - Patch for host lookup retries, activated by redial feature
-net-dialup/xl2tpd:kernel - Enable kernel interface for PPPoL2TP
 net-dns/avahi:autoipd - Build and install the IPv4LL (RFC3927) network address configuration daemon
 net-dns/avahi:bookmarks - Install the avahi-bookmarks application (requires dev-python/twisted-core and dev-python/twisted-web)
 net-dns/avahi:gtk3 - Build the avahi-ui-gtk3 library, and use gtk3 for the avahi utilities under USE=utils
@@ -5776,6 +5920,9 @@ net-im/corebird:glade - Install glade catalogs for corebird
 net-im/corebird:spellcheck - Support spell checking
 net-im/coturn:mongodb - Enable support for the mongodb database
 net-im/coturn:redis - Enable support for the redis database
+net-im/dino:gnupg - Enable OpenPGP encryption plugin
+net-im/dino:http - Enable HTTP file upload plugin
+net-im/dino:omemo - Enable OMEMO encryption plugin
 net-im/ejabberd:captcha - Support for CAPTCHA Forms (XEP-158) on registration
 net-im/ejabberd:full-xml - Use XML features in XMPP stream (ex: CDATA), requires XML compliant clients
 net-im/ejabberd:hipe - Compile natively with HiPE, not recommended
@@ -5802,7 +5949,6 @@ net-im/ekg2:ssl - Enable the complete SSL/TLS support through OpenSSL. This also
 net-im/empathy:gnome-online-accounts - Enable using net-libs/gnome-online-accounts for authorization (e.g. for Google Talk)
 net-im/empathy:map - Enable world map support through media-libs/libchamplain
 net-im/err:irc - Pull optional dependencies, needed for IRC backend
-net-im/err:plugins - Enable support for installing plugins with dev-vcs/git
 net-im/gajim:idle - Enable idle module
 net-im/gajim:srv - SRV capabilities
 net-im/gajim:xhtml - Enable XHTML support
@@ -5841,7 +5987,7 @@ net-im/psi:webkit - Enable themed, html-based chatlogs
 net-im/psi:whiteboarding - Enable experimental interactive SVG drawing
 net-im/pyicq-t:webinterface - Install dependencies needed for the web interface
 net-im/qtox:X - Adds support for X11
-net-im/qtox:gtk - Adds support for GTK and Status Notifier tray backends
+net-im/qtox:notification - Adds support for GTK Status Notifier tray backends
 net-im/skypeforlinux:pax_kernel - Triggers a paxmarking of the main skype binary
 net-im/slack-bin:pax_kernel - Triggers a paxmarking of the binary
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
@@ -5855,8 +6001,10 @@ net-im/telepathy-connection-managers:yahoo - Enable Yahoo! messaging support.
 net-im/telepathy-connection-managers:zeroconf - Enable Link-Local Messaging via the zeroconf or Bonjour protocol.
 net-im/tkabber:plugins - Enables installation the extra plugins
 net-im/toxic:audio - Enables audio calling
+net-im/toxic:notification - Enables desktop notifications with libnotify, with sound support.
 net-im/toxic:notifications - Enables desktop notifications with libnotify, with sound support.
 net-im/toxic:qrcode - Enables QR code support
+net-im/toxic:sound - Enables audio calling
 net-im/toxic:video - Enables video calling
 net-im/vacuum:adiummessagestyle - Use UI styles created for Adium
 net-im/vacuum:annotations - Enable adding comments to the contacts in the roster
@@ -6360,6 +6508,7 @@ net-misc/chrony:refclock - Support for reference clocks
 net-misc/chrony:rtc - Support for the Linux Real Time Clock interface
 net-misc/connman:ethernet - Enable ethernet support.
 net-misc/connman:iptables - Use net-firewall/iptables as firewall.
+net-misc/connman:iwd - Enable wifi support via net-wireless/iwd
 net-misc/connman:l2tp - Use net-dialup/xl2tpd for L2TP VPN support.
 net-misc/connman:nftables - Use net-firewall/nftables as firewall.
 net-misc/connman:ofono - Use net-misc/ofono for telephony support.
@@ -6438,8 +6587,6 @@ net-misc/gerbera:taglib - Use media-libs/taglib for reading files' metadata
 net-misc/gnome-online-miners:flickr - Enable Flickr support
 net-misc/gsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
 net-misc/gsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
-net-misc/guacamole-server:ssh - enable support for ssh connections
-net-misc/guacamole-server:telnet - enable support for telnet connections
 net-misc/gwget:epiphany - Build epiphany extensions
 net-misc/hotot:chrome - Build chrome browser extension
 net-misc/htbinit:esfq - Add support for Enhanced Stochastic Fairness queueing discipline.
@@ -6969,8 +7116,10 @@ net-wireless/aircrack-ng:experimental - Build the "experimental" tools which may
 net-wireless/aircrack-ng:netlink - Use netlink for channel control instead of WEXT
 net-wireless/aircrack-ng:unstable - Build the "unstable" tools which may randomly fail to run properly
 net-wireless/bladerf:tecla - use libtecla for command line editing, tab completion, and history
-net-wireless/bladerf-fpga:x115 - bitstream for the x115KLE Cyclone IV FPGA bladerf model"
-net-wireless/bladerf-fpga:x40 - bitstream for the x40KLE Cyclone IV FPGA bladerf model"
+net-wireless/bladerf-fpga:x115 - bitstream for the x115 kLE Cyclone IV FPGA bladerf model"
+net-wireless/bladerf-fpga:x40 - bitstream for the x40 kLE Cyclone IV FPGA bladerf model"
+net-wireless/bladerf-fpga:xA4 - bitstream for the xA4 49 kLE Cyclone V FPGA bladerf 2.0 micro model"
+net-wireless/bladerf-fpga:xA9 - bitstream for the xA9 301 kLE Cyclone V FPGA bladerf 2.0 micro model"
 net-wireless/blueman:appindicator - Enable usage of dev-libs/libappindicator to export menu options
 net-wireless/blueman:network - Add functionality to setup (host) PAN connections using either net-dns/dnsmasq or net-misc/dhcp
 net-wireless/bluez:btpclient - Enable BTP client
@@ -7513,6 +7662,10 @@ sci-physics/geant:geant3 - Add compatibility for geant321 to geant4
 sci-physics/geant:inventor - Add support for Open Inventor SGI toolkit via Coin3D
 sci-physics/geant:raytracerx - Enable raytracing for physics events
 sci-physics/geant:vrml - Enable output of geant4 in vrml formats
+sci-physics/geant-vmc:g4root - Build G4Root (interface for GEANT4 simulation with a ROOT geometry)
+sci-physics/geant-vmc:geant3 - Build with Geant4 G3toG4 library
+sci-physics/geant-vmc:mtroot - Build MTRoot (provides ROOT IO manager classes with multi-threading support)
+sci-physics/geant-vmc:vgm - Enable the Virtual Geometry Model (sci-physics/vgm)
 sci-physics/hepmc:cm - Build with cm instead of default mm for length units
 sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units
 sci-physics/herwig++:c++11 - Build Herwig++ using the C++11 standard. Experimental feature, not for production use.
@@ -7526,6 +7679,7 @@ sci-physics/pythia:lhapdf - Support the use of external PDF sets via sci-physics
 sci-physics/pythia:root - Use sci-physics/root trees and histograms (in examples only)
 sci-physics/root:R - Enable support for dev-lang/R
 sci-physics/root:asimage - Enable support for media-libs/libafterimage
+sci-physics/root:cuda - Enable support for nVidia CUDA
 sci-physics/root:davix - Enable support for DAVIX Data Management Client (https://cern.ch/davix)
 sci-physics/root:fits - Enable support for images and data from FITS files with sci-libs/cfitsio
 sci-physics/root:fortran - Compile included Fortran programs
@@ -7533,7 +7687,6 @@ sci-physics/root:gdml - Enable GDML writer and reader
 sci-physics/root:http - Enable http server support including but not limited to fastcgi support
 sci-physics/root:jemalloc - Enable support for dev-libs/jemalloc
 sci-physics/root:libcxx - Build ROOT against sys-libs/libcxx
-sci-physics/root:math - Build all math related libraries plugins, needs sci-libs/gsl
 sci-physics/root:memstat - Build memory statistics library, helps to detect memory leaks
 sci-physics/root:minuit - Build ROOT's internal versions of minuit (fortran) and minuit2 (C++)
 sci-physics/root:pythia6 - Build the interface for sci-physics/pythia version 6.x
@@ -7761,6 +7914,7 @@ sys-apps/roccat-tools:input_devices_roccat_ryosmkfx - Enable support for Ryos Mk
 sys-apps/roccat-tools:input_devices_roccat_skeltr - Enable support for Skeltr keyboard.
 sys-apps/roccat-tools:input_devices_roccat_sova - Enable support for Sova keyboard.
 sys-apps/roccat-tools:input_devices_roccat_suora - Enable support for Suora keyboard.
+sys-apps/rtl-entropy:bladerf - Build with Nuand BladeRF support
 sys-apps/s390-tools:fuse - build cmsfs-fuse to read files stored on a z/VM CMS disk
 sys-apps/s390-tools:ncurses - build hyptop monitoring program
 sys-apps/s390-tools:pfm - build the cpacfstats tool
@@ -8237,6 +8391,7 @@ sys-fs/udisks:gptfdisk - Pull in sys-apps/gptfdisk for sgdisk command as used by
 sys-fs/udisks:lvm - Add support for Logical Volume Management via sys-fs/lvm2.
 sys-fs/udisks:remote-access - Control whether connections from other clients over LAN are allowed
 sys-fs/udisks:systemd - Support sys-apps/systemd's logind
+sys-fs/udisks:vdo - Enable Virtual Data Optimizer support.
 sys-fs/zfs:kernel-builtin - Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree
 sys-fs/zfs:rootfs - Enable dependencies required for booting off a pool containing a rootfs
 sys-fs/zfs:test-suite - Install regression test suite
@@ -8449,7 +8604,6 @@ www-apps/drupal:accelerator - Add dependency on a php accelerator
 www-apps/drupal:uploadprogress - Install dev-php/pecl-uploadprogress package
 www-apps/gitit:network-uri - Get Network.URI from the network-uri package.
 www-apps/gitit:plugins - enables optional plugin runtime loader
-www-apps/guacamole:noauth - enable support for leaving out any authentication on the webinterface
 www-apps/hugo:sass - Enable SASS/SCSS support
 www-apps/icingaweb2:nginx - Adds support for nginx
 www-apps/ikiwiki:extras - Installs additional modules used by ikiwiki plugins
@@ -8787,7 +8941,6 @@ x11-libs/qscintilla:designer - Build plugin for Qt Designer
 x11-libs/qwt:designer - Installs dev-qt/designer plugin.
 x11-libs/qwt:mathml - Use the MathML renderer of the Qt solutions package.
 x11-libs/vte:glade - Provide integration with dev-util/glade.
-x11-libs/wxGTK:gnome - Use gnome-base/libgnomeprintui for printing tasks.
 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.
@@ -8816,7 +8969,6 @@ x11-misc/mate-notification-daemon:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/mozo:gtk3 - Build with GTK+3 instead of GTK+2
 x11-misc/mugshot:gnome - Add support for gnome-base/gnome-control-center
 x11-misc/mugshot:libreoffice - Add support for app-office/libreoffice and app-office/libreoffice-bin
-x11-misc/mugshot:pidgin - Add support for setting the avatar in net-im/pidgin
 x11-misc/mugshot:webcam - Add support for setting a profile photo in media-video/cheese
 x11-misc/openbox-menu:icons - Enable support for icons in menus
 x11-misc/openbox-menu:svg - Support SVG icons