Depend on virtual/ffmpeg instead of media-video/ffmpeg. Drop older overshadowed ebuild.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 8 insertions, 41 deletions

diff --git a/dev-php5/ffmpeg-php/ChangeLog b/dev-php5/ffmpeg-php/ChangeLog
index fd4485c807b3..8ae3e04520f0 100644
--- a/dev-php5/ffmpeg-php/ChangeLog
+++ b/dev-php5/ffmpeg-php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php5/ffmpeg-php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.9 2011/01/11 22:00:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ChangeLog,v 1.10 2011/03/31 15:42:49 scarabeus Exp $
+
+  31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -ffmpeg-php-0.6.0.ebuild, ffmpeg-php-0.6.0-r1.ebuild:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg. Drop older
+  overshadowed ebuild.
 
   11 Jan 2011; Markus Meier <maekke@gentoo.org> ffmpeg-php-0.6.0-r1.ebuild:
   x86 stable, bug #345891
diff --git a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild b/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild
index fd299fff9457..a5ab7ea0a84d 100644
--- a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild
+++ b/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.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/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild,v 1.4 2011/01/11 22:00:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0-r1.ebuild,v 1.5 2011/03/31 15:42:49 scarabeus Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND=">=media-video/ffmpeg-0.4.9_pre1
+DEPEND="virtual/ffmpeg
 		|| ( dev-lang/php[gd] dev-lang/php[gd-external] )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild b/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild
deleted file mode 100644
index 3678825973f4..000000000000
--- a/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ffmpeg-php/ffmpeg-php-0.6.0.ebuild,v 1.2 2009/09/22 04:44:18 aballier Exp $
-
-PHP_EXT_NAME="ffmpeg"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit depend.php php-ext-source-r1 eutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension that provides access to movie info."
-HOMEPAGE="http://sourceforge.net/projects/ffmpeg-php/"
-SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-video/ffmpeg-0.4.9_pre1"
-RDEPEND="${DEPEND}"
-
-need_php_by_category
-
-pkg_setup() {
-	require_gd
-}
-
-src_unpack() {
-	php-ext-source-r1_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-avutil50.patch"
-}
-
-src_install() {
-	php-ext-source-r1_src_install
-	dodoc-php CREDITS ChangeLog EXPERIMENTAL TODO
-}