18 files changed, 57 insertions, 53 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 0fd9ea14b178..9c391e600303 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index c7f454b95550..38084be13819 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+
 # Tobias Klausmann <klausman@gentoo.org> (17 Sep 2015)
 # Move this mask here (from package.use.mask) until net-fs/libnfs goes stable.
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 1de040a58101..0d52a2c83111 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -57,7 +57,7 @@ app-doc/doxygen clang
 dev-perl/GD fcgi
 media-libs/libcanberra gnome
 media-libs/mesa vaapi
-media-sound/pulseaudio equalizer qt4 qt5 realtime
+media-sound/pulseaudio equalizer qt5 realtime
 media-video/ffmpeg celt ebur128 kvazaar libilbc openh264
 media-video/ffmpeg rubberband sdl ssh x265 zeromq zimg
 net-libs/gnutls idn
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index e26995b8a676..e9d302285d1e 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -109,7 +109,6 @@ media-libs/xine-lib vaapi
 
 # media-libs/nas
 media-libs/libsdl nas
-dev-qt/qtgui nas
 app-editors/xemacs nas
 media-sound/mpg123 nas
 media-video/mplayer nas
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e1df758480b8..1d1a39a0266b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -135,11 +135,6 @@ sys-apps/systemd -gnuefi
 dev-java/oracle-jdk-bin -javafx -nsplugin
 dev-java/oracle-jre-bin -javafx -nsplugin
 
-# Michael Sterrett <mr_bones_@gentoo.org> (21 Apr 2015)
-# None of the fusionsound deps support multilib currently, maybe later.
-# Hiding the use flag fixes bug #545662 for now.
-media-libs/libsdl2 fusionsound
-
 # Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag
 media-libs/libbluray -bdplus
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 8b26a8794e8d..b3a48f0e0b25 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
+# Needs dev-libs/libmaxminddb which isn't keyworded
+app-admin/syslog-ng geoip2
+
 # Thomas Deutschmann <whissi@gentoo.org> (04 Jul 2018)
 # dev-libs/xxhash not keyworded for arm
 app-admin/rsyslog xxhash
@@ -245,10 +249,6 @@ app-portage/g-sorcery bson
 # samba-4 not keyworded on arm
 sys-auth/sssd samba
 
-# Markus Meier <maekke@gentoo.org> (03 Apr 2015)
-# Deps not yet stable or keyworded
-media-libs/libsdl2 fusionsound
-
 # Alexis Ballier <aballier@gentoo.org> (02 Apr 2015)
 # Needs ilmbase (openexr), which does not build and is masked on arm.
 media-libs/freeimage tiff
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index c10e731883fc..c702ac7c47ee 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# 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
+app-editors/emacs mailutils xwidgets
+
 # Mikle Kolyada <zlogene@gentoo.org> (16 Jul 2018)
 # No stable qtnetwork
 net-irc/znc test
@@ -14,10 +19,6 @@ dev-db/qdbm java
 app-text/dblatex inkscape
 
 # Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
-# Requires unstable dev-python/PyQt4
-media-sound/pulseaudio qt4
-
-# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
 # Requires not stabilised dev-python/restkit
 dev-python/wsgiproxy2 test
 dev-python/pyquery test
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 25983b9f5b5c..9f8482645756 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Tomáš Mózes <hydrapolic@gmail.com> (10 Aug 2018)
+# Needs dev-libs/libmaxminddb which isn't keyworded
+app-admin/syslog-ng geoip2
+
 # Matthew Thode <prometheanfire@gentoo.org> (18 Jul 2018)
 # dev-python/pandas not keyworded and test uses pandas
 dev-python/networkx pandas test
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index bffe985b4d1d..9e3b7b3e2365 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -184,10 +184,6 @@ media-sound/pulseaudio equalizer -oss
 # media-sound/lilypond has problems running mpost (bug #416961)
 app-text/asciidoc test
 
