[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/

[Andreas Sturmlechner]

commit:     3c20ca44f0a70c8337bb6c133a78ff2b50c89ad3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 22:25:33 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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:= )