depend on ffmpeg:0

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

24 files changed, 105 insertions, 80 deletions

diff --git a/media-video/ffdiaporama/ChangeLog b/media-video/ffdiaporama/ChangeLog
index 32a8d3a017a9..c1eb9e0b8762 100644
--- a/media-video/ffdiaporama/ChangeLog
+++ b/media-video/ffdiaporama/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ffdiaporama
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ChangeLog,v 1.11 2013/07/21 13:29:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ChangeLog,v 1.12 2013/08/11 22:49:20 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> ffdiaporama-1.6.ebuild:
+  depend on ffmpeg:0
 
   21 Jul 2013; Julian Ospald <hasufell@gentoo.org> ffdiaporama-1.6.ebuild,
   +files/ffdiaporama-1.6-ffmpeg-2.0.patch:
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index db19e4e8d416..fb1264384419 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -11,17 +11,13 @@ DIST ffdiaporama_1.6.tar.gz 15708389 SHA256 b82c125b22f15c343cf87e5ad83e86e5278e
 EBUILD ffdiaporama-1.4-r1.ebuild 1264 SHA256 6d915e795cd7091b83e58ba1660dd439153e3af3325a26edc67a5de3bf268330 SHA512 3d101581b76ea34550db397299a0866dcf3bcf79ea28ecddf55b7e855bc1442da82cc581854b6a973772ecc38473b2e9f88169bcb7c174313ecd51c6ce5b0616 WHIRLPOOL e4b0337710eefdcdf7d0dcb0d250662648d2dc24fa19ed1ec6928ee9e4bd26d9919ee1c3b332e83d781b4777d1c160d636e2ca914ade6b6b62b36c1d05a37962
 EBUILD ffdiaporama-1.4.ebuild 1229 SHA256 08f8814b7bf83934d33fd8f44439b57fcb9f16f8e2ba2a422179fc7a54bfdfa9 SHA512 1d35ae716c5f308ee67dae1cb46ac173f33d1c1899b480cb0b6dcd1bdf5365e60dca2efadd36e552771565d839671ad30085fd30ae18433df5b12c66a28376a0 WHIRLPOOL 73e7cc70d53329dd146af6755a24543290a0523cdceed2f3f11b8f6fe1ef7512e24e6c8b4586ef07bf1e5b2106bfd8860d1ce4077bfa4f50bbfbac81ebe9726e
 EBUILD ffdiaporama-1.5.ebuild 1190 SHA256 966543915ccf85a2c79c81a07f112d6c63d1adb09cec2e60482fcca18cc2a7d1 SHA512 59b25d305c57feef76b8431ee4150baefed6229df7b4dd241d0aef4f93b38aa06f489a91887a6c84c205719079fa43b45071e2d8ed7b8f968ee093585ab4422b WHIRLPOOL c6bd34e7246679f0169c7b775d3c3d947c2ebbb0dde855f77eebdc336387b9ff1c7ebf134c92c88e879195d078ca54558ee05a73a2e7056f0685c89a0a28b8f7
-EBUILD ffdiaporama-1.6.ebuild 1488 SHA256 c8bfa431d6615cc72e979be7f247ec907aa8aad25a7113ccc282536ee2d7b68a SHA512 6d03a2caf156528a587b00bd0d2a8daa5901e56cc8a1df0e909515cc0eb20f2dc574537fbd55457a3b7c8af95515a66ceeaa0f37dc373a79e6cd9eed9f0e593e WHIRLPOOL 555beaac3f2e888388a0f3f69240e5c293898f1d575b3fc353f8e29df246086c4b1432f2d1178e46e542731afca83ea01cce437802370faaa22662c541e75ced
-MISC ChangeLog 1856 SHA256 2059b77098c77b938161639d6d0b01f286407882ca503380a0007d5afd813334 SHA512 7f340fa47c98c56cd2004742c4a038af79c9ed0cb70cdc116be9ad2742e0e56a56e563270f81f5959c83d9319f93d864cb9d3698e898c5847691ea7c200a980a WHIRLPOOL 561ee329ed08fdcdd0e74aed7c0a61aa9c587bb02445976e734698d3669c3892b8403d79a3d8fabf096da61de77712c057450f8ea649319b8e666127e446b2a6
+EBUILD ffdiaporama-1.6.ebuild 1490 SHA256 cb74e252089e4c148677c284b7a2b1f1787457dbfab76ca9460adfeb942eea02 SHA512 09243779cad8e47fed87603afea9cf26cc4171130eda2467c8296c150f763fefc0ef9ca1f12d539907880eb6d8f6bbcc028ef002c5fff6aa43d116be6f8d89b2 WHIRLPOOL 898ef4049bad1e8f1cc0f670dc2ca4c01387c779791ee7978cea080a03c4c0dea72765bf884a13a4ef0b53ac312eb8826ab0739cceeb533d984653bfdff8d528
+MISC ChangeLog 1954 SHA256 fbbd794a8ceb28a8331d9522d051205249459724200480d3496ccbabe384838d SHA512 231edde4d76b9c50558b4158ffbcacdca2de3c00717f9200943ab885df646f3df9bf1287f7f0c381d88a922ac49a58a784ef463d686c03de5c8eb445cde1012a WHIRLPOOL 1a08a27e0ab0dbe8ab250bb4d7008efa9d578282223cb6b4df5aa70f67029c21be30a9d44f7c3757052ed85bfa5a8b976e4bb1ee8d677a944546aa2ff80c9366
 MISC metadata.xml 2361 SHA256 c4cf1a50796b04487048f905626e122846f272689527ae489037532cba94ab1f SHA512 e7d1089d538bd0e89a568f892ecd3bf62880a087b9c06a6dc99d35a833263769ab95dfd50a52d056237e9c24dde2635e701ed9aa1da914362c0fcfa54d3cf2e1 WHIRLPOOL 74f008e21de78da071e1a8aba84af82edbf5e403f296eaa71261a8e62dc84d3f92f04d0538e5827815f21e1e5a033f668b88e1f7829ceea3304eedebc78aa3b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR6+JHAAoJEFpvPKfnPDWziBMH/i340lZjsSDhvhQsZKtxuFxU
