Downgrade overzealous ffmpeg version dependency

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 9 insertions, 5 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index ec69ab70f67b..55fc951c6520 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.60 2014/12/12 14:08:03 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.61 2014/12/12 14:20:09 thev00d00 Exp $
+
+  12 Dec 2014; Ian Whyman <thev00d00@gentoo.org>
+  mediatomb-0.12.2_pre20141212.ebuild:
+  Downgrade overzealous ffmpeg version dependency
 
 *mediatomb-0.12.2_pre20141212 (12 Dec 2014)
 
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index d309322fbba7..2a2a0a20f646 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -20,6 +20,6 @@ DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df2
 DIST mediatomb_0.12.1-5.debian.tar.gz 36001 SHA256 bfbc971eeaeb09791d4cf1b1102a19ca9ce69d67c97608bba7b8ce3b519a8625 SHA512 420cf0d4fc0aa82337f2893ef18f04f9d079d833f2540d6bee504d423e8acee5e5ae528d97f5cd4228d6648777c62d6186532f7a74d3d0cb04f9226a2de1dd95 WHIRLPOOL 3d826181f97873fc9acb67fa5a3171b9e0c60862066cc0dd29e05a4f793828fbcfb438dd1375d56144933d101824a4f498b5dbf1e269e3bb12e4ee53d9b13d59
 EBUILD mediatomb-0.12.1-r7.ebuild 4426 SHA256 7d6fbb18ea1492ac81408fbcb9d7e62c0be0c35cc8420c75461d773da70968c6 SHA512 08fe49f1e201a4a334866f3a407b0f8de88fd22abb3554ce862b590dd553d9810513387c681e9e0a7355adbbe8905e5f8e1c970c802eaa0af8a8c5367e5e4773 WHIRLPOOL 90744b925113751c1db203ecabebdbac1bc5300fe46b254085fc2f4466d9436a420e3347f5323e07e3e36f532f7c9af36df1fc30e56847e29358a9d46d6d3183
 EBUILD mediatomb-0.12.1-r8.ebuild 4402 SHA256 197e6200e897d62274db820c30d88c5bf787283989a93f985835656502d61ff3 SHA512 c40157f60d910047951f2f70db16e5f148e28f530837ffb7cb6abe7370b40c82c4c54c43360663c1092377d288b27726fd45baea8d082a432dfe7ef3a6f9a1fe WHIRLPOOL 928556fba674097b2a64d893455260ce78f1c12e96dd9583a74a0f98b2af6f03c3bc8affac5ad92a47e738a40c6ab601cdc0551a5d3108f024f3e46bd4c1b669
-EBUILD mediatomb-0.12.2_pre20141212.ebuild 3352 SHA256 7731602764b2bd8607e457cea7b63430c5e616fe95658444671c4d01bcc32f0c SHA512 1e9c767f37d660354ab0614711125448cf7ab29dd9dfd3b03cbf3ddd688f2a8df7f814f6c9866de15af56a0514da617a3b8d5bb00ab44f2c3cb20d59f2db239d WHIRLPOOL 6c7c780cd76e71abef7e6a68ee278a7b928f1cb01ee98831ca2f99c4f3d5806341a5875767558d2781a955591904616edb789be203b9b67741a7b50aac990d61
-MISC ChangeLog 11152 SHA256 224a8948fd4cda380e53a15fe298ca69045e9879d4b598e55944b53721fe0471 SHA512 5e467fec36cef784ab45d6162ee4f8a33cbcd26d4c9dd01c029eeefa08812c79a5109cbad6dcd1fea27f2398ae5c787c839a181a379d2ee6b8d64bfbe7c94487 WHIRLPOOL 5b060060c08042fbc0590de90f81c915739415f0e1c7da4922b72f5416af6238360e74751bedd36bb5f95cbb690ac2f20e745550d763b10013d7f2888df6b72b
+EBUILD mediatomb-0.12.2_pre20141212.ebuild 3352 SHA256 ef7be57a5da8c8f65ac44594bc853319800ea61bfd516f826785a8a201a2c502 SHA512 28d400bc64d8a402c9473af113f606652852432cdbfe791f62466b1c7d29af630e350f21738b207a2237a71160f7ea4874744cfd9507bc2d3d5c5cb1919a8e2a WHIRLPOOL 53f36fff9e32a592a41b8e53373858a9227e27628a1a3a3fd9431d995b0d80c4c4b965e812f8841bb67d0a3f40811e2072d32151ec471f2bcb7b60303c5044ce
+MISC ChangeLog 11291 SHA256 fd390f99e2de6575b09900c58f31f8126c533309b4ec0a143e9277e976d3dd81 SHA512 6584722d892a18ec754b2c4a5df1c9d41959f7ad66463852e88166f1cefd6c3bbd2566fb5aae62a83f3ec430edaec5b2b601fb6d6cc4f2550120b29ad83e96eb WHIRLPOOL 79f488aaae341565cf5a2925ee1d00833be0c09897a2245fa33248809ed7f0fa524c6eff5a4c48f91b9ee3edc984ed65743de13436f3a717be598102da77c175
 MISC metadata.xml 1053 SHA256 80d12510f8130f063da5b1255f0e0ce668c11b1cb689392e93eb926be1fb9c0f SHA512 fbb8841367c92c0deb0a2248d4c3691d46e3f29e1270a41e78c1c11c7bb327393709e14e9ba6124c6ad7e3f953ecf1d3ced1e75784161c272f28b3fcafedc529 WHIRLPOOL 3eeb9bd0aaa01e7b2343c795daf175e4accacef6e7bfdc296e1df6c5e4b93fdc60e62585a80c605e4a86a3dc47d9f26202bf7a63fc97eb3dadf2953604e45f2c
diff --git a/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.ebuild b/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.ebuild
index 1f24891ca573..ce8150200496 100644
--- a/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.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/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.ebuild,v 1.1 2014/12/12 14:08:03 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.2_pre20141212.ebuild,v 1.2 2014/12/12 14:20:09 thev00d00 Exp $
 
 EAPI=5
 inherit autotools eutils linux-info systemd user vcs-snapshot
@@ -31,7 +31,7 @@ DEPEND="mysql? ( virtual/mysql )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	mp4? ( >=media-libs/libmp4v2-1.9.1_p479:0 )
-	ffmpeg? ( || ( >=media-video/libav-10 >=media-video/ffmpeg-2.4 ) )
+	ffmpeg? ( || ( >=media-video/libav-10 >=media-video/ffmpeg-2.2 ) )
 	flac? ( media-libs/flac )
 	thumbnail? ( media-video/ffmpegthumbnailer[jpeg] )
 	curl? ( net-misc/curl net-misc/youtube-dl )