summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-22 12:12:38 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-22 12:12:38 +0000
commite70548f59f7063badc77ce47bdb34613b1959fa9 (patch)
tree2f5f8540abf3f64fd89b729b8340fbb2d59a5831 /media-video/ffmpeg2theora
parentRemove USE expat wrt #297864. (diff)
downloadgentoo-2-e70548f59f7063badc77ce47bdb34613b1959fa9.tar.gz
gentoo-2-e70548f59f7063badc77ce47bdb34613b1959fa9.tar.bz2
gentoo-2-e70548f59f7063badc77ce47bdb34613b1959fa9.zip
Fix FFmpeg depend wrt #293820.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg2theora')
-rw-r--r--media-video/ffmpeg2theora/ChangeLog6
-rw-r--r--media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild5
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index 947af0a05986..04130e14234c 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg2theora
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.36 2009/11/23 20:08:42 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.37 2009/12/22 12:12:38 ssuominen Exp $
+
+ 22 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+ ffmpeg2theora-0.25.ebuild:
+ Fix FFmpeg depend wrt #293820.
23 Nov 2009; Dror Levin <spatz@gentoo.org> ffmpeg2theora-0.25.ebuild:
Depend on newer version of media-video/ffmpeg, bug 294287.
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild
index 874ab5167764..6cb3b1e08eb4 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild,v 1.2 2009/11/23 20:08:42 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.25.ebuild,v 1.3 2009/12/22 12:12:38 ssuominen Exp $
EAPI="2"
@@ -15,8 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="debug kate"
-RDEPEND="|| ( <media-video/ffmpeg-0.5_p19787[vhook]
- >=media-video/ffmpeg-0.5_p20373 )
+RDEPEND=">=media-video/ffmpeg-0.5_p20373
>=media-libs/libvorbis-1.1
>=media-libs/libogg-1.1
>=media-libs/libtheora-1.1.0[encode]