diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2011-09-06 21:05:11 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-09-06 21:05:11 +0000 |
| commit | f042183a5eb508a22ba1cc28023993ddb5d48ab0 (patch) | |
| tree | cec482901ed97b6297d3ff69bb8004b90bd991d8 /media-plugins | |
| parent | Version bump for beta channel release. Remove old. (diff) | |
| download | historical-f042183a5eb508a22ba1cc28023993ddb5d48ab0.tar.gz historical-f042183a5eb508a22ba1cc28023993ddb5d48ab0.tar.bz2 historical-f042183a5eb508a22ba1cc28023993ddb5d48ab0.zip | |
Bump opencv version dependency to fix usb_init symbol conflict, bug 380287
Package-Manager: portage-2.1.10.13/cvs/Linux x86_64
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/kipi-plugins/ChangeLog | 6 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/Manifest | 30 | ||||
| -rw-r--r-- | media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild | 4 |
3 files changed, 22 insertions, 18 deletions
diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index b5bc1091a2e6..f669c27d27f8 100644 --- a/media-plugins/kipi-plugins/ChangeLog +++ b/media-plugins/kipi-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/kipi-plugins # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.99 2011/08/14 18:14:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.100 2011/09/06 21:05:11 dilfridge Exp $ + + 06 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kipi-plugins-2.0.0.ebuild: + Bump opencv version dependency to fix usb_init symbol conflict, bug 380287 14 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kipi-plugins-2.0.0.ebuild, +files/kipi-plugins-2.0.0-tests.patch: diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest index 1dc0392b4a12..49ad64c9af88 100644 --- a/media-plugins/kipi-plugins/Manifest +++ b/media-plugins/kipi-plugins/Manifest @@ -8,23 +8,23 @@ DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be -EBUILD kipi-plugins-2.0.0.ebuild 2980 RMD160 29d1a35b7c933f69267d5cafbe6fa402742f7802 SHA1 c0200c6588ad05eee14492d72baa71d4acd52428 SHA256 89e7134373befac67cb9cddfa65388ad1e443dd0db8194ca319aa0cb56e2e6cd -MISC ChangeLog 16881 RMD160 9c0db66c19d7854d221164ace91d997105224386 SHA1 ff56bc9d2ad658673d494aec3f9fc69fb2e0e7de SHA256 ae28c76d2e8a1587644e1cdf20f1b792542b0131b4390fe7c615b11105abb761 +EBUILD kipi-plugins-2.0.0.ebuild 2992 RMD160 2644a07d862e2588e9c928533e3e7723e6e7c4c8 SHA1 70dc979aaad53e95d4ce8fbee0d551b7a748125b SHA256 50eeb605f896a92ee2767080633d75ee8d2ab73f0b294389a40bba91d18f851d +MISC ChangeLog 17046 RMD160 adb33a62c56255df90adc6b785adcf71f9436a54 SHA1 5f5f51d0ec7e6f26f4bc13e3deb9c09cd7f988ce SHA256 4f5a26ab5c27dff885cf0fd2964966dab33cbb8c8c1040508fb963a1e9f20357 MISC metadata.xml 821 RMD160 027364a9c743a1e63022c5bef28aacd8c6c8f2d4 SHA1 c204cf22dd75121734996fb26cc3348eeedd41e7 SHA256 6af9d8367a1e61b517b0129ec26e4ca0c4747b66d7e398d0c889094db292e4f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOSBB3AAoJENwGBM22xffeqHwQAJvEeC4tgW8nTD94KAiYaoFT -ztY2zRBM7hlwl7UZ3mkUHHNWg422LEENg5at+boZddjlrH0Ng3iKvoPgvY573nTQ -Bf1feZPXVtPgvO43uBT4sxAtARfSXl9RAhSLIH5DDKlHLcNQv8DxXb7gw7Pt/47X -JlC+APT5UxAABpw5/6GiMLjuqRm4gBJTqBKrgHRhYNS+CvK6H+fszisgSVoTwUuU -OgSc1OHVOKRVeMWIGtIwmZKLetEcIlvCV3x64O+uL2odi6mTq0osEkyMyROl9hXb -r+daMauZi+if1JjO4/caC4aheWqhrFIvkAUvxdUwauVyFEMmyUIAWktwXCW4njyr -LwcSQw3kXkFCvu+yBVZ8OEAVKxMKfZqKpR3cMKvYp5hpTeoL28yNPZCAALgFKYZp -Xr4pQs+CDtvUxJn8jbV9s8/6XjOckNF1shqzaPJ50AzssZLDEZUDbTEmuJgxnGP9 -zDbAHn0tx3VYCmcAb6OayWahGRCKKJK4KZ+BEC+os4pOzDuCULgcfW3ZyehOcPeS -HAmBsCQ7MTawg2mZlNC9LefNEu1+ll8DYz3tFtp385JEHv/YgU9tOp0kTYpHyrBU -b9MRlFw2hQuNIjdVLqE+svVEh/is+xNQta4bwNMSf7L4o1cs/g2ke+xK4yoRNZJM -mEhPogXfBOLhW68i3UpO -=2/sy +iQIcBAEBCgAGBQJOZosbAAoJENwGBM22xffewkMP/jixrYBd8Tr/o+dv5P2T12s9 +T8sdKLW6SE90ddi0HLfEZnKA7KMKwkAlkYcZQebyV8/BYaLKJApfRlNUILfTDAgT +AzonzekJxZHZ+K4YPClwPW8rO0uM8T/5nCI5X1ie1psHas0da/nGIIxsSBXOaDpa +JRml5suI571t81sBfoVfHbsYVpkqjCCjoWukkRN0YHRNZ3UtXjVYftprLNNnUz/a +7oUNoRHYevhGFVAhu8sX1aUDxIn9U6ICHA04+bilC7CUD40ddpamvycNOBZ6xIsQ +aGgEZLA3YRwQqqnWKfMOiooBgpLe14oiPm+OTraDp3M7xmQ5M0FXhHVkMmfG3uNw +8u5Qbyy1DRli/HtsfzwlN5Q+UkSPRoWJCcvM1ffEjcvgRN0nHHfnxCpQOU4rIjeX +xAX7gLc0oeMY/vCsU2hy8fRVcZMz3q7Kq+FYUCPhRuUJyU/TlEsaIUX+a1oX3nen +wJdHd5SkjldzM3LXEGl6B5Irj0HMhDOtT8FqUwAK6dkbfZXooLTXhGxVH9mTlhGe +vK/WnPM/qIiV97e2xeek+NEoP8/QRsbaoQ+Gc/xYPKfHCi+9Ki6gZzaiFKs7HfEL +T2mx1Fff0QtigC1f9Hta14dEabiNMfpVdA8IM4ZDDoQUDJdDed8fWi/yrk4NUQuX +9pJo4kr2/hjAO4Q6Gfwc +=mJXW -----END PGP SIGNATURE----- diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild index 011f405e325c..71864ff5a27e 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.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-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.3 2011/08/14 18:14:02 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.4 2011/09/06 21:05:11 dilfridge Exp $ EAPI=4 @@ -46,7 +46,7 @@ DEPEND=" media-libs/libgpod x11-libs/gtk+:2 ) - redeyes? ( media-libs/opencv ) + redeyes? ( >=media-libs/opencv-2.2.0-r10 ) scanner? ( $(add_kdebase_dep libksane) media-gfx/sane-backends |