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

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

4 files changed, 14 insertions, 48 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/Manifest b/dev-php5/ffmpeg-php/Manifest
index f1dbce09c6dd..464c13f0e823 100644
--- a/dev-php5/ffmpeg-php/Manifest
+++ b/dev-php5/ffmpeg-php/Manifest
@@ -3,14 +3,13 @@ Hash: SHA1
 
 AUX ffmpeg-php-0.6.0-avutil50.patch 1347 RMD160 a0dc5c175ebfd5b5f4992c53746b6bd97f1dd092 SHA1 c5e0126265a2d86bac6c341d56fa89eb082d24b4 SHA256 a08ad6582c7e57a43eddc7419fe37b89b1194d85d752a7a2a8837c1192784eec
 DIST ffmpeg-php-0.6.0.tbz2 275557 RMD160 a779b06f09fce3ff3c8326bb10db4ab8aadf425e SHA1 2978b5af51af3eda0639840634297eb584b394c1 SHA256 ec8a9847e0f4d5101a5afedb7dac318e9a13f099865215ae99d08d56add9b141
-EBUILD ffmpeg-php-0.6.0-r1.ebuild 988 RMD160 7d773d0a5de2814d97608f11e87de855b4f92208 SHA1 983029925d239d12bc629a8b5e1c926fe9ea81ac SHA256 906ece5421211304e3f9c245a49ecba3b3b9e1c0934660a01c6efcb671241825
-EBUILD ffmpeg-php-0.6.0.ebuild 874 RMD160 2292aad43cc0a8d9d9f0cb62774bf146348d13da SHA1 ad755bfcdf7e1108e9f5f8844b5395ad7349590e SHA256 10dec7fbd00f7fd4242cdeb2161d93283b88b2cde5dd2c401d89cee303ffb8b6
-MISC ChangeLog 1789 RMD160 b502ee0babcae2e3599f1f93c6f26c1a7987f91f SHA1 69d58bb965dbfaca78813503319cb6085c2dc601 SHA256 2974aedcea636fe1c6bfc9cb31a226174c9f279f42d8f608f080a1dae7c36b16
+EBUILD ffmpeg-php-0.6.0-r1.ebuild 974 RMD160 be8be43538badd4524b1e54793f42c33b3f7767a SHA1 2d7b62e14f30025997c06136e74e0c2d7fc35149 SHA256 7e23e8220836b6d1d5244833edec02147961bca6d36b77c359ef4840b5015474
+MISC ChangeLog 1997 RMD160 b57dc06efb064078546a6ede627a948f1ba2a38d SHA1 05a024c4f718a76cdf6d5c184bdd28f59b06fadc SHA256 cf407422ac0e76de444332ba4c2c0f35facec9cd2e743b1ec487414436a14cad
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0s0v4ACgkQkKaRLQcq0GLI1wCfa2Z3h9B9lNCoVH5Ax2i9fIMs
-ZSQAn3afhbLkEbPjFbDawC8n7IaVA4EK
-=Irn7
+iEYEARECAAYFAk2UoIcACgkQHB6c3gNBRYeZkQCgxkERoWX+ZGEi1/Vx0tqzXLLx
+2aoAoLbfaqRhbilWOU0edWuvDEmKQP6d
+=puXR
 -----END PGP SIGNATURE-----
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
-}