gentoo resync : 24.02.2018

5 files changed, 300 insertions, 344 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6e327e0130ce..b3e1790cc7a6 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -19,7 +19,7 @@ DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4
 DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
 EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
 EBUILD vlc-2.2.8-r1.ebuild 14829 BLAKE2B bd4dfb29beba20d2f9177c41ee4791aa733054eee6c522039b76586f0c9be8ec8ba6c79043a139ef0557b73cfc14c81edc7b14821241969a2bb8c84c1b5eefb0 SHA512 20305c4736dabc61729189a06be0082340f4f0619a9e49e28f4192585d88147c6a1c49a6284664c02b6674ab24c7ef4b1963484336cbb6c899330c048b250163
-EBUILD vlc-3.0.0-r1.ebuild 13778 BLAKE2B 57f18c1dc3bddfaa4b52e1ef6a238a5b4d36cc9da61bae28ac23c361f7bf696903efa1f2401091d4628382cedcd4a3869423ce950f78b14ebe8fb9d47a3e2a37 SHA512 a47472a6c92fa63db7e1096690b43c72f71d310bf47843ea59495e3d57584ab37132310bc06abd696b0f7fc267c72d761021d52876a7c6cad136a840ae1e7c03
-EBUILD vlc-3.0.9999.ebuild 13404 BLAKE2B 8d25b9df42539f302c8e20288afd42dd64ca2f00c3e826606878d7d1f0fc2937ac95db1265caf4ffa1f1d5440bb25f29c059ccd670b7928c0d9998c8c482099a SHA512 364a6bb9732aa0a2a548d6927a5c85f38afcebc5cc77a09d8866b948722982ed41ea170f06136a6d5b9349b4004ffb36a3eb60a53f7badfb3d9683b480ba30bc
-EBUILD vlc-9999.ebuild 13397 BLAKE2B 835143b3d9cca09bca391c4bc064099823d672101bdd8284b0ed60643ebe888d2b44cdbe3c623efc45b0cdae9cb81e3a7aca23fbf0d59f75e98f7de1c72cc435 SHA512 937c26307dbe60cf178ff06b7b8fe2cb93b46adaf3c9727a7fadc325b12466088e3473cba4b5049fb1ae90bb3918cb0774429f7cf66e7beb4c3b6ef2d49ba6e7
-MISC metadata.xml 6316 BLAKE2B 0d357647477cb1b25d8b4b91bb3ad9340c5f5ff7373aa595a737641fbce1faaa2668a7dc1179b3668abdabcb2d31b470d7263af94581ce8c714df00177525c81 SHA512 fd896bf02577e5a8788918eebd3c31b87b0a6e2cd56157c08431f2aa94a47823051ede6cb6d95e3d0b0cabf8b50a4de420f3b0693b80446dce6e998dfdba4aa4
+EBUILD vlc-3.0.0-r2.ebuild 12863 BLAKE2B 0d2313a88955338588a2cfde86a58f5fa7a24ef7924bb385e2c6dffdf0e9221edea9c9947c191119423a072fa2398115593f7e803078014177d9419c761326bb SHA512 7bc01d12c7462d4a28a20ba73f22cb1e7d6fc1f3c29a751ec66b27d5e1c04f4e43804fea15c1aff8f550729a4a7ebd6675377b82b2d0c4d824d45aa9cd449230
+EBUILD vlc-3.0.9999.ebuild 12863 BLAKE2B 0d2313a88955338588a2cfde86a58f5fa7a24ef7924bb385e2c6dffdf0e9221edea9c9947c191119423a072fa2398115593f7e803078014177d9419c761326bb SHA512 7bc01d12c7462d4a28a20ba73f22cb1e7d6fc1f3c29a751ec66b27d5e1c04f4e43804fea15c1aff8f550729a4a7ebd6675377b82b2d0c4d824d45aa9cd449230
+EBUILD vlc-9999.ebuild 12830 BLAKE2B 6656ef058beef88a73e45edbca09d531c1dc7fdfbdfdf55ad2321fc7bda63fd7084ca4f501b62f035a8dbf06c9202f945ad46f0d441243b228721bb25020dd00 SHA512 bac7d6ea063b827269dd825f106da3659a444a40f18a7caee504f6e872bd0227b9861b142caa285c8dbf4ed4646ef3552b7fb22616a68af11f100ceededfbb2d
+MISC metadata.xml 6352 BLAKE2B 9476a4ab2bd3de2ab12818592ebb2e8864953b3f6fedbd9975ed7c1e239a54c16baa8fbc5a973c78eee4c772ba7b0208ffc355855300d209001e5d6c2469c0b3 SHA512 e28cb584b5e42f99bc372e9ccdfdd163bcacf60bcee77ea9e6ac92dc6758a378eaec72ee344d1a67b682288ba34b9b6998a7625a5d3ecbe3ba62889442695811
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index d3e880287a29..318f173252f5 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,68 +6,69 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="aom">Enables experimental support for AV1 codec</flag>
-		<flag name="archive">Enables support for libarchive stream extractor</flag>
-		<flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
-		<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
-		<flag name="avcodec">Enables libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg.</flag>
-		<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
-		<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
-		<flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
-		<flag name="chromecast">Enable experimental support for Google Chromecast.</flag>
-		<flag name="dc1394">Enables IIDC cameras support.</flag>
-		<flag name="directx">Enable Win32 DirectX support.</flag>
-		<flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag>
-		<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
-		<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2.</flag>
-		<flag name="fdk">Enables the Fraunhofer AAC codec library.</flag>
-		<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
-		<flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
-		<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
-		<flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
-		<flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
-		<flag name="gstreamer">Enables GStreamer based decoding support (currently supports only video decoding)</flag>
-		<flag name="httpd">Enables a web based interface for vlc.</flag>
-		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
-		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins.</flag>
-		<flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
-		<flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
-		<flag name="live">Enables live555 streaming media support (client support for rtsp).</flag>
-		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things.</flag>
-		<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
-		<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
-		<flag name="macosx-notifications">Enables Mac OS X notifications module (formerly growl).</flag>
-		<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
-		<flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
-		<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
+		<flag name="aom">Enable experimental support for AV1 codec</flag>
+		<flag name="archive">Enable support for libarchive stream extractor</flag>
+		<flag name="atmo">Enable support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
+		<flag name="audioqueue">Enable AudioQueue audio module for Mac OS X</flag>
+		<flag name="avcodec">Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg</flag>
+		<flag name="avformat">Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg</flag>
+		<flag name="bluray">Enable libbluray for Blu-ray disc support</flag>
+		<flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag>
+		<flag name="chromecast">Enable experimental support for Google Chromecast</flag>
+		<flag name="dc1394">Enable IIDC cameras support</flag>
+		<flag name="directx">Enable Win32 DirectX support</flag>
+		<flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag>
+		<flag name="dxva2">Enable Win32 DxVA2 support</flag>
+		<flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag>
+		<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2</flag>
+		<flag name="fdk">Enable the Fraunhofer AAC codec library</flag>
+		<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis (with external sound fonts)</flag>
+		<flag name="gcrypt">Enable cryptography support via libgcrypt</flag>
+		<flag name="gme">Enable support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats</flag>
+		<flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related</flag>
+		<flag name="growl">Enable growl notification support (over UDP for remote access and native on OSX)</flag>
+		<flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag>
+		<flag name="httpd">Enable a web based interface for vlc</flag>
+		<flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag>
+		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag>
+		<flag name="libtiger">Enable Ogg Kate subtitles rendering using libtiger</flag>
+		<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
+		<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag>
+		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag>
+		<flag name="macosx-dialog-provider">Enable Mac OS X dialog module</flag>
+		<flag name="macosx-eyetv">Enable Mac OS X EyeTV (TNT Tuner) module</flag>
+		<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag>
+		<flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag>
+		<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag>
+		<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
 		<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
