From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 20 Oct 2016 21:22:56 +0000 (+1100)
Subject: media-gfx/digikam: do not allow media-libs/opencv[qt5]
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c635fbeb64aa8a2e85641dda54cfcea8d7b162b7;p=gentoo.git

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 f3828f62f31d..3f81aead6b35 100644
--- 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 ce6f022f9593..d8b0287b0ffd 100644
--- 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