Add kde-apps/kwalletd as an alternative.

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

4 files changed, 12 insertions, 18 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index cbb26c94ec25..0fad5a59228b 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.69 2015/05/22 20:41:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.70 2015/05/23 00:14:02 mrueg Exp $
+
+  23 May 2015; Manuel Rüger <mrueg@gentoo.org> darktable-1.6.6.ebuild,
+  darktable-9999.ebuild:
+  Add kde-apps/kwalletd as an alternative.
 
 *darktable-1.6.6 (22 May 2015)
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c74df030f279..f334fc80e343 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST darktable-1.6.1.tar.xz 3073356 SHA256 1372ec5b6df22409f3614b229ea98b89051c9e23e46c8bd6de1c4326705e32c6 SHA512 f1111940239b732201410b80beb7986372aedf90741fc93eff685f3ab6f53a1482d67dc1ceac4219c1e565c17492389d564bd8b21234bc0b7428e8eb1d009dcf WHIRLPOOL d6c549a530488445fc6bb6f0ee7701e639e079b547c358f020875bb07540d621045f0dddcc89dfd1da2da7c229420d1ab4d553d0555853bf64cfa029e16d0999
 DIST darktable-1.6.2.tar.xz 3086572 SHA256 66ee5f8ce5df9169211980fa374dc686eaf74322e0bd363a56612ae808bdc5bd SHA512 bd7cfb8f0ab3cce8e302bd089136d9054aa90f12fc5742606fe1cdfb782d252a59f073f6e3b08d093e7adca2e2ccf1b53c187304beff115f1c947e31d0b56cd7 WHIRLPOOL 27ca6786f6d0c1eb58b77a9519952ed0765d6910557f01b976895a13bf20f31e2b69cdd4b7ea5f538c87e4da62904380dbed66beccae7204d4eca57023733c3f
 DIST darktable-1.6.4.tar.xz 3117168 SHA256 c5f705e8164c014acf0dac2ffc5b730362068c2864622121ca6fa9f330368d2a SHA512 1527133ec6031431a8b929beaba592b3a99f800e883820a2e46d4e1155b2a32bf5e94ce030ab1942b112f6726592c9d538419887540daba014a9a1ba3100e874 WHIRLPOOL cfc7510250a4007f93e0f45919a43cf2c9c12ff259efefae634ccb844235ae5d947284252c3a822d4c14d23fc736e0c0df22ac98e325716cb041e18fe0111d8f
@@ -12,14 +9,7 @@ DIST darktable-usermanual-1.6.4.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2
 EBUILD darktable-1.6.1.ebuild 3925 SHA256 da867af4f8b93cf11c39a5eef3dcb55859776741ce8461145e98846d1af4f8fe SHA512 6b77630b4e356adca68f2aa90e8fbd4f1c781a4cf36e4191a8714e7d8a745f8e93f4edf6f34d9ddda9ace673c0eb5fe9db9aedc14b13ffd727b584ae77da8de4 WHIRLPOOL 6421310690a9f1fe8908367b91ebe7b3454535e846a66f82a98d8305a2bd05f7aa9f78c9212de513e77a3b041e35accaf186c96a7f6d90f2bc93247bd20e33b7
 EBUILD darktable-1.6.2.ebuild 4086 SHA256 48faa1faa299664911848ec0550c1d775c10707cba3307cb02cc648e10b32872 SHA512 c60b4f1c3c2a9f931d7f424d476bf30dbb3545f6a92628fcbaaa7d74654cbf9e818dc19ee4c2d03c557d441e05ab9c02f8e90cd5ad9d2f19ecea04cca448fde2 WHIRLPOOL e577f49d2e47d8f7ddb81cdba2742ac911b375cb5d8655731da08f99606affcf2bb4f4707313f6cf9a63479034a7b00525025c960c2630c142daa637ebd751c3
 EBUILD darktable-1.6.4.ebuild 4087 SHA256 0fab416dc3da712d69639945fee72a0ceb10038f5f474c833c3888a6da2b4bd0 SHA512 e65fc3d02bc4585bf690f1c5d6b17d89b02a2c53c6df44ff95dca53365b5a10c5d76def6140cf2ac96826999252135c13933efb1a4f1f2c56bbcd70eb820d79a WHIRLPOOL 686da87a10a09186c9b070cd1ce6d8e667860376f29d2be958330644335701da23a4dc431db99de9cf197a3438661704be20106786ddfc601a94a9702f1b1ff6
