Fix ffmpeg dependencies in preparation for ffmpeg bump.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27 x86_64

4 files changed, 12 insertions, 18 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index 6aa1703716c7..df9445b92db6 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/motion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.21 2008/10/14 17:20:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.22 2008/11/04 14:43:56 loki_val Exp $
+
+  04 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> motion-3.2.10.1.ebuild,
+  motion-3.2.11.ebuild:
+  Fix ffmpeg dependencies in preparation for ffmpeg bump.
 
 *motion-3.2.11 (14 Oct 2008)
 
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index ae432014b32a..c7bb068b5f1a 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX motion-3.2.10.1-asneeded.patch 515 RMD160 72fbbe9a29e69d90cccd1edbb2ebdce6ea92562c SHA1 1bda4644836e38ae2ee845087660fc1b45bcdb88 SHA256 01d548e78ed55e4d8feb455fc07db664dfd3bb0135dca1e43996d5bb8dd03099
 AUX motion-3.2.10.1-ffmpegheaders.patch 1214 RMD160 d26ace539af3325e50bbab6daa6c57cc5a79c096 SHA1 0021b8a18edeed99e396e956c75116ed9041da57 SHA256 3ded0b20d8078eed4ae42a3263106aaa06537733283ae8044664b116dd75a9f2
 AUX motion-3.2.11-offsett.patch 466 RMD160 62bac0efa34bc622fa1bbdf957c7080fe269ef79 SHA1 cee60a859571e857609d52ea8cf4f3df93fb9a08 SHA256 c482fbbd8c493e500fa94aa3103833b7c4f321174266385e58dc0abadcf8ffe3
@@ -8,14 +5,7 @@ AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f6
 AUX motion.init-r1 708 RMD160 45f70c3c0d91e9669341e274ff81469a889911ae SHA1 1f73b530683397e04646df01da064ba5a1155095 SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857
 DIST motion-3.2.10.1.tar.gz 402788 RMD160 c22ec64c176166519c76d12c6ab792f93d7dd707 SHA1 57cd8c5bdcf7c4d49e46fa3201630a018e67dcca SHA256 2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117
 DIST motion-3.2.11.tar.gz 416156 RMD160 942e656c7d6d8123de3e2136dfd13f42c0b13cd4 SHA1 bc171b1fa6c6a1a72f7fa3eecea2396fdcb8a02c SHA256 f1e187c61702a727bbd20bf5a66a310363257acc04b1f1c6e0b2e06e9b5dfa6e
-EBUILD motion-3.2.10.1.ebuild 1944 RMD160 2c553a9010bc84eede9af3e8db7da1af2e5418a3 SHA1 6608ca50b0ac814ee65280066a710e828c6728b7 SHA256 c3858c7e3eccc300a85b64dcc151df7b9804d046a3de91736af6e4dcc2c45f27
-EBUILD motion-3.2.11.ebuild 1850 RMD160 609e99bffc991a15c6a95d7ed743100693c633d2 SHA1 fe2926e01e8e24c215ce46e6c01541b425ffc532 SHA256 ef50aecaa4e2dd96b8968fc45707bb0013233379524c5d7516ba18e74f300b52
-MISC ChangeLog 3391 RMD160 e57947d33784d471226f994404eeda88be8f72af SHA1 c4f4b027c42dbdbb28ccd21d7631f30462e4a63e SHA256 b6b6af38590b1ebf4f66b7129151f75ea895a16e26702ff48077c4a8ff53369a
+EBUILD motion-3.2.10.1.ebuild 1963 RMD160 94ef505486bcfc4c14a8c905e673d07fef126b3b SHA1 2bca667f6220e34ccc7ff5146dde9759d3528068 SHA256 800f04cb44434712b7a2a843d63d02f6269265c9f8a08cec40dfca874cc6bc52
+EBUILD motion-3.2.11.ebuild 1868 RMD160 34a03afe817172b3581ac2f6dc53615a4177f1d7 SHA1 889b546a0ec47b43b06cc5bbf6d64707063e0c22 SHA256 a4567f79882a4477545cb8311e70826ebe53db9a79db3b6a486951c9cc171753
+MISC ChangeLog 3551 RMD160 830742abf82c0bdff45bd6252f44b0686bb08258 SHA1 91d30deee4ae5d385f8ea3cb53c994f30a14ffbb SHA256 9dea23fc46abab6b2302f5ccad42809b5938f76cd7a8a3d3a9c3286dfc1c2271
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj01OgACgkQvFcC4BYPU0rHWgCgsFUhESBcrKJBIqFw6vNXtaEN
-n8kAoIW6NdYwwtpSv7oJT4lsBJo1Ceyz
-=YdKf
------END PGP SIGNATURE-----
diff --git a/media-video/motion/motion-3.2.10.1.ebuild b/media-video/motion/motion-3.2.10.1.ebuild
index e5a7e60081b5..b9139266ee40 100644
--- a/media-video/motion/motion-3.2.10.1.ebuild
+++ b/media-video/motion/motion-3.2.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.10.1.ebuild,v 1.2 2008/06/22 11:30:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.10.1.ebuild,v 1.3 2008/11/04 14:43:56 loki_val Exp $
 
 inherit eutils autotools
 
@@ -16,7 +16,7 @@ IUSE="ffmpeg mysql postgres v4l"
 DEPEND="sys-libs/zlib
 	media-libs/jpeg
 	media-video/mjpegtools
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20081014 )
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )"
 
diff --git a/media-video/motion/motion-3.2.11.ebuild b/media-video/motion/motion-3.2.11.ebuild
index afb5449e9182..c9e0d2a7ff84 100644
--- a/media-video/motion/motion-3.2.11.ebuild
+++ b/media-video/motion/motion-3.2.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.11.ebuild,v 1.1 2008/10/14 17:20:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.11.ebuild,v 1.2 2008/11/04 14:43:56 loki_val Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE="ffmpeg mysql postgres v4l"
 
 DEPEND="sys-libs/zlib
 	media-libs/jpeg
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20081014 )
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )"