Made ffmpeg dependency unconditional, thanks Simon Stelling (bug #165836).

Package-Manager: portage-2.1.2-r5

3 files changed, 15 insertions, 13 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 1955d0d93ed8..c6114a983d76 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kino
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.56 2007/02/07 22:15:33 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.57 2007/02/07 22:55:15 calchan Exp $
+
+  07 Feb 2007; Denis Dupeyron <calchan@gentoo.org> kino-0.9.5.ebuild:
+  Made ffmpeg dependency unconditional, thanks Simon Stelling (bug #165836).
 
   07 Feb 2007; Simon Stelling <blubb@gentoo.org> kino-0.9.2.ebuild:
   stable on amd64; bug 165836
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index fb4dfaa17397..9ae87c0fc1cb 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -30,14 +30,14 @@ EBUILD kino-0.9.2.ebuild 1747 RMD160 f25173484e94b8d0fae263353ed6f037ceab21ac SH
 MD5 0e4d1956b1312b9b7f68a7ec713d4b68 kino-0.9.2.ebuild 1747
 RMD160 f25173484e94b8d0fae263353ed6f037ceab21ac kino-0.9.2.ebuild 1747
 SHA256 020bac21c41099704657e12dbff7fc75ac96293ceebf6d847bd17391e42b699c kino-0.9.2.ebuild 1747
-EBUILD kino-0.9.5.ebuild 1779 RMD160 417059ba557a1b80f8849ae6239152328f2d1a1f SHA1 6169c14a64c59b5e85879ad98bc42d846d3a04d0 SHA256 e2484321a1ce1c1a36c58726139aaae07c1cb115ece44fad310b24c9254ea1ad
-MD5 63faa803f2adc0c41ce9aca5710f9190 kino-0.9.5.ebuild 1779
-RMD160 417059ba557a1b80f8849ae6239152328f2d1a1f kino-0.9.5.ebuild 1779
-SHA256 e2484321a1ce1c1a36c58726139aaae07c1cb115ece44fad310b24c9254ea1ad kino-0.9.5.ebuild 1779
-MISC ChangeLog 7873 RMD160 5d645220ff05b1234605bb52d58b3f227b1462af SHA1 502872feb2f738ae1c5265cd05a4c68224124fd9 SHA256 80c13a924d83b76ae7788e51678ce2fce53a4d80751a93b1b80d32a75162199a
-MD5 da4eb0f5c432b27f82673b71becaee80 ChangeLog 7873
-RMD160 5d645220ff05b1234605bb52d58b3f227b1462af ChangeLog 7873
-SHA256 80c13a924d83b76ae7788e51678ce2fce53a4d80751a93b1b80d32a75162199a ChangeLog 7873
+EBUILD kino-0.9.5.ebuild 1729 RMD160 ddc614a2355f37f62c04e6623453e9c7e6ffb853 SHA1 3c62e8eae91a03828e87ccc4bb826637d2730903 SHA256 ea7ee11759de27b5d639226e9a3029467e0f1911d5ea5294a99a01c6a3a1121a
+MD5 96ed39e19a265674c24caade18e47aab kino-0.9.5.ebuild 1729
+RMD160 ddc614a2355f37f62c04e6623453e9c7e6ffb853 kino-0.9.5.ebuild 1729
+SHA256 ea7ee11759de27b5d639226e9a3029467e0f1911d5ea5294a99a01c6a3a1121a kino-0.9.5.ebuild 1729
+MISC ChangeLog 8023 RMD160 fda0631b6b87ff21b6c89809af1a8838f808ed87 SHA1 2073d25805b23950362064750ad51b70e4039426 SHA256 139cda6a589427162943eea17dc97d138552c4ad722549b84b2b1a91b92ddf2c
+MD5 0cab3e6ee99fef42f7a6282436af3c38 ChangeLog 8023
+RMD160 fda0631b6b87ff21b6c89809af1a8838f808ed87 ChangeLog 8023
+SHA256 139cda6a589427162943eea17dc97d138552c4ad722549b84b2b1a91b92ddf2c ChangeLog 8023
 MISC metadata.xml 327 RMD160 617e7747f5cb20cf1ca590b1a888f1f9f283e0da SHA1 1645d3e168dbad229e2db9a8511ee568c2c27812 SHA256 46c50f00675aa7e8350bee197f6fce91419ee4dca4d12a970d5c09855318558f
 MD5 09bd2596b64cb4b2e5fe3cd0d6629059 metadata.xml 327
 RMD160 617e7747f5cb20cf1ca590b1a888f1f9f283e0da metadata.xml 327
diff --git a/media-video/kino/kino-0.9.5.ebuild b/media-video/kino/kino-0.9.5.ebuild
index be398ce9d22e..9fd6ee06a04c 100644
--- a/media-video/kino/kino-0.9.5.ebuild
+++ b/media-video/kino/kino-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.9.5.ebuild,v 1.3 2007/01/31 21:00:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-0.9.5.ebuild,v 1.4 2007/02/07 22:55:15 calchan Exp $
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa dvdr ffmpeg quicktime sox vorbis"
+IUSE="alsa dvdr quicktime sox vorbis"
 
 DEPEND=">=x11-libs/gtk+-2.6.0
 	>=gnome-base/libglade-2.5.0
@@ -23,7 +23,7 @@ DEPEND=">=x11-libs/gtk+-2.6.0
 	=dev-libs/lzo-1*
 	!sparc? ( media-libs/libiec61883 )
 	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	>=media-video/ffmpeg-0.4.9_p20061016
 	quicktime? ( || ( >=media-libs/libquicktime-0.9.5 media-video/cinelerra-cvs ) )"
 RDEPEND="${DEPEND}
 	media-video/mjpegtools
@@ -50,7 +50,6 @@ src_compile() {
 		--disable-dependency-tracking \
 		--disable-debug \
 		$(use_enable quicktime) \
-		$(use_with ffmpeg avcodec) \
 		$(use_with sparc dv1394) \
 		|| die "Configuration failed"
 	emake || die "Compilation failed"