Backport the ffmpeg/libav dependency fix from -r6.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 29 insertions, 21 deletions

diff --git a/app-emulation/emul-linux-x86-medialibs/ChangeLog b/app-emulation/emul-linux-x86-medialibs/ChangeLog
index 8f32c1257dd2..edf79aaf7fc3 100644
--- a/app-emulation/emul-linux-x86-medialibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-medialibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-medialibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.104 2014/06/12 14:21:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/ChangeLog,v 1.105 2014/06/13 20:31:32 mgorny Exp $
+
+  13 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  emul-linux-x86-medialibs-20140508-r5.ebuild:
+  Backport the ffmpeg/libav dependency fix from -r6.
 
   12 Jun 2014; Michał Górny <mgorny@gentoo.org>
   emul-linux-x86-medialibs-20140508-r6.ebuild:
diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index df89cef5a828..561e33b0ee5f 100644
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -15,26 +15,26 @@ EBUILD emul-linux-x86-medialibs-20140406.ebuild 2492 SHA256 27cbf38e7c2ba2ac7c13
 EBUILD emul-linux-x86-medialibs-20140508-r2.ebuild 3485 SHA256 e3c192c0d14831e60146afaf9e7808708990b063e784e11d2660dd53c04eb230 SHA512 90ac940bbb015929e772e0a73b97a1040f964911732c1fa04029f11d19f628f190b75f579036d1e2dc5b530325813816ead51a2871ea5d1a56fdc60ecbc8e26b WHIRLPOOL db2b51d01a28d935c02da6f4f10ca5bd5dc6d5b20150d5452b1fa543e17ee372c477198c86528d48e4dad1b7ee63e181c3c0b20cc36fabd853b15852f60a3a88
 EBUILD emul-linux-x86-medialibs-20140508-r3.ebuild 3577 SHA256 bb0908ddb6e867d237b725ecfe68807c825bed9e330704366e081c446a53b785 SHA512 04a3c4d28b131e114912b4a2c10d022610dbcf1abd237e5bcc8713abb75dad3abb35713f113e8c457b9d7fa19a7c92682c2e6e47cb58be22a5a8a59a93ad0fbb WHIRLPOOL 284273f958bf0b7bebc8688b248c6cfcba06ae234348a7bae2bcb27787b23aa41f519c920ffb9e9fde65e0a512a8e227834cf6e297290b44ec15d5b61cc76b48
 EBUILD emul-linux-x86-medialibs-20140508-r4.ebuild 3156 SHA256 0f28a889373d512fe41b9c4125bf9e76a83876f348fc5004d5e18f7ee02a1fdf SHA512 feaa49a2b16eef6e6c21c4d38b47e390308d2f61a1f9f844f8233a2c5eaecd896cd952dcaed23f000e562a7e9a2804625794316462d33684627cbcff9c97ae26 WHIRLPOOL 09fee3579f6ec5536a072fbf8bf02f641eaa96ee51f78aaf824b511e3ebece7f26a1553b68fea7bf20a46cf6806bd65a37247b2de7db14882d134921697d7344
-EBUILD emul-linux-x86-medialibs-20140508-r5.ebuild 3207 SHA256 8b48b621b35a36a264ce1a1bbcb29ff5dc409ce6537347d65786b9ca060bb4db SHA512 ba6f5ed22ece33582f61a20c51a0433a2612365872f66ad99b27057d6e8562ff219f13661b8a01c33ecd0be1a8079b5ef496e3e5ecb1fbf11741a8637a066e07 WHIRLPOOL 40ac535a2cb3d003174073157978cd3eb04aba35a19faf64ea198787a3f33cdf071406f2b3cb726074fb40975b9d97b76fda16e02fa2457a983c7c1da812e2eb
+EBUILD emul-linux-x86-medialibs-20140508-r5.ebuild 3236 SHA256 2612efdf1c5c396c260e0e4c6c5cf84fa960f50ccc5fbee5031917b7ea72666b SHA512 4e34f35836118b280822f34fceeb490287aaeea6fc9a5d981998b6460a8f0890250d7c77d942ca7fcb991fbf90b536af8de995a89824171349d86d621d44c58d WHIRLPOOL 799f75fc8caf612186f82a90f07a37ac2a0e71cd5c85677c13dda85562877111449f15ff61b76a1811a86a018522716a67b79cda5ce82fe4f71221046c61b9fc
 EBUILD emul-linux-x86-medialibs-20140508-r6.ebuild 3290 SHA256 febfe0e77a61f1072f58d717e875fc2d2d54bc6bb876ef88e6b6725e1d34189a SHA512 1f7b87a7c8731c0f1b9747b965abf7871b7d5f2a8bbd308d8823d39aee127be98d685d307e21ba858bf16e06fcfff2d7f4d87d70d10ff8a8070af2fc47dd467d WHIRLPOOL 37dce25bbb291f487513b825201a4b0475328d4925e747df49f8fe930cd3987a13fcfe334933fb718ea86f572d02628a8503db045c22b3e9b3679d16c755f669
-MISC ChangeLog 20829 SHA256 45ebb961708f5f6fa3c209f0be8a420c89af274486eb0673ba39866bfab5c0ba SHA512 66cecffc584eea428de9f19bb39a65d7ec41d100fb66633e9737ccacaf7b03ea714299bc872f6ed9184b36129667e648ecb0b3205568d9d1cfe8cb8671e59518 WHIRLPOOL b95402cb3ce8aab32bafac19907a95d301fcff607d9a3ea299c2301d92c8c28be5731d8e41821ca79ac942b26cbf65201c19259063fef3290c7cfce3fcf9a96f
+MISC ChangeLog 20980 SHA256 41075af97fb407001757d8ea4b977f6028ca3f0cb82700823c3b557593c0102e SHA512 db0102918323f90b4758ab675803320154f38e148466798742a603c8d1896774ce7b50b3d7e9aae1b9c13fecd0d931b3ddd4efc30bd87b9a7c41da5e7a959144 WHIRLPOOL 9d16a73c7e4546795325d9540975908f3b00da96b2973740ee47318e3b61471f5a5aa0e1c68082fbf49067c48d553d203167bfe24b190742c6f81072241327b5
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmbdoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTm1+pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2iMP/iQQQBbnxVn/PcUKmFegbg6v
-C1DP1caG3reEAHXSOBxWpXy/6FekjeTCPcVTdOKl7AEMZedOPJk2D6SbfxEanBkI
-airE5zR7kS9MspFnRb4OjPt5DqDQxLd/MyJLjFuXJHnljXow46evtPAzOKoPJ7rQ
-eAi30OuN9gwSVtVPVtsnhCiNYz29VoydPM0xZfZe5Ge+yf/puIo+AZuD8k3oWm2J
-aqw3laOelHluz8oApTW5oV4sfz16NY/xl4GTImZJdC+toSRVVU8unUDcBEEIvzew
-qKQljE/nF3JY8VDpxSJkJCN+p5HerJrjYBLno6hYA68VKAUMNsJeM2S40KFIE/8+
-9z7THt0/mQ48CQVLVj5NLrkgEv6t+rrHuKgFBOmzHS5RqUT7cJjO6rWVK7xG9pc2
-gBKqm/08XMnpwhuH/WH3KyN6eIHjpJRU0wfeJ6ygrW4T1FU2FeXKqoiLyx84IBBv
-UJGXbgKqEfNJrQR7ZZ/GHT/S9EnkAvOF9Xm6a5frjE4KfnjK3aAC5zAdXZkarK65
-aGcJjx5+H/jwBFzeFKohm3A60DFn5ZmnuwdtMMbLv0ywQ4pGezlxrTgkq6+lgdXp
-sMicwdJ81hGIYKXhRcXzEHF5vJOrCE1eSPZUZv/lMw5Cq11zn7i6DY8PoPXZw68l
-AEakbBqiRw4dUF+1E6Rd
-=Psfi
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQ2gP/jnGrl0PFXcLZ18mocmYW4dU
+9vv6qwzD1XCDHasp0OkYlx0T3fjb96oUVRKTq7ETKccfYRooz6TOVS9qu3y8D9E+
+DGBx9K74ot6HKBYQdF7VkBmRABrx9idf6AbuSBf8VdGjI41Dgk0qSeeXdE8YKAbN
+M6d+OuKo1fbZfwvMWbmUmkw3RTqGPPJyC4OVd52Ba4msh3RQ9ABEu2AdU6KQsBIP
+kZqv8jRkTp7OmTyrQ/Y89zB27xg6rbwcguEIzPwERIPhFBZ//IdLaqlNjWCF6HqD
+28QO1tyCv0ymrJHCmqlLDYBe/wYSBKEwzAgnhrMON5+Ig7AubQ+eGI2sK8a8x24i
+Ykrb+PpLyRKWNEs5zOxS5VJ3i11zrBM40E3DDGDdD3P0bvGiTZY6KQphFd+cXr2e
+14R1BTCwAORFH0QeEu8t8QuCPPyGtcT/TniLGw9Wwx+q4SeNxqgWV092IMfW/4LK
+/f8m9n+lf+K6EqBtWPzBSwKGpGnNn2IkzFR0owEJM+S+D4/BHcHvjdSr53QBtimv
+esMBqPbL0tTtPwU/uGwy/5NmCbqpuLdWR4Y7/U/3Iw2SnEevMgQDziWGjEp3Jeoy
+J9RqrijvNFbp79om5hXKqY8EEhIa7j74+v4pI27Hy+3TjvuDdPbwJxN+f0l/qWcl
+yMRHFAmvVQuZ1Ylju4CX
+=0H+b
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild
index f93b60402f0d..eabcdb5c2940 100644
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild,v 1.1 2014/06/10 18:08:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20140508-r5.ebuild,v 1.2 2014/06/13 20:31:32 mgorny Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -62,14 +62,18 @@ RDEPEND="${RDEPEND}
 		>=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
 		>=dev-libs/libcdio-0.92[abi_x86_32(-)]
 		>=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
-		>=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
 		>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
 		>=media-libs/libgphoto2-2.5.4-r1[abi_x86_32(-)]
 		>=media-gfx/sane-backends-1.0.24-r4[abi_x86_32(-)]
 		>=media-libs/taglib-1.9.1-r1[abi_x86_32(-)]
 		>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)]
-		>=virtual/ffmpeg-9-r1[abi_x86_32(-)]
-		>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
+		|| (
+			(
+				>=media-video/libav-9.13-r1[abi_x86_32(-)]
+				>=media-libs/libpostproc-10.20140517-r1[abi_x86_32(-)]
+			)
+			>=media-video/ffmpeg-2.2.3-r1[abi_x86_32(-)]
+		)
 		>=media-video/mjpegtools-2.1.0-r2[abi_x86_32(-)]
 	)
 	"