9 files changed, 87 insertions, 94 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6328fe23210f..c8acac4f08a2 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 797a1d4a7c84..e3cf93a146a3 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for arm, bug #653800
+# projectm not yet keyworded, bug #314969
+media-video/vlc aom chromaprint microdns opencv projectm
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux.
 app-admin/diamond mongo
@@ -11,10 +17,6 @@ mail-client/mutt notmuch
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm, bug #653800
-media-video/vlc microdns
-
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Feb 2018)
 # Depends on not yet keyworded dev-python/geoip-python. Bug #636860
 net-p2p/deluge geoip
@@ -510,9 +512,6 @@ app-admin/gkrellm ntlm
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
 # Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index d3c000061f82..fadead2adf86 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/srt not yet keyworded
+# net-libs/libmicrodns not yet keyworded, bug #653800
+# projectm not yet keyworded, bug #314969
+# net-misc/freerdp not yet keyworded
+media-video/vlc aom chromaprint microdns opencv projectm rdp srt
+
 # Mart Raudsepp <leio@gentoo.org> (13 May 2018)
 # Not bothering with otherwise p.masked old gcc for the
 # extra dev-libs/cloog dependency with USE=graphite
@@ -56,10 +64,6 @@ www-client/chromium widevine
 www-servers/lighttpd memcached
 x11-misc/xscreensaver gdm
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm64, bug #653800
-media-video/vlc microdns
-
 # Michał Górny <mgorny@gentoo.org> (28 Feb 2018)
 # Requires masked dependent flags.
 dev-lang/php ldap-sasl
@@ -107,10 +111,6 @@ net-libs/glib-networking smartcard
 media-video/ffmpeg sofalizer
 
 # Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
-# USE=rdp requires net-misc/freerdp that is not keyworded yet.
-media-video/vlc rdp
-
-# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
 # USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
 >=media-plugins/grilo-plugins-0.3.5 upnp-av
 
@@ -506,9 +506,6 @@ dev-libs/boost mpi
 media-sound/sox ladspa
 media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
 # Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2555d54d3e90..4a742b4a3fcb 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
+media-video/vlc aom microdns
+
 # Anthony G. Basile <blueness@gentoo.org> (14 Apr 2018)
 # net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
 net-vpn/tor test
@@ -17,10 +22,6 @@ app-emulation/qemu capstone
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
-media-video/vlc microdns
-
 # Amy Liffey <amynka@gentoo.org (21 Jan 2018)
 # dev-libs/cereal not keyworded for ppc
 media-libs/opencv contrib_dnn
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 334f1e145a39..2517747adedc 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# Requires USE=qt5 that is masked in this profile.
+media-video/vlc aom skins
+
 # Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
 # Needs sys-libs/libomp which is not keyworded. Leaving the decision
 # whether sys-libs/libomp should eventually be keyworded to when new
@@ -12,10 +17,6 @@
 # no longer have the flag, so no point in keywording it for old.
 sys-devel/llvm ocaml
 
-# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
-# Requires USE=qt5 that is masked in this profile.
-media-video/vlc skins
-
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not keyworded
 # uuid: Needs sys-apps/util-linux which is not keyworded
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 4ce7a76c9bae..131814c8ceee 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+media-video/vlc aom
+
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index df676fb475aa..53273ad59cb4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -100,10 +100,6 @@ dev-qt/qtdemo:4 phonon
 dev-python/PyQt4 phonon
 dev-python/pyside:0 phonon
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
-# Depends on unreleased media-libs/libaom, and 9999 is currently broken
-media-video/vlc aom
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
 # This feature is not ready yet, see bug 146882 comment 26
 sys-libs/glibc compile-locales
