Fix ffmpeg deps: upstream recommends ffmpeg so this one shall come first in the || dep. xbmc doesnt even compile against libav, meaning the dep is in theory wrong but left there in case someone eventually gets upstream to fix it. Do not depend on virtual/ffmpeg which is not finegrained enough here (and also rather useless because of the libpostproc dep) since ffmpeg releases more often than libav these days and virtual/ffmpeg-9 depends on a masked ffmpeg version while xbmc only requires ffmpeg-1 which is unmasked.

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

3 files changed, 18 insertions, 20 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 5c271691282a..dede33893a7f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.183 2013/05/23 21:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.184 2013/05/24 14:05:55 aballier Exp $
+
+  24 May 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild:
+  Fix ffmpeg deps: upstream recommends ffmpeg so this one shall come first in
+  the || dep. xbmc doesnt even compile against libav, meaning the dep is in
+  theory wrong but left there in case someone eventually gets upstream to fix
+  it. Do not depend on virtual/ffmpeg which is not finegrained enough here (and
+  also rather useless because of the libpostproc dep) since ffmpeg releases
+  more often than libav these days and virtual/ffmpeg-9 depends on a masked
+  ffmpeg version while xbmc only requires ffmpeg-1 which is unmasked.
 
 *xbmc-12.2 (23 May 2013)
 
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f61339b783dd..9d300a62ae80 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -27,23 +27,13 @@ EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0c
 EBUILD xbmc-12.1-r1.ebuild 7075 SHA256 34a0c48fca3eadf20e15fc8b83495c9b3c4ee3672125cf00cf2ec721e1d625b5 SHA512 4b5a51e09e97aac67985588d2fa44891f3d409bff554ce9e80c9083a2fbe1b564a8652fedd4c8553c427894e58e4b30bac33236b3d396cf49eb290ffcb26f627 WHIRLPOOL 6cef003efd1e1cecd1ffc6366c0f123ba5c8fb58b8f8f738678fbbc3fcfb7b76be22a6ef9e0289afb8d900f84770cf4d588147b3fda05423f15fc9f0e6ac226f
 EBUILD xbmc-12.1.ebuild 6868 SHA256 9f0c53b808bfdcce7f89e31ec66c520ea5f4163068c8f526de0c44ee3b4ce1e9 SHA512 3d4ad64cdc2c4b19923e9143caf9210d9377c26af4e7bf6a1b22dfc660320ed2493c4617ea7122ef1c84b5d875240458f3d332ae58a649141e64b3571f4d4f99 WHIRLPOOL 6009890ca8b44e18f0348399639734752fe22aaa09d702c4f0c4da14ffb9d8a99828404fcf10f7913052af56c8f5bcbe60490bc060a3a63e71d7ef64a2e5f08f
 EBUILD xbmc-12.2.ebuild 6913 SHA256 e87201fd81099970a2c700425b679ccae94643120a39398018dac2f531a63845 SHA512 e2cacdfbb00219c00c90bd85f17e53e4f82c2514d455908afefb72d9c646a239d61a2a9446d7d88b3db92fdbbad10226dff0c5d55d71da495b8c25e60c7be40d WHIRLPOOL b43c29da1e353157c623867cb19d45e135e775b78638e5640f5d9aa9a774222cd3b4cbc70ded5c6c928743d1b2f326828832d109af55a55439e5f620c3177a67