-		<flag name="nfs">Enables support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
-		<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
-		<flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
-		<flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
-		<flag name="opus">Support opus decoding via libopus.</flag>
-		<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
-		<flag name="projectm">Enables the projectM visualization plugin.</flag>
-		<flag name="rtsp">Enables real audio and RTSP modules.</flag>
+		<flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
+		<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag>
+		<flag name="opencv">Enable OpenCV (computer vision) filter module</flag>
+		<flag name="optimisememory">Enable optimisation for memory rather than performance</flag>
+		<flag name="opus">Support opus decoding via libopus</flag>
+		<flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag>
+		<flag name="projectm">Enable the projectM visualization plugin</flag>
+		<flag name="rtsp">Enable real audio and RTSP modules</flag>
 		<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
-		<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
-		<flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
-		<flag name="sftp">Enables libssh2 to support SFTP file transfer.</flag>
-		<flag name="shout">Enables libshout output.</flag>
-		<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay</pkg>:2.</flag>
-		<flag name="skins">Enables support for the skins2 interface.</flag>
-		<flag name="swscale">Enables image scaling and conversion via libswscale (part of FFmpeg).</flag>
-		<flag name="tremor">Enables tremor, a fixed-point version of the Ogg Vorbis decoder.</flag>
-		<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder).</flag>
-		<flag name="upnp">Enables support for the Intel SDK stack based UPnP discovery module instead of CyberLink.</flag>
-		<flag name="vcdx">Enables VCD with navigation via libvcdinfo (depends on cdio)</flag>
-		<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC.</flag>
-		<flag name="vpx">Enables the decoder(s) from the WebM VP8 / VP9 Codec SDK.</flag>
-		<flag name="wma-fixed">Enables fixed point WMA decoder.</flag>
-		<flag name="X">Enables support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface.</flag>
-		<flag name="x265">Support X265 Encoder.</flag>
-		<flag name="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.</flag>
-		<flag name="zeroconf">Enables support for zero-configuration networking via avahi.</flag>
-		<flag name="zvbi">Enables support for teletext subtitles via the zvbi library.</flag>
+		<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec)</flag>
+		<flag name="sdl-image">Enable sdl image video decoder (depends on sdl)</flag>
+		<flag name="sftp">Enable libssh2 to support SFTP file transfer</flag>
+		<flag name="shout">Enable libshout output</flag>
+		<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay</pkg>:2</flag>
+		<flag name="skins">Enable support for the skins2 interface</flag>
+		<flag name="swscale">Enable image scaling and conversion via libswscale (part of FFmpeg)</flag>
+		<flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag>
+		<flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag>
+		<flag name="upnp">Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink</flag>
+		<flag name="vcdx">Enable VCD with navigation via libvcdinfo (depends on cdio)</flag>
+		<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC</flag>
+		<flag name="vpx">Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK</flag>
+		<flag name="wma-fixed">Enable fixed point WMA decoder</flag>
+		<flag name="X">Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface</flag>
+		<flag name="x265">Support X265 Encoder</flag>
+		<flag name="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</flag>
+		<flag name="zeroconf">Enable support for zero-configuration networking via avahi</flag>
+		<flag name="zvbi">Enable support for teletext subtitles via the zvbi library</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r2.ebuild
index 03f66537fe2d..953df06005ed 100644
--- a/media-video/vlc/vlc-3.0.0-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.0-r2.ebuild
@@ -29,149 +29,135 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb
-	chromaprint chromecast dbus dc1394 debug directx dts dvb +dvbpsi dvd
-	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
-	gme gnome-keyring gnutls gstreamer ieee1394 jack jpeg kate libass libav libcaca
-	libnotify +libsamplerate libtiger linsys libtar lirc live lua
-	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
-	mpeg mtp musepack ncurses neon nfs ogg omxil opencv opengl optimisememory opus
-	png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba
-	schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg
-	+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
-	vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
+	debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+	+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+	macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
+	optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
+	samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
+	truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
+	x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-	aalib? ( X )
 	bidi? ( truetype )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
