media-gfx/darktable: sync with main tree

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manifest-Sign-Key: 0x363AF1F7765A9D02

5 files changed, 26 insertions, 32 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c0c7faf..dccdc8b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -5,26 +5,26 @@ DIST darktable-2.0.7.tar.xz 2960436 SHA256 a9226157404538183549079e3b8707c910fed
 DIST darktable-2.2.3.tar.xz 3079524 SHA256 1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0 SHA512 cfebd82ffc3998e731d98e70e6b2b97ab469d2b289cb759eb0c59a5243bb31193ad9bc849668d55f2b885b24b4e66eb9a0ee6548b951b0ddf0561a48bcc38ae8 WHIRLPOOL 95ede4fc8a87efa4f4057d656fda6b7cfbe529628acd4125755042613e2d61900148deb295745dfc12d9551ca8a1c64ebaaac646a04d0f37e5364f002c9c31d6
 DIST darktable-usermanual-2.0.0.pdf 13875563 SHA256 ee1714011b05e872cd9d7cd5101e9b936d1aa787a19865bcb50774a2ad0e67a4 SHA512 3f51dc6b96cfb0f205a7abd3264945217b9c885ba30ac2359f13489362ed8e2a9212b80aa714c511546b5f4067fffe060858acff60f13b90c4f232583941281e WHIRLPOOL 5ff5f9ca968fdfafbd99a46593e1c2e43d1f33734fcf7262a8a5d87db2458d372dc981aec38f100694e00d13242add4576ad8e7ff857d0275f631e513d58ba2b
 DIST darktable-usermanual-2.2.0.pdf 14998142 SHA256 04213234e5bcdef658431d265310fbdfae38e1b820420c69cd802391a5a7accf SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 WHIRLPOOL 16aa4422f20871802cad3421f30dc6e230757f5366ec17259f4d07da048e23d64003f2531dcf33c702a46c0f2788aa4e0d81e94e13b83da2dd699255f6aca247
-EBUILD darktable-2.0.7.ebuild 4059 SHA256 65e11c79252b469daecd277c2214c40a9ac8c94050fb115e49f60a4d2ba6244c SHA512 04995289403ec28c239fca8bec61f7e054913dc660557c39eb5ac7524d14c1091e0038bf104ac9e14a58fa5bb3c50ac724cbcbf7b852a9aaf0924639c28bd688 WHIRLPOOL fbb950936de4a5d3d24d4483dafd1e5ab0c8acffeda51942593d52f616d77b4292075a16af2dc541cbcdde0323b3c5ec91515d96c9c73cafd098241044f3c51b
-EBUILD darktable-2.2.3.ebuild 3813 SHA256 a79fd5df5d60f6fa36646e689f0bd4434e075a30156bc03f52f0c42fb173e4f6 SHA512 cc915056a6cff7e69b3658329fc27b2d3b338fad92aded237ad82d59dee8107abce4aaabab29c51d3279b99f88dc023055874cb2d5d3d4566589a2dcda5cff53 WHIRLPOOL 8fefd0e4675ce283614ea9becd102c8867e9e681e6aba0b2fa54cfc1d17e790fd1838ad2deb0587da88a200b08e82d3161a9f138f0d15fe29b5efda5de6215ad
-EBUILD darktable-9999.ebuild 3248 SHA256 0e2405c686aafcd112264182b1a7607524e3f04bab661812941d0cdf144611ef SHA512 79c767a179978b8acd0c3d2fdc837b6978b1067ca242401e9bb78319e7c280ec9f6b510c3af92c367e9af7cb6edad7f9b13b58a701a8e1e43b4f4783cde43990 WHIRLPOOL 0bad829677e3ab3b58878093d7a31bb208e6c392733533a2c3cf7c1536d0a8d17300e6ccf827fc2a694e49d7c8c6b9772bb419b1c499e821aa138a2d2390ca8b
-MISC metadata.xml 960 SHA256 0f568b1fea7ef1c83141a091098844292341ecc0e8fe828e0405b96b14d60b17 SHA512 e4334eaf63c2c00c8d381dcde17437fc1a615e4bee432a27dbaf598926ba053d2b53dbb7e8ccabccbdee1da0ce104cc8731fb74a753ed682e0282d4dbe2abdeb WHIRLPOOL 15bc04e55cf008a12293d3133422967448cc6b1e359f3f0316dbaa8d815fe975e6f8a23f4edcfcea1693852ad0db73bbaf57a26e049d78f2b26bbc638cef6a4d
+EBUILD darktable-2.0.7.ebuild 4052 SHA256 1c15f516e3ddf9b71b9236670621ea2f803781e5a76bbb9af19f21a586c14516 SHA512 a31fd5f904a94bc252935ba5e5efe9d34bacf4fe0ee1561565efbc2ba8fe3bca971a050c8e46c37ba3ec0f12cc8129501c81e9e4d4a6249bf3c49cb880b4b836 WHIRLPOOL 5223101a28468a811c26b5d66a0c1102d8e2122a36a2d5d8f0120bb0d77dacbf091cf1767b9f9186741c50c1ae0fa2360a7359382199647c802b7815b602c61c
+EBUILD darktable-2.2.3.ebuild 3815 SHA256 06ee043d9635c1fd4805c9bddf30958c147fd55534c5feaf93a38cfb6803a13d SHA512 71db35fef7dd099139cdfb866cbb42809fbde7ab7fc19267c10e72552aad083ffd03daa344bec1e4b9e159da0f3b554dff2a20d7ff5402260092ef54928a1d49 WHIRLPOOL 5e9aac3452110d30a120ef37f8756377f8f1e137761743254323679380ba30bb75f4cba97657b613624bc2c3ae20019e5ec0787ce39cbb8bf501084ab2fc56ac
+EBUILD darktable-9999.ebuild 3250 SHA256 d2d41d13aa44ce1978a3dd6ec2d32fdd5cf4d9e62dceaa54791560354befa6f5 SHA512 9c3081ee00004b7a0b9bf18364718af74257642cab4aa410d1ea3cbc02b470be2cc825251fb158ca988a3615339003a02502f90ebb50ca034e6e07940a8565d6 WHIRLPOOL 301233b7d8c8f5108233b2c2222be334ff6c70ffaa3df5245e1e9298568ef6804e13f6f5a2c339565a0deb82c26b7c74eb10b26bb32f4873e6c816e3cacfb75c
+MISC metadata.xml 1067 SHA256 3cc5b9556ab666bba4472bb25bc7afff506b6765786c17e0ad96c66316a82ee6 SHA512 9e2d808abb53b729b93f78e5a7036659b00e696215fbcd3331412df38ad56240f5532027c97a41a4779cf26ae85d048ae51c8601daafc1acd6649d802499651f WHIRLPOOL 63bc320cc10cd6289bb2a1a4d5503375077ff9d8f0f0940a69327bdc073eec1e7f3e53fc4cfa90940a6daf2d4eebf6caee649ef20a370da7ad7986513d1b4339
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlimFaVfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAljmpqNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
 OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDwBFw/9GP2h5OKM6RFmVLEllVlMI4u4mqZarl5mxK+WYfi2UbyfR169NA7Ba1O9