diff --git a/profiles/package.mask b/profiles/package.mask
index 7eac10b6033f..4f6ecb0db45d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,63 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# Breaking consumers by internal header cleanup and removal of deprecated
+# qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
+# and against the qt-5.11 tracker (bug #653646).
+~dev-qt/assistant-5.11.0_rc2
+~dev-qt/designer-5.11.0_rc2
+~dev-qt/linguist-5.11.0_rc2
+~dev-qt/linguist-tools-5.11.0_rc2
+~dev-qt/pixeltool-5.11.0_rc2
+~dev-qt/qdbus-5.11.0_rc2
+~dev-qt/qdbusviewer-5.11.0_rc2
+~dev-qt/qdoc-5.11.0_rc2
+~dev-qt/qt3d-5.11.0_rc2
+~dev-qt/qtbluetooth-5.11.0_rc2
+~dev-qt/qtcharts-5.11.0_rc2
+~dev-qt/qtconcurrent-5.11.0_rc2
+~dev-qt/qtcore-5.11.0_rc2
+~dev-qt/qtdatavis3d-5.11.0_rc2
+~dev-qt/qtdbus-5.11.0_rc2
+~dev-qt/qtdeclarative-5.11.0_rc2
+~dev-qt/qtdiag-5.11.0_rc2
+~dev-qt/qtgraphicaleffects-5.11.0_rc2
+~dev-qt/qtgui-5.11.0_rc2
+~dev-qt/qthelp-5.11.0_rc2
+~dev-qt/qtimageformats-5.11.0_rc2
+~dev-qt/qtlocation-5.11.0_rc2
+~dev-qt/qtmultimedia-5.11.0_rc2
+~dev-qt/qtnetworkauth-5.11.0_rc2
+~dev-qt/qtnetwork-5.11.0_rc2
+~dev-qt/qtopengl-5.11.0_rc2
+~dev-qt/qtpaths-5.11.0_rc2
+~dev-qt/qtplugininfo-5.11.0_rc2
+~dev-qt/qtpositioning-5.11.0_rc2
+~dev-qt/qtprintsupport-5.11.0_rc2
+~dev-qt/qtquickcontrols2-5.11.0_rc2
+~dev-qt/qtquickcontrols-5.11.0_rc2
+~dev-qt/qtscript-5.11.0_rc2
+~dev-qt/qtscxml-5.11.0_rc2
+~dev-qt/qtsensors-5.11.0_rc2
+~dev-qt/qtserialbus-5.11.0_rc2
+~dev-qt/qtserialport-5.11.0_rc2
+~dev-qt/qtspeech-5.11.0_rc2
+~dev-qt/qtsql-5.11.0_rc2
+~dev-qt/qtsvg-5.11.0_rc2
+~dev-qt/qttest-5.11.0_rc2
+~dev-qt/qttranslations-5.11.0_rc2
+~dev-qt/qtvirtualkeyboard-5.11.0_rc2
+~dev-qt/qtwayland-5.11.0_rc2
+~dev-qt/qtwebchannel-5.11.0_rc2
+~dev-qt/qtwebengine-5.11.0_rc2
+~dev-qt/qtwebsockets-5.11.0_rc2
+~dev-qt/qtwebview-5.11.0_rc2
+~dev-qt/qtwidgets-5.11.0_rc2
+~dev-qt/qtx11extras-5.11.0_rc2
+~dev-qt/qtxmlpatterns-5.11.0_rc2
+~dev-qt/qtxml-5.11.0_rc2
+
 # Amy Liffey <amynka@gentoo.org> (16 May 2018)
 # Obsolete and not used anymore replaced by app-crypt/eid-mw.
 # Requested by maintainer Vincent Hardy <vincent.hardy.be@gmail.com>
@@ -66,7 +123,6 @@ games-action/trine2
 games-misc/dont-starve
 games-puzzle/larry
 games-rpg/avadon
-games-rpg/bastion
 games-rpg/penumbra-collection
 games-rpg/wasteland2
 
@@ -124,63 +180,6 @@ dev-util/valkyrie
 # Masked for removal in 30 days. Bugs #489190, #648666
 media-gfx/ipe
 