+	directx? ( ffmpeg )
 	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
-	vlm? ( encode )
-	xv? ( xcb )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
 "
 RDEPEND="
-	dev-libs/libgpg-error:0
 	net-dns/libidn:0
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-11.8:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-11.8:0= )
-	)
 	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.6.2:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
 	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dbus? ( sys-apps/dbus:0 )
 	dc1394? (
-		>=media-libs/libdc1394-2.1:2
-		>=sys-libs/libraw1394-2.0.1:0
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
 	)
-	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dts? ( media-libs/libdca:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
 	dvd? (
 		>=media-libs/libdvdnav-4.9:0
 		>=media-libs/libdvdread-4.9:0
 	)
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
+	)
 	flac? (
-		>=media-libs/flac-1.1.2:0
-		>=media-libs/libogg-1:0
+		media-libs/flac:0
+		media-libs/libogg:0
 	)
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fluidsynth? ( media-sound/fluidsynth:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error:0
+	)
 	gme? ( media-libs/game-music-emu:0 )
 	gnome-keyring? ( app-crypt/libsecret )
-	gnutls? ( net-libs/gnutls:0 )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
-		>=sys-libs/libavc1394-0.5.3:0
-		>=sys-libs/libraw1394-2.0.1:0
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
+	kate? ( media-libs/libkate:0 )
 	libass? (
 		media-libs/fontconfig:1.0
-		>=media-libs/libass-0.9.8:0=
+		media-libs/libass:0=
 	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libcaca? ( media-libs/libcaca:0 )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
+		x11-libs/gtk+:3
 		x11-libs/libnotify:0
 	)
 	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
