media-gfx/darktable: use global USE flags where applicable

Closes: https://bugs.gentoo.org/629438
Package-Manager: Portage-2.3.27, Repoman-2.3.9

5 files changed, 21 insertions, 22 deletions

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..1c9bfe801f2c 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -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_}"
 
@@ -44,11 +44,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= )"
@@ -81,9 +81,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/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>