Migrate to virutal/ffmpeg. Per bug #362081.

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

4 files changed, 25 insertions, 11 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 540c8180b832..ab2a99831172 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.25 2010/11/25 15:57:49 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.26 2011/04/14 12:39:11 scarabeus Exp $
+
+  14 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> opencv-2.0.0.ebuild,
+  opencv-2.1.0.ebuild:
+  Migrate to virutal/ffmpeg. Per bug #362081.
 
   25 Nov 2010; Jeroen Roovers <jer@gentoo.org> opencv-2.1.0.ebuild:
   Marked ~hppa (bug #340269).
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 09175315a393..3e22b4557bab 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
 AUX opencv-2.0.0-multilib.patch 5569 RMD160 f519c1276600d6d22bce7415a0fd1411fc4bd5aa SHA1 1727a3d8d5673d647b128f627e24ec22584fea40 SHA256 594cdaf2b49253b6ab1e1d7c6b55c99e4f0a9924d743e5bf0947846459099777
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
 AUX opencv-2.1.0-multilib.patch 5132 RMD160 a47c10e8f8c7fc325a562b19a925b96288605600 SHA1 167358eb0b32112c2a877a27015b2b7fb04c69b8 SHA256 25280be148a410af8f8cf79dcdcba4d2ae24ddce041af7712f1d76cf0cd863a6
 DIST OpenCV-2.0.0.tar.bz2 12779856 RMD160 f46b993ded3d579dc52175131e5485476ac1f569 SHA1 2090c2aaff77c3b0cc669c2ee81bea389db0a366 SHA256 c17db9974d87290aefc12bf7987a9f417946bc313823985de4df48ae3e1e0022
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
-EBUILD opencv-2.0.0.ebuild 2350 RMD160 1afc43fff20783c16c79b0f40c6198aa1e522fd9 SHA1 ff288b92a4759eedf908ba253058cfa076bc82f4 SHA256 f166ad3454a8351fb3eaeab913ff59822f35638140b8780a472afeb58845a428
-EBUILD opencv-2.1.0.ebuild 2937 RMD160 b8ee77340e0a11cb3f375156c6649b76ad97fb01 SHA1 dba58f13c579a3ae0615000210eff9d249692b45 SHA256 97ff1b054a8b5f237276a2de130ddf8b34356e79bcd0cccde0087f9fcac646a0
-MISC ChangeLog 4501 RMD160 7d88dec097cbc902dd5facacb9d77da0a38e184e SHA1 f1e72cc08b08de0ab57d045cd93422ca04400951 SHA256 092f2e30c1e0e532efac7941a393d364d84f420e9830bf058576ef2e817a75b9
+EBUILD opencv-2.0.0.ebuild 2341 RMD160 95014760a935f3f421219f11af4b9f472c8ff11e SHA1 5ddf2e3492ee55d8c476a9f11a9da68881b4eb69 SHA256 a0a42ef185d9252339bf3010224ac21effbf6efaa59900c0021af07b4bea2097
+EBUILD opencv-2.1.0.ebuild 2933 RMD160 8e0259e3b871ab0085b89c2874b0bc63f21f1566 SHA1 0a95c8a2c88ad43614fb8e2603bd3733f602548d SHA256 3680d08c479af4508ccf84d2aac5389438468d4f7179658ee6e0b7dcf464bdc5
+MISC ChangeLog 4653 RMD160 38ef99ddc173285414d1283be74f9a94999129a9 SHA1 cdb1e73cfa814c7116b624c1f0f3c3bb6da27f47 SHA256 55f1a42960893c623c50eb0b0854b1ea0b5b8497dd41edd225b32f9264b0e458
 MISC metadata.xml 1077 RMD160 698e45d20b4651c827a6546a5fa11db2b3919cd9 SHA1 2be6ca7ffbd3b30780534a5bf0f6af8afad2fb79 SHA256 a2958aed83ba6742d645e7cdd48900fec3be1ef39b1970805f00ae3241b31c76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2m6vUACgkQHB6c3gNBRYeTPQCcCIYZm20iHRg+ocxxAIXDoUcV
+uDMAnRwys6A5eEPey0I1nQEHsGtVckJ0
+=EVQz
+-----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.0.0.ebuild b/media-libs/opencv/opencv-2.0.0.ebuild
index 8ce79ca76fc6..e5312913b011 100644
--- a/media-libs/opencv/opencv-2.0.0.ebuild
+++ b/media-libs/opencv/opencv-2.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.9 2010/11/09 09:08:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.0.0.ebuild,v 1.10 2011/04/14 12:39:11 scarabeus Exp $
 
 EAPI=2
 
@@ -23,7 +23,7 @@ mmx octave openmp png python sse sse2 sse3 test tiff v4l xine"
 RDEPEND="sys-libs/zlib
 	ieee1394? ( sys-libs/libraw1394
 		media-libs/libdc1394:2 )
-	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? ( media-libs/gstreamer )
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg2k? ( media-libs/jasper )
diff --git a/media-libs/opencv/opencv-2.1.0.ebuild b/media-libs/opencv/opencv-2.1.0.ebuild
index f760bf5e5431..e27ae0b9fd42 100644
--- a/media-libs/opencv/opencv-2.1.0.ebuild
+++ b/media-libs/opencv/opencv-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.6 2010/11/25 15:57:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.1.0.ebuild,v 1.7 2011/04/14 12:39:11 scarabeus Exp $
 
 EAPI=3
 
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/zlib
 	ipp? ( sci-libs/ipp )
 	ieee1394? ( sys-libs/libraw1394
 		media-libs/libdc1394:2 )
-	ffmpeg? ( >=media-video/ffmpeg-0.5 )
+	ffmpeg? ( virtual/ffmpeg )
 	gstreamer? ( media-libs/gstreamer )
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg2k? ( media-libs/jasper )