-lo2+d7X9azpFTkgMf/It3zcKZ5uSOtjmEWEWBlraiI96ffnCgCh4C22imPWhMzZa
-6m7Sr+ifXKO1tbceCMVxAwrKJz52GQSLAWwAPNU/gCBZDYZtA0WcQz/4BVa6+rTi
-2Moyxd7XfH20kyw9aOHPXgA58v9bh57l5s8P6uWyFKFQrFAQShnNEBvUnv0mBQom
-TYvEvKewPwa4/VbX6ZZAgeW4HG4DNmc7whSC4aIvIM0DUL2qPZkaWFKfpl4fmWa1
-NQbABM2U/2vL5HoZgCtIDHv7USCxU2bRoaoCyBPYYRp7UADlJ3Ibn6AGWbfkJJo=
-=GmH5
+iEYEAREIAAYFAlIIFPEACgkQvFcC4BYPU0rLugCfRZv5h9+NDiX3ZIUX1aakpwDq
+us8AnivoqKIGafqEGfPJCNgFYAYKoHgl
+=qDrQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffdiaporama/ffdiaporama-1.6.ebuild b/media-video/ffdiaporama/ffdiaporama-1.6.ebuild
index 34e0171833a0..0d86adcee010 100644
--- a/media-video/ffdiaporama/ffdiaporama-1.6.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-1.6.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/ffdiaporama/ffdiaporama-1.6.ebuild,v 1.3 2013/07/21 13:29:40 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-1.6.ebuild,v 1.4 2013/08/11 22:49:20 aballier Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ RDEPEND="
 	media-libs/libsdl[audio]
 	media-libs/qimageblitz
 	media-libs/taglib
-	>=media-video/ffmpeg-1.0[encode]"
+	>=media-video/ffmpeg-1.0:0[encode]"
 DEPEND="${RDEPEND}"
 
 DOCS=( authors.txt )
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index cf119e489228..142693f384e5 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg2theora
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.60 2013/05/14 09:37:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.61 2013/08/11 22:51:04 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg2theora-0.28.ebuild,
+  ffmpeg2theora-0.28-r1.ebuild, ffmpeg2theora-0.29.ebuild:
+  depend on ffmpeg:0
 
   14 May 2013; Agostino Sarubbo <ago@gentoo.org> ffmpeg2theora-0.29.ebuild:
   Stable for x86, wrt bug #464560
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index adc3a8a1839e..040c21505534 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,28 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ffmpeg2theora-0.28-ffmpeg-0.10.patch 414 SHA256 c878e2100cb95acb00c2a726c0a0cd5941c4e5f6f05de6230616996edca74eed SHA512 a9a4aed74a82afaaa9297a1fc874d785d3b49d93c63d815f106e0cc58fbd1f58c436637d0cc2e75d9398a7dcd847c5681ac4f513bd5f2fdda5738c7ed9623225 WHIRLPOOL f87525e6eedd29bbf6a22e44e38d970974135d099820684db00e703acf229830ccfd370ebc0a1c28852ee0a4cae45afa9ea521b4ecb92a895d9f005ddfa65538
 DIST ffmpeg2theora-0.28.tar.bz2 95404 SHA256 6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e SHA512 14c7f783994995826014b08b4e6978669a0ac038ec1a75db38de8fc1e528d92f6f7e7aaab1f51603a832685761df75382d083f53c1923e7c07a5866763886ad7 WHIRLPOOL 8ddc99235473f103e4bf0f85e83cf3fe6055c8c1c258d65f3629e8f3543921d525e5953797f2eb997171e65686bcfffaa11d0bb5acc087a9469d8c496062ae91
 DIST ffmpeg2theora-0.29.tar.bz2 90143 SHA256 214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d SHA512 5e5cf1dbc6807a15b3a3e8526955ef341357b6a3106a6449a54b5dc09c652a9df34b5e93c9cbf05e1efad87542364cb8335e173a59a184aa2ff38ec4b536a725 WHIRLPOOL d093a0b0a5d90f6b9a3d959ff662e5e8c9f8ca36d51122f0c293d2189493bdf6daa710fa94be0fdca0d63166c3102dba82da1e533e1876e62f3ed4ec47b65bea
