gentoo resync : 19.05.2018

8 files changed, 20 insertions, 17 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 967845a55f45..f30b9064bd37 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index ed6bca1750e1..b96e47e52f62 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -9,5 +9,5 @@ DIST mpv-0.28.2.tar.gz 2982558 BLAKE2B 5faef4122d456916f43bd603192fc72dee1ad16fa
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 EBUILD mpv-0.27.2.ebuild 10508 BLAKE2B 37b3ba28fee39f4e5d54e8009888f2a2cdf6568b236acc43e58be9fee72c60b7140904c57db8ee9cba46698cc764908705076df3940e55858a141d59ab6d7a86 SHA512 ebf1bb73a7189768a522ac3d86d33eb63dd97459bbca488a08fa78554316d3ab28e7cd54ab80dd449b55b05dbd0dc00a0f3353bd18ca3fed7444978e0bf02aa9
 EBUILD mpv-0.28.2.ebuild 10150 BLAKE2B 6a578bb33d95a3f3f9a14e83415797b0db8958c6ac914154c864305721c7f25ffe8d7733a64e9cbae3db23bdffb157e9e35ba0aa2c5880f805cebd404bd14798 SHA512 0086735a3d64b4c918c24556d8738ab0f7a739d957f308f9ff5db7158091bce2febfdbe2056199f2a7d68bd6a1a1c93529c1bf58abab669438a6bcbe74776fe3
-EBUILD mpv-9999.ebuild 10052 BLAKE2B e947ea5eb136b6aa23a1fc605adb0c92f342437c37e80f11baf4c2c7d4d2c595b9bc41a3ab77725c80b440d4d06657d1007b4d3eb00c4224672ee5387991fc3a SHA512 0a8ae56b7c4769d96631aba34463a9ef9bad549d5db3b922347f97a40c8b2b40e6dc83b10c6bf838f224163482ff1d963a02c3c62d6fea354764275974ff6bd7
+EBUILD mpv-9999.ebuild 10011 BLAKE2B 3c9da31731b2e7bf98448969292be607d2a12f4def6fd36c7881454ce245ff2ea79016b015a51e3457cd5a8d92bc1408426ade93c30fea229221483bd27f4b2a SHA512 fe637fa5c1924cd54de775fda88e144e28240c3fdbe9cd1fe2b185e75aa40f5c47bce569f93b48972c763719aecdaae48d945e8bce42ffbe47df02d7dfc38446
 MISC metadata.xml 2189 BLAKE2B 00ef1b58d48470241e6d1fa451a46ac73c6719c30531380edfb8af0c52441fb2f3e90f6bcd0aec0ab6b98dba7f9ebe8491868e3939e71128af139efb38b08c3a SHA512 68e4ca79451d81ba5cd16f0042d2177a1002135e6d2bdefe6aa3e9670ddd3f7b6a5239245de4ae89f71b49878c6bd43122bd7d860f61ced1f704f9e90439b930
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index de7207561cea..0a8bcea9f758 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -29,9 +29,9 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
 SLOT="0"
 IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
-	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
-	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libav libcaca libmpv
+	+lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
+	selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
 	zsh-completion"
 
 REQUIRED_USE="
@@ -58,8 +58,8 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	!libav? ( >=media-video/ffmpeg-4.0:0=[encode?,threads,vaapi?,vdpau?] )
-	libav? ( ~media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
+	!libav? ( >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] )
+	libav? ( ~media-video/libav-9999:0=[encode,threads,vaapi?,vdpau?] )
 	alsa? ( >=media-libs/alsa-lib-1.0.18 )
 	archive? ( >=app-arch/libarchive-3.0.0:= )
 	bluray? ( >=media-libs/libbluray-0.3.0:= )
@@ -180,7 +180,6 @@ src_configure() {
 		$(use_enable libass)
 		$(use_enable libass libass-osd)
 		$(use_enable zlib)
-		$(use_enable encode encoding)
 		$(use_enable bluray libbluray)
 		$(use_enable dvd dvdread)
 		$(use_enable dvd dvdnav)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b2f840654199..e1f800ad2674 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -18,7 +18,7 @@ DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0
 DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
 EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
 EBUILD vlc-3.0.1-r1.ebuild 13499 BLAKE2B 73a4d22e21b0198ea06d3049a323c4acf728f026d46a407137caab96fff63e9f45720cda16ac8961ee48e497baf3f5b5fb7296e439ba8f5b605b7774fcf68b1d SHA512 f928a50049fdbcd6bb498ab2dfbd40470ff92279339034320b722dba0ead2aeb01580aa394380011cf32c68117caf4ddfcddbe30cf61e45f4d3cd421a8d133b7
-EBUILD vlc-3.0.2.ebuild 13454 BLAKE2B d2af9d1909905464a32e2287e92073bd08573bd5d9e135cea3b8006b3f4b8971a6896139e8685a21f551f9552b94bda31014c2102e78c06ce3ed3c171252647f SHA512 4c2031f442786547d217544e528dbf3bcf64f6431cff88acd0f354570cfe621b7cf2f6d70a453a86bcae25769982fe4b817c87123d9f81b764282a3d1baad7b7
-EBUILD vlc-3.0.9999.ebuild 13454 BLAKE2B d2af9d1909905464a32e2287e92073bd08573bd5d9e135cea3b8006b3f4b8971a6896139e8685a21f551f9552b94bda31014c2102e78c06ce3ed3c171252647f SHA512 4c2031f442786547d217544e528dbf3bcf64f6431cff88acd0f354570cfe621b7cf2f6d70a453a86bcae25769982fe4b817c87123d9f81b764282a3d1baad7b7
-EBUILD vlc-9999.ebuild 13364 BLAKE2B 81776da7648e5c7a5517cb24e95143a4c5721601644bf56a101be4f25d9f7247475ba55cd4518601c045b78c71938714148493e4f554d88476dc7861b86d64b2 SHA512 fc84a8014bdfcaf2fb1bebc2e6e663d637bef0fa6f7483c948e5bcd03a95ef62c458d6b7dbb5b6e5f4703194b316afdb455521affd4fcc44492c328965e73d0d
-MISC metadata.xml 6541 BLAKE2B 4119e3ff76fea78140bcac05a2a2d244bfdd86d808ec1f9cf9171c6ec487aaa0b4ab32a43e259b69ed5d4677fc7a91c0d0fe5e074df0ddcf7fb380c9ba6fe5a4 SHA512 64e7aa292342c9c585c05cefce9d7582e8f01f2f8231625e8e393cebd53dbafe50e8a1c6ef6f4f0a2ee35d80912c11705538ec8316e30b771e8d4780ae1ee780
+EBUILD vlc-3.0.2.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f
+EBUILD vlc-3.0.9999.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f
+EBUILD vlc-9999.ebuild 13395 BLAKE2B bdb64730d08aa744300a4af237863940b5e8178be375879447a8b358122e75980cca93e0bd193b98e8e4c16d8de70fbdcd2947ff729f5e888c2e0c21339e1d9a SHA512 c5435dd7038057d256cbaef11cc654d521881cca8f28a8a94fef12c3a6e89252fa90a687ca65653fe42c10f467d0811ab0e698297f2b000548b93f8886fcf1b6
+MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 9f898e2ac85a..89c1c887a183 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -59,6 +59,7 @@
 		<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="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag>
+		<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></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>
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
index 7b4d7ebc7e76..9ee5edc366b8 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska microdns 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 soxr speex ssl svg
+	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt 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
 "
@@ -175,6 +175,7 @@ RDEPEND="
 		>=media-libs/speex-1.2.0:0
 		media-libs/speexdsp:0
 	)
+	srt? ( net-libs/srt )
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
 		gnome-base/librsvg:2
@@ -367,6 +368,7 @@ src_configure() {
 		$(use_enable skins skins2)
 		$(use_enable soxr)
 		$(use_enable speex)
+		$(use_enable srt)
 		$(use_enable ssl gnutls)
 		$(use_enable svg)
 		$(use_enable svg svgdec)
@@ -414,7 +416,6 @@ src_configure() {
 		--disable-shine
 		--disable-sndio
 		--disable-spatialaudio
-		--disable-srt
 		--disable-vsxu
 		--disable-wasapi
 	)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 7b4d7ebc7e76..9ee5edc366b8 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska microdns 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 soxr speex ssl svg
+	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt 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
 "
@@ -175,6 +175,7 @@ RDEPEND="
 		>=media-libs/speex-1.2.0:0
 		media-libs/speexdsp:0
 	)
+	srt? ( net-libs/srt )
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
 		gnome-base/librsvg:2
@@ -367,6 +368,7 @@ src_configure() {
 		$(use_enable skins skins2)
 		$(use_enable soxr)
 		$(use_enable speex)
+		$(use_enable srt)
 		$(use_enable ssl gnutls)
 		$(use_enable svg)
 		$(use_enable svg svgdec)
@@ -414,7 +416,6 @@ src_configure() {
 		--disable-shine
 		--disable-sndio
 		--disable-spatialaudio
-		--disable-srt
 		--disable-vsxu
 		--disable-wasapi
 	)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0d4fec12e51a..a8bd9326940d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -35,7 +35,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska microdns 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 soxr speex ssl svg
+	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt 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
 "
@@ -175,6 +175,7 @@ RDEPEND="
 		>=media-libs/speex-1.2.0:0
 		media-libs/speexdsp:0
 	)
+	srt? ( net-libs/srt )
 	ssl? ( net-libs/gnutls:0 )
 	svg? (
 		gnome-base/librsvg:2
@@ -365,6 +366,7 @@ src_configure() {
 		$(use_enable skins skins2)
 		$(use_enable soxr)
 		$(use_enable speex)
+		$(use_enable srt)
 		$(use_enable ssl gnutls)
 		$(use_enable svg)
 		$(use_enable svg svgdec)
@@ -412,7 +414,6 @@ src_configure() {
 		--disable-shine
 		--disable-sndio
 		--disable-spatialaudio
-		--disable-srt
 		--disable-vsxu
 		--disable-wasapi
 	)