Restrict libquvi versions since 0.9 is not supported, bug #499512.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 19 insertions, 14 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 2585f1bcc726..ce4b6ebf66f3 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.115 2014/01/27 07:31:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.116 2014/01/29 22:58:13 eva Exp $
+
+  29 Jan 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  mplayer2-2.0_p20130126.ebuild, mplayer2-2.0_p20130428-r1.ebuild,
+  mplayer2-9999.ebuild:
+  Restrict libquvi versions since 0.9 is not supported, bug #499512.
 
   27 Jan 2014; Jeroen Roovers <jer@gentoo.org>
   mplayer2-2.0_p20130428-r1.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index cee4bf3bed36..f860b79f1947 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -6,15 +6,15 @@ AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b2
 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 11664 SHA256 c2ab7aefc9876e6d1bf6f3ea98e224967bf7f258aa9cf95e5f5e8003485b4095 SHA512 7d37a06478560d91da79d914086605069af0327e278071c1e31950d28b05a0b02bcdc948d1f4f86db9766fdc5819bd04352f6d0cbf06c2d188b749660fa647b3 WHIRLPOOL 62477119bb3560ad51425d632733b5a0f33033f415309a71f617f8c80620586e7cc830c52c965c4102ed806ec773de907ad482282c70ebcad5591b06d469068a
-EBUILD mplayer2-2.0_p20130428-r1.ebuild 10427 SHA256 720ae01377485b5b462b7f0a7ea671b63f6d97d7ddada4465a6c60d1607e48de SHA512 f003bd1d28071ce3af54d18c22e4cbae555aaa315730ac087794d1abb859fd740ddfd5db19a3078aa98bf93a0b04078c21ae98f8ad8269a4589f8a6bff7168ed WHIRLPOOL d48603986782d81b6073d61c7ca669b183ff6b81587283e44f5b224613d90c187d0ab708a8aecc0dd53d83f350cf67b7e12a7d8cfc2a633982a5cfc9b9828647
-EBUILD mplayer2-9999.ebuild 10438 SHA256 4582ba617b1a815a810d87698c284d6b59b4c1700c2d0bae17abb17b74ea76f3 SHA512 72e9d61ff1028abd2df7913ab7ba16a47ed11ffa1d1e6e622bc7e2c4858647868c230d6a7903e23689a4e0255c8b468489868136bfaa203608006387c24cfe93 WHIRLPOOL bd3335e272f330de926100c28baf7bc8c6b836dae21e9c08762517a5b4d4f94f62e5a6611c905234d8ee0e459740dfa61b61a95994b26c3202093efcd804f536
-MISC ChangeLog 21628 SHA256 5c52648751c8216c562f02304f77abf3da88899607922a237c22ee228ffebbe3 SHA512 6608d90deeb633d51c3d9ff6d0ebd101383fcc9ef9677cba53a441c2c674caf5b1902d91065b7ddca8acc8799a177ebdc59697859836df3b23c261d69b7e4668 WHIRLPOOL 2cf1d30dd5f7194ac0d3c958cf1fa67cc7f7450f10b955134c7cd2a079843f5ec44b30eab8c292c446c8da4dc027f655d7dc978aed0b3f2075ca7f6de9ccc71b
+EBUILD mplayer2-2.0_p20130126.ebuild 11686 SHA256 9a56cd8eb35665a77423fde35a76c98cc2b091f9837376821fb2271bfb4d94bb SHA512 9be3e0cc59a7166a615cce848be8b09db375a813fe774d221dde9624f79d954f820de092d39248ab79d8703670bbdd072bf670fcca609443c809f098e2fadc54 WHIRLPOOL d3aa4cf4d5a2c48a969c46bbf3bedbde8952026c0f58466fa3ebed5c2e359ae1688c1243f43dc31d2c4d2b0c25f5781cf57df4ca6692a4b064dc2f4aee60b27e
+EBUILD mplayer2-2.0_p20130428-r1.ebuild 10451 SHA256 d4f55aff9404dd5dffa700f666077b8d8f9f96a5f07f2958d959350784f74ecd SHA512 86a24b60f14cf7f66b864cf85ed0d3a7ea924103404eafdd1bc70da485c5a1fe08f0e0cf052db302603917e7d8867198261c5e10e5e27f39fd5b044595f28951 WHIRLPOOL 1ea69995161ac348b080a436d563699a1e050a9668511484d6bba78a288f5227cf0a9c7882ad6230c73ca2d76c0890f2ba8d10b1a09e037f9f145ef17b62ef27
+EBUILD mplayer2-9999.ebuild 10460 SHA256 2432dc39417b398208d02f6d136fb7156837b15c851f240abee9afc3fc91909e SHA512 78db168532031e8e640ac7be495e159aaf137654129ae5849390b61732de3cde3fe9f06b32c67b97dd6ed1b8a34b7a0a3a93e4544294494e1b277e361612a000 WHIRLPOOL 74a71a5adbf0ebf0458c55ecbe85ba3b183dcfccddc4aa436dca26d09dbf113118e3f9ec6e7b2b62fe136d6b5fae8aef19132b18eab941171be5eb6a3d85f2ca
+MISC ChangeLog 21843 SHA256 348e43d8f79bce90da265fc6a25db34c4bbc80623595657a535ef2400abc97c2 SHA512 351c0afad1593eaa955cfc9ca88d52e172c680270f5ba4b61213713921c7b10d49628248d1f308f1c6074a5fab13e518d63eac66232e4fef186572fd5ee582b8 WHIRLPOOL 9fb9c26cf7674f03973e544a40563809d460a5590230ea6dec1bcbb1cc1179498d26536835f25d41c3eff4fd40cb2497d36f1343babdb37f3432c74e7d151ca3
 MISC metadata.xml 3147 SHA256 b59a051d61995b8e8f565110f91005df45b271b19f55f12e873160189d523ed9 SHA512 88338f85b67efc54241fb4d6bb91883ee337fcabac184bf7cac2cb971e81bc53fd9bd9fbec1c71a2353ab5f5263218fc673d58f45642a42e9934dcf8240e9c11 WHIRLPOOL 98da9689a06cad004f9056e31766771bdd62274c05ad9334144845ea2be378197343e87c86debec08c6beaff027f82534792b3b76ae444ce7aa3eb2b4dca2cb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLmC0MACgkQVWmRsqeSphP5cgCfUVWHSjlJPiq62Ax++/yGscF6
