Bump libdc1394 version dependency to fix usb_init symbol conflict, bug 380287

Package-Manager: portage-2.1.10.13/cvs/Linux x86_64

3 files changed, 23 insertions, 11 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 388ffbc0e8f7..ed8e704d360e 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.43 2011/08/10 16:49:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.44 2011/09/06 20:56:37 dilfridge Exp $
+
+  06 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencv-2.2.0-r10.ebuild:
+  Bump libdc1394 version dependency to fix usb_init symbol conflict, bug 380287
 
   10 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> opencv-2.1.0.ebuild,
   opencv-2.2.0-r10.ebuild:
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index d718e67c2cf9..f773722d680f 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX opencv-2.0.0-libpng14.patch 505 RMD160 86ef29284531519dcc5c6da1bb3abfd3c46efc73 SHA1 81bf18db6984144a0cc5b49e47e180e5337aae75 SHA256 78dc27ae16b2fcbef7cc05496dddf227640f47c37d8da05fe469eeb04146af4a
 AUX opencv-2.1.0-mmap.patch 483 RMD160 a1e1843d1845307d1e6bb7ef03f3fe45fe45380e SHA1 981e4614b5360351426990e2e12d276b04b7043a SHA256 f05a7d79218bfd5ec392a5f0017dd9efce4cdc08bbda7b223bf72525fa40a322
@@ -19,16 +19,24 @@ AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81
 DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
 DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
 EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
-EBUILD opencv-2.2.0-r10.ebuild 4486 RMD160 08ac50ace6b7125f837e4ef316446820c9cb947d SHA1 12bec82e2842997b58dccf81c18a2b3d18d82c9f SHA256 a44141182ce0a3d39995695f750346359562903434ac80239a74ccb6124e1877
+EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
 EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-MISC ChangeLog 7427 RMD160 bc1e75e1fbfe8626ca6ee9fb055686069fed30c5 SHA1 72412965dcbbc603ab955c25726a3927a5095a75 SHA256 ecab70ad84403d1550fd8c0fb3ecae9fbbbb2667033d18d82c1bd43972ed0fc8
+MISC ChangeLog 7591 RMD160 9e0a1ae7aabdcdfdfd5f965694eda5e815d8ef09 SHA1 fa30d9f7e7fcce8ada9c5f62464baa0635855217 SHA256 1f369ec567021b4cae6af6cd951f5b21ef71d9bd237ab8f444084620273c44c9
 MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk5CtpgACgkQIiMqcbOVdxQNowP/Y68z8nNn77RH2Znb58Qa5mP0
-GG3WvSMnmOqD8/X0r5G/4GLYwqoSxH9GZwW5qBYHPiIDL+bF2z1zkrJA+TuKEkim
-COPX9k2oBWi8T1gYDYtu3R7y2Lw/MH/LPE64jUzfdgDK+csnbPGQlendlCpQ7Ooc
-uf4rb56yBW1qbk7KpdM=
-=7TFu
+iQIcBAEBCgAGBQJOZokZAAoJENwGBM22xffeZ1MQAJNfJPdQddJXmHBoGe8qD5iX
+sCZWFcZ6Wtut+X2FysHyFCcQKLMo4VSg83HoUz7Npx3NYCv6u/+52EqhhspPgw6Y
+EdrHObe+/mjnTs+lQi6RMRjcHth5UrgKR2lrQe8iSjYxbCI6hJJvs8PNxIq8guhV
+XsEbWWol7JYZ3iCgNVKgjfP+xT5Bt+EfBeMSWqzLz2AgL4vsX116R7iKw+yiaS2j
+PtlfOgTn79BHQmBXEB+73hC0hA7F9WX/oKy17ITmK/En2uuHRtlHUt1K8CN0eDio
+SlnOsOjpuEHbq9k1WXt06kQFp+RHu9D+g4u+QZ2mqzz6RuBPUGt2JQfK7S+O+RBY
+dRu2Qwj/j8HgTWYGQS20hMKJ5MK1H6pBAl/RXt93QSX4vSqz+hwMgDV+jj+bFrS0
+vtOOudo0rqa0/j0dpmF28V5yvWjynv8rYp1541ZaAUBJjYhrvaIS07bbehLAmUqo
+MUCV8LtGIcj+ON0vfg3t6d5MOuCV5kYmKDvXsyGs83znHu6R0OiCPQlJ74pnw9Ff
+SVKlMFji8pmYGDt42735aPvdMzUcvtx62wdMGROVVEqQIq/E6ZtkBFBJoQbxV9uG
+oaxeaK3GVGV9g0QlOo4g9/4mbJb+7OTsg2hYb6NXHQssYNXB8SZkjC1bar9e9v5d
+q1qSkl5cX+0NPKrgD+5t
+=6iNU
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.2.0-r10.ebuild b/media-libs/opencv/opencv-2.2.0-r10.ebuild
index 2a86d3eb244e..e067847577a4 100644
--- a/media-libs/opencv/opencv-2.2.0-r10.ebuild
+++ b/media-libs/opencv/opencv-2.2.0-r10.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-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.8 2011/08/10 16:49:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.2.0-r10.ebuild,v 1.9 2011/09/06 20:56:37 dilfridge Exp $
 
 EAPI=3
 
@@ -46,7 +46,7 @@ RDEPEND="
 	)
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
-	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	ieee1394? ( >=media-libs/libdc1394-2.1.3-r1 sys-libs/libraw1394 )
 	ipp? ( sci-libs/ipp )
 	openexr? ( media-libs/openexr )
 	png? ( media-libs/libpng )