-EBUILD ffmpeg2theora-0.28-r1.ebuild 1199 SHA256 e05e845d07805d885322260fdece7eaea0e653eea40e3e19ac10c041f94367c2 SHA512 9cdb9dba969deb54f67ffff5bd52b909dccb3da565a64fcf8992bca57df11336dfb3a143d2923a9fb8aab55973841092c3ce53c23ba8eb02a2e73f1fc3f8f6d4 WHIRLPOOL f6f42352c22f2568a8abea40fa12591e1022e65dc41c15ed264e8c95fba50b39c7352402680b1bf205a29a1caa052fd7125f3a0163854035b8a17150c88b5fd6
-EBUILD ffmpeg2theora-0.28.ebuild 1207 SHA256 c5be6ca8a29fd0e78ad532ffdffbfd32cd24d0e565039dc9523c9f2545f6c80a SHA512 e8d080edf0c3e90f3d10f327071f98fb2d46420240f0ce33c2633a1cb3f8bfd27fb3e5645efec9fb9aaa99e2faa2ecbdefdcc07ec25eb844186742232f43811e WHIRLPOOL 5b1f66ad7ab4e33c97745bc080e6ae6c0a7d5d02556cc990ca767e3f1d0d6a4ddf45ad732122a52f5dc300ef3d6a76d5d8a160d6d6a15193eeb11a3b69964581
-EBUILD ffmpeg2theora-0.29.ebuild 1196 SHA256 3f1879277f32523a46b0fd682a616aa97aeb376e4b6dd437fde517dd2706cdfc SHA512 321541666a1ec9b7fed5af32f4a7c8fae0b53abb58c87a8a30d70027b37432c66ba44c9e71f057ffa2829cf62e76a685886672f416a37a0eb669cf025b1db755 WHIRLPOOL 7045ce9598cbab028e191584cd3fa4cecc583577ba82dd6f5538091771454d3465ad833ee505252f30f3a1825318a659b11c9cc684ad22445045a36b6df57d11
-MISC ChangeLog 9107 SHA256 a6b6767faa31c7ed237aa2061b5917a056b12867d9b01723bf7b2448c16b31fc SHA512 14eb9c98da33c9f47af49097d9de95b3c4151c5c641912c17dfd10bbb70c376b69c6cdf7318969e6d6e13ee56baec90a333685f13cde58958939134d3d6a1a10 WHIRLPOOL 72bd0e53cc51852b66ba25f61321e27ee19d2b11c23c33d12515a4b7f46b9b4245a3c85ea10c87b2ded74237c4ae9148f89bd861974993bdca15cab9d34f0e39
+EBUILD ffmpeg2theora-0.28-r1.ebuild 1200 SHA256 c232f56a25aa83e1b9f1fa0af259e308fce7fb07a713e87a34c66cdd7b069a34 SHA512 91cc8f9240dc3fafa0205651b34dc6072241a27a6bc8afa3a4ba8b711bbb08059cbe406cee4f2daac987a236c018d6b45c038a2a58a125c4163d6cb88ef2288e WHIRLPOOL 1a9fc210475d375468b1ac226eb1b7a2456c94f2b63db9c8d7fec4f1d0b423d4f889669d9e45c9748999ff3bcae895566a0f1c8c22346102a2fd6f072668159d
+EBUILD ffmpeg2theora-0.28.ebuild 1208 SHA256 e1d3f832a657ab43fba17f57b5d576100fe5e1c84381e1a131690aec1bf70336 SHA512 a10e87876e29ddb0b6899767f1191f1f250ba04bd8b3e3b9ca91b50bcce5ece5ae69ad97d4942d781d65d43b22f47b62c54a653b8e98e2e9e861f2d9eb697575 WHIRLPOOL f1a4afe338ad30942e8967e0870b129b1ca0f98544ec150b55cefbb9372180fc8639b963c17938ae9c938e2099d6628f78905205963f9f517c30dcc04e9da125
+EBUILD ffmpeg2theora-0.29.ebuild 1203 SHA256 48d4c46243731ad1a8bf104c3a00eee1e5e390169de16c40b96f6b0f6cdd033a SHA512 67a1b4087e3d7240e73e3df084f3911e0d34c8e4fde9504e0f5870b9e4c9bb66786d844cbf6b98ff5a4169bc35f1abd01005efe9ccd66539e9d747770c46946b WHIRLPOOL be39da50c017d7a6d4746b31894ebd799f1507f661000ac9a5d55329f61e69d54a4cee9017332ac2d9649b7c8daff44aa2f03de0c621a1376f64691f9fbeb4d8
+MISC ChangeLog 9272 SHA256 8f966c734c68f1b4136f25aec85384b91afbd71410ccd24071062bd93986a300 SHA512 f10fa9788c31c9b318271844d08102845a506a061638951ff1060a7860eaf871e979fa9d6dcac7c8aeef262a590f95ff4a84c8ccd4dc6d64eaafd61c1643bdf8 WHIRLPOOL 977294ff41ce750f49ab82d6dbf945c175304ca3e4639008a575b16148acf936ad35f600393c8a9e30813dfb335e42ed22eda2fb7d524e786f913348b9251f06
 MISC metadata.xml 319 SHA256 0baf3db1e97a58c0210e91be4f08d6ecd30270f6875c0b63a77deab3aa85e530 SHA512 32c75672f9052ca9341ca231961d98777d7629027da1221c042a23834ccb4bea444bc8571e6157464f53c038064e68a5c0bfcfd0c0f459cac1df67297230e403 WHIRLPOOL 41c55a833e2d927d416c3948b2ee961a116e3d68375ba07b0c459c0dc98c9a8df5dc3fb104fd6670045a52ff744d2fcf3acfc4cb64db1ebb660eddde760c551a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRkgXjAAoJELp701BxlEWfWQIQAJSPxVPpWgHLJDsCM3no4G00
-Ku3M9r4x04KWxpUt6nMMJSJ6iYWiDdvHmwdve50bYdtXlUrPgpKpf6E/+uoNv+k0
-Yt8j4ekmGMt5TC0r/Ak/k9oBbxeSCTKOCH3bNezoDe7hKb8DImSazHKDKItCzMbS
-xmo8KrVXbMvFDiY0Cgebs/drmPrbOV6/3K+7gVyvNQFZjFUKFP0XgZBw2kNt4DA+
-9CqFDCUTdo4278Vtc+XKTkEi2TElkaZHCydJlSFMv3WfHMO9yQxqR8S6BzwhNThn
-59Xl2cizzY4fiMs7OHAJyizDnuk4c/2KLOItGwAjJbXRna13nY918U/nqhOFBLZ7
-DS7VuojqTTfPpZe+LetDvlT9zWvFgG7Oq6vxCxeV2JULaDc9Ie0wN1M6434WuZly
-GicI/mipp2dDjWrwflwE7U+14RpkkG0Wam8ptwVwr7qDfW37NWYu7wEVgKNcMapm
-36aASPArzCswHQ3kupUY9tthtSVNaCkLd+Ijpil9zecaYnwXqsj6E3wveC17Xzdi
-zN4GLLt26/b4xlyyC/r9XT+AlyiPpv5a46Fndh7yVRPnAF7HarpUaFh6AiGNkItf
-L/xPeonXsAGAe6omQOjHPoAOi8fJ3BOGa5GipteaPF6GR9h9yVIrH01YP7ssLyZu
-Yk8b22hU4KLpUACYAwyd
-=nEeo
+iEYEAREIAAYFAlIIFVkACgkQvFcC4BYPU0qXfACfcqkKdw3JILE1YdKiAbf1b1Wu
+npIAnj2JeufwJSTVxlFs0Fm1xconWWlF
+=vtkF
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild
index a318bbe14bdf..f1e57f1969e2 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.7 2012/05/22 16:44:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.8 2013/08/11 22:51:04 aballier Exp $
 
 EAPI=4
 inherit eutils scons-utils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug kate"
 
-RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
+RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg:0 )
 	>=virtual/ffmpeg-0.6.90
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild
index 4229106b1259..7f1764647e7e 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.6 2012/05/22 16:44:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.7 2013/08/11 22:51:04 aballier Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug kate"
 
-RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
+RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg:0 )
 	virtual/ffmpeg
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild
index 13283ef2c0ac..905ebe8c16c5 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.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/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.5 2013/05/14 09:37:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.6 2013/08/11 22:51:04 aballier Exp $
 
 EAPI=4
 inherit eutils scons-utils
@@ -16,7 +16,7 @@ IUSE="debug kate"
 
 RDEPEND="
     || ( media-libs/libpostproc
-		 <media-video/libav-0.8.2-r1 media-video/ffmpeg )
+		 <media-video/libav-0.8.2-r1 media-video/ffmpeg:0 )
 	>=virtual/ffmpeg-0.10
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 3b6968b8c71f..4b596f6c4b18 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.909 2013/07/29 21:38:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.910 2013/08/11 22:52:39 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
+  depend on ffmpeg:0
 
 *mplayer-1.2_pre20130729 (29 Jul 2013)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b3927ac23139..fec12b3365b5 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -19,15 +19,15 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd
 EBUILD mplayer-1.1.1-r1.ebuild 18290 SHA256 e76605c8447bef64bed2c66325aee788af5c2efbbc10324afc0a1fb3157f8b9c SHA512 658f2b065887f21f27f4e82e8c4d949447f891e46e0a3ef65a3a5387ff47c87f02b6b0a7c21257096c9921a7fa461d70ed84eb312b9bd516f0595ef7c3c21a95 WHIRLPOOL 845d349af756a5bdedffd909f563d40370cc381ca3bb1fa7490640740b88e05962ca782da5c95ba24a77c51f7c719c85ceccd1016a966927068d41b283ffb8c6
-EBUILD mplayer-1.2_pre20130729.ebuild 17310 SHA256 8f00ee65b053e0c905f60105d9274c5c838cf1cff0b9291bc9cc23388b997192 SHA512 95df29c2a9deb70bc0461fceb33ccd3659235bcd0e074715d4dec185042bb8740cbdf1fc48aaaf91d8ab179288b80a519d6c04c0deca66509e679e2ed3814176 WHIRLPOOL 6c11d77f13e4aa475501ee1855654690abded437bacf4ddc844d986dc87853f0f9c55194922aa85a43ac211e809ebb49dea5462e72a06c7c252de2bc4fde570c
-EBUILD mplayer-9999.ebuild 17233 SHA256 c0ee5aa8dcc22b6e8f6fc2d9c666df54153bdd162218aa8fd4f0e2ba3146eb9d SHA512 22f3dd5f927dbc178304dced369376246b254f3692ad24445d40e7214baef0f5401a4ec02060f8d5ea6bbaa4995cb7bdc9c20b7d36c0396f22d7a66d04672311 WHIRLPOOL e9d6de63c674e687ca0274711ab7034e2ec4ae0de224d51f55ed66cc3b6b48b50df26ed7f56af0c28c253a88790fa1771d49413a9011959ae59b8f22dd267add
-MISC ChangeLog 50706 SHA256 1c8e051e530c7a4a7c36d32588c680270d8830f856cd76725263935c7fd9c789 SHA512 ddc58f72931cff2e144ec78b4393c481185a826ba4686dbca05053627e04b81b9d2c688179a517a521ddc7d2b72c94cc98e85191a12726eb74d51f58cb716e2e WHIRLPOOL 5c577f3e34c350ea2947d880e625ecf664373ddd5d46d381ce33bdca0e104b2be0cd92169c6a2c3c5e8139f82ef62cef96d012003031c3e1336014061dc891ed
+EBUILD mplayer-1.2_pre20130729.ebuild 17311 SHA256 02512872aa4c3ddcec6fb10a3d0d9cf30cb5784d748e42d902545707cba4004f SHA512 8c8643a43fb91526de20701654293eeb7e7375598266abd866db374817778529478b61f7a09fe3d9141670e917825779b764dca5887284a7e2a654d1dafb89a9 WHIRLPOOL 82dd5b462b15a56cda6200a213e9842a8c9adb1a80a559d684b12a4b1a89638a9b952f9a089450b5a961061c02194047a57ea97d9643052cc85d0f5abce9cb15
+EBUILD mplayer-9999.ebuild 17234 SHA256 4087980e880f8a506c87ad27c841ff7b8e83b9cdd7568dc60a224f6b909b1fd5 SHA512 0f97d4bc6929cb82f50a6e7dc2e3070bb94a0525671a6c2473fc4d1135fab11027127e31f0779aa76d20d7fb77bd0e289722ceb04f5b4d123e2799275265bcc8 WHIRLPOOL 2d0498af9f308427bc5c2c79b495d1f70bd7cdbc443c952491dc474faba918e19a6feb8f5f8eeb3f125d9f8eeb7910d515538dffdc41fcadc16eb73f4d1305f3
+MISC ChangeLog 50835 SHA256 f798be41d8be805ec910f786f6079c9914248a061c5d1ed6abcec67c9b1bbaba SHA512 7230f44883b1c9a3292f1c334ffa08420452d4cef32b3a93b9de0d42b29cde8ffb63c34752ad348fb1d748cc026a1c4aa26001a6232db8eb9c4e3aeff60dcd79 WHIRLPOOL f7726d51ca8c1f5912e82deb10b97003d0d6ce846187561dd5e585b175d0453e6226b1c4ffd529c5c5bb8dd7ec8043b6532749d001001912f30b17e0f26f67a6
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
 MISC metadata.xml 2761 SHA256 0fe785443da73a55b99d98fe12c82e1f7507042aeb27d3eb70023dff1165d05c SHA512 fce5bb2777a78d6972b46db7f3d840b023b050c21ce76d77b276f4bf0cf7a48a9918e9bb8b9e9dab84ea2e5b4aa87913df7e0929daec08cda96c72400fef09a6 WHIRLPOOL bc277ac3a4996f5c73479bd08bbee9654b7cdadb8bc369d2ec545dab06414fa74724a08d1db8f3a7bcdd4bcc384034b8e9146da1344b240e1df3cea68efbd04f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH24L8ACgkQvFcC4BYPU0rQZQCgtJQP018OImqWPKlRu32xhN8p
-pnQAnR+uv4rgp6M4APXTutXT0DT2BDJq
-=1OqK
+iEYEAREIAAYFAlIIFbkACgkQvFcC4BYPU0p88gCgiIs/rscmSj/VcamVGPz1SxYF
+bc4AnRO7J5ij9eJUVdZRn498wgLknwkJ
+=Jh62
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index 17ec68999bc5..d871a42f0ecc 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.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/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.1 2013/07/29 21:38:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.2 2013/08/11 22:52:39 aballier Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.2.1:= >=media-video/libav-9.8:= )
+	|| ( >=media-video/ffmpeg-1.2.1:0= >=media-video/libav-9.8:= )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 1895cb034c00..681bba45d484 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.152 2013/07/29 20:55:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.153 2013/08/11 22:52:39 aballier Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-2.0:= >=media-video/libav-9:= )
+	|| ( >=media-video/ffmpeg-2.0:0= >=media-video/libav-9:= )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 960b885fce10..7d66d718db96 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.109 2013/07/10 02:33:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.110 2013/08/11 22:54:24 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  mplayer2-2.0_p20130126.ebuild, mplayer2-2.0_p20130428-r1.ebuild,
+  mplayer2-9999.ebuild:
+  depend on ffmpeg:0
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneeded useflag descriptions from metadata.xml
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index c7406d1111b3..ff5d4e4feb24 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX generate-tarball.sh 964 SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e577699ecfdf775b9599 SHA512 7141872caebf0e76e92f400f97f0bb540aed071decfb7668cf652d9a6f304cab968355b6d12343001b797d9cbfb113c3a5a272418427391ec7c85404dd618f90 WHIRLPOOL 1adef66fb0889c55f7a095eb1c543935c0a3b4e92ec4d3f086cbfbf9348dac58acec61aa57f0d222376da80cabb0925f3a59215dabf3c93a0baac1e89967d850
 AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b20d787342e4eb21b7cdab44aa04f2b01bc43 SHA512 e5ffa7ba9cba0c381ae37903659aaa050ecde489d7fc011e9375c41800afda08ee6073126a1e1099c4a83deb890b4ebb7ca0af43c3a9664aad8f7546757be140 WHIRLPOOL 1eb7aea177a423dd999e6c4797405bbb61c6f474ec086e9a7b91310fdc51292177fecfbb9191ba6af8326f49791607eb2d09b4201c900d3df3cbeee30a9f29d8
 AUX mplayer2-py2compat.patch 2179 SHA256 36e26a89ec03de0e349443ca3ce07c58e408e032200f49c3ce849691589a1cc7 SHA512 a90417c923c36c78d4c8053de89b26f69cd29a01ee37028360c8c564b903ee00ac0d7e98bcaf25220998951f25987cd89ede47b54518736c14abd1e7153e6568 WHIRLPOOL 987c63235be05fd3dbe89e4e291649c6f2176771e07c8515c08725a4e3d54118136b968531565a65c1e83bd754cc51e9bef5493ec2e653dfa4b3278c8bed6cce
 DIST mplayer2-2.0_p20130126.tar.xz 1914780 SHA256 ed68090e1ed2698132065ab4567e2920a6fb9f2f0868efc172f612d6848919f5 SHA512 b54780a0a45619ababf874fe40797a6c73c4adea26469178bbd5bf3396cd1977631622a8e150c02b650cf4a415d1e5d80943fda1e50935d921328022187b65dc WHIRLPOOL b1876eece2223d1b1281aeb1043c1f436c518363a2e720a2eb6be92853cac3ed0dce16b3c4300acffe4746925831ccfddcc24553d5fdcac4cce385701d5625bf
 DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79161bfd08f2cccf7d624e9b25b038fdf6c0 SHA512 da0101736b76535d38b1063c3ec7054003c8013f24df949bac26d51deebb41fcb6116af35d3b49bd6d9c1cc76842ab58c8e049a42e70dc5694058e3e6ed44bd8 WHIRLPOOL f97620ec26483e498d21b75fb533d09e41542ca18bb6a5a535c40c33fad34f745966f10a001026766610b6e40754dcecab3dc6292c00532437d2a92cb8d21079