-EBUILD darktable-1.6.6.ebuild 4154 SHA256 74f9ad8a98999a1deba8290fccd1deb38b158497df99e3a687b444b5018bef2a SHA512 043960bd8e48968b9224814ebcbb7742880f07f0db0e4cdf9b9b83c817fb1728ce984d0c6fe5050a4c3ed7e9c8e542a48aab3556ced1211d33f6ac5e068a0fcb WHIRLPOOL 39c059752b3bdf4d89351edfc485148a8a8576a39288ffdf60f14a8b0191382c21da4094f01a17ef6c50a0f6c552909b80ec1fae100cf871eebd90921f852f9c
-EBUILD darktable-9999.ebuild 3913 SHA256 1f254522e28870f9bb9992abd02b16f985b4dd3090362325ab26bdc238e61f9b SHA512 309bb265aedc62a83e8a72eb350d29dd48cb9bc4049927ee9941d8dce79e49c3531579d8aba7ed928322af7a9d8010296058db3a63169a3b5979f3540070d529 WHIRLPOOL 316f57ab96f8a434185750b8ff7ed95d046b6baffb9995a758c6299babf5515a627dabd777a13d3d9a19ecf73e5e483ecf9e2a4f174ceb50a1491fde0105ea4e
-MISC ChangeLog 12519 SHA256 d291f1b8ea0e2f39633050eb8b8f27d8d6ab6ef0f8f083e95a2592e3f5bc0def SHA512 6d530c5a463b314ae17ac75769203e29e0101b859318322e84129c2cb83fe8b71c91197142ebad7c5f6014e79c7ef8d91ea7ce45e93e62302340e0ebc7091f3d WHIRLPOOL 03fdfc6741c98b0e72f5fdcc5626119dd95a7e8d025c59cde6956cbe162e2ec2954b1b0d3f481635f530345734d7a047e59b5de71cb6fb3a8db1f1d9a2e705a3
+EBUILD darktable-1.6.6.ebuild 4180 SHA256 d27cce0b387fbe58bcfbab602c3ccc6e53548079c9afb7115ae3e23a7d9e9cd3 SHA512 82e7970cfa810f5b03520bee8f7e52ca4aa908484385624a6cf9612f97cdcdd7f6e8dcf879a46c6a410082818bfab13b61ede3f6b8e8bfb9b0afcbab971e639c WHIRLPOOL 5f09cf018492c234efcc9acc9f17f5677c87a2674bac884972c8b3e4e55a6b48dc2f0b3f4d9cb9b090858c0742614b8042898ff5a0795efb3d2043924a34cd8e
+EBUILD darktable-9999.ebuild 3939 SHA256 fdb472aa04ad45c8ab4418e0cabeaf9db9c83fa165273dbd9b9ec459b399256e SHA512 88bc81fa6059dee7f88abc7af8dfbef4532c452c54fad4c12a9df441b86046389ed47de2bead1abaca8826306b13682cde5704769ec8d102afc65d88eab322d8 WHIRLPOOL a24cc284605f9c22775dab5879f16267b0bb535b52fb390b4a53c82930da8f3772616e1a7c3fbb61a642310ebe73246f634a447b2402d23d10330f8566ff8413
+MISC ChangeLog 12659 SHA256 6894fd77788702eea0b618695230196761adb2059fed40d9339b0120f6273105 SHA512 e0717085c29f9d46e0efbabe334c38376d3d65b6971ea10211bea3d385f50dd55afc7d81e1beb7de0c9b249c519c9c449469ee2f37455747f2de3fd17e4d3594 WHIRLPOOL f21cc05cbcf33b8ba678daa2bb5ce204d5f96a0909739b7ee4db2714b2ad7dda2628826e5692e8ac01981950043423a3043bc2b726d41bb0e7dbb2ae117a8251
 MISC metadata.xml 1183 SHA256 74075c6b1ec2b0d94214dffb780882acc4ebc5305d4a94fff7487b9630098be7 SHA512 34ceb0e19ac74ff04ceb3cca0bcdca9410323b0a69486eac134c965d3b89721d7154bde1fb18d86a6f2b44e5b29c526c795d20d757a12dfb02e88407dcf5b09c WHIRLPOOL a661e3b2cb39693e8349f075c839acc3256b513ee3c9ab07654aa91e07edd1ad583d939f6379f69aae7a6b0a32a608fad493cdafca0f4971c6bc59503f5f854d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlVflGwACgkQkKaRLQcq0GLLtgCgm3Fc6DTODrr/n1xddXgg79/Q
-qHMAn2PbIcQNT8p+6gT98Tqzs6qOCsg/
-=AXsJ
------END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.6.6.ebuild b/media-gfx/darktable/darktable-1.6.6.ebuild
index b2d0c6ade07d..9b392d56f9e7 100644
--- a/media-gfx/darktable/darktable-1.6.6.ebuild
+++ b/media-gfx/darktable/darktable-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.6.6.ebuild,v 1.1 2015/05/22 20:41:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.6.6.ebuild,v 1.2 2015/05/23 00:14:02 mrueg Exp $
 
 EAPI=5
 
@@ -62,7 +62,7 @@ CDEPEND="
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
 	x11-themes/gtk-engines:2
-	kde? ( kde-base/kwalletd )"
+	kde? ( || ( kde-base/kwalletd kde-apps/kwalletd:4 ) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 744d7e6f4b4a..43c113067a06 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.19 2015/05/22 20:41:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.20 2015/05/23 00:14:02 mrueg Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@ CDEPEND="
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
 	x11-themes/gtk-engines:2
-	kde? ( kde-base/kwalletd )"
+	kde? ( || ( kde-base/kwalletd kde-apps/kwalletd:4 ) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig