From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 60C8B1385B4 for ; Thu, 20 Oct 2016 21:23:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70B2BE080D; Thu, 20 Oct 2016 21:23:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53B60E080D for ; Thu, 20 Oct 2016 21:23:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 150E334165C for ; Thu, 20 Oct 2016 21:23:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F7AD303 for ; Thu, 20 Oct 2016 21:23:14 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1476998583.c635fbeb64aa8a2e85641dda54cfcea8d7b162b7.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-4.14.0-r1.ebuild media-gfx/digikam/digikam-4.4.0-r1.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: c635fbeb64aa8a2e85641dda54cfcea8d7b162b7 X-VCS-Branch: master Date: Thu, 20 Oct 2016 21:23:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 83079d6d-899c-4ddf-96eb-1a40c0acb41c X-Archives-Hash: 389ebe47b13111513c886090b5ab6151 commit: c635fbeb64aa8a2e85641dda54cfcea8d7b162b7 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 21:22:56 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 21:23:03 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c635fbeb 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 media-gfx/digikam/digikam-4.14.0-r1.ebuild | 2 +- media-gfx/digikam/digikam-4.4.0-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild b/media-gfx/digikam/digikam-4.14.0-r1.ebuild index f3828f6..3f81aea 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 ce6f022..d8b0287 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