-EBUILD mplayer2-2.0_p20130126.ebuild 11611 SHA256 0029c4c7a6ea3cb86dcd3b20b67e3a58b478839a8da06ab78691e2fe94007c4c SHA512 64fd955a770ad3097fe61fe0af40180b5ed65d6f4225958e3c26a4e357db750b0d50a0867284d50db9a006bdc07c86442df6e893265c3525b4b56ac787e20f78 WHIRLPOOL 9fb738b004f60bf55f51b55d580f8209b1c50ed0a76416345223ee214d0ff78094af1f1fb04fac800a725271a1305c7579a0f0cc99ec217c279b99e8ff2f12aa
-EBUILD mplayer2-2.0_p20130428-r1.ebuild 10387 SHA256 177583c840f4d176ad2f909bc59b57bac3fdb1f6b715c63e5efc6c1fbef10af8 SHA512 4b65b05d829bf1eea486504a99a2d2c1b8ef736ecba37efc2e2f20125fc679919061a6baa4064b81f532319031be4d7e2f127c8662592480c370216ae455a7a5 WHIRLPOOL 80dd544c3e67105892b347c248e4b765f21d29fb1aeb63870ffbedec7dba069d0a49859c95c3d475ec3f890ea7d5a3cdab7ca140c8ff5e0479426f0d12fa3290
-EBUILD mplayer2-9999.ebuild 10376 SHA256 03ee536b4c84f3ed9ddcec08c34bc284fa08f552f73eb6b134c6d9339e98a8fb SHA512 1646d4df77de1d3d9b93a8c0d9a49ab0ba1c55969ea196e7e70144c1f440b2b7017f0ff32a589922c3f7d6ea04d2f059f3fefa217df65bf685ea5e6768faed4a WHIRLPOOL 2663a12c242bdbebdbf604bc474a7507bca565edcba78e8be1a13c0c4cd215546493f98cbcf3e667dc5bcfcd66b73d0d14f1c96ccce5684cc41e30aee0660b19
-MISC ChangeLog 20604 SHA256 d53041c65eef92a13255e6705abf54f0e69014f4c470c8040f94f515a4441850 SHA512 a2d650fe146512d87188c65a0badeda0c805ca9eb981544557a812acb33254f9cf32cc53f4c1f8ca8e4ff71b6f775adf1bd712b0afb701f4ebb77af8044544c9 WHIRLPOOL 70b71f6a3cb4418c8025ea8a4a27061993943549e446b7e2bce37cd38e940cb6884925c4e9da314292b7ba84b5c8ee2bbf135cfcaab67373c685fa63a2b8dfbb
+EBUILD mplayer2-2.0_p20130126.ebuild 11618 SHA256 d67a73d0d4aecee66e0c3d5ac0b3ba4698354cc12b23bb557b2427c405c5acd2 SHA512 e3049d4d5be893451ce1320f1585e13b23962c2fdc4baae822469bccbcef859f1423d18f9e5f20e762ac748e54ecf9f091222a8ef85317aae015efc33cdac7aa WHIRLPOOL 5b0f5e9dee25069678c0ca729abb718843abf82f9e2c2bec20dbada1185e594696f1bf8cd4d2cb2228081413c21064d213a0ebb900ff96fef3f3417a31c0bebc
+EBUILD mplayer2-2.0_p20130428-r1.ebuild 10388 SHA256 8060efe5d126e926f3dadd9aa58e6c69951d88f9a526742e6a63a13873bd4819 SHA512 be679a9f9e9ac45e3d963ba65e0f94fc7daed2aecb3f1195cc855ade21c3a0fbcaab21bef3788bdeed7d2873df906d291be5988271b63c8e933356da25522306 WHIRLPOOL f0027e5df198543a5833db023d64f8780f1262c28db70d06c68c35443dd2cea70b46ed1b3f328d43846035139e77ff6bc78289d3bac3540d5b41c51655db9fb3
+EBUILD mplayer2-9999.ebuild 10377 SHA256 79aab02528fe3437293686c402a12a2700d09ba531a5541e2989021d321e7e29 SHA512 35198e356336ca9eecea3716431c2c1e99b42bda27f3f71e526840aad0e48482b5400af25eac3084b1bac319c37d377c6aa82107ca36c1ba765d4bb3410bab6d WHIRLPOOL c344360ad378959a645252bb0791f61584dba4070e1965af11a0e6fe9b29ed0e510ffea04ca2c9ff032ded03d4997219f4fbac210822fdb53da81717f29643d2
+MISC ChangeLog 20770 SHA256 c6e45f7ff1e3e040bb7f7df099de51a422ae0d105092b43be2be776a75ffd834 SHA512 909e3ee80f40797937252d293d2a98ee665ae79d0cae6ab4e5c1b47e66508bd8f557361a6238a0ea15e4a8a1db5371fb1a89017e84eaef73f3afc2a3fe13c136 WHIRLPOOL df1adc6402ac35c3125283b87d77fcb291cb6672f83ff181a9692cb3123017b052f3d9e71d533f413d4cd55ff4aa0abd489a76d3bc4f653e4739725870afab4a
 MISC metadata.xml 3152 SHA256 9ca08e75defa06c737d496ed7611e4fe047a839a1d2a34361c4456447e1c17c3 SHA512 d0940c07a53d59d92128ef017cca4a75e4f086d619f912941cb8c035e209fd301abc4ec3bbac63d45c2dee536029735d643ff5b95fc0c14b60e30034b398b510 WHIRLPOOL 463edc38c0a958b530ff4bf5d1d308f2c8d5d7ede654782deaff495a9c0725df9fd8c37cd8fa5e30da567fbbf66f7ee7967d32da104a1c3b4b9ecf559034b2f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlIIFiIACgkQvFcC4BYPU0o+sQCfVk4UDMjVv12IKRyvf4T91Iq5
+7DMAoLteBL39J53dhA6izzM1lly/NJ4P
+=IMat
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
index 83d39a23e1c3..03def7d77581 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130126.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/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.15 2013/06/29 19:19:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.16 2013/08/11 22:54:24 aballier Exp $
 
 EAPI=4
 
@@ -99,7 +99,7 @@ RDEPEND+="
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
+	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1	media-video/ffmpeg:0 ) )
 	pulseaudio? ( media-sound/pulseaudio )
 	quvi? ( >=media-libs/libquvi-0.4.1 )
 	rar? (
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
index dd301df53ee7..cd6d4a13140b 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.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/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.1 2013/07/09 16:06:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.2 2013/08/11 22:54:24 aballier Exp $
 
 EAPI=5
 
@@ -98,7 +98,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			media-video/ffmpeg
+			media-video/ffmpeg:0
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index fdabd3175a00..9aec56d275fc 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-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/mplayer2/mplayer2-9999.ebuild,v 1.60 2013/07/09 16:06:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.61 2013/08/11 22:54:24 aballier Exp $
 
 EAPI=5
 
@@ -98,7 +98,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			media-video/ffmpeg
+			media-video/ffmpeg:0
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 4c2adcc9569e..47c109292745 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.845 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.846 2013/08/11 22:57:34 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org> vlc-2.0.5.ebuild,
+  vlc-2.0.6.ebuild, vlc-2.0.7.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
+  depend on ffmpeg:0
 
   10 Jul 2013; Luca Barbato <lu_zero@gentoo.org> vlc-2.0.5.ebuild,
   vlc-2.0.6.ebuild, vlc-2.0.7.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0d03b6b88923..eac78b791796 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,13 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.6.tar.xz 18619836 SHA256 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 SHA512 80793305f7e0e48c99be99adfd85d699deaff53184f740b7624cdc9cad106b7c70f1d221e26c1362a1d1e5b02b861a1289e21a3af8a4c5ae3dfc316c67f15e74 WHIRLPOOL 04d2ff943d59979e25707aeab8a4157a3417b604ddf4d7116a6affe235afcd24fede3c49fea15b2b54784f9716b6376aae753b8b5b89f65e471d1fe11bfa728d
 DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
 DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
-EBUILD vlc-2.0.5.ebuild 10961 SHA256 ba5e4751110e18ce59f1c5edf0180e8b9f04983b3b11f3c171b48ebdf488456d SHA512 d6c5e7572dee1093bcaf69c5445216acf9eb2447663f6d395be46a2622e3b1d0d90ded0cddece03323dc8ddf75f89f13858956210f24601f44603e8975ecbc11 WHIRLPOOL 9806dfb64653a62adeee70cba471077d24a7b6480127ac73ca9e51ac552ae88ad8e8851d45736a0abffa165ec038abc2087aec927fa59535301cc23fa30b9eeb
-EBUILD vlc-2.0.6.ebuild 11024 SHA256 0f18fe9a00626d860e97940caf640d9f9808e0c7d8184b6a94a65e6a3c70409d SHA512 0433a7f90f4d7344c4649f29e643ea131227544357c974c2cf3b3fa18edd8009f7f57448a9b1a1b7d0705b31428531c22bd45004a2e68ef0d4e0e73062f3f1d2 WHIRLPOOL f559c7d27a8256675a54b559a03c6037ca967d644d52bee6511b6130ce91414afdffa504adaa35bfbaa38161307fa3f8f499d732dd2e8541736af7aef9c727c8
-EBUILD vlc-2.0.7.ebuild 11024 SHA256 ce83b7f350e195359040733f17da62574cad08591d17a24290772ad7cf06d5ac SHA512 29d38f7d590a3023b841582418a6658af766e6d33207c5504b19b4043a2f39da5c86dfc82f5438289ab3bf53205b89c234ee866eab77dfe16c929661e7580f85 WHIRLPOOL 6f4d07fa2966dcd1e09ad351a58973d44b5c4dfd1f4baa8853625ba83e057c29026fec936b7fe2e739a5e574259eac9e98931725da53b33e83ba1a22ea0a0721
-EBUILD vlc-2.0.9999.ebuild 10798 SHA256 a4b624f5c8339e46a041a9561fec7252d9f971f1ef53d849ee357da10ea02123 SHA512 96a22039a1ac5be84ab35221bf644cecacb44143564ffc811b3bbf0e3a5d6b55838356ebc871c63e930770896c6d6782872b736681ca66491584ba63645fd184 WHIRLPOOL 02e1ee369b8a73fa508634a3f50f559909f0ba20b3fc3d24c65706ef1702fb842b679eccb198761982ddab2bd859e2f7ee3a028bff2282580176c251f2126144
-EBUILD vlc-9999.ebuild 10619 SHA256 ecc1ca6e1ee52eea1d3bc8ccaf36ae760ec8210c07c37e6c8cdd610cd68ac126 SHA512 757c645e1d0487fd85a0ea8e1395c183f9c6fa01ace167ee8d61e4254679d4557e694c3732d4585ceadef92de44a7265d8a027ac0f493a230660aeca7b3df489 WHIRLPOOL 6e18056c5e08fa636b99c92f97acaa92c26be57bad04ef1addfa8c5f29bb9bd2b82a9639ffdabe7663ca69af9acb34d1e8c740b5b2b9d6b38ad78ff1eec62176
-MISC ChangeLog 11067 SHA256 525997c15b51715b03ddc67d76fa5f6d901695c23e6d6d6eec4c500b4438e58b SHA512 17db1ca7bce5111ce14aefe4acbb41d45040f98038d266fea0d2325d31b56cb6e5c475f8cb83b1c7c81e3a1293753f568650da9aad215e742bdd991285c61472 WHIRLPOOL 2466999a89fbd7083ac25ae8450486d0d72873f16f4a1b90a1f676f77e5f65613e388214a4e27c386457e5032780bbc871c1b06150064cd2551b5e6c6b661fef
+EBUILD vlc-2.0.5.ebuild 10964 SHA256 a16425b3ac14d440e2929a5bc9cabd15e3ef23f1d3d5a6d334b848f413220d20 SHA512 3e839fa62e456a391499b002dbf57fa1c9713ce63b731650fb1842ed1ec7f378fc74655b2c24471e18ac5fc987efce5caf58e90cc095b44137e4197f09064c99 WHIRLPOOL 180ed9da75b7cae009b5fee01e366c322cea5d20ed6b34839c7bbfb82c5bce4c9e02a97bb3aef306e3c794e33687edf105b8f23c7449cf9f8f207db099e0fa21
+EBUILD vlc-2.0.6.ebuild 11027 SHA256 04bbf069ffbfdbcc82afb16192003cfe0c0453a5e14eb2473c9199675c6ef4ad SHA512 cf577b8824ba8414e9c9ab263d5e97e78b7d836f79b032871b2ad9efecac670d0d4f724327964c50db548aacc943930107f41a4ff211c7c727931c3881554fd9 WHIRLPOOL e82ba709ec6f764fa589fb1d182e3fbfdd097d663deaf8628d2fa4f2f9c317f1d711fa67a990768df0d8bfd04f1b176e52bc17975a0a254d23ad1178a05f1e85
+EBUILD vlc-2.0.7.ebuild 11027 SHA256 cd02755ff00975b1e26dc2125256efdb3b9f898c4f5359d2b8e165f39b664f12 SHA512 aa170b7fb7698af2336681ee6c1c5ceabf70ef793d57b1271e93319d1796f25040226c143c1fcc65f577f08e7593810da39c22339c90bc7671514c5fe2a34f8a WHIRLPOOL d1bcf7c545b12c1fa9db52c238fec5cd5a430bc3248ceeadbf5af5de5d2da3150cd52af0a79b55a5f23b38e6d0051a8b996cc42b5ce8ca129bc73af5a6ea2ca8
+EBUILD vlc-2.0.9999.ebuild 10801 SHA256 41eff317fa08d5a0e2fa5d6fa0cb75fb1a2ed9dc5c4b70c675821bef968b7c70 SHA512 7076090ce2aa458b040bac489f9a3e96244a45b65d2e0cd56ec78f43e7dd3ed5c06526b9909ccc78f98ac32300adf5a433e99934296cff7ec0fd4e8f4b142c19 WHIRLPOOL e7b8104fa83682f65c2be25bceb129c451661647bb38a3f8ae8ba7e2e79e412a5dfbc02b7001a2a55b2f66ddde5cf83ad6b8516d54310c3ccf61e3b78957541c
+EBUILD vlc-9999.ebuild 10622 SHA256 9291704af6bca854fa6fbd9e86cfba8dc5a0733000f93d41c4dff75dc194750a SHA512 1833a715e935304bf25ca4f92d2ee2d9c792df8d220ec34f241082178c1ed58759eb604c76af79f725a9ab63e5d67d40362f16c73a84294b75f39a8bdf558da3 WHIRLPOOL 74dfe12d116a10f162dde4af4f3e8c3a16745e14f3eaf4e9c7896eab3a97d476ce0028bb0a891e19f73a908b5a4b40774cc9549d2656e9877214a8fcf7d2d0c6
+MISC ChangeLog 11236 SHA256 24f7caa6071bcf0d2c0a2cb58fd0a93bd83668919890de5df975e13f49d62ccc SHA512 5d2366baca7d760bccbc8954badac5dc83bb3b7ebc5302ea8d0cbb2bac6d9d4d8a9bc8acdcd43a34f05c67efa8da73af5aa8a14ad7ca2fde7f410c618e8017e8 WHIRLPOOL bedc51827ecbfafe95705b38cca7e5e6d6eb064cfcad681695828da7d5e0c3a445773278bf5369dc81fe130f9cda26c98820c18e798f18841c020b32f246281c
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 5930 SHA256 fc2605f67272f81ed582248b34df595c22536e446075b94131302b5b6c7c0b1c SHA512 59ff8f40ff0af5efef463fd1875939ba85ed55af1a394923a3ba48d005e9d45519be7ee0aabd0f0a05b7aafa77637473c826cde8bda512b041e02b3d2bcecc44 WHIRLPOOL 56bf2213b9e6fa5e562791689fec6cce4ad6e881ee4e9c813defab5b54dca2f912d271d14664028940e13da7e1d11c5331fb6b21b55977d8f4cfc60fa4fd95b2
-MISC vlc-9999.ebuild.orig 10613 SHA256 e64c8723cb03ce35840a41675f11372aefbbfa72b4b5ac30f15612c53136413d SHA512 5e167624a7a84bec18f088a5c22fe11d3a87fa78f7ef943bbf044fd62f7c0cad04a4c395313cefdae28e7446ac4a8e3bed7daee7631d48776c6f7cd186066aeb WHIRLPOOL 2c91d8704f190402ee128ea9ddc690fb727a8c6e7af2c9490db85be732f8eae425bc67b2f68cfd71dc1da65c460b3d4675dd5519907507e9c91216a2955d0da4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlIIFuAACgkQvFcC4BYPU0qAfwCgh+VJJ1TA9TsCQT0EnkHjSiaU
+G6QAn3v7+I0zvOh7xYq06AwDuMua/Kot
+=WQlc
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild
index 161ff4727e2e..53df697afb68 100644
--- a/media-video/vlc/vlc-2.0.5.ebuild
+++ b/media-video/vlc/vlc-2.0.5.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/vlc/vlc-2.0.5.ebuild,v 1.8 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.9 2013/08/11 22:57:34 aballier Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@ RDEPEND="
 		opus? ( media-libs/opus )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) )
