Depend on virtual/ffmpeg instead of media-video/ffmpeg.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 9 insertions, 39 deletions

diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index 58f498242f38..91475a5597f3 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.66 2011/03/05 17:37:14 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.67 2011/03/26 15:37:45 scarabeus Exp $
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kdenlive-0.7.7.1.ebuild, kdenlive-0.7.8.ebuild:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg.
 
   05 Mar 2011; Theo Chatzimichos <tampakrap@gentoo.org> kdenlive-0.7.8.ebuild:
   Add use dep for ffmpeg[encode], bug 357215
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index d4e04fee61cb..ed217fa8fbdb 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -1,6 +1,4 @@
-DIST kdenlive-0.7.7.1.tar.gz 2960541 RMD160 905196bacb9d2a668f96562c200fefdaedf43ee6 SHA1 7660537bb3ca6971c5aa9edc7a510bc2d41ea84c SHA256 dddd1047f3955e6ae3691ee261fd79f7e10958f197c1b6a6b5efc6dadcbff310
 DIST kdenlive-0.7.8.tar.gz 3232442 RMD160 5ce3ffa5d4480c6da0672675b2ec3aa47ecac905 SHA1 6fd6d50f9714974ec3f2ce04e8c978f839020f9a SHA256 7d57f455480b1657db2c12c61c5a20efe7e68fa54523fc6dc0abfd3920ac7c81
-EBUILD kdenlive-0.7.7.1.ebuild 916 RMD160 086cd52ca617e7c00b6bd33d9da054f012f54ad8 SHA1 250292ea655c416937bcad5953ab1c534ff03b14 SHA256 6dc1054f760e40af51108404175445067490366f060d002815e90c5c467dccb8
-EBUILD kdenlive-0.7.8.ebuild 920 RMD160 235c7f5bc51586df7c1216c7a041332e0706b13a SHA1 70c258b319ccedee3dd31563460da5397aff8bce SHA256 736ea222b6aa3f97cc169283d92b344f6decd9cf006ffe2755b04aa8c70d119c
-MISC ChangeLog 9055 RMD160 0254ca57c96d36bfe0fa2ef3cb4b5e0288ab6a43 SHA1 4cee1cd35d668bd11e8ca15005cc938dfa1dcdf4 SHA256 cab8195a025f230766e836aea28bf12e1b8835f67de539cab1c38818e697cbf4
+EBUILD kdenlive-0.7.8.ebuild 916 RMD160 de677d2bd1ab7eb683ee907817571f6ef8d13338 SHA1 801223f412466f84980782f73a24d4fc517a139f SHA256 065bef650a4b1286cd829a13414a2362f6857159132691d1a7f42d84602dd08d
+MISC ChangeLog 9220 RMD160 fbd24e01417d0e18c40092bf2c9897c8968ee954 SHA1 02a8f690eec4ff16746584e29255d32bc0b22733 SHA256 9a83c3a8c5529117ff60b4d5a2d7826848f855443347db716c8f721ded546609
 MISC metadata.xml 242 RMD160 c037681945b99a9569d186766fcb7b0d84b8491c SHA1 681af6a82762d3f076d49a2ca9baa9bb64266f71 SHA256 87a89e336f95de812afc49fe66d85bd1c69e2beffe7f822c18aa82031a5804bf
diff --git a/media-video/kdenlive/kdenlive-0.7.7.1.ebuild b/media-video/kdenlive/kdenlive-0.7.7.1.ebuild
deleted file mode 100644
index 5b3928d65a2d..000000000000
--- a/media-video/kdenlive/kdenlive-0.7.7.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.7.7.1.ebuild,v 1.6 2011/02/02 05:06:54 tampakrap Exp $
-
-EAPI=3
-KDE_LINGUAS="ca cs da de el es fi fr gl he hr hu it nl pl pt pt_BR ru sl tr uk
-zh"
-inherit kde4-base
-
-DESCRIPTION="Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE."
-HOMEPAGE="http://www.kdenlive.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux"
-IUSE="debug semantic-desktop"
-
-RDEPEND=">=media-libs/mlt-0.5.0[ffmpeg,sdl,xml,melt,qt4,kde]
-	media-video/ffmpeg[X,sdl]
-	>=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS README"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-video/kdenlive/kdenlive-0.7.8.ebuild b/media-video/kdenlive/kdenlive-0.7.8.ebuild
index cf3e86e5d3d6..818f6e6c2f6c 100644
--- a/media-video/kdenlive/kdenlive-0.7.8.ebuild
+++ b/media-video/kdenlive/kdenlive-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.7.8.ebuild,v 1.7 2011/03/05 17:37:14 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.7.8.ebuild,v 1.8 2011/03/26 15:37:45 scarabeus Exp $
 
 EAPI=3
 KDE_LINGUAS="ca cs da de el es fi fr gl he hr hu it nl pl pt pt_BR ru sl tr uk
@@ -18,7 +18,7 @@ IUSE="debug semantic-desktop"
 
 RDEPEND="
 	>=media-libs/mlt-0.5.10[ffmpeg,sdl,xml,melt,qt4,kde]
-	media-video/ffmpeg[encode,sdl,X]
+	virtual/ffmpeg[encode,sdl,X]
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 "
 DEPEND="${RDEPEND}"