add ssh useflag

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 16 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6fb42c33505b..e3a854f895ea 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.687 2013/10/26 07:36:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.688 2013/11/05 19:44:37 aballier Exp $
+
+  05 Nov 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
+  metadata.xml:
+  add ssh useflag
 
   26 Oct 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.9.ebuild,
   ffmpeg-1.0.7.ebuild, ffmpeg-1.0.8.ebuild, ffmpeg-1.2.3.ebuild,
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 5d4914cddc6c..ca33e99cb503 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -15,13 +15,13 @@ EBUILD ffmpeg-1.0.8.ebuild 9610 SHA256 9a1e202ad82a5be36254ad110de5adc1329fedc63
 EBUILD ffmpeg-1.2.3.ebuild 8938 SHA256 c93bdb73ebf4c2fc20f047983e3532cecd533918218196777de3e730f6cc0db8 SHA512 87c906c60da0302d4f3c5731995ec3a399d1c2b12ed571d2979d8cedfec8ebd561750da16449d76a684fdd1b883eeba7e782c3859148da8c9286acaa4cd33cbe WHIRLPOOL cb3f2b83ae6f849db0c7344cfb79f64fc06ff87f9dd7ea39f3352b8337ade1a16dde5b404a194c8e4185b8fb6b20f4128a80b19bb579a21503bcce423bfc35a4
 EBUILD ffmpeg-1.2.4.ebuild 8938 SHA256 355e1e93f1e29be91bccdae3e8a29a7fb2200eb6cd8ef65d11afbf45ae49f714 SHA512 67386dd72541faeb911c2ccf93d29becd149dd47af17c857062dc438fa38e6235691595e1fecc1a6506d485844589b6e60f04006e57726c5d863b2b684f072b9 WHIRLPOOL f0c6a478834ab4132753d3253ce7cfc7020a929067a7baaaab49b19451ae8ec3b4e8465a45dc6ef490630932220d82e5f10c2f101206be58f0c99e58bf65becc
 EBUILD ffmpeg-2.0.2.ebuild 9757 SHA256 1a73660a475f3a910e627fb356a787c00cfff1d5d1dd069aa93af8a1d4b0c613 SHA512 c6156d4301d691f2442066cdb5b020416d007dbfda569ba5f3c1851ab48a94f6775eedbb54ac4e930d281e7c142cdf178d20b8ff927d745eaf4f070d5f80be3b WHIRLPOOL 8448dd2b1b2f556949216f771a0ce44c24a80afe948898dfe6c6fdaa86c5ac302a8f6b89beb410fc388618779245bffdf5442c6741bd4832507317ea67c19f67
-EBUILD ffmpeg-9999.ebuild 9886 SHA256 1324c349da7fe8fc6bc01de3fed2fd0119ccfb12777ac1ea84e66b81bbaf2d2e SHA512 7c0f87270da13272d528f76c01b73f096f24a3a42a37fa1cc623b0c578383f06469b2f9cc25f60bebef16e434c5a6cc7fdab1c6b65f1ae46c2496cb694a60cf3 WHIRLPOOL 4bdf58d13b2ad4d2d81d0e7743b6c7986c31190b62b101615a97a5c7b20d83df5511c1c380d38b603c317794ba2ffd42668d682c7410bd7c08206e8b0aa583d3
-MISC ChangeLog 96064 SHA256 ef300cce2ffa47196af73be9d9f3e1ea25c15789379f29ea17d7bd4947109f43 SHA512 5ca2aba40d442b6aba9619cd11aaf410d0780ae2f81a161fa8e92d4f70d4c354f2e83c2f73b15f1807f8eacd5ce854fdc937c9766e2eea8f9c34689c430a39a2 WHIRLPOOL 5c7d6c24b157e69208e3895b912aaf3f101491188cf220561dc120561bf4dc71e3f1853fcf188ca81957c2affa0dcea6075e4fc4223e3cdbe5d16e82405a2000
-MISC metadata.xml 3945 SHA256 d2b1fb32139fa6961f91c2e8c890d596ace86a8bd949eeea3b8b3aa68ea00470 SHA512 083e5cfe66b1bf86eddadc383863ad2c04a03a01e7a6b0efeaba353f3db31c26b4c053054f12acad8100dc8bb621f6251c28596d0f060390dc7967d037baee6e WHIRLPOOL c41071a759851b119c3620df94847df34f1e147a701caeb3f3c10caeb282c4e2cb0fffe3f0eb83f9e4e7664761d9ed2816ed7fe433ad9edf4153e7c75eb4b5c2
+EBUILD ffmpeg-9999.ebuild 9920 SHA256 56d669bfa614315f6850519437d624d8b5d58467c6ac5475d59f30fa9a379c89 SHA512 4132818f85c3ed0c798e525ead3d6af0375d18efde7d1e039b94e66ceb0c0375d85d9a9249e0309d5cb469f3a88b834b56430aec50c829b99e4231b5f38f9c4e WHIRLPOOL b068a7a2f7aa04dd7f46b638eb02ab04e72b16986b2a7a285548cbcb1da9c85beed79f26b49029d653f261c8ff3b098787b22c88c5a1ae032da77016a0631d0c
+MISC ChangeLog 96171 SHA256 22765092f61f0fc09335b96bb9b0863158a7efbf222f36a789a8bcac5933e0ab SHA512 91165595c45fafd4f22d8de6bdadc24a89f5da02c314407b62fa74c233fec8a2e4e76578cff480cfe81ea52f69f73b0c96fa2ac58a9ad81d7fe307480721ea25 WHIRLPOOL f68d4a677b1196082b49d4238b1e357e2f3924c3fb2388d06b999b1e946b0cdee613fcb6dad52fa7b8da4e390d9c1130eba7f8342c8b1f572fee30d6f146d110
+MISC metadata.xml 4026 SHA256 b99cd266de51ce4b49626364c422eca5ac2eff168f9373d3a72e6a569592d7c9 SHA512 6cce40d69c1f77396f9d723493d71561928e6541d5a420fa32486c1197b15f15e827e06bdd4daf2f958ad89e4a14a1d87c0e2d4969ac57eeef34418d579c8f0a WHIRLPOOL a05c783ecabc5d42d3210e8c9bb4f44948127fd0c43beea54b05713e44df993952d20432901a009fc991ff81bed1323ea30af1479451562d9ad2b943d93137c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJrcREACgkQvFcC4BYPU0rMjwCdFZ6b8AKmvmSCTdxMn2+EN6n4
-ezQAn0DDUsJALYTl0N0VtSKuRhA8O2aN
-=7I2P
+iEYEAREIAAYFAlJ5SqYACgkQvFcC4BYPU0rb7wCgvo7gnD/6qaXSZmXTcb0zpdVi
+ty8AniM9IjuyF1lGL8j0C3CBxmi65teL
+=1gWP
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index bb1ba12f71fa..0bd5b06a3779 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.141 2013/10/26 07:36:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.142 2013/11/05 19:44:37 aballier Exp $
 
 EAPI="5"
 
@@ -44,7 +44,7 @@ IUSE="
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
 	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal openssl opus
-	oss pic pulseaudio quvi rtmp schroedinger sdl speex static-libs test theora
+	oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh static-libs test theora
 	threads truetype twolame v4l vaapi vdpau vorbis vpx wavpack X x264 xvid
 	+zlib zvbi
 	"
@@ -108,6 +108,7 @@ RDEPEND="
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
+	ssh? ( net-libs/libssh )
 	truetype? ( media-libs/freetype:2 )
 	vaapi? ( >=x11-libs/libva-0.32 )
 	vdpau? ( x11-libs/libvdpau )
@@ -210,7 +211,7 @@ src_configure() {
 	# Decoders
 	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg"
 	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gme gsm modplug opus quvi rtmp schroedinger speex vorbis vpx zvbi; do
+	for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
 		ffuse="${ffuse} ${i}:lib${i}"
 	done
 	use fdk && myconf="${myconf} --enable-nonfree"
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index f93edd22ace8..89ae9bf95737 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -38,6 +38,7 @@
 	<flag name="quvi">Adds support for playing media from Internet services using the quvi project.</flag>
     <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</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="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
     <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>