gentoo resync : 02.04.2018

6 files changed, 38 insertions, 34 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index eb1f15e96dfa..a9d6a2574bb6 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -3,8 +3,8 @@ DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b91
 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
 DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
-EBUILD darktable-2.2.5.ebuild 3829 BLAKE2B 67c3aa78c0173080e13a1d501a3fb01a07fd76f40ba1b1e956b5a51541c04d8bc98a806dce9d0efcf94aafb616fd43fe72bb8c031ead93452e80c026e33845c2 SHA512 f97928203c082af404054f9f0c36379f6103401ed8a7ffe6463c26656364ce373522175513ad6890b0884c8cd6bfb5447236c9b98c7771ba4ec868bcf77f091b
-EBUILD darktable-2.4.0.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
-EBUILD darktable-2.4.1.ebuild 3963 BLAKE2B 7e5e439bb852372d18e48e9650ea6923f59a91ca5ee6701d1167aabf7fc0d0f2e325e678805af7a96bc8194495c2f2e4bca08db5e688fdf65f5c80fdb149d6e8 SHA512 bd51102f6d4cfbcae7bc68a70a70351010955642f0d2605e7d7eacaf58ebf59db2479d874dbff50f67aff19fdb6a73afb8cd3796c1bb68a9e88bf1d2ed737b24
-EBUILD darktable-9999.ebuild 3264 BLAKE2B 06aef5e59ed8218739fbf1ed9588aa0d0d22199352155445f6956eb8cefb3e1877741e9dddc373c241a48cd3ebac8793be07bc1a71ac5d83194ba6b5905b92cc SHA512 ed17c0d301da505e15616729189a6a1381850fcd4d77df157337b211b422b5ef680b2edf94eeaf0575ed7af8ea25813c4b9a4877b553b7f31649e853baa49ae8
-MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88
+EBUILD darktable-2.2.5.ebuild 3865 BLAKE2B 840d9f1a6d2df0d2531bdf69909e15bc82253971a286159eb0e1d2e8e319ca39a2b5f69732191b852c7706c441e29f232c9a3f773205c34b2916e12dcb92051f SHA512 7f9f2e38f942c2eaa90f5d26269d0dfdf393b16b68454b717334b7736da09556287b5cff1eed2d61ae02e1fb36ae5b117e9d32cb84bd3762390ff10f7c795612
+EBUILD darktable-2.4.0.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088
+EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088
+EBUILD darktable-9999.ebuild 3434 BLAKE2B 3f4354c3815fdb84a0ff0b4362e1426d54cc8a9244cc39f3a760bcbc199044c1e8591ecdf8b581335f9e60a793f2519e39285ab50bfdd7542dc57f7a0601c913 SHA512 d814738b460f2e18847b52a2559ecd4479e45862209648badacab847b3dd0a002e4c168a69c69b1e416d5d68537f3fb19ae3f47006695572ea950e736d6c7bc7
+MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
index 7c7b70ce4474..a8a7aa1b9a0f 100644
--- a/media-gfx/darktable/darktable-2.2.5.ebuild
+++ b/media-gfx/darktable/darktable-2.2.5.ebuild
@@ -19,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 kwallet libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -48,11 +48,11 @@ CDEPEND="
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:0 )
-	libsecret? ( >=app-crypt/libsecret-0.18 )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
@@ -87,9 +87,9 @@ src_configure() {
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
 		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geo)
+		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)
 		-DUSE_OPENEXR=$(usex openexr)
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index db708727b58a..29265f5ebb36 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -19,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 kwallet libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -47,11 +47,11 @@ CDEPEND="
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:2= )
-	libsecret? ( >=app-crypt/libsecret-0.18 )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
@@ -92,9 +92,9 @@ src_configure() {
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
 		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geo)
+		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)
 		-DUSE_OPENEXR=$(usex openexr)
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
index db708727b58a..29265f5ebb36 100644
--- a/media-gfx/darktable/darktable-2.4.1.ebuild
+++ b/media-gfx/darktable/darktable-2.4.1.ebuild
@@ -19,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 kwallet libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -47,11 +47,11 @@ CDEPEND="
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:2= )
-	libsecret? ( >=app-crypt/libsecret-0.18 )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
@@ -92,9 +92,9 @@ src_configure() {
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
 		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geo)
+		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)
 		-DUSE_OPENEXR=$(usex openexr)
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 0a707bfeba93..ffbe61010f4d 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils versionator
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils git-r3 pax-utils eutils versionator
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -15,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 kwallet libsecret
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
 nls opencl openmp openexr pax_kernel webp
 ${LANGS// / l10n_}"
 
@@ -35,20 +35,19 @@ CDEPEND="
 	media-libs/tiff:0
 	net-libs/libsoup:2.4
 	net-misc/curl
+	sys-libs/zlib:=
 	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
 	x11-libs/cairo
 	>=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 )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	libsecret? ( >=app-crypt/libsecret-0.18 )
+	jpeg2k? ( media-libs/openjpeg:2= )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
@@ -57,7 +56,11 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
 
 pkg_pretend() {
 	if use openmp ; then
@@ -81,9 +84,9 @@ src_configure() {
 		-DUSE_FLICKR=$(usex flickr)
 		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
 		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex libsecret)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
 		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geo)
+		-DUSE_MAP=$(usex geolocation)
 		-DUSE_NLS=$(usex nls)
 		-DUSE_OPENCL=$(usex opencl)
 		-DUSE_OPENEXR=$(usex openexr)
@@ -91,11 +94,13 @@ src_configure() {
 		-DUSE_OPENMP=$(usex openmp)
 		-DUSE_WEBP=$(usex webp)
 	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	for lang in ${LANGS} ; do
 		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
@@ -117,10 +122,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 8dc052cec1b8..e363ebddb751 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -8,9 +8,8 @@
 	<use>
 		<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="geolocation">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>
 		<flag name="webp">Enable WebP export support</flag>