media-gfx/digikam: do not allow media-libs/opencv[qt5]

The presence of qt5 symbols in opencv collides with the symbols used in
digikam:4 causing a crash.

Gentoo-bug: 595358

Package-Manager: portage-2.3.2

diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild
index f3828f62f31dfea1285b115dcbe9ae4e41933afa..3f81aead6b35a3a78454b444398d309589b449cf 100644 (file)
--- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.14.0-r1.ebuild
@@ -41,7 +41,7 @@ CDEPEND="
        media-libs/liblqr
        >=media-libs/libpgf-6.12.27
        media-libs/libpng:0=
-       media-libs/opencv:=[contrib(+)]
+       media-libs/opencv:=[contrib(+),-qt5]
        media-libs/phonon[qt4]
        >=media-libs/tiff-3.8.2:0
        virtual/jpeg:0

diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index ce6f022f95934b538c0754ea9ce8229f23f6bba9..d8b0287b0ffd63cab172dddbdf3dc04dce70472b 100644 (file)
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
        media-libs/liblqr
        >=media-libs/libpgf-6.12.27
        media-libs/libpng:0=
-       >=media-libs/opencv-2.4.9
+       >=media-libs/opencv-2.4.9[-qt5]
        media-libs/tiff
        virtual/jpeg
        dev-qt/qtgui:4