+	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
 	matroska? (
-		>=dev-libs/libebml-1:0=
-		>=media-libs/libmatroska-1:0=
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
 	)
 	modplug? ( media-libs/libmodplug:0 )
 	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? (
-		virtual/opengl:0
-		>=x11-libs/libX11-1.3.99.901:0
-	)
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
 	opus? ( >=media-libs/opus-1.0.3:0 )
 	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
 	projectm? (
 		media-fonts/dejavu:0
 		media-libs/libprojectm:0
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
-		X? ( dev-qt/qtx11extras:5 )
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
 	)
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
+	sdl-image? ( media-libs/sdl-image:0 )
 	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
+	shout? ( media-libs/libshout:0 )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
 		x11-libs/libXext:0
@@ -182,13 +168,10 @@ RDEPEND="
 		>=media-libs/speex-1.2.0:0
 		media-libs/speexdsp:0
 	)
+	ssl? ( net-libs/gnutls:0 )
 	svg? (
-		>=gnome-base/librsvg-2.9:2
-		>=x11-libs/cairo-1.13.1:0
-	)
-	swscale? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
 	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
@@ -202,43 +185,34 @@ RDEPEND="
 	udev? ( virtual/udev:0 )
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
-	vaapi? (
-		x11-libs/libva:0=[drm,wayland?,X?]
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] )
-		libav? ( media-video/libav:0=[vaapi] )
-	)
+	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
 	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
-	vdpau? (
-		x11-libs/libvdpau:0
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-10:0= )
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vdpau? ( x11-libs/libvdpau:0 )
+	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
 	)
-	X? ( x11-libs/libX11:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
-	xcb? (
-		x11-libs/libxcb:0
-		x11-libs/xcb-util:0
-		x11-libs/xcb-util-keysyms:0
-	)
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.19.8:*
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-proto/xproto )
 "
 
 PATCHES=(
@@ -285,46 +259,49 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-vlc
-		--docdir=/usr/share/doc/${PF}
+		--disable-aa
 		--disable-dependency-tracking
 		--disable-optimizations
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vlc
 		$(use_enable a52)
-		$(use_enable aalib aa)
 		$(use_enable alsa)
 		$(use_enable altivec)
 		$(use_enable aom)
 		$(use_enable archive)
-		$(use_enable avcodec)
-		$(use_enable avformat)
 		$(use_enable bidi fribidi)
 		$(use_enable bluray)
 		$(use_enable cddb libcddb)
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dbus)
 		$(use_enable dbus kwallet)
-		$(use_enable directx)
 		$(use_enable dc1394)
 		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
 		$(use_enable dts dca)
 		$(use_enable dvbpsi)
 		$(use_enable dvd dvdnav)
 		$(use_enable dvd dvdread)
-		$(use_enable dxva2)
 		$(use_enable encode sout)