-EBUILD xbmc-9999.ebuild 8300 SHA256 0a294db58c757c035d25a29f21db85a283eff501b9294c5bf56fdddbb825ee83 SHA512 235b96fd6cbdb382f2fbfc2d5be819d252b1d0ebfe43aac96b9fe8978fc39cb6163f3a8992614fee3089aaf76043bea1cef85fb12a44710d733e16e3d0540ad8 WHIRLPOOL fd3cfb0cf00302f31bf70910ee82fab4a317b8110a34cff8f9c67a4c63d873b82d26e496f6b8106ee81755829cbab6fb10633a04d319d2fb08872021167ad516
-MISC ChangeLog 29700 SHA256 e1e6be07892aeca890e7dbce27718602f9bc01f0b4ce728dd4c75b3cc7005d96 SHA512 0a78b2b7ac3bdb16dbe4793a5803a5d041669a12d0723a02bfbe4c91008c8c0aac9508116f9ec36930e93286abbdd45dcf245a4159f01e4fdfc8997405603e90 WHIRLPOOL 78c10047aa9806512ba656ad6154a5a0ebec36fa10c12c4a75b122080587b908c1e89d7f48a578d1067ce50c8d9cd10fa593525b567990dd12fcbc66e5827f0e
+EBUILD xbmc-9999.ebuild 8322 SHA256 843049a3fecd2c9b1ab7c66d9f4c8c8f67f85351f30d5bd3d90ca22d15257099 SHA512 301772fc0c82c18a6539e6d5bb0e5b54fba46dca563cc38258f1af6f01e9da96c71ceafbf13e0f63c3b610e0072fb2adf476529067dfa88085e5b0fa49449c6b WHIRLPOOL 5dfab91f2edcd2e9e16ec5e9fb3b225016388c134a1d09ca5a055f3170a643efb64227c58ab01f886a33ad34ccded47a59cc589cd1807499df3aed35d9529b57
+MISC ChangeLog 30307 SHA256 cbb8af2d35a476521415c3d74c6882a3244061806fb524bb5be4d4e9fcb0203f SHA512 6ba6a33d1338bc249b16882061432b39b2e8ff20a7e2865cc4f226d41956a9aa3a486eec2a9a485ac87a879199dbc964a43a9c12ab8d57ba457ecc5ca3a0e654 WHIRLPOOL 6bd40efda2c85226193d2f490267620aef5936ac15990efaf90e0caec720368bf0115e62eb79a440c2e5f28de41e9859903548950b1245c72ca0a80a417984a6
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRnojuAAoJELEHsLL7fEFWfCUP+gOSQA6a157dz2fpWo0a71IE
-3HAvbrLX2QCiKUsqhkSoWLKpwSPb8NKv3naiMU6YjtCcA73xQkVkyGn2uEBvVY5/
-9R0W7eQLGSofxvuwbE/VUoKX8rS0kEwEwv6YtWWvhZggwmXEX4IUOEl0jtnfqBfw
-XVFljgNHJJGMT/B3JCAT3BbY0i6YfjYNJNLN1IHi8JwiM7KJ/hoB/iWiJDjeI754
-BhCK2F0Hd8HnPPmO7oXoUhq4zAKEBxG4xQgOvOYnqXpQk0toGN4hOSyxUXh526Qe
-u/VJGhtfR1vafQUhax/uxQoYJGAm0z3qS0ShLIhI1nkvlVFdgR8Rw+RQK9fUlDd+
-QcIBvJW0kToCZJx3u5fYSAk9JKVUgWuHTzh1L9bXaJwHzT173X0l6OR984B+/EyM
-w3LWGNz6wi5sOPrLszwsHBwg5eGmr0Y52cSTrgdNga7TnsorcBUYWLSA8Q/SXVT+
-KzYUv/+NG8S6gZ91jLqr89HcpHn58P0KDfDNldI+fKeOKbw3HbtaAdI99WXW6G2q
-yJVqGm6zTeDvO5C5r/YCD6E8t2VYu4UFWMnr/7aPCYEsrBYMODsbV8Dk5JbAGfrt
-wDeXAhBoKNmjVOxk1bKnfthOSPvuOOViO1boJsXaJSZu9gGsWnWEzvmCRYz07Vb0
-ucLVH4vYV+1k5kPqUhMR
-=agh3
+iEYEAREIAAYFAlGfc8QACgkQvFcC4BYPU0psqgCgmOnGCV3rKbw6sXC7qyNYkDPS
+lfYAn2MGAwIYCdfss8DSOcS6ypb25AUM
+=0KJY
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index f7af705eae52..001ffff599a0 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-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-tv/xbmc/xbmc-9999.ebuild,v 1.144 2013/05/23 21:23:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.145 2013/05/24 14:05:55 aballier Exp $
 
 EAPI=5
 
@@ -91,8 +91,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	|| ( media-libs/libpostproc media-video/ffmpeg )
-	>=virtual/ffmpeg-9[encode]
+	|| ( >=media-video/ffmpeg-1.0[encode] ( media-libs/libpostproc >=media-video/libav-9[encode] ) )
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )