depend on ffmpeg:0

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

5 files changed, 26 insertions, 11 deletions

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 )