+		$(use_enable encode vlm)
 		$(use_enable faad)
 		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg swscale)
 		$(use_enable flac)
 		$(use_enable fluidsynth)
 		$(use_enable fontconfig)
 		$(use_enable gcrypt libgcrypt)
 		$(use_enable gme)
 		$(use_enable gnome-keyring secret)
-		$(use_enable gnutls)
 		$(use_enable gstreamer gst-decode)
 		$(use_enable ieee1394 dv1394)
 		$(use_enable jack)
@@ -342,7 +319,6 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable macosx-qtkit)
-		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable modplug mod)
 		$(use_enable mp3 mad)
 		$(use_enable mpeg libmpeg2)
@@ -350,12 +326,12 @@ src_configure() {
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
 		$(use_enable neon)
-		$(use_enable ogg) $(use_enable ogg)
+		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
 		$(use_enable opencv)
-		$(use_enable opus)
 		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
 		$(use_enable png)
 		$(use_enable postproc)
 		$(use_enable projectm)
@@ -367,15 +343,14 @@ src_configure() {
 		$(use_enable samba smbclient)
 		$(use_enable schroedinger)
 		$(use_enable sdl-image)
-		$(use_enable sid)
 		$(use_enable sftp)
 		$(use_enable shout)
+		$(use_enable sid)
 		$(use_enable skins skins2)
 		$(use_enable speex)
-		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable ssl gnutls)
 		$(use_enable svg)
 		$(use_enable svg svgdec)
-		$(use_enable swscale)
 		$(use_enable taglib)
 		$(use_enable theora)
 		$(use_enable tremor)
@@ -387,18 +362,17 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vcd)
 		$(use_enable vdpau)
-		$(use_enable vlm)
 		$(use_enable vnc)
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_enable wma-fixed)
 		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
 		$(use_enable x264)
-		$(use_enable xcb)
-		$(use_enable xml libxml2)
-		$(use_enable xv xvideo)
 		$(use_enable x265)
+		$(use_enable xml libxml2)
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index bc75f15f8c11..953df06005ed 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -29,142 +29,135 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
-	debug directx dts +dvbpsi dvd elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth
-	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
+	debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+	+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
-	opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
+	optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
 	samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
-	truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
+	x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-	aalib? ( X )
 	bidi? ( truetype )
 	directx? ( ffmpeg )
 	fontconfig? ( truetype )
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
-	vlm? ( encode )
-	xv? ( xcb )
 "
 RDEPEND="
 	net-dns/libidn:0
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.6.2:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
 	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dbus? ( sys-apps/dbus:0 )
 	dc1394? (
-		>=media-libs/libdc1394-2.1:2
-		>=sys-libs/libraw1394-2.0.1:0
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
 	)
-	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dts? ( media-libs/libdca:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
 	dvd? (
 		>=media-libs/libdvdnav-4.9:0
 		>=media-libs/libdvdread-4.9:0
 	)
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?] )
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
 	)
 	flac? (
-		>=media-libs/flac-1.1.2:0
-		>=media-libs/libogg-1:0
+		media-libs/flac:0
+		media-libs/libogg:0
 	)
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fluidsynth? ( media-sound/fluidsynth:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
-		>=dev-libs/libgcrypt-1.6.0:0=
+		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error:0
 	)
 	gme? ( media-libs/game-music-emu:0 )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
-		>=sys-libs/libavc1394-0.5.3:0
-		>=sys-libs/libraw1394-2.0.1:0
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
+	kate? ( media-libs/libkate:0 )
 	libass? (
 		media-libs/fontconfig:1.0
-		>=media-libs/libass-0.9.8:0=
+		media-libs/libass:0=
 	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libcaca? ( media-libs/libcaca:0 )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
+		x11-libs/gtk+:3
 		x11-libs/libnotify:0
 	)
 	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
+	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
 	matroska? (
-		>=dev-libs/libebml-1:0=
-		>=media-libs/libmatroska-1:0=
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
 	)
 	modplug? ( media-libs/libmodplug:0 )
 	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? (
-		virtual/opengl:0
-		>=x11-libs/libX11-1.3.99.901:0
-	)
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
 	opus? ( >=media-libs/opus-1.0.3:0 )
 	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
 	projectm? (
 		media-fonts/dejavu:0
 		media-libs/libprojectm:0
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
-		X? ( dev-qt/qtx11extras:5 )
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
 	)
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
+	sdl-image? ( media-libs/sdl-image:0 )
 	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
+	shout? ( media-libs/libshout:0 )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
 		x11-libs/libXext:0
@@ -177,8 +170,8 @@ RDEPEND="
 	)
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
-		>=gnome-base/librsvg-2.9:2
-		>=x11-libs/cairo-1.13.1:0
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
 	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
@@ -195,32 +188,31 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
 	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
 	)
-	X? ( x11-libs/libX11:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
-	xcb? (
-		x11-libs/libxcb:0
-		x11-libs/xcb-util:0
-		x11-libs/xcb-util-keysyms:0
-	)
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.19.8:*
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-proto/xproto )
 "
 
 PATCHES=(
@@ -267,15 +259,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-vlc
-		--docdir=/usr/share/doc/${PF}
+		--disable-aa
 		--disable-dependency-tracking
 		--disable-optimizations
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vlc
 		$(use_enable a52)
-		$(use_enable aalib aa)
 		$(use_enable alsa)
 		$(use_enable altivec)
 		$(use_enable aom)
@@ -299,6 +290,7 @@ src_configure() {
 		$(use_enable dvd dvdnav)
 		$(use_enable dvd dvdread)
 		$(use_enable encode sout)
+		$(use_enable encode vlm)
 		$(use_enable faad)
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
@@ -370,18 +362,17 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vcd)
 		$(use_enable vdpau)
-		$(use_enable vlm)
 		$(use_enable vnc)
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_enable wma-fixed)
 		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
 		$(use_enable x264)
 		$(use_enable x265)
-		$(use_enable xcb)
 		$(use_enable xml libxml2)
-		$(use_enable xv xvideo)
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 92b9f7445a32..21bc19b30620 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -29,142 +29,135 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="a52 aalib alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
-	debug directx dts +dvbpsi dvd elibc_glibc +encode faad fdk +ffmpeg flac fluidsynth
-	fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
+IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
+	debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
+	+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
+	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv
-	opengl optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
+	optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root
 	samba schroedinger sdl-image sftp shout sid skins speex ssl svg taglib theora tremor
-	truetype twolame udev upnp vaapi v4l vcd vdpau vlm vnc vorbis vpx wayland wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X
+	x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
-	aalib? ( X )
 	bidi? ( truetype )
 	directx? ( ffmpeg )
 	fontconfig? ( truetype )
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
+	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
-	vlm? ( encode )
-	xv? ( xcb )
 "
 RDEPEND="
 	net-dns/libidn:0
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+	virtual/opengl
+	a52? ( media-libs/a52dec:0 )
+	alsa? ( media-libs/alsa-lib:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.6.2:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+	bluray? ( media-libs/libbluray:0= )
+	cddb? ( media-libs/libcddb:0 )
+	chromaprint? ( media-libs/chromaprint:0= )
 	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
+	dbus? ( sys-apps/dbus:0 )
 	dc1394? (
-		>=media-libs/libdc1394-2.1:2
-		>=sys-libs/libraw1394-2.0.1:0
+		media-libs/libdc1394:2
+		sys-libs/libraw1394:0
 	)
-	dts? ( >=media-libs/libdca-0.0.5:0 )
+	dts? ( media-libs/libdca:0 )
 	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
 	dvd? (
 		>=media-libs/libdvdnav-4.9:0
 		>=media-libs/libdvdread-4.9:0
 	)
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
+	faad? ( media-libs/faad2:0 )
+	fdk? ( media-libs/fdk-aac:0= )
 	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?] )
