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 374B7138335 for ; Sat, 12 Oct 2019 21:13:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B4C6E086D; Sat, 12 Oct 2019 21:13:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FE90E083D for ; Sat, 12 Oct 2019 21:13:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7887B34BC50 for ; Sat, 12 Oct 2019 21:13:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04CED772 for ; Sat, 12 Oct 2019 21:13:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1570914793.3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/digikam/digikam-6.3.0-r1.ebuild media-gfx/digikam/digikam-6.3.0.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3 X-VCS-Branch: master Date: Sat, 12 Oct 2019 21:13:50 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a9a93e7b-8e5f-44c8-b074-cce1fe341e72 X-Archives-Hash: d36263cc01405d7f6e504774f1221d38 commit: 3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 9 22:25:33 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Oct 12 21:13:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c20ca44 media-gfx/digikam: Accept kde-frameworks/{kcalendarcore,kcontacts} Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../digikam/{digikam-6.3.0.ebuild => digikam-6.3.0-r1.ebuild} | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild similarity index 95% rename from media-gfx/digikam/digikam-6.3.0.ebuild rename to media-gfx/digikam/digikam-6.3.0-r1.ebuild index 3324004430e..df968b3029c 100644 --- a/media-gfx/digikam/digikam-6.3.0.ebuild +++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild @@ -61,10 +61,16 @@ COMMON_DEPEND=" media-libs/tiff:0 virtual/jpeg:0 addressbook? ( + || ( + $(add_frameworks_dep kcontacts) + $(add_kdeapps_dep kcontacts) + ) $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kcontacts) ) - calendar? ( $(add_kdeapps_dep kcalcore) ) + calendar? ( || ( + $(add_frameworks_dep kcalendarcore) + $(add_kdeapps_dep kcalcore) + ) ) dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= )