Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/
Date: Mon, 03 May 2021 07:47:59
Message-Id: 1620027996.8710c2bcd278a1d8fc656ccc289a84f3ea2df646.zlogene@gentoo
1 commit: 8710c2bcd278a1d8fc656ccc289a84f3ea2df646
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 07:46:36 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 07:46:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8710c2bc
7
8 dev-db/mariadb: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-db/mariadb/mariadb-10.2.22-r2.ebuild | 10 ++++------
14 dev-db/mariadb/mariadb-10.2.32-r3.ebuild | 8 +++-----
15 dev-db/mariadb/mariadb-10.2.34.ebuild | 8 +++-----
16 dev-db/mariadb/mariadb-10.2.35.ebuild | 8 +++-----
17 dev-db/mariadb/mariadb-10.2.36.ebuild | 8 +++-----
18 dev-db/mariadb/mariadb-10.2.37-r3.ebuild | 8 +++-----
19 dev-db/mariadb/mariadb-10.3.23-r3.ebuild | 8 +++-----
20 dev-db/mariadb/mariadb-10.3.25.ebuild | 8 +++-----
21 dev-db/mariadb/mariadb-10.3.26.ebuild | 8 +++-----
22 dev-db/mariadb/mariadb-10.3.27.ebuild | 8 +++-----
23 dev-db/mariadb/mariadb-10.3.28-r3.ebuild | 8 +++-----
24 dev-db/mariadb/mariadb-10.4.13-r3.ebuild | 8 +++-----
25 dev-db/mariadb/mariadb-10.4.15.ebuild | 8 +++-----
26 dev-db/mariadb/mariadb-10.4.16.ebuild | 8 +++-----
27 dev-db/mariadb/mariadb-10.4.17.ebuild | 8 +++-----
28 dev-db/mariadb/mariadb-10.4.18-r3.ebuild | 8 +++-----
29 dev-db/mariadb/mariadb-10.5.6.ebuild | 8 +++-----
30 dev-db/mariadb/mariadb-10.5.7.ebuild | 8 +++-----
31 dev-db/mariadb/mariadb-10.5.8.ebuild | 8 +++-----
32 dev-db/mariadb/mariadb-10.5.9-r5.ebuild | 8 +++-----
33 20 files changed, 61 insertions(+), 101 deletions(-)
34
35 diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
36 index aca4c6dfa4c..9da7717b745 100644
37 --- a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
38 +++ b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
39 @@ -1,4 +1,4 @@
40 -# Copyright 1999-2020 Gentoo Authors
41 +# Copyright 1999-2021 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 EAPI="6"
45 @@ -29,13 +29,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
46 LICENSE="GPL-2 LGPL-2.1+"
47 SLOT="10.2/${SUBSLOT:-0}"
48 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
49 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
50 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
51 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
52 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
53 test tokudb xml yassl"
54
55 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
56 -RESTRICT="!bindist? ( bindist ) !test? ( test ) libressl? ( test )"
57 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
58
59 REQUIRED_USE="jdbc? ( extraengine server !static )
60 server? ( tokudb? ( jemalloc !tcmalloc ) )
61 @@ -82,8 +81,7 @@ COMMON_DEPEND="
62 kerberos? ( virtual/krb5 )
63 yassl? ( net-libs/gnutls:0= )
64 !yassl? (
65 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
66 - libressl? ( dev-libs/libressl:0= )
67 + >=dev-libs/openssl-1.0.0:0=
68 )
69 sys-libs/ncurses:0=
70 !bindist? (
71
72 diff --git a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
73 index 5220f19266b..90d4e0ae97e 100644
74 --- a/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
75 +++ b/dev-db/mariadb/mariadb-10.2.32-r3.ebuild
76 @@ -22,13 +22,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
77 LICENSE="GPL-2 LGPL-2.1+"
78 SLOT="10.2/${SUBSLOT:-0}"
79 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
80 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
81 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
82 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
83 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
84 test tokudb xml yassl"
85
86 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
87 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
88 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
89
90 REQUIRED_USE="jdbc? ( extraengine server !static )
91 server? ( tokudb? ( jemalloc !tcmalloc ) )
92 @@ -57,8 +56,7 @@ COMMON_DEPEND="
93 kerberos? ( virtual/krb5 )
94 yassl? ( net-libs/gnutls:0= )
95 !yassl? (
96 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
97 - libressl? ( dev-libs/libressl:0= )
98 + >=dev-libs/openssl-1.0.0:0=
99 )
100 sys-libs/ncurses:0=
101 !bindist? (
102
103 diff --git a/dev-db/mariadb/mariadb-10.2.34.ebuild b/dev-db/mariadb/mariadb-10.2.34.ebuild
104 index aa85215bd84..906f4db9f25 100644
105 --- a/dev-db/mariadb/mariadb-10.2.34.ebuild
106 +++ b/dev-db/mariadb/mariadb-10.2.34.ebuild
107 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
108 LICENSE="GPL-2 LGPL-2.1+"
109 SLOT="10.2/${SUBSLOT:-0}"
110 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
111 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
112 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
113 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
114 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
115 test tokudb xml yassl"
116
117 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
118 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
119 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
120
121 REQUIRED_USE="jdbc? ( extraengine server !static )
122 server? ( tokudb? ( jemalloc !tcmalloc ) )
123 @@ -55,8 +54,7 @@ COMMON_DEPEND="
124 kerberos? ( virtual/krb5 )
125 yassl? ( net-libs/gnutls:0= )
126 !yassl? (
127 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
128 - libressl? ( dev-libs/libressl:0= )
129 + >=dev-libs/openssl-1.0.0:0=
130 )
131 sys-libs/ncurses:0=
132 !bindist? (
133
134 diff --git a/dev-db/mariadb/mariadb-10.2.35.ebuild b/dev-db/mariadb/mariadb-10.2.35.ebuild
135 index fc25a535a83..81166142aa7 100644
136 --- a/dev-db/mariadb/mariadb-10.2.35.ebuild
137 +++ b/dev-db/mariadb/mariadb-10.2.35.ebuild
138 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
139 LICENSE="GPL-2 LGPL-2.1+"
140 SLOT="10.2/${SUBSLOT:-0}"
141 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
142 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
143 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
144 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
145 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
146 test tokudb xml yassl"
147
148 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
149 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
150 +RESTRICT="!bindist? ( bindist ) test? ( test )"
151
152 REQUIRED_USE="jdbc? ( extraengine server !static )
153 server? ( tokudb? ( jemalloc !tcmalloc ) )
154 @@ -55,8 +54,7 @@ COMMON_DEPEND="
155 kerberos? ( virtual/krb5 )
156 yassl? ( net-libs/gnutls:0= )
157 !yassl? (
158 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
159 - libressl? ( dev-libs/libressl:0= )
160 + >=dev-libs/openssl-1.0.0:0=
161 )
162 sys-libs/ncurses:0=
163 !bindist? (
164
165 diff --git a/dev-db/mariadb/mariadb-10.2.36.ebuild b/dev-db/mariadb/mariadb-10.2.36.ebuild
166 index 8673125864b..e710a0d553a 100644
167 --- a/dev-db/mariadb/mariadb-10.2.36.ebuild
168 +++ b/dev-db/mariadb/mariadb-10.2.36.ebuild
169 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
170 LICENSE="GPL-2 LGPL-2.1+"
171 SLOT="10.2/${SUBSLOT:-0}"
172 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
173 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
174 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
175 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
176 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
177 test tokudb xml yassl"
178
179 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
180 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
181 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
182
183 REQUIRED_USE="jdbc? ( extraengine server !static )
184 server? ( tokudb? ( jemalloc !tcmalloc ) )
185 @@ -55,8 +54,7 @@ COMMON_DEPEND="
186 kerberos? ( virtual/krb5 )
187 yassl? ( net-libs/gnutls:0= )
188 !yassl? (
189 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
190 - libressl? ( dev-libs/libressl:0= )
191 + >=dev-libs/openssl-1.0.0:0=
192 )
193 sys-libs/ncurses:0=
194 !bindist? (
195
196 diff --git a/dev-db/mariadb/mariadb-10.2.37-r3.ebuild b/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
197 index a815c35193e..2622cb71a80 100644
198 --- a/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
199 +++ b/dev-db/mariadb/mariadb-10.2.37-r3.ebuild
200 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
201 LICENSE="GPL-2 LGPL-2.1+"
202 SLOT="10.2/${SUBSLOT:-0}"
203 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
204 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
205 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
206 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
207 sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc
208 test tokudb xml yassl"
209
210 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
211 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
212 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
213
214 REQUIRED_USE="jdbc? ( extraengine server !static )
215 server? ( tokudb? ( jemalloc !tcmalloc ) )
216 @@ -55,8 +54,7 @@ COMMON_DEPEND="
217 kerberos? ( virtual/krb5 )
218 yassl? ( net-libs/gnutls:0= )
219 !yassl? (
220 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
221 - libressl? ( dev-libs/libressl:0= )
222 + >=dev-libs/openssl-1.0.0:0=
223 )
224 sys-libs/ncurses:0=
225 !bindist? (
226
227 diff --git a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
228 index 49287ca1614..523a0c907d1 100644
229 --- a/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
230 +++ b/dev-db/mariadb/mariadb-10.3.23-r3.ebuild
231 @@ -22,13 +22,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
232 LICENSE="GPL-2 LGPL-2.1+"
233 SLOT="10.3/${SUBSLOT:-0}"
234 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
235 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
236 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
237 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
238 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
239 test tokudb xml yassl"
240
241 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
242 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
243 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
244
245 REQUIRED_USE="jdbc? ( extraengine server !static )
246 server? ( tokudb? ( jemalloc !tcmalloc ) )
247 @@ -57,8 +56,7 @@ COMMON_DEPEND="
248 kerberos? ( virtual/krb5 )
249 yassl? ( net-libs/gnutls:0= )
250 !yassl? (
251 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
252 - libressl? ( dev-libs/libressl:0= )
253 + >=dev-libs/openssl-1.0.0:0=
254 )
255 sys-libs/ncurses:0=
256 !bindist? (
257
258 diff --git a/dev-db/mariadb/mariadb-10.3.25.ebuild b/dev-db/mariadb/mariadb-10.3.25.ebuild
259 index 73c8f3fa447..4b560041aa1 100644
260 --- a/dev-db/mariadb/mariadb-10.3.25.ebuild
261 +++ b/dev-db/mariadb/mariadb-10.3.25.ebuild
262 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
263 LICENSE="GPL-2 LGPL-2.1+"
264 SLOT="10.3/${SUBSLOT:-0}"
265 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
266 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
267 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
268 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
269 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
270 test tokudb xml yassl"
271
272 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
273 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
274 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
275
276 REQUIRED_USE="jdbc? ( extraengine server !static )
277 server? ( tokudb? ( jemalloc !tcmalloc ) )
278 @@ -55,8 +54,7 @@ COMMON_DEPEND="
279 kerberos? ( virtual/krb5 )
280 yassl? ( net-libs/gnutls:0= )
281 !yassl? (
282 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
283 - libressl? ( dev-libs/libressl:0= )
284 + >=dev-libs/openssl-1.0.0:0=
285 )
286 sys-libs/ncurses:0=
287 !bindist? (
288
289 diff --git a/dev-db/mariadb/mariadb-10.3.26.ebuild b/dev-db/mariadb/mariadb-10.3.26.ebuild
290 index c5f1eaf4279..c2089d951e6 100644
291 --- a/dev-db/mariadb/mariadb-10.3.26.ebuild
292 +++ b/dev-db/mariadb/mariadb-10.3.26.ebuild
293 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
294 LICENSE="GPL-2 LGPL-2.1+"
295 SLOT="10.3/${SUBSLOT:-0}"
296 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
297 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
298 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
299 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
300 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
301 test tokudb xml yassl"
302
303 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
304 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
305 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
306
307 REQUIRED_USE="jdbc? ( extraengine server !static )
308 server? ( tokudb? ( jemalloc !tcmalloc ) )
309 @@ -55,8 +54,7 @@ COMMON_DEPEND="
310 kerberos? ( virtual/krb5 )
311 yassl? ( net-libs/gnutls:0= )
312 !yassl? (
313 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
314 - libressl? ( dev-libs/libressl:0= )
315 + >=dev-libs/openssl-1.0.0:0=
316 )
317 sys-libs/ncurses:0=
318 !bindist? (
319
320 diff --git a/dev-db/mariadb/mariadb-10.3.27.ebuild b/dev-db/mariadb/mariadb-10.3.27.ebuild
321 index c3d7f8e6067..700176d0f57 100644
322 --- a/dev-db/mariadb/mariadb-10.3.27.ebuild
323 +++ b/dev-db/mariadb/mariadb-10.3.27.ebuild
324 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
325 LICENSE="GPL-2 LGPL-2.1+"
326 SLOT="10.3/${SUBSLOT:-0}"
327 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
328 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
329 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
330 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
331 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
332 test tokudb xml yassl"
333
334 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
335 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
336 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
337
338 REQUIRED_USE="jdbc? ( extraengine server !static )
339 server? ( tokudb? ( jemalloc !tcmalloc ) )
340 @@ -55,8 +54,7 @@ COMMON_DEPEND="
341 kerberos? ( virtual/krb5 )
342 yassl? ( net-libs/gnutls:0= )
343 !yassl? (
344 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
345 - libressl? ( dev-libs/libressl:0= )
346 + >=dev-libs/openssl-1.0.0:0=
347 )
348 sys-libs/ncurses:0=
349 !bindist? (
350
351 diff --git a/dev-db/mariadb/mariadb-10.3.28-r3.ebuild b/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
352 index b9722ab6f77..995a619bc5c 100644
353 --- a/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
354 +++ b/dev-db/mariadb/mariadb-10.3.28-r3.ebuild
355 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
356 LICENSE="GPL-2 LGPL-2.1+"
357 SLOT="10.3/${SUBSLOT:-0}"
358 IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
359 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
360 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
361 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
362 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
363 test tokudb xml yassl"
364
365 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
366 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
367 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
368
369 REQUIRED_USE="jdbc? ( extraengine server !static )
370 server? ( tokudb? ( jemalloc !tcmalloc ) )
371 @@ -55,8 +54,7 @@ COMMON_DEPEND="
372 kerberos? ( virtual/krb5 )
373 yassl? ( net-libs/gnutls:0= )
374 !yassl? (
375 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
376 - libressl? ( dev-libs/libressl:0= )
377 + >=dev-libs/openssl-1.0.0:0=
378 )
379 sys-libs/ncurses:0=
380 !bindist? (
381
382 diff --git a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
383 index cd815bfe019..4e128c050da 100644
384 --- a/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
385 +++ b/dev-db/mariadb/mariadb-10.4.13-r3.ebuild
386 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
387 LICENSE="GPL-2 LGPL-2.1+"
388 SLOT="10.4/${SUBSLOT:-0}"
389 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
390 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
391 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
392 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
393 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
394 test tokudb xml yassl"
395
396 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
397 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
398 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
399
400 REQUIRED_USE="jdbc? ( extraengine server !static )
401 server? ( tokudb? ( jemalloc !tcmalloc ) )
402 @@ -55,8 +54,7 @@ COMMON_DEPEND="
403 kerberos? ( virtual/krb5 )
404 yassl? ( net-libs/gnutls:0= )
405 !yassl? (
406 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
407 - libressl? ( dev-libs/libressl:0= )
408 + >=dev-libs/openssl-1.0.0:0=
409 )
410 sys-libs/ncurses:0=
411 !bindist? (
412
413 diff --git a/dev-db/mariadb/mariadb-10.4.15.ebuild b/dev-db/mariadb/mariadb-10.4.15.ebuild
414 index fd371add014..753ddd9b8a8 100644
415 --- a/dev-db/mariadb/mariadb-10.4.15.ebuild
416 +++ b/dev-db/mariadb/mariadb-10.4.15.ebuild
417 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
418 LICENSE="GPL-2 LGPL-2.1+"
419 SLOT="10.4/${SUBSLOT:-0}"
420 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
421 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
422 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
423 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
424 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
425 test tokudb xml yassl"
426
427 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
428 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
429 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
430
431 REQUIRED_USE="jdbc? ( extraengine server !static )
432 server? ( tokudb? ( jemalloc !tcmalloc ) )
433 @@ -55,8 +54,7 @@ COMMON_DEPEND="
434 kerberos? ( virtual/krb5 )
435 yassl? ( net-libs/gnutls:0= )
436 !yassl? (
437 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
438 - libressl? ( dev-libs/libressl:0= )
439 + >=dev-libs/openssl-1.0.0:0=
440 )
441 sys-libs/ncurses:0=
442 !bindist? (
443
444 diff --git a/dev-db/mariadb/mariadb-10.4.16.ebuild b/dev-db/mariadb/mariadb-10.4.16.ebuild
445 index 87e0f3285c3..a4b2fc06a1f 100644
446 --- a/dev-db/mariadb/mariadb-10.4.16.ebuild
447 +++ b/dev-db/mariadb/mariadb-10.4.16.ebuild
448 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
449 LICENSE="GPL-2 LGPL-2.1+"
450 SLOT="10.4/${SUBSLOT:-0}"
451 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
452 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
453 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
454 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
455 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
456 test tokudb xml yassl"
457
458 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
459 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
460 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
461
462 REQUIRED_USE="jdbc? ( extraengine server !static )
463 server? ( tokudb? ( jemalloc !tcmalloc ) )
464 @@ -55,8 +54,7 @@ COMMON_DEPEND="
465 kerberos? ( virtual/krb5 )
466 yassl? ( net-libs/gnutls:0= )
467 !yassl? (
468 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
469 - libressl? ( dev-libs/libressl:0= )
470 + >=dev-libs/openssl-1.0.0:0=
471 )
472 sys-libs/ncurses:0=
473 !bindist? (
474
475 diff --git a/dev-db/mariadb/mariadb-10.4.17.ebuild b/dev-db/mariadb/mariadb-10.4.17.ebuild
476 index 983375442a0..0abf3fccea7 100644
477 --- a/dev-db/mariadb/mariadb-10.4.17.ebuild
478 +++ b/dev-db/mariadb/mariadb-10.4.17.ebuild
479 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
480 LICENSE="GPL-2 LGPL-2.1+"
481 SLOT="10.4/${SUBSLOT:-0}"
482 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
483 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
484 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
485 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
486 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
487 test tokudb xml yassl"
488
489 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
490 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
491 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
492
493 REQUIRED_USE="jdbc? ( extraengine server !static )
494 server? ( tokudb? ( jemalloc !tcmalloc ) )
495 @@ -55,8 +54,7 @@ COMMON_DEPEND="
496 kerberos? ( virtual/krb5 )
497 yassl? ( net-libs/gnutls:0= )
498 !yassl? (
499 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
500 - libressl? ( dev-libs/libressl:0= )
501 + >=dev-libs/openssl-1.0.0:0=
502 )
503 sys-libs/ncurses:0=
504 !bindist? (
505
506 diff --git a/dev-db/mariadb/mariadb-10.4.18-r3.ebuild b/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
507 index 5fad8a38238..1c922e47c71 100644
508 --- a/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
509 +++ b/dev-db/mariadb/mariadb-10.4.18-r3.ebuild
510 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
511 LICENSE="GPL-2 LGPL-2.1+"
512 SLOT="10.4/${SUBSLOT:-0}"
513 IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
514 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
515 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
516 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
517 sst-rsync sst-mariabackup static systemd systemtap tcmalloc
518 test tokudb xml yassl"
519
520 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
521 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
522 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
523
524 REQUIRED_USE="jdbc? ( extraengine server !static )
525 server? ( tokudb? ( jemalloc !tcmalloc ) )
526 @@ -55,8 +54,7 @@ COMMON_DEPEND="
527 kerberos? ( virtual/krb5 )
528 yassl? ( net-libs/gnutls:0= )
529 !yassl? (
530 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
531 - libressl? ( dev-libs/libressl:0= )
532 + >=dev-libs/openssl-1.0.0:0=
533 )
534 sys-libs/ncurses:0=
535 !bindist? (
536
537 diff --git a/dev-db/mariadb/mariadb-10.5.6.ebuild b/dev-db/mariadb/mariadb-10.5.6.ebuild
538 index 707286c11f4..5bcad73cf9f 100644
539 --- a/dev-db/mariadb/mariadb-10.5.6.ebuild
540 +++ b/dev-db/mariadb/mariadb-10.5.6.ebuild
541 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
542 LICENSE="GPL-2 LGPL-2.1+"
543 SLOT="10.5/${SUBSLOT:-0}"
544 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
545 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
546 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
547 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
548 sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
549 test xml yassl"
550
551 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
552 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
553 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
554
555 REQUIRED_USE="jdbc? ( extraengine server !static )
556 ?? ( tcmalloc jemalloc )
557 @@ -84,8 +83,7 @@ COMMON_DEPEND="
558 tcmalloc? ( dev-util/google-perftools:0= )
559 yassl? ( net-libs/gnutls:0= )
560 !yassl? (
561 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
562 - libressl? ( dev-libs/libressl:0= )
563 + >=dev-libs/openssl-1.0.0:0=
564 )
565 "
566 BDEPEND="virtual/yacc
567
568 diff --git a/dev-db/mariadb/mariadb-10.5.7.ebuild b/dev-db/mariadb/mariadb-10.5.7.ebuild
569 index 8f9f6778b6c..a48f286d522 100644
570 --- a/dev-db/mariadb/mariadb-10.5.7.ebuild
571 +++ b/dev-db/mariadb/mariadb-10.5.7.ebuild
572 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
573 LICENSE="GPL-2 LGPL-2.1+"
574 SLOT="10.5/${SUBSLOT:-0}"
575 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
576 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
577 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
578 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
579 sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
580 test xml yassl"
581
582 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
583 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
584 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
585
586 REQUIRED_USE="jdbc? ( extraengine server !static )
587 ?? ( tcmalloc jemalloc )
588 @@ -84,8 +83,7 @@ COMMON_DEPEND="
589 tcmalloc? ( dev-util/google-perftools:0= )
590 yassl? ( net-libs/gnutls:0= )
591 !yassl? (
592 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
593 - libressl? ( dev-libs/libressl:0= )
594 + >=dev-libs/openssl-1.0.0:0=
595 )
596 "
597 BDEPEND="virtual/yacc
598
599 diff --git a/dev-db/mariadb/mariadb-10.5.8.ebuild b/dev-db/mariadb/mariadb-10.5.8.ebuild
600 index e2bdf78cecd..550c14700ef 100644
601 --- a/dev-db/mariadb/mariadb-10.5.8.ebuild
602 +++ b/dev-db/mariadb/mariadb-10.5.8.ebuild
603 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
604 LICENSE="GPL-2 LGPL-2.1+"
605 SLOT="10.5/${SUBSLOT:-0}"
606 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
607 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
608 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
609 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
610 sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
611 test xml yassl"
612
613 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
614 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
615 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
616
617 REQUIRED_USE="jdbc? ( extraengine server !static )
618 ?? ( tcmalloc jemalloc )
619 @@ -84,8 +83,7 @@ COMMON_DEPEND="
620 tcmalloc? ( dev-util/google-perftools:0= )
621 yassl? ( net-libs/gnutls:0= )
622 !yassl? (
623 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
624 - libressl? ( dev-libs/libressl:0= )
625 + >=dev-libs/openssl-1.0.0:0=
626 )
627 "
628 BDEPEND="virtual/yacc
629
630 diff --git a/dev-db/mariadb/mariadb-10.5.9-r5.ebuild b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
631 index 27accfb1aa1..35a14850bf6 100644
632 --- a/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
633 +++ b/dev-db/mariadb/mariadb-10.5.9-r5.ebuild
634 @@ -20,13 +20,12 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
635 LICENSE="GPL-2 LGPL-2.1+"
636 SLOT="10.5/${SUBSLOT:-0}"
637 IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
638 - innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
639 + innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 mroonga
640 numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
641 sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
642 test xml yassl"
643
644 -# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
645 -RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
646 +RESTRICT="!bindist? ( bindist ) !test? ( test )"
647
648 REQUIRED_USE="jdbc? ( extraengine server !static )
649 ?? ( tcmalloc jemalloc )
650 @@ -84,8 +83,7 @@ COMMON_DEPEND="
651 tcmalloc? ( dev-util/google-perftools:0= )
652 yassl? ( net-libs/gnutls:0= )
653 !yassl? (
654 - !libressl? ( >=dev-libs/openssl-1.0.0:0= )
655 - libressl? ( dev-libs/libressl:0= )
656 + >=dev-libs/openssl-1.0.0:0=
657 )
658 "
659 BDEPEND="virtual/yacc