+		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
+		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
 	)
 	flac? (
-		>=media-libs/flac-1.1.2:0
-		>=media-libs/libogg-1:0
+		media-libs/flac:0
+		media-libs/libogg:0
 	)
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+	fluidsynth? ( media-sound/fluidsynth:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
-		>=dev-libs/libgcrypt-1.6.0:0=
+		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error:0
 	)
 	gme? ( media-libs/game-music-emu:0 )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
 	ieee1394? (
-		>=sys-libs/libavc1394-0.5.3:0
-		>=sys-libs/libraw1394-2.0.1:0
+		sys-libs/libavc1394:0
+		sys-libs/libraw1394:0
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
+	kate? ( media-libs/libkate:0 )
 	libass? (
 		media-libs/fontconfig:1.0
-		>=media-libs/libass-0.9.8:0=
+		media-libs/libass:0=
 	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+	libcaca? ( media-libs/libcaca:0 )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
+		x11-libs/gtk+:3
 		x11-libs/libnotify:0
 	)
 	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
+	libtar? ( dev-libs/libtar:0 )
+	libtiger? ( media-libs/libtiger:0 )
+	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
+	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
 	matroska? (
-		>=dev-libs/libebml-1:0=
-		>=media-libs/libmatroska-1:0=
+		dev-libs/libebml:0=
+		media-libs/libmatroska:0=
 	)
 	modplug? ( media-libs/libmodplug:0 )
 	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
+	mpeg? ( media-libs/libmpeg2:0 )
+	mtp? ( media-libs/libmtp:0= )
+	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? (
-		virtual/opengl:0
-		>=x11-libs/libX11-1.3.99.901:0
-	)
+	ogg? ( media-libs/libogg:0 )
+	opencv? ( media-libs/opencv:0= )
 	opus? ( >=media-libs/opus-1.0.3:0 )
 	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
+	postproc? ( libav? ( media-libs/libpostproc:0= ) )
 	projectm? (
 		media-fonts/dejavu:0
 		media-libs/libprojectm:0
 	)
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+	pulseaudio? ( media-sound/pulseaudio:0 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtsvg:5
 		dev-qt/qtwidgets:5
-		X? ( dev-qt/qtx11extras:5 )
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
 	)
 	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl-image? ( >=media-libs/sdl-image-1.2.10:0 )
+	sdl-image? ( media-libs/sdl-image:0 )
 	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
+	shout? ( media-libs/libshout:0 )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
 		x11-libs/libXext:0
@@ -177,8 +170,8 @@ RDEPEND="
 	)
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
-		>=gnome-base/librsvg-2.9:2
-		>=x11-libs/cairo-1.13.1:0
+		gnome-base/librsvg:2
+		x11-libs/cairo:0
 	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
@@ -195,32 +188,32 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
 	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
 		dev-libs/wayland
 		dev-libs/wayland-protocols
 	)
-	X? ( x11-libs/libX11:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
 	x264? ( media-libs/x264:0= )
 	x265? ( media-libs/x265:0= )
-	xcb? (
-		x11-libs/libxcb:0
-		x11-libs/xcb-util:0
-		x11-libs/xcb-util-keysyms:0
-	)
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
+	zeroconf? ( net-dns/avahi:0[dbus] )
+	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.19.8:*
 	virtual/pkgconfig:*
 	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
+	x86? ( dev-lang/yasm:* )
+	X? ( x11-proto/xproto )
 "
 
 PATCHES=(
@@ -267,15 +260,13 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--enable-vlc
-		--docdir=/usr/share/doc/${PF}
 		--disable-dependency-tracking
 		--disable-optimizations
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vlc
 		$(use_enable a52)
-		$(use_enable aalib aa)
 		$(use_enable alsa)
 		$(use_enable altivec)
 		$(use_enable aom)
@@ -299,6 +290,7 @@ src_configure() {
 		$(use_enable dvd dvdnav)
 		$(use_enable dvd dvdread)
 		$(use_enable encode sout)
+		$(use_enable encode vlm)
 		$(use_enable faad)
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
@@ -336,7 +328,6 @@ src_configure() {
 		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
 		$(use_enable opencv)
 		$(use_enable optimisememory optimize-memory)
 		$(use_enable opus)
@@ -370,18 +361,17 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vcd)
 		$(use_enable vdpau)
-		$(use_enable vlm)
 		$(use_enable vnc)
 		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_enable wma-fixed)
 		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
 		$(use_enable x264)
 		$(use_enable x265)
-		$(use_enable xcb)
 		$(use_enable xml libxml2)
-		$(use_enable xv xvideo)
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)