Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/
Date: Mon, 02 Apr 2018 12:57:23
Message-Id: 1522673820.8eb1ce18344ef704822614f24920f4243392d003.eva@gentoo
1 commit: 8eb1ce18344ef704822614f24920f4243392d003
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 11:49:06 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 12:57:00 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb1ce18
7
8 media-gfx/darktable: use global USE flags where applicable
9
10 Closes: https://bugs.gentoo.org/629438
11 Package-Manager: Portage-2.3.27, Repoman-2.3.9
12
13 media-gfx/darktable/darktable-2.2.5.ebuild | 10 +++++-----
14 media-gfx/darktable/darktable-2.4.0.ebuild | 10 +++++-----
15 media-gfx/darktable/darktable-2.4.1.ebuild | 10 +++++-----
16 media-gfx/darktable/darktable-9999.ebuild | 10 +++++-----
17 media-gfx/darktable/metadata.xml | 3 +--
18 5 files changed, 21 insertions(+), 22 deletions(-)
19
20 diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
21 index 7c7b70ce447..a8a7aa1b9a0 100644
22 --- a/media-gfx/darktable/darktable-2.2.5.ebuild
23 +++ b/media-gfx/darktable/darktable-2.2.5.ebuild
24 @@ -19,7 +19,7 @@ SLOT="0"
25 KEYWORDS="amd64 x86"
26 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
27 # TODO add lua once dev-lang/lua-5.2 is unmasked
28 -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
29 +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
30 nls opencl openmp openexr pax_kernel webp
31 ${LANGS// / l10n_}"
32
33 @@ -48,11 +48,11 @@ CDEPEND="
34 colord? ( x11-libs/colord-gtk:0= )
35 cups? ( net-print/cups )
36 flickr? ( media-libs/flickcurl )
37 - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
38 + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
39 + gnome-keyring? ( >=app-crypt/libsecret-0.18 )
40 gphoto2? ( media-libs/libgphoto2:= )
41 graphicsmagick? ( media-gfx/graphicsmagick )
42 jpeg2k? ( media-libs/openjpeg:0 )
43 - libsecret? ( >=app-crypt/libsecret-0.18 )
44 opencl? ( virtual/opencl )
45 openexr? ( media-libs/openexr:0= )
46 webp? ( media-libs/libwebp:0= )"
47 @@ -87,9 +87,9 @@ src_configure() {
48 -DUSE_FLICKR=$(usex flickr)
49 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
50 -DUSE_KWALLET=$(usex kwallet)
51 - -DUSE_LIBSECRET=$(usex libsecret)
52 + -DUSE_LIBSECRET=$(usex gnome-keyring)
53 -DUSE_LUA=OFF
54 - -DUSE_MAP=$(usex geo)
55 + -DUSE_MAP=$(usex geolocation)
56 -DUSE_NLS=$(usex nls)
57 -DUSE_OPENCL=$(usex opencl)
58 -DUSE_OPENEXR=$(usex openexr)
59
60 diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
61 index db708727b58..29265f5ebb3 100644
62 --- a/media-gfx/darktable/darktable-2.4.0.ebuild
63 +++ b/media-gfx/darktable/darktable-2.4.0.ebuild
64 @@ -19,7 +19,7 @@ SLOT="0"
65 KEYWORDS="~amd64 ~x86"
66 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
67 # TODO add lua once dev-lang/lua-5.2 is unmasked
68 -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
69 +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
70 nls opencl openmp openexr pax_kernel webp
71 ${LANGS// / l10n_}"
72
73 @@ -47,11 +47,11 @@ CDEPEND="
74 colord? ( x11-libs/colord-gtk:0= )
75 cups? ( net-print/cups )
76 flickr? ( media-libs/flickcurl )
77 - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
78 + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
79 + gnome-keyring? ( >=app-crypt/libsecret-0.18 )
80 gphoto2? ( media-libs/libgphoto2:= )
81 graphicsmagick? ( media-gfx/graphicsmagick )
82 jpeg2k? ( media-libs/openjpeg:2= )
83 - libsecret? ( >=app-crypt/libsecret-0.18 )
84 opencl? ( virtual/opencl )
85 openexr? ( media-libs/openexr:0= )
86 webp? ( media-libs/libwebp:0= )"
87 @@ -92,9 +92,9 @@ src_configure() {
88 -DUSE_FLICKR=$(usex flickr)
89 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
90 -DUSE_KWALLET=$(usex kwallet)
91 - -DUSE_LIBSECRET=$(usex libsecret)
92 + -DUSE_LIBSECRET=$(usex gnome-keyring)
93 -DUSE_LUA=OFF
94 - -DUSE_MAP=$(usex geo)
95 + -DUSE_MAP=$(usex geolocation)
96 -DUSE_NLS=$(usex nls)
97 -DUSE_OPENCL=$(usex opencl)
98 -DUSE_OPENEXR=$(usex openexr)
99
100 diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
101 index db708727b58..29265f5ebb3 100644
102 --- a/media-gfx/darktable/darktable-2.4.1.ebuild
103 +++ b/media-gfx/darktable/darktable-2.4.1.ebuild
104 @@ -19,7 +19,7 @@ SLOT="0"
105 KEYWORDS="~amd64 ~x86"
106 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
107 # TODO add lua once dev-lang/lua-5.2 is unmasked
108 -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
109 +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
110 nls opencl openmp openexr pax_kernel webp
111 ${LANGS// / l10n_}"
112
113 @@ -47,11 +47,11 @@ CDEPEND="
114 colord? ( x11-libs/colord-gtk:0= )
115 cups? ( net-print/cups )
116 flickr? ( media-libs/flickcurl )
117 - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
118 + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
119 + gnome-keyring? ( >=app-crypt/libsecret-0.18 )
120 gphoto2? ( media-libs/libgphoto2:= )
121 graphicsmagick? ( media-gfx/graphicsmagick )
122 jpeg2k? ( media-libs/openjpeg:2= )
123 - libsecret? ( >=app-crypt/libsecret-0.18 )
124 opencl? ( virtual/opencl )
125 openexr? ( media-libs/openexr:0= )
126 webp? ( media-libs/libwebp:0= )"
127 @@ -92,9 +92,9 @@ src_configure() {
128 -DUSE_FLICKR=$(usex flickr)
129 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
130 -DUSE_KWALLET=$(usex kwallet)
131 - -DUSE_LIBSECRET=$(usex libsecret)
132 + -DUSE_LIBSECRET=$(usex gnome-keyring)
133 -DUSE_LUA=OFF
134 - -DUSE_MAP=$(usex geo)
135 + -DUSE_MAP=$(usex geolocation)
136 -DUSE_NLS=$(usex nls)
137 -DUSE_OPENCL=$(usex opencl)
138 -DUSE_OPENEXR=$(usex openexr)
139
140 diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
141 index 0a707bfeba9..1c9bfe801f2 100644
142 --- a/media-gfx/darktable/darktable-9999.ebuild
143 +++ b/media-gfx/darktable/darktable-9999.ebuild
144 @@ -15,7 +15,7 @@ SLOT="0"
145 #KEYWORDS="~amd64 ~x86"
146 LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
147 # TODO add lua once dev-lang/lua-5.2 is unmasked
148 -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
149 +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
150 nls opencl openmp openexr pax_kernel webp
151 ${LANGS// / l10n_}"
152
153 @@ -44,11 +44,11 @@ CDEPEND="
154 colord? ( x11-libs/colord-gtk:0= )
155 cups? ( net-print/cups )
156 flickr? ( media-libs/flickcurl )
157 - geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
158 + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
159 + gnome-keyring? ( >=app-crypt/libsecret-0.18 )
160 gphoto2? ( media-libs/libgphoto2:= )
161 graphicsmagick? ( media-gfx/graphicsmagick )
162 jpeg2k? ( media-libs/openjpeg:0 )
163 - libsecret? ( >=app-crypt/libsecret-0.18 )
164 opencl? ( virtual/opencl )
165 openexr? ( media-libs/openexr:0= )
166 webp? ( media-libs/libwebp:0= )"
167 @@ -81,9 +81,9 @@ src_configure() {
168 -DUSE_FLICKR=$(usex flickr)
169 -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
170 -DUSE_KWALLET=$(usex kwallet)
171 - -DUSE_LIBSECRET=$(usex libsecret)
172 + -DUSE_LIBSECRET=$(usex gnome-keyring)
173 -DUSE_LUA=OFF
174 - -DUSE_MAP=$(usex geo)
175 + -DUSE_MAP=$(usex geolocation)
176 -DUSE_NLS=$(usex nls)
177 -DUSE_OPENCL=$(usex opencl)
178 -DUSE_OPENEXR=$(usex openexr)
179
180 diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
181 index 8dc052cec1b..e363ebddb75 100644
182 --- a/media-gfx/darktable/metadata.xml
183 +++ b/media-gfx/darktable/metadata.xml
184 @@ -8,9 +8,8 @@
185 <use>
186 <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
187 <flag name="flickr">Add support for uploading photos to flickr</flag>
188 - <flag name="geo">Enable geotagging support</flag>
189 + <flag name="geolocation">Enable geotagging support</flag>
190 <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
191 - <flag name="libsecret">Enable libsecret support to store login credentials</flag>
192 <flag name="opencl">Enable opencl support</flag>
193 <flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
194 <flag name="webp">Enable WebP export support</flag>