From 3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 10 Oct 2019 00:25:33 +0200 Subject: [PATCH] media-gfx/digikam: Accept kde-frameworks/{kcalendarcore,kcontacts} Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- .../{digikam-6.3.0.ebuild => digikam-6.3.0-r1.ebuild} | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) rename media-gfx/digikam/{digikam-6.3.0.ebuild => digikam-6.3.0-r1.ebuild} (95%) 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 3324004430ee..df968b3029c2 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:= ) -- 2.26.2