media-gfx/darktable: sync with main tree

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --force
Manifest-Sign-Key: 0x363AF1F7765A9D02

5 files changed, 62 insertions, 61 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 0394544..ceb3de6 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST darktable-2.0.7.tar.xz 2960436 SHA256 a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab SHA512 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928 WHIRLPOOL 2d8df1d69c367df83d7933c2b4d6a904b4a56c5f13ca67820263669067ee938dbddb514129827abeec02fd01b82a23512d57e95461f6a44e5327516205dae3c4
+DIST darktable-2.2.3.tar.xz 3079524 SHA256 1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0 SHA512 cfebd82ffc3998e731d98e70e6b2b97ab469d2b289cb759eb0c59a5243bb31193ad9bc849668d55f2b885b24b4e66eb9a0ee6548b951b0ddf0561a48bcc38ae8 WHIRLPOOL 95ede4fc8a87efa4f4057d656fda6b7cfbe529628acd4125755042613e2d61900148deb295745dfc12d9551ca8a1c64ebaaac646a04d0f37e5364f002c9c31d6
 DIST darktable-2.2.4.tar.xz 3083400 SHA256 bd5445d6b81fc3288fb07362870e24bb0b5378cacad2c6e6602e32de676bf9d8 SHA512 4231bcbbf975fb9cd73d3a9e4ab1a05ebd1c58e681f776896b252bb245529d89bfd34d05c1a6dcf0d6a9a190898eaaa495084906f92bfb1aa8bb2ca0cf84eb9d WHIRLPOOL c49d1a8d8bd50f8ec0927ab03b9837beb5bbb80936e026283882dc4bb5b7ed25e761cb4810794fcbc7b6d970c390046c2530b3b5bab9aed74a0b7d884f729dee
-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 4052 SHA256 1c15f516e3ddf9b71b9236670621ea2f803781e5a76bbb9af19f21a586c14516 SHA512 a31fd5f904a94bc252935ba5e5efe9d34bacf4fe0ee1561565efbc2ba8fe3bca971a050c8e46c37ba3ec0f12cc8129501c81e9e4d4a6249bf3c49cb880b4b836 WHIRLPOOL 5223101a28468a811c26b5d66a0c1102d8e2122a36a2d5d8f0120bb0d77dacbf091cf1767b9f9186741c50c1ae0fa2360a7359382199647c802b7815b602c61c
-EBUILD darktable-2.2.4.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
+EBUILD darktable-2.2.3.ebuild 3860 SHA256 3cbbbf1a4bec693fccd57414b18c3681d14c5db531f3c07c57c42e7bbe818d4f SHA512 8380a10fd805e63de9d96c8865472f090fe1c976613bdc96495446541bdfcf2d03bdb8817a0db43cfc078581cc2ef55a8c61a01671c87ebaae7c437f1b1db8fa WHIRLPOOL f1fe7dd04bfce22b26670d99b929a1d05bb3fb91e13e94047d67b3bb1ace949fdc640668b5ece398d36d53f683d6fff7e43ef0e7b7bca13cdc6127ce5a79d0a1
+EBUILD darktable-2.2.4.ebuild 3862 SHA256 b634e34c65098f8ffe7a350629e822b7e3ea7d368ef8120bf2171ecb9db5bef1 SHA512 75873fdfd9e8fe459af11bc14c33cb73781d55ebf850901e131866f88c6092192aff49d35fd08dee72fd2a962ef87381daea7c6d8cd563351433e0221779057d WHIRLPOOL bea6ab43e48c43d50fbf9bc82aa6dffca1d5918d945ed484db9d82cf4f96d07ac3524217181db45c824cc7cfcf6f31f4f81049eaa2203ec49810d7b30a799d0d
+EBUILD darktable-9999.ebuild 3297 SHA256 391cdfa7ed2aea8139edf9660d07e1fddc8651ea82fd2f5f5ed71c83eb976d42 SHA512 2906221d9104aea5989f4747179eed49ca6572d04544c3a9f4f1f51d693082fe682418c58467f9ad3c76c40a18697fe795d8cbb5dccea3ef28a0389416cf0eaf WHIRLPOOL 5f324303f252f0ddff909042ebd38bd422ade36f8a058de635725194d9a9e63fab6142be6efc8f603ec3eb6d69b160bc5eee7a72d1988f36ae9070c0566407b2
+MISC metadata.xml 1001 SHA256 dc599f3625ad302106823e3f7593e121c113e14c3f7fd395bc369921631ddfaf SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88 WHIRLPOOL 6a80ae2a0b9fc6b3cf2a3794242251338fc33346ea3551612fecc99eee08882f204d89a5dd1bf52042a2f3161a566a5fa7985b3f0c9f9a34bb40c17d266dd817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAljnF+NfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlkzrXpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
 OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDweYRAAounh99jeRzRDo0JDjGczjHflWw8bvi0F6V9NIWzNsIwsGcWMp0ZMTJTF