-# Andreas Sturmlechner <asturm@gentoo.org> (8 May 2018)
-# Breaking consumers by internal header cleanup and removal of deprecated
-# qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
-# and against the qt-5.11 tracker (bug #653646).
-~dev-qt/assistant-5.11.0_rc
-~dev-qt/designer-5.11.0_rc
-~dev-qt/linguist-5.11.0_rc
-~dev-qt/linguist-tools-5.11.0_rc
-~dev-qt/pixeltool-5.11.0_rc
-~dev-qt/qdbus-5.11.0_rc
-~dev-qt/qdbusviewer-5.11.0_rc
-~dev-qt/qdoc-5.11.0_rc
-~dev-qt/qt3d-5.11.0_rc
-~dev-qt/qtbluetooth-5.11.0_rc
-~dev-qt/qtcharts-5.11.0_rc
-~dev-qt/qtconcurrent-5.11.0_rc
-~dev-qt/qtcore-5.11.0_rc
-~dev-qt/qtdatavis3d-5.11.0_rc
-~dev-qt/qtdbus-5.11.0_rc
-~dev-qt/qtdeclarative-5.11.0_rc
-~dev-qt/qtdiag-5.11.0_rc
-~dev-qt/qtgraphicaleffects-5.11.0_rc
-~dev-qt/qtgui-5.11.0_rc
-~dev-qt/qthelp-5.11.0_rc
-~dev-qt/qtimageformats-5.11.0_rc
-~dev-qt/qtlocation-5.11.0_rc
-~dev-qt/qtmultimedia-5.11.0_rc
-~dev-qt/qtnetworkauth-5.11.0_rc
-~dev-qt/qtnetwork-5.11.0_rc
-~dev-qt/qtopengl-5.11.0_rc
-~dev-qt/qtpaths-5.11.0_rc
-~dev-qt/qtplugininfo-5.11.0_rc
-~dev-qt/qtpositioning-5.11.0_rc
-~dev-qt/qtprintsupport-5.11.0_rc
-~dev-qt/qtquickcontrols2-5.11.0_rc
-~dev-qt/qtquickcontrols-5.11.0_rc
-~dev-qt/qtscript-5.11.0_rc
-~dev-qt/qtscxml-5.11.0_rc
-~dev-qt/qtsensors-5.11.0_rc
-~dev-qt/qtserialbus-5.11.0_rc
-~dev-qt/qtserialport-5.11.0_rc
-~dev-qt/qtspeech-5.11.0_rc
-~dev-qt/qtsql-5.11.0_rc
-~dev-qt/qtsvg-5.11.0_rc
-~dev-qt/qttest-5.11.0_rc
-~dev-qt/qttranslations-5.11.0_rc
-~dev-qt/qtvirtualkeyboard-5.11.0_rc
-~dev-qt/qtwayland-5.11.0_rc
-~dev-qt/qtwebchannel-5.11.0_rc
-~dev-qt/qtwebengine-5.11.0_rc
-~dev-qt/qtwebsockets-5.11.0_rc
-~dev-qt/qtwebview-5.11.0_rc
-~dev-qt/qtwidgets-5.11.0_rc
-~dev-qt/qtx11extras-5.11.0_rc
-~dev-qt/qtxmlpatterns-5.11.0_rc
-~dev-qt/qtxml-5.11.0_rc
-
 # Hans de Graaff <graaff@gentoo.org> (7 May 2018)
 # Old slots that are ruby23-only and no longer maintained
 # upstream, and that do not have packages depend on them.
@@ -284,12 +283,6 @@ x11-libs/libXp
 # Masked for initial testing
 >=dev-db/mysql-connector-c++-8.0.0
 
-# Lars Wendler <polynomial-c@gentoo.org> (18 Apr 2018)
-# Breaks consumers most likely because of the following change:
-#   * Add const to several classes and members
-# See tracker bug #653464
->=app-text/poppler-0.64.0
-
 # Jason Zaman <perfinion@gentoo.org> (08 Apr 2018)
 # Dead upstream, for an old version of Xfce
 # Masked for removal in 30 days.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f1fc08b5cf7f..10db1a3bac90 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5126,6 +5126,7 @@ media-video/vlc:shout - Enable libshout output
 media-video/vlc:sid - Adds support for playing C64 SID files through media-libs/libsidplay:2
 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)
@@ -6987,6 +6988,7 @@ net-wireless/wpa_supplicant:p2p - Add support for Wi-Fi Direct mode
 net-wireless/wpa_supplicant:privsep - Enable wpa_priv privledge separation binary
 net-wireless/wpa_supplicant:ps3 - Add support for ps3 hypervisor driven gelic wifi
 net-wireless/wpa_supplicant:smartcard - Add support for smartcards
+net-wireless/wpa_supplicant:suiteb - Enable enable NSA Suite B encryption
 net-wireless/wpa_supplicant:tdls - Add support for Tunneled Direct Link Setup (802.11z)
 net-wireless/wpa_supplicant:uncommon-eap-types - Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE
 net-wireless/wpa_supplicant:wimax - Add support for Wimax EAP-PEER authentication algorithm