Add kde-applications dependency option.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 84c869dbc96232f41601d647f31922490874be15..b722778b90e5e32b82c7baaac8f8abbe0c3d3fc4 100644 (file)
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.273 2014/12/13 00:21:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.274 2014/12/17 23:03:05 mrueg Exp $
+
+  17 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
+  Add kde-applications dependency option.
 
   13 Dec 2014; Manuel Rüger <mrueg@gentoo.org> digikam-4.4.0-r1.ebuild:
   Fix typo in dependency.

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index fc88617ff73c4e6804f46bc6f4771760798dcdd2..3d2d8f20050c1d4a0e385965ff8d8da9e76363fa 100644 (file)
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,7 +7,7 @@ DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad33
 EBUILD digikam-3.5.0.ebuild 4111 SHA256 d372538b818c5269d1cb5d69feb23d8bcc5e32a28651f3a3f0a9a0e456fa2fcb SHA512 f9973a8ee9bf0385b8b1a40c1c41c34400b1d1191228c16890d1677c77518aa63526e9330a26848bd419f28bff07081f37f02f4295aac0703f696c6ff9b0d7a3 WHIRLPOOL 37ac33b748e6f456663af60941fc995002c219e37ecd1b277d8b4b980edda017596e11b0bb3e7ee3bc4b2f60824b40ef548ca30285b06c6879798755410ac7e0
 EBUILD digikam-4.0.0.ebuild 4123 SHA256 f444ae5b2bd336fa9756764747da661dfbeddf8cec72f0b207c9803e6eccbf45 SHA512 d94f9e7f2d2d574ae33407e153955a81dbfb3d33e4e411b8ed10f5ff5d4a712d64668ea7c4024d7ed3bf5f301ee2cfa7e6790c1e8c73eb9f452f7fd710ce201f WHIRLPOOL 1cac3eee95763cc96038feb0e3b11aebef2fb02a85b1bb3d6082cf3b8ecbea132cb411dc2e921e2a734206b18866541222d3fb37109dbbfb03e7c940db07f374
 EBUILD digikam-4.2.0.ebuild 4173 SHA256 1e4a8b893779bf01fc127effec2c4649d51480ae907ed61306409bd26cb638c2 SHA512 1a5b8d13d1b43c5e669ef07ca43c5e4f897a81f5317b140193f5421733c4cff3572a5cecce60de52b75fbaa0e6b8e812bb5e7d9e6bee3a0dc939cc9c5071b3fe WHIRLPOOL 579d78540aaa5bece8983b0b18328104dc6ccd5fe76d636f4acbdc9f08386f84cb53cd64d215dd51c8fe004122d2b13aec321c4b8dcea2628edc92b6f368eb8c
-EBUILD digikam-4.4.0-r1.ebuild 4608 SHA256 4ef34734fa876d430f85d2d835249490f525520d5ec97865d2b1ce52af9db8b8 SHA512 c7ad057fbb779753aa69b66018e992108a7bbccafcffd745fc714c25406fca2949bbc23aeb1e8388b54caf158909a48767178bea1988bd7510c863ca2947245a WHIRLPOOL 658cdcce098010e6113c03e24b20623c3f0b630b4e73a78b46a5874cf8263bb0024ce51b48fcb2bfb55b0176c2d6b5ecb000402e5aa26375ac275cd79d029829
+EBUILD digikam-4.4.0-r1.ebuild 4635 SHA256 00d42c0a3b521c03e0d8a9cf90cf7dc9608f474581166e223b431b9a0d972b71 SHA512 05ed54ae83c6ad91ac494982d796e96bb1610cfb10f6cc621f88dd2cb6dfd9c106bccbd190559168f3ecdf0960fa1deeb78fca869d748c394edf4e5c28be5842 WHIRLPOOL 68de9f19cb44e311e680b27cc0a85c778f916d59586ffc1c26fec68d747a7deffe2c90a6c3f33a8aa99bdd95701480660f7f2360b81c84fd954391fef2ce22be
 EBUILD digikam-4.4.0.ebuild 4333 SHA256 ec5b3765a88777a05cf6b38b6965f153a928ae2ef0b0ec2403957e5ef98c1ab8 SHA512 ff30494714a4e1cf90a9562c753039593a2d9c53a727bf075dfe81d0f92409854bfacb8d07bdd059d8d8b21eb76645147bd66a54ab68e23c74dd06b784afaeb5 WHIRLPOOL 1ff613beb006c2f442645c6400b94cd285330646ced6c6541b0ea2bbf506386a0011e59be5a62e48486bd21ca0e4be09a4e6dd8d880690344175df8a27e51550
-MISC ChangeLog 44300 SHA256 0e8ffb04279f89510a6665058ee990a070a404d76ccfe5a9d3ab47cc783684d9 SHA512 2621e11217b6839aac2c19e248f9f550f9922ef045bf489295fcb9ca69ba50869c1beb18cdcb2ad59df1c0c6122a406d8a71acd200f8fe1b8e88b7792d35e8d2 WHIRLPOOL 8408eded81460d3e2508c89a19bd3253a9561e832d2a53f210f16f816297d4fdcee4fe40f5f229c326eaf355655c3756a30fa2632110b53581c5e65f3cdcbda0
+MISC ChangeLog 44416 SHA256 62598755817744a018b0facbf6cb548da015ca6b563d167e448368f0a4a48032 SHA512 a616273ff1b567c8eab1a72cec872e498a1652d3277e2e83d7f36f4a51f48751d39a459cde7d6a22776d0b26e99b3f35e730e1d0808a9470c2c0d376fe3505f6 WHIRLPOOL a4bd1dbe05105a81c75753067e278e56ce02f5801609e0d3ef4c440982e0545bd395dd99e86c16491942bc1b30a0e867aa1447df6c5b2408942820cbf56dcccb
 MISC metadata.xml 736 SHA256 86156e040ab866e9a95236a9e4a3943b02ed4b9309e688b0217a7449e9601613 SHA512 d19e6e93b72c8141e778c36b0cd032db08ad2a87fc8f8325a32ab5df3c457787520267a8b86cce7272590d971de835fdf647a1a84a4c7d4c656f605dfe42d01e WHIRLPOOL bcb65d07cc4325fbde7b748da9977ddccb52097398cb0ab9db9599505a477bff1c97388c8143fc747d854d42ecab534d81160cb09c9e868b7c63f7bcea3c53f9

diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index e13a175298a6bc8b610dc357be345d62d26a1947..340d4afdbc5b7ddb5bd98c0aa46315dc9ce2117e 100644 (file)
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.5 2014/12/13 00:21:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-4.4.0-r1.ebuild,v 1.6 2014/12/17 23:03:05 mrueg Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ CDEPEND="
        media-libs/jasper
        media-libs/lcms:2
        media-libs/lensfun
-       >=media-libs/libkface-3.3.0
+       || ( kde-apps/libkface:4 >=media-libs/libkface-3.3.0 )
        media-libs/libkgeomap
        media-libs/liblqr
        >=media-libs/libpgf-6.12.27