+		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-2.0.6.ebuild b/media-video/vlc/vlc-2.0.6.ebuild
index d967322005bb..5bb7ff456153 100644
--- a/media-video/vlc/vlc-2.0.6.ebuild
+++ b/media-video/vlc/vlc-2.0.6.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/vlc/vlc-2.0.6.ebuild,v 1.6 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.7 2013/08/11 22:57:34 aballier Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@ RDEPEND="
 		opus? ( media-libs/opus )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) )
+		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-2.0.7.ebuild b/media-video/vlc/vlc-2.0.7.ebuild
index a9dd5d0194e7..861f61feb620 100644
--- a/media-video/vlc/vlc-2.0.7.ebuild
+++ b/media-video/vlc/vlc-2.0.7.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/vlc/vlc-2.0.7.ebuild,v 1.2 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.3 2013/08/11 22:57:34 aballier Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@ RDEPEND="
 		opus? ( media-libs/opus )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) )
+		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 65ba1d4efafa..d8e398274cf9 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.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/vlc/vlc-2.0.9999.ebuild,v 1.24 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.25 2013/08/11 22:57:34 aballier Exp $
 
 EAPI="5"
 
@@ -108,7 +108,7 @@ RDEPEND="
 		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
 		png? ( media-libs/libpng sys-libs/zlib )
 		portaudio? ( >=media-libs/portaudio-19_pre )
-		postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) )
+		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 1ba55b7141da..bc2bc3b322f5 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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/vlc/vlc-9999.ebuild,v 1.189 2013/07/10 03:16:50 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.190 2013/08/11 22:57:34 aballier Exp $
 
 EAPI="5"
 
@@ -110,7 +110,7 @@ RDEPEND="
 		ogg? ( media-libs/libogg )
 		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
 		png? ( media-libs/libpng sys-libs/zlib )
-		postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) )
+		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm media-fonts/dejavu )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )