Made ffmpeg dependency consistent; that way, it doesn't satisfy and block itself at the same time if the user has a lower version installed. Discovered in topic #964594 on the Gentoo Forums.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 28 insertions, 8 deletions

diff --git a/media-video/mpv/ChangeLog b/media-video/mpv/ChangeLog
index e4a16bc43d13..57e415d0fea0 100644
--- a/media-video/mpv/ChangeLog
+++ b/media-video/mpv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mpv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.15 2013/07/15 08:38:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/ChangeLog,v 1.16 2013/07/17 18:16:28 tomwij Exp $
+
+  17 Jul 2013; Tom Wijsman <TomWij@gentoo.org> mpv-0_p20130715.ebuild,
+  mpv-9999.ebuild:
+  Made ffmpeg dependency consistent; that way, it doesn't satisfy and block
+  itself at the same time if the user has a lower version installed. Discovered
+  in topic #964594 on the Gentoo Forums.
 
 *mpv-0_p20130715 (15 Jul 2013)
 
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 334ed547eeb3..1b301f233a44 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST mpv-0_p20130715.tar.xz 1221104 SHA256 9aacae31549f052e7a5a4abb0a42e527c6ab0ba54a6c0b49f225d7b64eeb268e SHA512 c158322cc39d02a7f0fbdade6ec13ea180edbd93214122c2ae108844639ef3e47347666f4fbe71e024f98894c1f0f5441e1dac2a4ac37b430b96f8aa6cff0028 WHIRLPOOL f1dc2f564629e28c90996a0385d9d3515c0b1241c437dce736f614deb1421f615ec4e8c3d2c3a99ae9955775c4c0db8f7561971d2a2f13ac1e1bf913fca1f41c
-EBUILD mpv-0_p20130715.ebuild 7760 SHA256 1b94202796b56393b29504dc35a6aff6fdad6ab0c447cc2479dc4f9197528092 SHA512 90dc6ffd90fb4264eb88634c8c52b8e9f63e8729dd1467addf1f759f9d07305bf835e645b50df3bc175c57617aa59d2a327b47040efee3d629db2d1411674452 WHIRLPOOL e5712033c073e85b2cafaa3ccfe955ac62cffe324b5da9dc4892e611db38af10ad7d55819963efc764eed6245f0f6e81a8d050f2e74b5248baba766efef637f0
-EBUILD mpv-9999.ebuild 7765 SHA256 522ad6cd04de4fe6ae4ecb537f70fefe3a567be79ac7b59ed4431cee0400ae32 SHA512 adb3a37f60f5716cef001990f301bda25b2dcbef8c5e261db771c9e8548cac4382f3a23146c6e5b50712ffba0d7a6659e8936c515fdf7bb085a7c33abb28d191 WHIRLPOOL 0be80801334a2b7126a6f23765edae8c4c8698ae07f9e519a1ac4e2df1d016195737a4641eea7bfdcd2ebaa2dcff200b08b90b07216dfb1815cf8bf77baaf0da
-MISC ChangeLog 2553 SHA256 ef3fab1ba8da3c8982836dafa37b712a40669308d08e5cac765209606e936a16 SHA512 01a2bf650037b7af9f1027426a86a2886138983ff1c0bf09853601271993c430c5ea4b3706425ebd6d03334166117d1a9c1b2279f5d05e26d913a68ab2da12a7 WHIRLPOOL 2fa1a55abc8aeb4bcf5827690a82f4431bcf052d5e023c7ffc8a7fd061f3ebdab64a010536bccc12b0abccdee635031d03be710e850782840505017d72cdc769
+EBUILD mpv-0_p20130715.ebuild 7790 SHA256 bfa70745b9e12f731c491976908293d6440e4ebe71af0d47541da57cf12adf3f SHA512 8e18455a77dd358567558cc8528a9b336ef1044e67b2aaabbe345e2a44a16672979acc422ec4554f1b0602a79f2d880295b5207767695cc4cfdff9d6ac950634 WHIRLPOOL ea70c863f2d259cbb08897fecc3eb37356c99d5274f0569c541ca0427f2a40bdaddce0eb0afab406542beedfb90608f33d60941c286fcc0defbee14163ff6ee1
+EBUILD mpv-9999.ebuild 7795 SHA256 208c55ebf78c40788bb992eb6c625a212ea041a0dbc60b1327d6668095734a86 SHA512 e5a8173a7e260d5fd457d7c601ce42f9bd5a2026668062addde1c116953bdba32706df8c03c0fe3a272f0defdbf5ebe8ebbb51e34a2abacfe3581d71b59baa40 WHIRLPOOL 2fbc35b990fc2127b53187bf8e60ae2aa7781bc97eb665f8ebd60457617911260153b69b3a8a45bfb5f218464ddc53d2077b314acf77ccd7c650da7ad5c26734
+MISC ChangeLog 2840 SHA256 a9a4b960bc55dc0ca9d3f23f92dd038e71d059123dd978b48374c7b29c59345b SHA512 23736271326cb8685b032184ae3198d2e7f0f1370598b95b5aabbfff13f957a5c8d8cbc3dbbb0ea98eae15babb85c89c50af92bbbec6ec369237740526d54ab4 WHIRLPOOL 1f87e0ad1b6636b9c664c2b3527c02bf36f120055d0d10e90f0ed3d8428d10a6d43563c9ba7eed035d64f70f2673a61132c241f48075a7d6d01bd80d4b1f4812
 MISC metadata.xml 1446 SHA256 22b32d5c86ce09604f020f15829f1c893a00aee53be5c708287537cad04dfbe9 SHA512 6f0abee3fcf19cb4d12aa96eded06fbe87a5c3367be8695fb33305e1d5e8da80d912e55f15236f82f44459a80c8e68ceef04e15d01f8d68ed36be23d02b993d5 WHIRLPOOL efa5d3d7d199a8462f01395e640422c3defeff1672e79065685f85dc3d2678de8f69c55d7ea01ecd78719c39aa0aff13d86bffba79dc5e87c6608a0a451e3c7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR5t65AAoJEJWyH81tNOV9LvAH/jGrxKfrwRKqrq7/cIvHaJUk
+yyLbO58a6JIC1Lpf7nHwu+M7CAwjRh5DIVo4LHLq3XIsb0iyb3AzvdyisIoKrBIi
+kJAh5U7EvZdZLpe3Z3PvtwqiqzkKPYlBTsqUiDkab4Ebvc7YzXZhqh+vamDdZmqC
+Qmc3x/BhI18jHGQmG/FCXPrZC53x0aZV/M/z5zzcxPYXE4qZUowGdHet9vZWAFW1
+7fl4pq2L0SVnXJjVKXljtDLCf5Xovg+kWmLmPJEwggB4GLgxi0pD0uIPJkZ57beV
+gRuyggeQ9V4H+XKW0koRQThoQ3hGdF9KnR0wWVPTIHboHrY0m+ksLmAVimYkdFI=
+=i3OV
+-----END PGP SIGNATURE-----
diff --git a/media-video/mpv/mpv-0_p20130715.ebuild b/media-video/mpv/mpv-0_p20130715.ebuild
index 95e82994ad8d..4c5fd8f3367b 100644
--- a/media-video/mpv/mpv-0_p20130715.ebuild
+++ b/media-video/mpv/mpv-0_p20130715.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/mpv/mpv-0_p20130715.ebuild,v 1.1 2013/07/15 08:38:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-0_p20130715.ebuild,v 1.2 2013/07/17 18:16:28 tomwij Exp $
 
 EAPI=5
 
@@ -86,7 +86,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			media-video/ffmpeg
+			>=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 9176edef5526..11499e21605a 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-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/mpv/mpv-9999.ebuild,v 1.13 2013/07/15 08:38:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpv/mpv-9999.ebuild,v 1.14 2013/07/17 18:16:28 tomwij Exp $
 
 EAPI=5
 
@@ -86,7 +86,7 @@ RDEPEND+="
 	postproc? (
 		|| (
 			media-libs/libpostproc
-			media-video/ffmpeg
+			>=media-video/ffmpeg-1.2[encode?,threads?,vdpau?]
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )