Gentoo Archives: gentoo-commits

From: Christian Ruppert <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/
Date: Tue, 26 Apr 2022 15:28:17
Message-Id: 1650986893.42944642f12a758e2f602227ac2553e70b5330c5.idl0r@gentoo
1 commit: 42944642f12a758e2f602227ac2553e70b5330c5
2 Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 15:25:07 2022 +0000
4 Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 15:28:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42944642
7
8 net-proxy/haproxy: Unify live ebuilds. Default to PCRE2, bug 838013
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
12
13 net-proxy/haproxy/haproxy-2.0.9999.ebuild | 24 +++++++++++-------------
14 net-proxy/haproxy/haproxy-2.2.9999.ebuild | 24 +++++++++++-------------
15 net-proxy/haproxy/haproxy-2.4.9999.ebuild | 22 ++++++++++------------
16 net-proxy/haproxy/haproxy-2.5.9999.ebuild | 22 ++++++++++------------
17 net-proxy/haproxy/haproxy-9999.ebuild | 24 +++++++++++-------------
18 5 files changed, 53 insertions(+), 63 deletions(-)
19
20 diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
21 index f85333d3df83..4ec0188ead43 100644
22 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
23 +++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
24 @@ -14,7 +14,10 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
25 HOMEPAGE="http://www.haproxy.org"
26 if [[ ${PV} != *9999 ]]; then
27 SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
28 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
29 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
30 +elif [[ ${PV} == 9999 ]]; then
31 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
32 + EGIT_BRANCH=master
33 else
34 EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
35 EGIT_BRANCH=master
36 @@ -22,11 +25,9 @@ fi
37
38 LICENSE="GPL-2 LGPL-2.1"
39 SLOT="0/$(ver_cut 1-2)"
40 -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
41 +IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
42 ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
43 REQUIRED_USE="pcre-jit? ( pcre )
44 - pcre2-jit? ( pcre2 )
45 - pcre? ( !pcre2 )
46 lua? ( ${LUA_REQUIRED_USE} )
47 ?? ( slz zlib )"
48
49 @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
50 DEPEND="
51 crypt? ( virtual/libcrypt:= )
52 pcre? (
53 - dev-libs/libpcre
54 - pcre-jit? ( dev-libs/libpcre[jit] )
55 - )
56 - pcre2? (
57 dev-libs/libpcre2:=
58 - pcre2-jit? ( dev-libs/libpcre2:=[jit] )
59 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
60 )
61 ssl? (
62 dev-libs/openssl:0=
63 @@ -79,16 +76,17 @@ src_compile() {
64 local -a args=(
65 V=1
66 TARGET=linux-glibc
67 + # Switching to PCRE2 by default, bug 838013
68 + PCRE=
69 + PCRE_JIT=
70 )
71
72 # TODO: PCRE2_WIDTH?
73 args+=( $(haproxy_use threads THREAD) )
74 args+=( $(haproxy_use crypt LIBCRYPT) )
75 args+=( $(haproxy_use net_ns NS) )
76 - args+=( $(haproxy_use pcre PCRE) )
77 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
78 - args+=( $(haproxy_use pcre2 PCRE2) )
79 - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
80 + args+=( $(haproxy_use pcre PCRE2) )
81 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
82 args+=( $(haproxy_use ssl OPENSSL) )
83 args+=( $(haproxy_use slz SLZ) )
84 args+=( $(haproxy_use zlib ZLIB) )
85
86 diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
87 index f85333d3df83..4ec0188ead43 100644
88 --- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
89 +++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
90 @@ -14,7 +14,10 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
91 HOMEPAGE="http://www.haproxy.org"
92 if [[ ${PV} != *9999 ]]; then
93 SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
94 - KEYWORDS="~amd64 ~arm ~ppc ~x86"
95 + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
96 +elif [[ ${PV} == 9999 ]]; then
97 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
98 + EGIT_BRANCH=master
99 else
100 EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
101 EGIT_BRANCH=master
102 @@ -22,11 +25,9 @@ fi
103
104 LICENSE="GPL-2 LGPL-2.1"
105 SLOT="0/$(ver_cut 1-2)"
106 -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
107 +IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
108 ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
109 REQUIRED_USE="pcre-jit? ( pcre )
110 - pcre2-jit? ( pcre2 )
111 - pcre? ( !pcre2 )
112 lua? ( ${LUA_REQUIRED_USE} )
113 ?? ( slz zlib )"
114
115 @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
116 DEPEND="
117 crypt? ( virtual/libcrypt:= )
118 pcre? (
119 - dev-libs/libpcre
120 - pcre-jit? ( dev-libs/libpcre[jit] )
121 - )
122 - pcre2? (
123 dev-libs/libpcre2:=
124 - pcre2-jit? ( dev-libs/libpcre2:=[jit] )
125 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
126 )
127 ssl? (
128 dev-libs/openssl:0=
129 @@ -79,16 +76,17 @@ src_compile() {
130 local -a args=(
131 V=1
132 TARGET=linux-glibc
133 + # Switching to PCRE2 by default, bug 838013
134 + PCRE=
135 + PCRE_JIT=
136 )
137
138 # TODO: PCRE2_WIDTH?
139 args+=( $(haproxy_use threads THREAD) )
140 args+=( $(haproxy_use crypt LIBCRYPT) )
141 args+=( $(haproxy_use net_ns NS) )
142 - args+=( $(haproxy_use pcre PCRE) )
143 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
144 - args+=( $(haproxy_use pcre2 PCRE2) )
145 - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
146 + args+=( $(haproxy_use pcre PCRE2) )
147 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
148 args+=( $(haproxy_use ssl OPENSSL) )
149 args+=( $(haproxy_use slz SLZ) )
150 args+=( $(haproxy_use zlib ZLIB) )
151
152 diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
153 index e50349eab9a2..959a7a9dac4f 100644
154 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
155 +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
156 @@ -15,6 +15,9 @@ HOMEPAGE="http://www.haproxy.org"
157 if [[ ${PV} != *9999 ]]; then
158 SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
159 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
160 +elif [[ ${PV} == 9999 ]]; then
161 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
162 + EGIT_BRANCH=master
163 else
164 EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
165 EGIT_BRANCH=master
166 @@ -22,11 +25,9 @@ fi
167
168 LICENSE="GPL-2 LGPL-2.1"
169 SLOT="0/$(ver_cut 1-2)"
170 -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
171 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
172 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
173 REQUIRED_USE="pcre-jit? ( pcre )
174 - pcre2-jit? ( pcre2 )
175 - pcre? ( !pcre2 )
176 lua? ( ${LUA_REQUIRED_USE} )
177 ?? ( slz zlib )"
178
179 @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
180 DEPEND="
181 crypt? ( virtual/libcrypt:= )
182 pcre? (
183 - dev-libs/libpcre
184 - pcre-jit? ( dev-libs/libpcre[jit] )
185 - )
186 - pcre2? (
187 dev-libs/libpcre2:=
188 - pcre2-jit? ( dev-libs/libpcre2:=[jit] )
189 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
190 )
191 ssl? (
192 dev-libs/openssl:0=
193 @@ -74,16 +71,17 @@ src_compile() {
194 local -a args=(
195 V=1
196 TARGET=linux-glibc
197 + # Switching to PCRE2 by default, bug 838013
198 + PCRE=
199 + PCRE_JIT=
200 )
201
202 # TODO: PCRE2_WIDTH?
203 args+=( $(haproxy_use threads THREAD) )
204 args+=( $(haproxy_use crypt LIBCRYPT) )
205 args+=( $(haproxy_use net_ns NS) )
206 - args+=( $(haproxy_use pcre PCRE) )
207 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
208 - args+=( $(haproxy_use pcre2 PCRE2) )
209 - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
210 + args+=( $(haproxy_use pcre PCRE2) )
211 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
212 args+=( $(haproxy_use ssl OPENSSL) )
213 args+=( $(haproxy_use slz SLZ) )
214 args+=( $(haproxy_use zlib ZLIB) )
215
216 diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
217 index e50349eab9a2..959a7a9dac4f 100644
218 --- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
219 +++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
220 @@ -15,6 +15,9 @@ HOMEPAGE="http://www.haproxy.org"
221 if [[ ${PV} != *9999 ]]; then
222 SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
223 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
224 +elif [[ ${PV} == 9999 ]]; then
225 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
226 + EGIT_BRANCH=master
227 else
228 EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
229 EGIT_BRANCH=master
230 @@ -22,11 +25,9 @@ fi
231
232 LICENSE="GPL-2 LGPL-2.1"
233 SLOT="0/$(ver_cut 1-2)"
234 -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
235 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
236 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
237 REQUIRED_USE="pcre-jit? ( pcre )
238 - pcre2-jit? ( pcre2 )
239 - pcre? ( !pcre2 )
240 lua? ( ${LUA_REQUIRED_USE} )
241 ?? ( slz zlib )"
242
243 @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
244 DEPEND="
245 crypt? ( virtual/libcrypt:= )
246 pcre? (
247 - dev-libs/libpcre
248 - pcre-jit? ( dev-libs/libpcre[jit] )
249 - )
250 - pcre2? (
251 dev-libs/libpcre2:=
252 - pcre2-jit? ( dev-libs/libpcre2:=[jit] )
253 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
254 )
255 ssl? (
256 dev-libs/openssl:0=
257 @@ -74,16 +71,17 @@ src_compile() {
258 local -a args=(
259 V=1
260 TARGET=linux-glibc
261 + # Switching to PCRE2 by default, bug 838013
262 + PCRE=
263 + PCRE_JIT=
264 )
265
266 # TODO: PCRE2_WIDTH?
267 args+=( $(haproxy_use threads THREAD) )
268 args+=( $(haproxy_use crypt LIBCRYPT) )
269 args+=( $(haproxy_use net_ns NS) )
270 - args+=( $(haproxy_use pcre PCRE) )
271 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
272 - args+=( $(haproxy_use pcre2 PCRE2) )
273 - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
274 + args+=( $(haproxy_use pcre PCRE2) )
275 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
276 args+=( $(haproxy_use ssl OPENSSL) )
277 args+=( $(haproxy_use slz SLZ) )
278 args+=( $(haproxy_use zlib ZLIB) )
279
280 diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
281 index 4b1f8887b4de..9b0bc07daa75 100644
282 --- a/net-proxy/haproxy/haproxy-9999.ebuild
283 +++ b/net-proxy/haproxy/haproxy-9999.ebuild
284 @@ -15,18 +15,19 @@ HOMEPAGE="http://www.haproxy.org"
285 if [[ ${PV} != *9999 ]]; then
286 SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
287 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
288 -else
289 +elif [[ ${PV} == 9999 ]]; then
290 EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
291 EGIT_BRANCH=master
292 +else
293 + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
294 + EGIT_BRANCH=master
295 fi
296
297 LICENSE="GPL-2 LGPL-2.1"
298 SLOT="0/${PV}"
299 -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
300 +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
301 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
302 REQUIRED_USE="pcre-jit? ( pcre )
303 - pcre2-jit? ( pcre2 )
304 - pcre? ( !pcre2 )
305 lua? ( ${LUA_REQUIRED_USE} )
306 ?? ( slz zlib )"
307
308 @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
309 DEPEND="
310 crypt? ( virtual/libcrypt:= )
311 pcre? (
312 - dev-libs/libpcre
313 - pcre-jit? ( dev-libs/libpcre[jit] )
314 - )
315 - pcre2? (
316 dev-libs/libpcre2:=
317 - pcre2-jit? ( dev-libs/libpcre2:=[jit] )
318 + pcre-jit? ( dev-libs/libpcre2:=[jit] )
319 )
320 ssl? (
321 dev-libs/openssl:0=
322 @@ -74,16 +71,17 @@ src_compile() {
323 local -a args=(
324 V=1
325 TARGET=linux-glibc
326 + # Switching to PCRE2 by default, bug 838013
327 + PCRE=
328 + PCRE_JIT=
329 )
330
331 # TODO: PCRE2_WIDTH?
332 args+=( $(haproxy_use threads THREAD) )
333 args+=( $(haproxy_use crypt LIBCRYPT) )
334 args+=( $(haproxy_use net_ns NS) )
335 - args+=( $(haproxy_use pcre PCRE) )
336 - args+=( $(haproxy_use pcre-jit PCRE_JIT) )
337 - args+=( $(haproxy_use pcre2 PCRE2) )
338 - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
339 + args+=( $(haproxy_use pcre PCRE2) )
340 + args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
341 args+=( $(haproxy_use ssl OPENSSL) )
342 args+=( $(haproxy_use slz SLZ) )
343 args+=( $(haproxy_use zlib ZLIB) )