-h5YOfuZ0Z8cqVPx+2hohpm1bEk1kRg04c9jju2BKW5t4J8mU71cD/gO1R3YhJj0S
-iLqle+/9ZvCHRbvP8SCHcaVSaDEu213/XyUNDI9RoIPc52h+emwfHxwR0IeaimcL
-Z7LbGVWsEEwmAL35SU6YLKHCuWhXPJRkjV8eeZfzSalMLyiq3ExGApeFlKv7SmP2
-9NSzYqqIGXdc5w/PdZuhuHMH/4ZNn63m49LIZHRr9Fw/sjsyNCcuOssBvkjy2lyr
-4D+KB0TXIoAh31ITO32X8xwiR2iVgjdGgyHzp7fNmrNBCou8paYApkfdjNKT6ZO8
-3bJIWUXxVrRSPNOwcqhj4/DGqkK9AZzPg2v2xG7OevG+ebVaqBiUd+i9Aq0EVqaU
-KiZxTjpZDCd622wj3bebuR/6oM29ARV/30gWNL/uLZ86SBwTauvKnOWoN1j1DnYt
-u6B0bVjHbikDSY62DHimV1dZJV45HuSbfIb7V2yJx+j3Yj1ErpeDA68FA3wD7DSX
-J7XpfmIbECES4H1BJj6PjJEVeBAGfd3++NAoGSeUcHEFEdtEBxuuBWSa291+lYZr
-rntxXTOy2kpgBsQBU+DZGFEPq/rkXjmcIwtLDcQxZRFU/Fd1Rjg=
-=NeG1
+RDwbFw//WXiK2i+MjhwaZ/vH4TtmFpBN5n/1dSpWUVXuW1hvcROzGh97n0JChNoN
+hc4orQYjrJberICeBtincFeuqtvVIoKRpMgzJzKeIu7OJQAEw0s9l1o8WbMKybbX
+LzDP+KE/mcfcjLpTgwueCKlGkEN8N09duGH765m8i+tzw1mibt6fw0tBtm6f4cec
+nheFeFwLOiDX5J6sCFsUtHR1N2GvLNB0uo43J7wjow+5so6W22FKeqixtCnz6NPw
+xIOstP2vYRSUHU6KW4dpGE6nxyuiqHzQm2c703XClu1cZk94rh6sqi2RDwR7P7m2
+iyxxwwOlo7oMtdJVqeQ43YS3geNtTEt7Ld4Lvfluh8o+iHziRjhG4Rq6VTIi+8hh
+vJjYtwFw6WrLwNyBqCH2wOLH9dbjD5Us3fzbmoK6bY7619dXFccrgczbby3KGlYT
+NnBY3VbWcWVUwgrkJHVfpDYVWT9BYDaVpt33GyRP2KKcbXbcSrKKOTkOh8A8E7KK
+7ASvM412y0ysw7ayOZdOOHc6mQHOoDrXRKLjhcAkz8FPbP6g8flECckck7V0C0Vx
+TvsaCLp2PaUsoBEVJTPv0x/uCTwyOApWZPToHJ28R9+4ozVXO1ruj7tr6Gvbhr19
+SssCA1K02N7U0SpzmHXNaTTfVpdHjRC8LzDMg+AZIg4o9z84NYo=
+=Ljj7
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-2.0.7.ebuild b/media-gfx/darktable/darktable-2.2.3.ebuild
index 1d0f4eb..fb0fe22 100644
--- a/media-gfx/darktable/darktable-2.0.7.ebuild
+++ b/media-gfx/darktable/darktable-2.2.3.ebuild
@@ -1,24 +1,26 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
 
-DOC_PV="2.0.0"
+DOC_PV="2.2.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-LANGS=" ca cs da de el es fr he hu it ja nl pl pt-BR pt-PT ru sk sl sq sv uk"
+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 gphoto2 graphicsmagick jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
+nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
 # sse3 support is required to build darktable
@@ -35,35 +37,37 @@ CDEPEND="
 	>=media-libs/lensfun-0.2.3:0=
 	media-libs/libpng:0=
 	media-libs/tiff:0
+	net-libs/libsoup:2.4
 	net-misc/curl
 	virtual/jpeg:0
+	virtual/glu
+	virtual/opengl
 	x11-libs/cairo
-	x11-libs/gtk+:3
+	>=x11-libs/gtk+-3.14:3
 	x11-libs/pango
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	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= )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kde? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		kde-apps/kwalletd:4
+	) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@@ -73,35 +77,28 @@ pkg_pretend() {
 src_prepare() {
 	use cpu_flags_x86_sse3 && append-flags -msse3
 
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
 	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_build cups PRINT)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use kde KWALLET)
-		$(cmake-utils_use_use libsecret LIBSECRET)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openexr OPENEXR)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use webp WEBP)
-		-DUSE_GEO=OFF
-		-DUSE_LUA=OFF
+		-DBUILD_PRINT=$(usex cups)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
 		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geo)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
 	)
 	cmake-utils_src_configure
 }
diff --git a/media-gfx/darktable/darktable-2.2.4.ebuild b/media-gfx/darktable/darktable-2.2.4.ebuild
index 1f70dac..ce3aaad 100644
--- a/media-gfx/darktable/darktable-2.2.4.ebuild
+++ b/media-gfx/darktable/darktable-2.2.4.ebuild
@@ -57,7 +57,10 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		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 0c10071..245e18c 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -53,7 +53,10 @@ CDEPEND="
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
-	kwallet? ( kde-apps/kwalletd:4 )"
+	kwallet? ( || (
+		>=kde-frameworks/kwallet-5.34.0-r1
+		kde-apps/kwalletd:4
+	) )"
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 004e9c9..8dc052c 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -13,7 +13,6 @@
 		<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>
-		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 		<flag name="webp">Enable WebP export support</flag>
 	</use>
 	<upstream>