-# Jeroen Roovers <jer@gentoo.org> (26 Apr 2012)
-# Untested dependency on net-misc/connman
-dev-qt/qtbearer connman
-
 # Jeroen Roovers <jer@gentoo.org> (19 Apr 2012)
 # Requires sys-power/upower or sys-power/upower-pm-utils which are
 # not much use on HPPA
diff --git a/profiles/arch/ia64/package.use.stable.mask b/profiles/arch/ia64/package.use.stable.mask
index 1e80f4364342..13b1358cdf1a 100644
--- a/profiles/arch/ia64/package.use.stable.mask
+++ b/profiles/arch/ia64/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+app-editors/emacs mailutils xwidgets
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (6 Jan 2018)
 # Please unmask after newer dietlibc is finally stable on ia64
 sys-fs/dmraid dietlibc
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index c9e0a7b9710b..fcff1116df40 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# 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
+app-editors/emacs mailutils xwidgets
+
 # Andreas Sturmlechner <asturm@gentoo.org> (20 Jun 2018)
 # dev-python/PyQt5 is not stable.
 media-sound/pulseaudio qt5
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index ae2d441f7338..3d2684931cfa 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -89,10 +89,6 @@ x11-terms/gnome-terminal gnome-shell
 # unkeyworded rev deps
 dev-games/openscenegraph gdal las
 
-# Justin Lecher <jlec@gentoo.org> (15 Jan 2017)
-# masked rev deps
-media-libs/libsdl2 fusionsound
-
 # Pacho Ramos <pacho@gentoo.org> (02 Jan 2017)
 # Don't keyword redis
 dev-libs/hiredis test
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 01744a72fa90..a0a1d4f977ba 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -135,10 +135,9 @@ PYTHON_SINGLE_TARGET="python3_6"
 # Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
 # Moved from portage's make.globals.
 # 1) do not uninstall kernel modules and therefore allow replacing them,
-# 2) allow replacing unowned compiled Python modules (python-r1 migration),
-# 3) allow replacing unowned dropin.cache files (twisted-r1 migration).
+# 2,3) removed wrt bug #663170,
 # 4) protect /var/{run,lock} symlinks for bug 519620
-COLLISION_IGNORE="/lib/modules/* *.py[co] *\$py.class */dropin.cache"
+COLLISION_IGNORE="/lib/modules/*"
 UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (23 Aug 2013)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index fd2b151749f7..7074d96eb53f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,11 +7,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Mike Gilbert <floppym@gentoo.org> (05 Aug 2018)
-# Fails to build.
-# https://bugs.gentoo.org/661880
->=www-client/chromium-69 system-icu
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (3 Aug 2018)
 # New and for Gentoo still quite experimental. You've been
 # warned. (Also, works only on x86_64 and with certain CPUs
@@ -35,13 +30,11 @@ sci-libs/ViSP qt4
 # Andreas Sturmlechner <asturm@gentoo.org> (18 Jun 2018)
 # dev-python/PyQt4 and dev-python/pyside are dead and going away.
 dev-python/pandas X
-media-sound/pulseaudio qt4
 media-video/syncplay gui
 net-wireless/gnuradio qt4
 
 # Pacho Ramos <pacho@gentoo.org> (17 Jun 2018)
 # dev-libs/DirectFB is being removed (#606194)
-media-libs/libsdl2 fusionsound
 media-libs/xine-lib fusionsound
 www-plugins/gnash directfb
 
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index b35a30ebccb7..560311c41759 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans <grknight@gentoo.org> (10 Aug 2018)
+# Mask PHP 7.3 target while in beta
+php_targets_php7-3
+
 # Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
 # media-sound/mumble is masked/not keyworded at this point, bug #656826.
 mumble
@@ -102,10 +106,6 @@ netlink
 # could suffer unexpected problem, don't expect support for it then.
 openrc-force
 
-# Brian Evans <grknight@gentoo.org> (2 Dec 2015)
-# php 5.4 is end of life, masked for removal
-php_targets_php5-4
-
 # Brian Evans <grknight@gentoo.org> (22 Aug 2016)
 # php 5.5 is end of life, masked for removal
 php_targets_php5-5
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index a5189b32dc10..c532d52bae54 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -11,6 +11,11 @@ sys-devel/gcc -pie
 >=www-client/chromium-62.0.3202.9 -system-icu
 >=www-client/firefox-56.0 -system-icu
 
+# Mike Gilbert <floppym@gentoo.org> (05 Aug 2018)
+# Fails to build.
+# https://bugs.gentoo.org/661880
+>=www-client/chromium-69 system-icu
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following need pdftk, which is masked now
 app-text/getxbook pdf
diff --git a/profiles/releases/17.0/package.use.stable.mask b/profiles/releases/17.0/package.use.stable.mask
index 9a9410ed7366..1f4a6f6c548d 100644
--- a/profiles/releases/17.0/package.use.stable.mask
+++ b/profiles/releases/17.0/package.use.stable.mask
@@ -4,7 +4,3 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
-# Remove when ICU 59 or later becomes stable
->=www-client/chromium-62.0.3202.9 system-icu
-
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cfd76a5d69a6..cab6a2a629c0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -171,6 +171,7 @@ app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's intern
 app-admin/sudo:sendmail - Allow sudo to send emails with sendmail
 app-admin/sysklogd:logrotate - use app-admin/logrotate for rotating logs rather than custom cron scripts
 app-admin/syslog-ng:amqp - Enable support for AMQP destinations
+app-admin/syslog-ng:geoip2 - Add support for geo lookup based on IPs via dev-libs/libmaxminddb
 app-admin/syslog-ng:http - Enable support for HTTP destinations
 app-admin/syslog-ng:json - Enable support for JSON template formatting via dev-libs/json-c
 app-admin/syslog-ng:mongodb - Enable support for mongodb destinations
@@ -819,6 +820,7 @@ app-i18n/rime-data:extra - Install extra packages
 app-i18n/scim:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:kasumi - Use Anthy dictionary maintenance tool (app-dicts/kasumi)
+app-i18n/scim-sunpinyin:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/tomoe:hyperestraier - Enable support for app-text/hyperestraier
 app-i18n/translate-shell:tts - Enable text-to-speech support
 app-i18n/uim:anthy - Enable support for app-i18n/anthy
@@ -1432,8 +1434,6 @@ dev-db/firebird:xinetd - Install ClassicServer
 dev-db/maatkit:udf - Build the MySQL UDFs shipped with maatkit, requires non-minimal MySQL
 dev-db/mariadb:backup - Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption
 dev-db/mariadb:client-libs - Build the client libraries from the server package instead of the C Connector packages
-dev-db/mariadb:cluster - Add support for NDB clustering (deprecated)
-dev-db/mariadb:community - Enables the community features from upstream.
 dev-db/mariadb:embedded - Build embedded server (libmysqld)
 dev-db/mariadb:extraengine - Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)
 dev-db/mariadb:galera - Enables galera replication
@@ -1444,8 +1444,6 @@ dev-db/mariadb:jdbc - Enable the CONNECT engine to access foreign databases via
 dev-db/mariadb:jemalloc - Use dev-libs/jemalloc for allocations.
 dev-db/mariadb:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mariadb:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
-dev-db/mariadb:max-idx-128 - Raise the max index per table limit from 64 to 128
-dev-db/mariadb:minimal - Install client programs only, no server
 dev-db/mariadb:mroonga - Add support for the Mroonga engine for interfacing with the Groonga text search
 dev-db/mariadb:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
 dev-db/mariadb:openssl - Enable SSL connections and crypto functions using dev-libs/openssl
@@ -1549,6 +1547,7 @@ dev-db/postgis:address-standardizer - Normalize US and CA postal addresses
 dev-db/postgis:gtk - Build graphical interface for shp2pgsql (shp2pgsql-gui)
 dev-db/postgis:mapbox - Add capability to transform geometry into Mapbox Vector Tile
 dev-db/postgis:topology - Build topology spatial types and functions
+dev-db/postgresql:llvm - Add support for llvm JIT engine
 dev-db/postgresql:pg_legacytimestamp - Use double precision floating-point numbers instead of 64-bit integers for timestamp storage.
 dev-db/postgresql:server - Disable to build and install the clients and libraries only.
 dev-db/postgresql:uuid - Enable server side UUID generation (via dev-libs/ossp-uuid).
@@ -3636,6 +3635,7 @@ kde-plasma/systemsettings:classic - Enable classic mode plugin, requires kde-fra
 lxde-base/lxdm:consolekit - Enables support for authorization using consolekit
 lxde-base/lxdm:gtk3 - Use GTK+3 instead of 2
 lxde-base/lxterminal:gtk3 - Use GTK+3 instead of GTK+2
+lxqt-base/lxqt-config:monitor - Build monitor settings tool
 lxqt-base/lxqt-meta:about - Install lxqt-base/lxqt-about
 lxqt-base/lxqt-meta:admin - Install lxqt-base/lxqt-admin
 lxqt-base/lxqt-meta:filemanager - Install x11-misc/pcmanfm-qt file manager
@@ -3645,13 +3645,17 @@ lxqt-base/lxqt-meta:lximage - Install media-gfx/lximage-qt image viewer
 lxqt-base/lxqt-meta:minimal - Do not install x11-wm/openbox window manager
 lxqt-base/lxqt-meta:oxygen - Prefer kde-frameworks/oxygen-icons (default)
 lxqt-base/lxqt-meta:powermanagement - Install lxqt-base/lxqt-powermanagement package
+lxqt-base/lxqt-meta:processviewer - Install x11-misc/qps package
+lxqt-base/lxqt-meta:screenshot - Install x11-misc/screengrab package
 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-panel:clock - Build clock plugin
 lxqt-base/lxqt-panel:colorpicker - Build colorpicker plugin
 lxqt-base/lxqt-panel:cpuload - Build cpuload plugin
 lxqt-base/lxqt-panel:desktopswitch - Build desktopswitch plugin
+lxqt-base/lxqt-panel:directorymenu - Build directorymenu plugin
 lxqt-base/lxqt-panel:dom - Build dom plugin
 lxqt-base/lxqt-panel:kbindicator - Build kbindicator plugin
 lxqt-base/lxqt-panel:mainmenu - Build mainmenu plugin
@@ -3660,12 +3664,14 @@ lxqt-base/lxqt-panel:networkmonitor - Build networkmonitor plugin
 lxqt-base/lxqt-panel:quicklaunch - Build quicklaunch plugin
 lxqt-base/lxqt-panel:sensors - Build sensors plugin
 lxqt-base/lxqt-panel:showdesktop - Build showdesktop plugin
+lxqt-base/lxqt-panel:spacer - Build spacer plugin
 lxqt-base/lxqt-panel:statusnotifier - Build statusnotifier plugin
 lxqt-base/lxqt-panel:sysstat - Build sysstat plugin
 lxqt-base/lxqt-panel:taskbar - Build taskbar plugin
 lxqt-base/lxqt-panel:tray - Build tray plugin
 lxqt-base/lxqt-panel:volume - Build volume plugin
 lxqt-base/lxqt-panel:worldclock - Build worldclock plugin
+lxqt-base/lxqt-session:themes - Install LXQt themes and graphics
 mail-client/alot:doc - Install user manual and API documentation
 mail-client/alpine:chappa - enhance alpine by applying Eduardo Chappa's patches
 mail-client/alpine:onlyalpine - installs only the alpine binary, so it does not collied with pico and/or pine
@@ -3829,7 +3835,6 @@ mail-filter/rspamd:fann - Enable neural network plugin (requires sci-mathematics
 mail-filter/rspamd:jemalloc - Use dev-libs/jemalloc for allocations
 mail-filter/rspamd:pcre2 - Use dev-libs/libpcre2
 mail-filter/rspamd:torch - Enable torch support. This is required for the neural module
-mail-filter/spamassassin:bayes - Require a database (MySQL, SQLite, Postgres, or BerkDB) backend to enable the Bayesian filtering database. If you use the Redis backend, you do not need to enable this flag (Redis support is enabled automatically, and has no external dependencies).
 mail-filter/spamassassin:cron - Install a cron job to update SpamAssassin's rules daily.
 mail-filter/spamassassin:qmail - Build qmail functionality and docs
 mail-filter/spamdyke:ssl - Enables TLS protocol for spamdyke
@@ -4243,7 +4248,6 @@ media-libs/libsdl:joystick - Control joystick support (disable at your own risk)
 media-libs/libsdl:sound - Control audio support (disable at your own risk)
 media-libs/libsdl:tslib - Build with tslib support for touchscreen devices
 media-libs/libsdl:video - Control video support (disable at your own risk)
-media-libs/libsdl2:fusionsound - use FusionSound audio driver
 media-libs/libsdl2:gles - include OpenGL ES support
 media-libs/libsdl2:haptic - Enable the haptic (force feedback) subsystem
 media-libs/libsdl2:joystick - Control joystick support (disable at your own risk)
@@ -5142,6 +5146,7 @@ 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: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
@@ -5164,6 +5169,7 @@ media-video/vlc:growl - Enable growl notification support (over UDP for remote a
 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
 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
@@ -6053,8 +6059,9 @@ net-libs/libsrtp:aesicm - Use AES ICM cryptographic algorithm
 net-libs/libsrtp:console - Use /dev/console instead of stdout for error messages
 net-libs/libsrtp:openssl - Use OpenSSL crypto primitives
 net-libs/libsrtp:syslog - Use syslog for error messages
-net-libs/libssh:gcrypt - Prefer dev-libs/libgcrypt over dev-libs/openssl for encryption
+net-libs/libssh:gcrypt - Use dev-libs/libgcrypt as TLS provider
 net-libs/libssh:gssapi - Enable gssapi support
+net-libs/libssh:mbedtls - Use net-libs/mbedtls as TLS provider
 net-libs/libssh:pcap - Build with PCAP output support
 net-libs/libssh:server - Build with SSH server support
 net-libs/libssh:sftp - Build with SFTP support
@@ -6519,7 +6526,6 @@ net-misc/networkmanager:wifi - Enable support for wifi and 802.1x security using
 net-misc/networkmanager-strongswan:glib - Enable libnm-glib compatibility.
 net-misc/nextcloud-client:dolphin - Install the kde-apps/dolphin extension
 net-misc/nextcloud-client:nautilus - Install the gnome-base/nautilus extension
-net-misc/nextcloud-client:sftp - Enable sftp transfer support via net-libs/libssh
 net-misc/nextcloud-client:shibboleth - Build support for Shibboleth single sign-on
 net-misc/ntp:openntpd - Allow ntp to be installed alongside openntpd
 net-misc/ntp:parse-clocks - Add support for PARSE clocks
@@ -6571,7 +6577,6 @@ net-misc/openssh:ssl - Enable additional crypto algorithms via OpenSSL
 net-misc/openvswitch:monitor - Build the Python and GUI dependent monitor applications
 net-misc/owncloud-client:dolphin - Install the kde-apps/dolphin extension
 net-misc/owncloud-client:nautilus - Install the gnome-base/nautilus extension
-net-misc/owncloud-client:sftp - Enable sftp transfer support via net-libs/libssh
 net-misc/owncloud-client:shibboleth - Build support for Shibboleth single sign-on
 net-misc/plowshare:view-captcha - View captcha with aview
 net-misc/ps3mediaserver:multiuser - Allow renderer customization per-user.
@@ -7292,6 +7297,7 @@ sci-libs/gdal:ogdi - Enable support for the open geographic datastore interface
 sci-libs/gdal:opencl - Enable OpenCL support
 sci-libs/gdal:spatialite - Enable Spatial DBMS over sqlite dev-db/spatialite
 sci-libs/gdal:xls - Add the dev-libs/freexl library for xls import support
+sci-libs/gdal:zstd - Enable support for ZSTD compression using app-arch/zstd
 sci-libs/grib_api:aec - Build with Adaptive Entropy Coding compression, needs sci-libs/libaec
 sci-libs/grib_api:jasper - Use media-libs/jasper instead of media-libs/openjpeg for JPEG 2000 support
 sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version