summaryrefslogtreecommitdiff
path: root/media-gfx/digikam
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /media-gfx/digikam
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r--media-gfx/digikam/Manifest2
-rw-r--r--media-gfx/digikam/digikam-6.3.0-r1.ebuild (renamed from media-gfx/digikam/digikam-6.3.0.ebuild)10
2 files changed, 9 insertions, 3 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d07a110b30be..2afd4571d0b3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,5 +6,5 @@ AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b1
DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56
DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0
-EBUILD digikam-6.3.0.ebuild 4127 BLAKE2B dd3aadddedca2bb93412994ff869c486b9653eedeea4faffc4dc970886b80448a0d487cc36173ea93a93e617aebfec39f012910a18885ef1f468093dfbb165e8 SHA512 58c0c44f993dd4ed6088ca6697c9f2a00ea7c33b75f6c80877308cc17d0a292305b9c423d7eae7e4896571097d3025602714c4e8379732f66949f9fb0264d2fe
+EBUILD digikam-6.3.0-r1.ebuild 4222 BLAKE2B 82d92ebfce1947d6b7950e8089a905861ad0eaae570eb8a4aec01ee60469dfdebe289285766448fbc40adec244d9f39ddc1351746829a0ad7f0c80a575383d07 SHA512 5e7b5357bb0815157a02cc039df8d06ac0cdb754c62ba3315a8fa96790f5764851d37ac397144c76846c32b55e628bd14c54c5842302df5946c8fc01dcf32130
MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f
diff --git a/media-gfx/digikam/digikam-6.3.0.ebuild b/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:= )