-hAHWMWhuVjlwYPTrTB4vm8TKbCypjj/gDg5QHi/6lAaPslEqHFxsRzl5Uw6kxVmU
-nOl/a7RwZfKkZj9A8REKbQkiOJltm+tWEn31NEdjqJXytusfNy8hED+EvNN7ermp
-fLKHHFBhh2xBd+7Q7mjn3wuu+y6NjbDKrrlxwxjGVgF+051hsfB8nAOIfrr0CQ7A
-AU+74ioQVOzMlvgKQflDvZe7im2Hud/C3dM5ACmMJ8BEc5aFqopUYQfeuwuHCju6
-RzDlL+cv9ykiTnv5H3qkaUvpOeP2ophA8yhkucmILSeiL4R/AEeEByUWJ2S97Pdk
-7yNEH/SYVDHQiWhHUquojHNGUXlzsxLMo9p+WqE57gO4Zzb7ZtWPXGZjenOqv6fu
-rAkBsjBsktIA7oUQ/UmcCxG3PvLc/ZnOVZ/wVGhHHiWIVp0XgQDtyO/oMIHnnIbS
-oD27/rD581ZvEjducuCXajfwasO/NngDySZE8WfUopUuzjPJhWxV4Iy/PQHrL4ay
-H5KADEgcP65u6VZDCMny/WcpsU9pY4ehhJwZ75nQPKuqjgXdNh5sZvICCnGtVt25
-26JdW1ZpxcFSuaF4PbWyODlZk9G6fV7YwEShHvApJybg394YObY=
-=6TmH
+RDzYNw//d0sSO9T3xGTbSxRUAj7+6vDUVDOYPG6s7maINLbG3SRNLsM/ejfy7Xfo
+VSeSoAy9wW51iyubeIZPwKoLLrZCByvYgm+368NbgU+5kYyq7PrVm+KQ0zPL9fFP
+4GoeZallWTpqrojuzj7dy+kYOHvCWwfToFBWQYLWbHQKlpBOnovUpwxa3VgQPzdV
+gYyk36gLCev8ZJYJaWsD3wIfcXblYpCG49cB3HSvIZ5TNGF09iJmDcGpRDkPKdd6
+EHuNpl/Z58jh0erRJBQ12jFBjUgwUnDtMsGy0TZ/cMRXeo9Wzui7EBYpPgA1KUOC
+Ay4bT/lwV0VZkyFY+kRUKoibqtawbBfqD7pZ3gCPm0wclvEGPOsN63czjhA77JZU
+m8VCQTY/n52vO2g4U6t5w80V08b/cLxu+lhV3W1uXCylNRcjnrCuSAbno6V2lgJ0
+KOLjjCnFZzGPyicFDsTHx1aZM7gX/MSrUGXIe7SDn5ZyUouCGqGu1LSSw8YPwARt
+DwEXf6Ih0q2BX95aSl36GPMmz5G1q+Goz6LLGXir5sPifTv2/X8H/rGwDnenr6x3
+UQJGanadaJSfeZTLeujz+PJvy24ROOPDkRPh735g8pvV3RGLpwxtGeDqrjTHGW7H
+P1yhSL8ttZFjmltvLOXxegHrvG0+9qpzbkXFM43lVbsmgfJNwVk=
+=h5IO
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-2.0.7.ebuild b/media-gfx/darktable/darktable-2.0.7.ebuild
index 506adee..1d0f4eb 100644
--- a/media-gfx/darktable/darktable-2.0.7.ebuild
+++ b/media-gfx/darktable/darktable-2.0.7.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/media-gfx/darktable/darktable-2.2.3.ebuild b/media-gfx/darktable/darktable-2.2.3.ebuild
index 8e86ae0..1f70dac 100644
--- a/media-gfx/darktable/darktable-2.2.3.ebuild
+++ b/media-gfx/darktable/darktable-2.2.3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -20,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -53,14 +52,12 @@ CDEPEND="
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	libsecret? (
-		>=app-crypt/libsecret-0.18
-	)
+	libsecret? ( >=app-crypt/libsecret-0.18 )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kde? ( kde-apps/kwalletd:4 )"
+	kwallet? ( kde-apps/kwalletd:4 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
@@ -89,7 +86,7 @@ src_configure() {
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kde)
+		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex libsecret)
 		-DUSE_LUA=OFF
 		-DUSE_MAP=$(usex geo)
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 16eab8d..0c10071 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -16,7 +15,7 @@ SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -49,14 +48,12 @@ CDEPEND="
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	libsecret? (
-		>=app-crypt/libsecret-0.18
-	)
+	libsecret? ( >=app-crypt/libsecret-0.18 )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kde? ( kde-apps/kwalletd:4 )"
+	kwallet? ( kde-apps/kwalletd:4 )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
@@ -83,7 +80,7 @@ src_configure() {
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kde)
+		-DUSE_KWALLET=$(usex kwallet)
 		-DUSE_LIBSECRET=$(usex libsecret)
 		-DUSE_LUA=OFF
 		-DUSE_MAP=$(usex geo)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 441e4a3..004e9c9 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geo">Enable geotagging support</flag>
+		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>