-TSIAn3q3gmR/+zB099BE+58Kf3eQbA6G
-=6EJj
+iEYEAREIAAYFAlLph4YACgkQ1fmVwcYIWAY7/gCfdL6q4/7aSBV4buNZh1g+Gt93
+tBQAoMyp0CmsmfxjdVWo19WM1SFLPM68
+=+rka
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
index ac1beaa7062b..c6d2c493dc7a 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-2014 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.17 2014/01/23 19:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.18 2014/01/29 22:58:13 eva Exp $
 
 EAPI=4
 
@@ -101,7 +101,7 @@ RDEPEND+="
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
 	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 )
+	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
 	rar? (
 		|| (
 			app-arch/unrar
diff --git a/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild
index a326c03bf1a2..19a029cfea3c 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-2014 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.5 2014/01/27 07:31:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130428-r1.ebuild,v 1.6 2014/01/29 22:58:13 eva Exp $
 
 EAPI=5
 
@@ -102,7 +102,7 @@ RDEPEND+="
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( >=media-libs/libquvi-0.4.1 )
+	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
 	samba? ( net-fs/samba )
 	selinux? ( sec-policy/selinux-mplayer )
 	>=virtual/ffmpeg-9[threads?,vdpau?]
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index bf1905c03d54..f4a912ddd571 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.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/media-video/mplayer2/mplayer2-9999.ebuild,v 1.64 2014/01/23 19:49:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.65 2014/01/29 22:58:13 eva Exp $
 
 EAPI=5
 
@@ -103,7 +103,7 @@ RDEPEND+="
 		)
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	quvi? ( >=media-libs/libquvi-0.4.1 )
+	quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
 	samba? ( net-fs/samba )
 	selinux? ( sec-policy/selinux-mplayer )
 	>=virtual/ffmpeg-9[threads?,vdpau?]