Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/pandoc-citeproc/
Date: Mon, 30 Sep 2019 07:31:27
Message-Id: 1569828675.fca878ac5e5a1e073a74254568077d5b40f4a083.slyfox@gentoo
1 commit: fca878ac5e5a1e073a74254568077d5b40f4a083
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 30 07:30:23 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 07:31:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca878ac
7
8 dev-haskell/pandoc-citeproc: convert IUSE underscore to dash
9
10 Reported-by: Michał Górny
11 Closes: https://bugs.gentoo.org/695034
12 Package-Manager: Portage-2.3.76, Repoman-2.3.17
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 dev-haskell/pandoc-citeproc/metadata.xml | 6 +++---
16 .../pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild | 8 ++++----
17 .../pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild | 16 ++++++++--------
18 .../pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild | 16 ++++++++--------
19 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild | 8 ++++----
20 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild | 8 ++++----
21 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild | 8 ++++----
22 dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild | 8 ++++----
23 .../pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild | 10 +++++-----
24 9 files changed, 44 insertions(+), 44 deletions(-)
25
26 diff --git a/dev-haskell/pandoc-citeproc/metadata.xml b/dev-haskell/pandoc-citeproc/metadata.xml
27 index cc43b3deba9..44fca18984b 100644
28 --- a/dev-haskell/pandoc-citeproc/metadata.xml
29 +++ b/dev-haskell/pandoc-citeproc/metadata.xml
30 @@ -7,11 +7,11 @@
31 </maintainer>
32 <use>
33 <flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
34 - <flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag>
35 + <flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
36 <flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
37 <flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
38 - <flag name="small_base">Choose the new smaller, split-up base package.</flag>
39 - <flag name="test_citeproc">Build the test-citeproc program</flag>
40 + <flag name="small-base">Choose the new smaller, split-up base package.</flag>
41 + <flag name="test-citeproc">Build the test-citeproc program</flag>
42 <flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
43 </use>
44 <longdescription>
45
46 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
47 index ccaee0e55d7..f6d16965a96 100644
48 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
49 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.1.2.1.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2013 Gentoo Foundation
52 +# Copyright 1999-2019 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI=5
56 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
57 LICENSE="BSD"
58 SLOT="0/${PV}"
59 KEYWORDS="~amd64 ~x86"
60 -IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
61 +IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode_collation"
62 RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
63
64 RDEPEND=">=app-text/pandoc-1.12.0.2:=[profile?]
65 @@ -56,9 +56,9 @@ src_configure() {
66
67 haskell-cabal_src_configure \
68 $(cabal_flag bibutils bibutils) \
69 - $(cabal_flag embed_data_files embed_data_files) \
70 + $(cabal_flag embed-data-files embed_data_files) \
71 $(cabal_flag hexpat hexpat) \
72 $(cabal_flag network network) \
73 - $(cabal_flag small_base small_base) \
74 + $(cabal_flag small-base small_base) \
75 $(cabal_flag unicode_collation unicode_collation)
76 }
77
78 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
79 index e2d63fc8aa1..533ce8a18a8 100644
80 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
81 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.1.ebuild
82 @@ -1,4 +1,4 @@
83 -# Copyright 1999-2017 Gentoo Foundation
84 +# Copyright 1999-2019 Gentoo Authors
85 # Distributed under the terms of the GNU General Public License v2
86
87 EAPI=6
88 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
89 LICENSE="BSD"
90 SLOT="0/${PV}"
91 KEYWORDS="amd64 x86"
92 -IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
93 +IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
94
95 RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
96
97 @@ -40,24 +40,24 @@ RDEPEND=">=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?]
98 >=dev-lang/ghc-7.4.1:=
99 bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
100 debug? ( dev-haskell/pretty-show:=[profile?] )
101 - test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
102 + test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
103 >=dev-haskell/vector-0.10:=[profile?] )
104 - !test_citeproc? ( dev-haskell/vector:=[profile?] )
105 + !test-citeproc? ( dev-haskell/vector:=[profile?] )
106 unicode_collation? ( dev-haskell/text-icu:=[profile?] )
107 !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
108 "
109 DEPEND="${RDEPEND}
110 >=dev-haskell/cabal-1.12
111 - test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) )
112 - embed_data_files? ( dev-haskell/hsb2hs )
113 + test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) )
114 + embed-data-files? ( dev-haskell/hsb2hs )
115 "
116
117 src_configure() {
118 haskell-cabal_src_configure \
119 $(cabal_flag bibutils bibutils) \
120 $(cabal_flag debug debug) \
121 - $(cabal_flag embed_data_files embed_data_files) \
122 + $(cabal_flag embed-data-files embed_data_files) \
123 --flag=-small_base \
124 - $(cabal_flag test_citeproc test_citeproc) \
125 + $(cabal_flag test-citeproc test_citeproc) \
126 $(cabal_flag unicode_collation unicode_collation)
127 }
128
129 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
130 index 64db508e0ed..a89de2bce4e 100644
131 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
132 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.10.4.ebuild
133 @@ -1,4 +1,4 @@
134 -# Copyright 1999-2017 Gentoo Foundation
135 +# Copyright 1999-2019 Gentoo Authors
136 # Distributed under the terms of the GNU General Public License v2
137
138 EAPI=6
139 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
140 LICENSE="BSD"
141 SLOT="0/${PV}"
142 KEYWORDS="~amd64 ~x86"
143 -IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
144 +IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
145
146 RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
147
148 @@ -40,24 +40,24 @@ RDEPEND=">=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?]
149 >=dev-lang/ghc-7.4.1:=
150 bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
151 debug? ( dev-haskell/pretty-show:=[profile?] )
152 - test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
153 + test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?]
154 >=dev-haskell/vector-0.10:=[profile?] )
155 - !test_citeproc? ( dev-haskell/vector:=[profile?] )
156 + !test-citeproc? ( dev-haskell/vector:=[profile?] )
157 unicode_collation? ( dev-haskell/text-icu:=[profile?] )
158 !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
159 "
160 DEPEND="${RDEPEND}
161 >=dev-haskell/cabal-1.12
162 - test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) )
163 - embed_data_files? ( dev-haskell/hsb2hs )
164 + test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) )
165 + embed-data-files? ( dev-haskell/hsb2hs )
166 "
167
168 src_configure() {
169 haskell-cabal_src_configure \
170 $(cabal_flag bibutils bibutils) \
171 $(cabal_flag debug debug) \
172 - $(cabal_flag embed_data_files embed_data_files) \
173 + $(cabal_flag embed-data-files embed_data_files) \
174 --flag=-small_base \
175 - $(cabal_flag test_citeproc test_citeproc) \
176 + $(cabal_flag test-citeproc test_citeproc) \
177 $(cabal_flag unicode_collation unicode_collation)
178 }
179
180 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
181 index 72658455f8d..d94d2d87170 100644
182 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
183 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.2.ebuild
184 @@ -1,4 +1,4 @@
185 -# Copyright 1999-2013 Gentoo Foundation
186 +# Copyright 1999-2019 Gentoo Authors
187 # Distributed under the terms of the GNU General Public License v2
188
189 EAPI=5
190 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
191 LICENSE="BSD"
192 SLOT="0/${PV}"
193 KEYWORDS="~amd64 ~x86"
194 -IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation"
195 +IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode_collation"
196 RESTRICT=test # missing files: locales-en-US.xml: openBinaryFile
197
198 RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
199 @@ -54,9 +54,9 @@ src_configure() {
200
201 haskell-cabal_src_configure \
202 $(cabal_flag bibutils bibutils) \
203 - $(cabal_flag embed_data_files embed_data_files) \
204 + $(cabal_flag embed-data-files embed_data_files) \
205 $(cabal_flag hexpat hexpat) \
206 $(cabal_flag network network) \
207 - $(cabal_flag small_base small_base) \
208 + $(cabal_flag small-base small_base) \
209 $(cabal_flag unicode_collation unicode_collation)
210 }
211
212 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
213 index 6db5f10ed77..76125b17759 100644
214 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
215 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.3.1.ebuild
216 @@ -1,4 +1,4 @@
217 -# Copyright 1999-2015 Gentoo Foundation
218 +# Copyright 1999-2019 Gentoo Authors
219 # Distributed under the terms of the GNU General Public License v2
220
221 EAPI=5
222 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
223 LICENSE="BSD"
224 SLOT="0/${PV}"
225 KEYWORDS="amd64 x86"
226 -IUSE="+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation"
227 +IUSE="+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation"
228
229 RDEPEND=">=app-text/pandoc-1.12.1:=[profile?]
230 dev-haskell/aeson:=[profile?]
231 @@ -66,10 +66,10 @@ src_configure() {
232
233 haskell-cabal_src_configure \
234 $(cabal_flag bibutils bibutils) \
235 - $(cabal_flag embed_data_files embed_data_files) \
236 + $(cabal_flag embed-data-files embed_data_files) \
237 $(cabal_flag hexpat hexpat) \
238 $(cabal_flag network network) \
239 --flag=-small_base \
240 - $(cabal_flag test_citeproc test_citeproc) \
241 + $(cabal_flag test-citeproc test_citeproc) \
242 $(cabal_flag unicode_collation unicode_collation)
243 }
244
245 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
246 index 1172030256f..0b2a203a2fd 100644
247 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
248 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.6.ebuild
249 @@ -1,4 +1,4 @@
250 -# Copyright 1999-2015 Gentoo Foundation
251 +# Copyright 1999-2019 Gentoo Authors
252 # Distributed under the terms of the GNU General Public License v2
253
254 EAPI=5
255 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
256 LICENSE="BSD"
257 SLOT="0/${PV}"
258 KEYWORDS="~amd64 ~x86"
259 -IUSE="+bibutils embed_data_files test_citeproc unicode_collation"
260 +IUSE="+bibutils embed-data-files test-citeproc unicode_collation"
261
262 RESTRICT=test # missing files
263
264 @@ -56,8 +56,8 @@ src_configure() {
265
266 haskell-cabal_src_configure \
267 $(cabal_flag bibutils bibutils) \
268 - $(cabal_flag embed_data_files embed_data_files) \
269 + $(cabal_flag embed-data-files embed_data_files) \
270 --flag=-small_base \
271 - $(cabal_flag test_citeproc test_citeproc) \
272 + $(cabal_flag test-citeproc test_citeproc) \
273 $(cabal_flag unicode_collation unicode_collation)
274 }
275
276 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
277 index 332e82c6e28..03c9c514fe3 100644
278 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
279 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.7.2.ebuild
280 @@ -1,4 +1,4 @@
281 -# Copyright 1999-2015 Gentoo Foundation
282 +# Copyright 1999-2019 Gentoo Authors
283 # Distributed under the terms of the GNU General Public License v2
284
285 EAPI=5
286 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
287 LICENSE="BSD"
288 SLOT="0/${PV}"
289 KEYWORDS="amd64 x86"
290 -IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
291 +IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
292
293 RESTRICT=test # fd:8: hClose: resource vanished (Broken pipe)
294
295 @@ -56,8 +56,8 @@ src_configure() {
296 haskell-cabal_src_configure \
297 $(cabal_flag bibutils bibutils) \
298 $(cabal_flag debug debug) \
299 - $(cabal_flag embed_data_files embed_data_files) \
300 + $(cabal_flag embed-data-files embed_data_files) \
301 --flag=-small_base \
302 - $(cabal_flag test_citeproc test_citeproc) \
303 + $(cabal_flag test-citeproc test-citeproc) \
304 $(cabal_flag unicode_collation unicode_collation)
305 }
306
307 diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
308 index 51b893fd6c4..dac020cd335 100644
309 --- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
310 +++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.8.1.3.ebuild
311 @@ -1,4 +1,4 @@
312 -# Copyright 1999-2015 Gentoo Foundation
313 +# Copyright 1999-2019 Gentoo Authors
314 # Distributed under the terms of the GNU General Public License v2
315
316 EAPI=5
317 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
318 LICENSE="BSD"
319 SLOT="0/${PV}"
320 KEYWORDS="~amd64 ~x86"
321 -IUSE="+bibutils debug embed_data_files test_citeproc unicode_collation"
322 +IUSE="+bibutils debug embed-data-files test-citeproc unicode_collation"
323
324 RESTRICT=test # execs a process dropping environment (with LD_PRELOAD)
325
326 @@ -47,7 +47,7 @@ RDEPEND=">=app-text/pandoc-1.13:=[profile?]
327 "
328 DEPEND="${RDEPEND}
329 >=dev-haskell/cabal-1.12
330 - embed_data_files? ( dev-haskell/hsb2hs )
331 + embed-data-files? ( dev-haskell/hsb2hs )
332 "
333
334 src_prepare() {
335 @@ -58,8 +58,8 @@ src_configure() {
336 haskell-cabal_src_configure \
337 $(cabal_flag bibutils bibutils) \
338 $(cabal_flag debug debug) \
339 - $(cabal_flag embed_data_files embed_data_files) \
340 + $(cabal_flag embed-data-files embed_data_files) \
341 --flag=-small_base \
342 - $(cabal_flag test_citeproc test_citeproc) \
343 + $(cabal_flag test-citeproc test_citeproc) \
344 $(cabal_flag unicode_collation unicode_collation)
345 }