gentoo resync : 17.02.2018

5 files changed, 83 insertions, 119 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index be5bfb59c77e..6e327e0130ce 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 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e
-EBUILD vlc-3.0.9999.ebuild 13764 BLAKE2B 974b217b5096a6072c2a30c901b04b26c850a3d47315756b256fc8416537ed54de651ee83130dec582d2c09bc347ae974c5bf8f4538d67e9d5375dcf3d687db1 SHA512 7e8ee4ba97bd64afca1d952815de7ebf3faadabc4bf88dc731489e8c3b8175986fea541fe04e742dd792a8558303c3c24b49cdc1d0e26c85c336eef85dcfc78e
-EBUILD vlc-9999.ebuild 13757 BLAKE2B a63677b92fd8ad7e432071f88962247b37b5394d609827b3ace21ea64f437fdc82a6fcf238f2ab3deb86b29b2e57f34919bd951a5ae857c53e0c304c68f923e6 SHA512 b088d6fec3f082455a95f318e6487eb522ba6c80fa4a321637471e4352ca3d584c8d52b2ecf12e3d546bc78bc93cae1ee6066c9d4137732bb39cc096fc7ea3dd
-MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
+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
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 7f79c863655f..d3e880287a29 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -43,20 +43,18 @@
 		<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="optimisememory">Enable optimisation for memory rather than performance.</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="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a Qt4 based frontend, a graphical interface.</flag>
-		<flag name="qt5" restrict="&gt;=media-video/vlc-2.2">Builds a Qt5 based frontend, a graphical interface (overrides qt4).</flag>
 		<flag name="rtsp">Enables 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="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay</pkg>:2.</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>
@@ -67,8 +65,8 @@
 		<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="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="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>
 	</use>
diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild
index 782d399de032..03f66537fe2d 100644
--- a/media-video/vlc/vlc-3.0.0-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.0-r1.ebuild
@@ -70,11 +70,11 @@ RDEPEND="
 	archive? ( app-arch/libarchive:= )
 	avcodec? (
 		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
+		libav? ( >=media-video/libav-11.8:0= )
 	)
 	avformat? (
 		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
+		libav? ( >=media-video/libav-11.8:0= )
 	)
 	bidi? ( dev-libs/fribidi:0 )
 	bluray? ( >=media-libs/libbluray-0.6.2:0= )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 782d399de032..bc75f15f8c11 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -29,37 +29,32 @@ 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 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
+	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
+	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
 "
 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 )
 	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
 	vlm? ( encode )
 	xv? ( xcb )
 "
 RDEPEND="
-	dev-libs/libgpg-error:0
 	net-dns/libidn:0
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
@@ -68,14 +63,6 @@ RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
 	bidi? ( dev-libs/fribidi:0 )
 	bluray? ( >=media-libs/libbluray-0.6.2:0= )
 	cddb? ( >=media-libs/libcddb-1.2:0 )
@@ -95,16 +82,22 @@ RDEPEND="
 	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
 	faad? ( >=media-libs/faad2-2.6.1: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?] )
+	)
 	flac? (
 		>=media-libs/flac-1.1.2:0
 		>=media-libs/libogg-1:0
 	)
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+	gcrypt? (
+		>=dev-libs/libgcrypt-1.6.0: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
@@ -182,14 +175,11 @@ 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= )
-	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
 	tremor? ( media-libs/tremor:0 )
@@ -202,17 +192,9 @@ 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= )
-	)
+	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
@@ -298,33 +280,36 @@ src_configure() {
 		$(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 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 +327,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 +334,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 +351,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)
@@ -395,10 +378,10 @@ src_configure() {
 		$(use_enable wma-fixed)
 		$(use_with X x)
 		$(use_enable x264)
+		$(use_enable x265)
 		$(use_enable xcb)
 		$(use_enable xml libxml2)
 		$(use_enable xv xvideo)
-		$(use_enable x265)
 		$(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 9a3f64ee3bf8..92b9f7445a32 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -29,37 +29,32 @@ 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 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
+	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
+	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
 "
 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 )
 	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
 	vlm? ( encode )
 	xv? ( xcb )
 "
 RDEPEND="
-	dev-libs/libgpg-error:0
 	net-dns/libidn:0
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
@@ -68,14 +63,6 @@ RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
 	bidi? ( dev-libs/fribidi:0 )
 	bluray? ( >=media-libs/libbluray-0.6.2:0= )
 	cddb? ( >=media-libs/libcddb-1.2:0 )
@@ -95,16 +82,22 @@ RDEPEND="
 	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
 	faad? ( >=media-libs/faad2-2.6.1: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?] )
+	)
 	flac? (
 		>=media-libs/flac-1.1.2:0
 		>=media-libs/libogg-1:0
 	)
 	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
 	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6.0:0= )
+	gcrypt? (
+		>=dev-libs/libgcrypt-1.6.0: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
@@ -182,14 +175,11 @@ 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= )
-	)
 	taglib? ( >=media-libs/taglib-1.9:0 )
 	theora? ( media-libs/libtheora:0 )
 	tremor? ( media-libs/tremor:0 )
@@ -202,17 +192,9 @@ 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= )
-	)
+	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
@@ -298,33 +280,36 @@ src_configure() {
 		$(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 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 +327,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 +334,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 +351,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)
@@ -395,10 +378,10 @@ src_configure() {
 		$(use_enable wma-fixed)
 		$(use_with X x)
 		$(use_enable x264)
+		$(use_enable x265)
 		$(use_enable xcb)
 		$(use_enable xml libxml2)
 		$(use_enable xv xvideo)
-		$(use_enable x265)
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)