Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Tue, 13 Jul 2021 11:21:08
Message-Id: 1626175252.b38538ccf12f3a2631208e35a75dc74e0a712c21.marecki@gentoo
1 commit: b38538ccf12f3a2631208e35a75dc74e0a712c21
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 13 10:50:06 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 13 11:20:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38538cc
7
8 net-proxy/haproxy: migrate to lua-single.eclass
9
10 Identical changes in all the ebuilds, tested on 2.2.5-r2 both with and
11 without USE=lua - no problems. Exactly the same logic as before the
12 migration, i.e. only lua5-3 is supported and that is the version that
13 should be used even if any others are present (upstream Makefile only
14 looks for unversioned "lua" if it cannot explicitly find 5.3, at least
15 in the more recent versions anyway).
16
17 Changing this without revbumps because USE=lua is still masked on this
18 package.
19
20 Invoking maintainer time-out on this issue.
21
22 Closes: https://bugs.gentoo.org/752825
23 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
24
25 net-proxy/haproxy/haproxy-1.8.30-r1.ebuild | 9 +++++++--
26 net-proxy/haproxy/haproxy-2.0.14-r3.ebuild | 9 +++++++--
27 net-proxy/haproxy/haproxy-2.0.22-r1.ebuild | 9 +++++++--
28 net-proxy/haproxy/haproxy-2.0.9999.ebuild | 9 +++++++--
29 net-proxy/haproxy/haproxy-2.2.14-r1.ebuild | 9 +++++++--
30 net-proxy/haproxy/haproxy-2.2.5-r2.ebuild | 9 +++++++--
31 net-proxy/haproxy/haproxy-2.2.9999.ebuild | 9 +++++++--
32 net-proxy/haproxy/haproxy-2.3.10-r1.ebuild | 9 +++++++--
33 net-proxy/haproxy/haproxy-2.3.12.ebuild | 9 +++++++--
34 net-proxy/haproxy/haproxy-2.3.9999.ebuild | 9 +++++++--
35 net-proxy/haproxy/haproxy-2.4.1-r1.ebuild | 9 +++++++--
36 net-proxy/haproxy/haproxy-2.4.2.ebuild | 9 +++++++--
37 net-proxy/haproxy/haproxy-2.4.9999.ebuild | 9 +++++++--
38 13 files changed, 91 insertions(+), 26 deletions(-)
39
40 diff --git a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
41 index 90d01074475..e6b1932baf9 100644
42 --- a/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
43 +++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
44 @@ -3,8 +3,10 @@
45
46 EAPI="7"
47
48 +LUA_COMPAT=( lua5-3 )
49 +
50 [[ ${PV} == *9999 ]] && SCM="git-r3"
51 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
52 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
53
54 MY_P="${PN}-${PV/_beta/-dev}"
55
56 @@ -25,9 +27,11 @@ systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
57 REQUIRED_USE="pcre-jit? ( pcre )
58 pcre2-jit? ( pcre2 )
59 pcre? ( !pcre2 )
60 + lua? ( ${LUA_REQUIRED_USE} )
61 device-atlas? ( pcre )
62 ?? ( slz zlib )"
63
64 +BDEPEND="virtual/pkgconfig"
65 DEPEND="
66 crypt? ( virtual/libcrypt:= )
67 pcre? (
68 @@ -44,7 +48,7 @@ DEPEND="
69 slz? ( dev-libs/libslz:= )
70 systemd? ( sys-apps/systemd )
71 zlib? ( sys-libs/zlib )
72 - lua? ( dev-lang/lua:5.3 )
73 + lua? ( ${LUA_DEPS} )
74 device-atlas? ( dev-libs/device-atlas-api-c )"
75 RDEPEND="${DEPEND}
76 acct-group/haproxy
77 @@ -66,6 +70,7 @@ haproxy_use() {
78 }
79
80 pkg_setup() {
81 + use lua && lua-single_pkg_setup
82 if use net_ns; then
83 CONFIG_CHECK="~NET_NS"
84 linux-info_pkg_setup
85
86 diff --git a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
87 index 49cfe55e3a3..68db0dd8989 100644
88 --- a/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
89 +++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
90 @@ -3,8 +3,10 @@
91
92 EAPI="7"
93
94 +LUA_COMPAT=( lua5-3 )
95 +
96 [[ ${PV} == *9999 ]] && SCM="git-r3"
97 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
98 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
99
100 MY_P="${PN}-${PV/_beta/-dev}"
101
102 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
103 REQUIRED_USE="pcre-jit? ( pcre )
104 pcre2-jit? ( pcre2 )
105 pcre? ( !pcre2 )
106 + lua? ( ${LUA_REQUIRED_USE} )
107 device-atlas? ( pcre )
108 ?? ( slz zlib )"
109
110 +BDEPEND="virtual/pkgconfig"
111 DEPEND="
112 crypt? ( virtual/libcrypt:= )
113 pcre? (
114 @@ -44,7 +48,7 @@ DEPEND="
115 slz? ( dev-libs/libslz:= )
116 systemd? ( sys-apps/systemd )
117 zlib? ( sys-libs/zlib )
118 - lua? ( dev-lang/lua:5.3 )
119 + lua? ( ${LUA_DEPS} )
120 device-atlas? ( dev-libs/device-atlas-api-c )"
121 RDEPEND="${DEPEND}
122 acct-group/haproxy
123 @@ -66,6 +70,7 @@ haproxy_use() {
124 }
125
126 pkg_setup() {
127 + use lua && lua-single_pkg_setup
128 if use net_ns; then
129 CONFIG_CHECK="~NET_NS"
130 linux-info_pkg_setup
131
132 diff --git a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
133 index 42c17e31be4..6335de9e475 100644
134 --- a/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
135 +++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
136 @@ -3,8 +3,10 @@
137
138 EAPI="7"
139
140 +LUA_COMPAT=( lua5-3 )
141 +
142 [[ ${PV} == *9999 ]] && SCM="git-r3"
143 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
144 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
145
146 MY_P="${PN}-${PV/_beta/-dev}"
147
148 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
149 REQUIRED_USE="pcre-jit? ( pcre )
150 pcre2-jit? ( pcre2 )
151 pcre? ( !pcre2 )
152 + lua? ( ${LUA_REQUIRED_USE} )
153 device-atlas? ( pcre )
154 ?? ( slz zlib )"
155
156 +BDEPEND="virtual/pkgconfig"
157 DEPEND="
158 crypt? ( virtual/libcrypt:= )
159 pcre? (
160 @@ -44,7 +48,7 @@ DEPEND="
161 slz? ( dev-libs/libslz:= )
162 systemd? ( sys-apps/systemd )
163 zlib? ( sys-libs/zlib )
164 - lua? ( dev-lang/lua:5.3 )
165 + lua? ( ${LUA_DEPS} )
166 device-atlas? ( dev-libs/device-atlas-api-c )"
167 RDEPEND="${DEPEND}
168 acct-group/haproxy
169 @@ -66,6 +70,7 @@ haproxy_use() {
170 }
171
172 pkg_setup() {
173 + use lua && lua-single_pkg_setup
174 if use net_ns; then
175 CONFIG_CHECK="~NET_NS"
176 linux-info_pkg_setup
177
178 diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
179 index 0dd6f708510..41c1558bb74 100644
180 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
181 +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
182 @@ -3,8 +3,10 @@
183
184 EAPI="7"
185
186 +LUA_COMPAT=( lua5-3 )
187 +
188 [[ ${PV} == *9999 ]] && SCM="git-r3"
189 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
190 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
191
192 MY_P="${PN}-${PV/_beta/-dev}"
193
194 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
195 REQUIRED_USE="pcre-jit? ( pcre )
196 pcre2-jit? ( pcre2 )
197 pcre? ( !pcre2 )
198 + lua? ( ${LUA_REQUIRED_USE} )
199 device-atlas? ( pcre )
200 ?? ( slz zlib )"
201
202 +BDEPEND="virtual/pkgconfig"
203 DEPEND="
204 crypt? ( virtual/libcrypt:= )
205 pcre? (
206 @@ -44,7 +48,7 @@ DEPEND="
207 systemd? ( sys-apps/systemd )
208 slz? ( dev-libs/libslz:= )
209 zlib? ( sys-libs/zlib )
210 - lua? ( dev-lang/lua:5.3 )
211 + lua? ( ${LUA_DEPS} )
212 device-atlas? ( dev-libs/device-atlas-api-c )"
213 RDEPEND="${DEPEND}
214 acct-group/haproxy
215 @@ -66,6 +70,7 @@ haproxy_use() {
216 }
217
218 pkg_setup() {
219 + use lua && lua-single_pkg_setup
220 if use net_ns; then
221 CONFIG_CHECK="~NET_NS"
222 linux-info_pkg_setup
223
224 diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
225 index 42c17e31be4..6335de9e475 100644
226 --- a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
227 +++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
228 @@ -3,8 +3,10 @@
229
230 EAPI="7"
231
232 +LUA_COMPAT=( lua5-3 )
233 +
234 [[ ${PV} == *9999 ]] && SCM="git-r3"
235 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
236 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
237
238 MY_P="${PN}-${PV/_beta/-dev}"
239
240 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
241 REQUIRED_USE="pcre-jit? ( pcre )
242 pcre2-jit? ( pcre2 )
243 pcre? ( !pcre2 )
244 + lua? ( ${LUA_REQUIRED_USE} )
245 device-atlas? ( pcre )
246 ?? ( slz zlib )"
247
248 +BDEPEND="virtual/pkgconfig"
249 DEPEND="
250 crypt? ( virtual/libcrypt:= )
251 pcre? (
252 @@ -44,7 +48,7 @@ DEPEND="
253 slz? ( dev-libs/libslz:= )
254 systemd? ( sys-apps/systemd )
255 zlib? ( sys-libs/zlib )
256 - lua? ( dev-lang/lua:5.3 )
257 + lua? ( ${LUA_DEPS} )
258 device-atlas? ( dev-libs/device-atlas-api-c )"
259 RDEPEND="${DEPEND}
260 acct-group/haproxy
261 @@ -66,6 +70,7 @@ haproxy_use() {
262 }
263
264 pkg_setup() {
265 + use lua && lua-single_pkg_setup
266 if use net_ns; then
267 CONFIG_CHECK="~NET_NS"
268 linux-info_pkg_setup
269
270 diff --git a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
271 index f773d9548c6..5ef90b045a3 100644
272 --- a/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
273 +++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
274 @@ -3,8 +3,10 @@
275
276 EAPI="7"
277
278 +LUA_COMPAT=( lua5-3 )
279 +
280 [[ ${PV} == *9999 ]] && SCM="git-r3"
281 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
282 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
283
284 MY_P="${PN}-${PV/_beta/-dev}"
285
286 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
287 REQUIRED_USE="pcre-jit? ( pcre )
288 pcre2-jit? ( pcre2 )
289 pcre? ( !pcre2 )
290 + lua? ( ${LUA_REQUIRED_USE} )
291 device-atlas? ( pcre )
292 ?? ( slz zlib )"
293
294 +BDEPEND="virtual/pkgconfig"
295 DEPEND="
296 crypt? ( virtual/libcrypt:= )
297 pcre? (
298 @@ -44,7 +48,7 @@ DEPEND="
299 slz? ( dev-libs/libslz:= )
300 systemd? ( sys-apps/systemd )
301 zlib? ( sys-libs/zlib )
302 - lua? ( dev-lang/lua:5.3 )
303 + lua? ( ${LUA_DEPS} )
304 device-atlas? ( dev-libs/device-atlas-api-c )"
305 RDEPEND="${DEPEND}
306 acct-group/haproxy
307 @@ -67,6 +71,7 @@ haproxy_use() {
308 }
309
310 pkg_setup() {
311 + use lua && lua-single_pkg_setup
312 if use net_ns; then
313 CONFIG_CHECK="~NET_NS"
314 linux-info_pkg_setup
315
316 diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
317 index 42c17e31be4..6335de9e475 100644
318 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
319 +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
320 @@ -3,8 +3,10 @@
321
322 EAPI="7"
323
324 +LUA_COMPAT=( lua5-3 )
325 +
326 [[ ${PV} == *9999 ]] && SCM="git-r3"
327 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
328 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
329
330 MY_P="${PN}-${PV/_beta/-dev}"
331
332 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
333 REQUIRED_USE="pcre-jit? ( pcre )
334 pcre2-jit? ( pcre2 )
335 pcre? ( !pcre2 )
336 + lua? ( ${LUA_REQUIRED_USE} )
337 device-atlas? ( pcre )
338 ?? ( slz zlib )"
339
340 +BDEPEND="virtual/pkgconfig"
341 DEPEND="
342 crypt? ( virtual/libcrypt:= )
343 pcre? (
344 @@ -44,7 +48,7 @@ DEPEND="
345 slz? ( dev-libs/libslz:= )
346 systemd? ( sys-apps/systemd )
347 zlib? ( sys-libs/zlib )
348 - lua? ( dev-lang/lua:5.3 )
349 + lua? ( ${LUA_DEPS} )
350 device-atlas? ( dev-libs/device-atlas-api-c )"
351 RDEPEND="${DEPEND}
352 acct-group/haproxy
353 @@ -66,6 +70,7 @@ haproxy_use() {
354 }
355
356 pkg_setup() {
357 + use lua && lua-single_pkg_setup
358 if use net_ns; then
359 CONFIG_CHECK="~NET_NS"
360 linux-info_pkg_setup
361
362 diff --git a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
363 index 143c6394abd..56c62e7ad7d 100644
364 --- a/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
365 +++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
366 @@ -3,8 +3,10 @@
367
368 EAPI="7"
369
370 +LUA_COMPAT=( lua5-3 )
371 +
372 [[ ${PV} == *9999 ]] && SCM="git-r3"
373 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
374 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
375
376 MY_P="${PN}-${PV/_beta/-dev}"
377
378 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
379 REQUIRED_USE="pcre-jit? ( pcre )
380 pcre2-jit? ( pcre2 )
381 pcre? ( !pcre2 )
382 + lua? ( ${LUA_REQUIRED_USE} )
383 device-atlas? ( pcre )
384 ?? ( slz zlib )"
385
386 +BDEPEND="virtual/pkgconfig"
387 DEPEND="
388 crypt? ( virtual/libcrypt:= )
389 pcre? (
390 @@ -44,7 +48,7 @@ DEPEND="
391 slz? ( dev-libs/libslz:= )
392 systemd? ( sys-apps/systemd )
393 zlib? ( sys-libs/zlib )
394 - lua? ( dev-lang/lua:5.3 )
395 + lua? ( ${LUA_DEPS} )
396 device-atlas? ( dev-libs/device-atlas-api-c )"
397 RDEPEND="${DEPEND}
398 acct-group/haproxy
399 @@ -66,6 +70,7 @@ haproxy_use() {
400 }
401
402 pkg_setup() {
403 + use lua && lua-single_pkg_setup
404 if use net_ns; then
405 CONFIG_CHECK="~NET_NS"
406 linux-info_pkg_setup
407
408 diff --git a/net-proxy/haproxy/haproxy-2.3.12.ebuild b/net-proxy/haproxy/haproxy-2.3.12.ebuild
409 index 143c6394abd..56c62e7ad7d 100644
410 --- a/net-proxy/haproxy/haproxy-2.3.12.ebuild
411 +++ b/net-proxy/haproxy/haproxy-2.3.12.ebuild
412 @@ -3,8 +3,10 @@
413
414 EAPI="7"
415
416 +LUA_COMPAT=( lua5-3 )
417 +
418 [[ ${PV} == *9999 ]] && SCM="git-r3"
419 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
420 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
421
422 MY_P="${PN}-${PV/_beta/-dev}"
423
424 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
425 REQUIRED_USE="pcre-jit? ( pcre )
426 pcre2-jit? ( pcre2 )
427 pcre? ( !pcre2 )
428 + lua? ( ${LUA_REQUIRED_USE} )
429 device-atlas? ( pcre )
430 ?? ( slz zlib )"
431
432 +BDEPEND="virtual/pkgconfig"
433 DEPEND="
434 crypt? ( virtual/libcrypt:= )
435 pcre? (
436 @@ -44,7 +48,7 @@ DEPEND="
437 slz? ( dev-libs/libslz:= )
438 systemd? ( sys-apps/systemd )
439 zlib? ( sys-libs/zlib )
440 - lua? ( dev-lang/lua:5.3 )
441 + lua? ( ${LUA_DEPS} )
442 device-atlas? ( dev-libs/device-atlas-api-c )"
443 RDEPEND="${DEPEND}
444 acct-group/haproxy
445 @@ -66,6 +70,7 @@ haproxy_use() {
446 }
447
448 pkg_setup() {
449 + use lua && lua-single_pkg_setup
450 if use net_ns; then
451 CONFIG_CHECK="~NET_NS"
452 linux-info_pkg_setup
453
454 diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
455 index 143c6394abd..56c62e7ad7d 100644
456 --- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
457 +++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
458 @@ -3,8 +3,10 @@
459
460 EAPI="7"
461
462 +LUA_COMPAT=( lua5-3 )
463 +
464 [[ ${PV} == *9999 ]] && SCM="git-r3"
465 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
466 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
467
468 MY_P="${PN}-${PV/_beta/-dev}"
469
470 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
471 REQUIRED_USE="pcre-jit? ( pcre )
472 pcre2-jit? ( pcre2 )
473 pcre? ( !pcre2 )
474 + lua? ( ${LUA_REQUIRED_USE} )
475 device-atlas? ( pcre )
476 ?? ( slz zlib )"
477
478 +BDEPEND="virtual/pkgconfig"
479 DEPEND="
480 crypt? ( virtual/libcrypt:= )
481 pcre? (
482 @@ -44,7 +48,7 @@ DEPEND="
483 slz? ( dev-libs/libslz:= )
484 systemd? ( sys-apps/systemd )
485 zlib? ( sys-libs/zlib )
486 - lua? ( dev-lang/lua:5.3 )
487 + lua? ( ${LUA_DEPS} )
488 device-atlas? ( dev-libs/device-atlas-api-c )"
489 RDEPEND="${DEPEND}
490 acct-group/haproxy
491 @@ -66,6 +70,7 @@ haproxy_use() {
492 }
493
494 pkg_setup() {
495 + use lua && lua-single_pkg_setup
496 if use net_ns; then
497 CONFIG_CHECK="~NET_NS"
498 linux-info_pkg_setup
499
500 diff --git a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
501 index 31171c86ed5..9183ede9a10 100644
502 --- a/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
503 +++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
504 @@ -3,8 +3,10 @@
505
506 EAPI="7"
507
508 +LUA_COMPAT=( lua5-3 )
509 +
510 [[ ${PV} == *9999 ]] && SCM="git-r3"
511 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
512 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
513
514 MY_P="${PN}-${PV/_beta/-dev}"
515
516 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
517 REQUIRED_USE="pcre-jit? ( pcre )
518 pcre2-jit? ( pcre2 )
519 pcre? ( !pcre2 )
520 + lua? ( ${LUA_REQUIRED_USE} )
521 device-atlas? ( pcre )
522 ?? ( slz zlib )"
523
524 +BDEPEND="virtual/pkgconfig"
525 DEPEND="
526 crypt? ( virtual/libcrypt:= )
527 pcre? (
528 @@ -43,7 +47,7 @@ DEPEND="
529 )
530 systemd? ( sys-apps/systemd )
531 zlib? ( sys-libs/zlib )
532 - lua? ( dev-lang/lua:5.3 )
533 + lua? ( ${LUA_DEPS} )
534 device-atlas? ( dev-libs/device-atlas-api-c )"
535 RDEPEND="${DEPEND}
536 acct-group/haproxy
537 @@ -61,6 +65,7 @@ haproxy_use() {
538 }
539
540 pkg_setup() {
541 + use lua && lua-single_pkg_setup
542 if use net_ns; then
543 CONFIG_CHECK="~NET_NS"
544 linux-info_pkg_setup
545
546 diff --git a/net-proxy/haproxy/haproxy-2.4.2.ebuild b/net-proxy/haproxy/haproxy-2.4.2.ebuild
547 index 31171c86ed5..9183ede9a10 100644
548 --- a/net-proxy/haproxy/haproxy-2.4.2.ebuild
549 +++ b/net-proxy/haproxy/haproxy-2.4.2.ebuild
550 @@ -3,8 +3,10 @@
551
552 EAPI="7"
553
554 +LUA_COMPAT=( lua5-3 )
555 +
556 [[ ${PV} == *9999 ]] && SCM="git-r3"
557 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
558 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
559
560 MY_P="${PN}-${PV/_beta/-dev}"
561
562 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
563 REQUIRED_USE="pcre-jit? ( pcre )
564 pcre2-jit? ( pcre2 )
565 pcre? ( !pcre2 )
566 + lua? ( ${LUA_REQUIRED_USE} )
567 device-atlas? ( pcre )
568 ?? ( slz zlib )"
569
570 +BDEPEND="virtual/pkgconfig"
571 DEPEND="
572 crypt? ( virtual/libcrypt:= )
573 pcre? (
574 @@ -43,7 +47,7 @@ DEPEND="
575 )
576 systemd? ( sys-apps/systemd )
577 zlib? ( sys-libs/zlib )
578 - lua? ( dev-lang/lua:5.3 )
579 + lua? ( ${LUA_DEPS} )
580 device-atlas? ( dev-libs/device-atlas-api-c )"
581 RDEPEND="${DEPEND}
582 acct-group/haproxy
583 @@ -61,6 +65,7 @@ haproxy_use() {
584 }
585
586 pkg_setup() {
587 + use lua && lua-single_pkg_setup
588 if use net_ns; then
589 CONFIG_CHECK="~NET_NS"
590 linux-info_pkg_setup
591
592 diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
593 index 31171c86ed5..9183ede9a10 100644
594 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
595 +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
596 @@ -3,8 +3,10 @@
597
598 EAPI="7"
599
600 +LUA_COMPAT=( lua5-3 )
601 +
602 [[ ${PV} == *9999 ]] && SCM="git-r3"
603 -inherit toolchain-funcs flag-o-matic systemd linux-info ${SCM}
604 +inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
605
606 MY_P="${PN}-${PV/_beta/-dev}"
607
608 @@ -25,9 +27,11 @@ ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
609 REQUIRED_USE="pcre-jit? ( pcre )
610 pcre2-jit? ( pcre2 )
611 pcre? ( !pcre2 )
612 + lua? ( ${LUA_REQUIRED_USE} )
613 device-atlas? ( pcre )
614 ?? ( slz zlib )"
615
616 +BDEPEND="virtual/pkgconfig"
617 DEPEND="
618 crypt? ( virtual/libcrypt:= )
619 pcre? (
620 @@ -43,7 +47,7 @@ DEPEND="
621 )
622 systemd? ( sys-apps/systemd )
623 zlib? ( sys-libs/zlib )
624 - lua? ( dev-lang/lua:5.3 )
625 + lua? ( ${LUA_DEPS} )
626 device-atlas? ( dev-libs/device-atlas-api-c )"
627 RDEPEND="${DEPEND}
628 acct-group/haproxy
629 @@ -61,6 +65,7 @@ haproxy_use() {
630 }
631
632 pkg_setup() {
633 + use lua && lua-single_pkg_setup
634 if use net_ns; then
635 CONFIG_CHECK="~NET_NS"
636 linux-info_pkg_setup
Report Message
Find on MARC Find on Google Groups