1 |
commit: 094ee79a18973e8a1a594605626654fff0400aa7 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 17 01:08:48 2020 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 17 01:09:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=094ee79a |
7 |
|
8 |
dev-db/mariadb: bump to v10.5.5 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/737348 |
11 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
dev-db/mariadb/Manifest | 2 + |
15 |
dev-db/mariadb/mariadb-10.1.38-r2.ebuild | 1 + |
16 |
dev-db/mariadb/mariadb-10.1.45-r1.ebuild | 1 + |
17 |
dev-db/mariadb/mariadb-10.1.46.ebuild | 1 + |
18 |
dev-db/mariadb/mariadb-10.2.22-r2.ebuild | 1 + |
19 |
dev-db/mariadb/mariadb-10.2.32-r2.ebuild | 1 + |
20 |
dev-db/mariadb/mariadb-10.2.33.ebuild | 1 + |
21 |
dev-db/mariadb/mariadb-10.3.23-r2.ebuild | 1 + |
22 |
dev-db/mariadb/mariadb-10.3.24.ebuild | 1 + |
23 |
dev-db/mariadb/mariadb-10.4.13-r2.ebuild | 1 + |
24 |
dev-db/mariadb/mariadb-10.4.14.ebuild | 1 + |
25 |
...ariadb-10.4.14.ebuild => mariadb-10.5.5.ebuild} | 64 +++++++++++++--------- |
26 |
dev-db/mariadb/mariadb-5.5.68-r1.ebuild | 1 + |
27 |
dev-db/mariadb/metadata.xml | 2 + |
28 |
14 files changed, 54 insertions(+), 25 deletions(-) |
29 |
|
30 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
31 |
index cb3f291fd88..28ed8c8c159 100644 |
32 |
--- a/dev-db/mariadb/Manifest |
33 |
+++ b/dev-db/mariadb/Manifest |
34 |
@@ -16,6 +16,8 @@ DIST mariadb-10.4.13-patches-03.tar.xz 5520 BLAKE2B 949b7f6ee5a9a6077424264e53d2 |
35 |
DIST mariadb-10.4.13.tar.gz 80608459 BLAKE2B e9ada14da6ec7492311068549a5b6e5a66e1177312013b25472c084a21fbace543ec43b47f2e12190d45432648d508f311198521f42359561f8d75ea60f98205 SHA512 68919ceffb3d4afdd0d94daa77439a954c82ce4e08fbe06044fc397940eeb88a39ec75932cbd08ff26ef3cf7636fdb779947cda5b2764aa1fd888be19c44b566 |
36 |
DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B f32e1d383ffd99de431bc34c36101c71c5e631344527e96b80ca6bd0a68015b45a4c33d6f0518cb4aa2bcfd493b64b6607671450ca045243404c0d65ebbc66fd SHA512 201fe82cbcca705dba52b32405d463b5569d97a5ffd9fd2967ec7fc3c3ff305011b3d2c3c0e9f7c19aaac57b26661bd361f3b6da6f3812f25934ec18856c7051 |
37 |
DIST mariadb-10.4.14.tar.gz 80789865 BLAKE2B fed455e906af9fe105f52cc7180a6b8d8839fdbffac079f2ced265741c2ab8010c78c0e75ff77740d45a2bd02a15c379bdb3a0237152848a0ce1a7aaac4cbf32 SHA512 c09817c1dd7962132bcf2886c97ad17ce43c00ee687724028e5f39f6a6a93877ae8695c2c795abba6a4f3bc40674f93a53d6d43f46788a4a8a42c4a65a22c91c |
38 |
+DIST mariadb-10.5.5-patches-01.tar.xz 5540 BLAKE2B 6d88b3486d0a92dd62117e065a11e2789cb318385b936b471c101f166793019e1eda74d7e56faa29ce8158d24f9544aff28405ffdb70bf82e22747503099ed54 SHA512 486f518a0d7ee9b38a1aaa4b24ef3c30df285bf0864b5b88ac26f36274736ee14e683c4afc652713b7040c78faeffd495be05869b18ed9563f64f9dfbacfb636 |
39 |
+DIST mariadb-10.5.5.tar.gz 86880268 BLAKE2B 58430dd4e7199d674bbd4f7381a56129e067ed1bb30c171545fe9fac3a83f7db2c57cc1b577ef242deb99dd69e17a1d3cbf756031711d27b04c97a7e93e14c60 SHA512 09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45 |
40 |
DIST mariadb-5.5.68.tar.gz 45969389 BLAKE2B 5b3a647649c614825adccbc83faa40ba330dae0a1f8005b2297cc6a44fbc00bf817f2d854af315f995e1065bd4d14a2f21a9cec44b5c78402524467d876d8157 SHA512 3419790aa88a7e2a5d80e56ca94683d22ca2d5d817dfe19904d11454f34cfc3b9d55e603295ea58580a3c9fe96a6c6f9b650e1058c4e8f2f2e82f09165436865 |
41 |
DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c |
42 |
DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 3ad0da663c31831d3b511b88df34b6a28bb781cfd88fd4479b43273aa15946e63c7ae43d5497207edc6cc53a72bd42b8ce2e2058dfb236afd940bd0282190e98 SHA512 8f7b39017efb08e1ae98c4c68728bc86f8427b88b2a22688abf6975c6706122086dc93289beb511bbaf17cd5a790c76406e81315a11830829efe9170ce4f6a42 |
43 |
|
44 |
diff --git a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild |
45 |
index bfba9298006..b205f74ad1b 100644 |
46 |
--- a/dev-db/mariadb/mariadb-10.1.38-r2.ebuild |
47 |
+++ b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild |
48 |
@@ -124,6 +124,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
49 |
!dev-db/mariadb:10.2 |
50 |
!dev-db/mariadb:10.3 |
51 |
!dev-db/mariadb:10.4 |
52 |
+ !dev-db/mariadb:10.5 |
53 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
54 |
${COMMON_DEPEND} |
55 |
server? ( galera? ( |
56 |
|
57 |
diff --git a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild |
58 |
index fc55747077f..616c340d5a8 100644 |
59 |
--- a/dev-db/mariadb/mariadb-10.1.45-r1.ebuild |
60 |
+++ b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild |
61 |
@@ -101,6 +101,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
62 |
!dev-db/mariadb:10.2 |
63 |
!dev-db/mariadb:10.3 |
64 |
!dev-db/mariadb:10.4 |
65 |
+ !dev-db/mariadb:10.5 |
66 |
${COMMON_DEPEND} |
67 |
server? ( |
68 |
galera? ( |
69 |
|
70 |
diff --git a/dev-db/mariadb/mariadb-10.1.46.ebuild b/dev-db/mariadb/mariadb-10.1.46.ebuild |
71 |
index e9d43232481..fd560e8d61a 100644 |
72 |
--- a/dev-db/mariadb/mariadb-10.1.46.ebuild |
73 |
+++ b/dev-db/mariadb/mariadb-10.1.46.ebuild |
74 |
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
75 |
!dev-db/mariadb:10.2 |
76 |
!dev-db/mariadb:10.3 |
77 |
!dev-db/mariadb:10.4 |
78 |
+ !dev-db/mariadb:10.5 |
79 |
${COMMON_DEPEND} |
80 |
server? ( |
81 |
galera? ( |
82 |
|
83 |
diff --git a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild |
84 |
index b5c367e1a8e..aca4c6dfa4c 100644 |
85 |
--- a/dev-db/mariadb/mariadb-10.2.22-r2.ebuild |
86 |
+++ b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild |
87 |
@@ -121,6 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
88 |
!dev-db/mariadb:10.1 |
89 |
!dev-db/mariadb:10.3 |
90 |
!dev-db/mariadb:10.4 |
91 |
+ !dev-db/mariadb:10.5 |
92 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
93 |
!<virtual/mysql-5.6-r11 |
94 |
${COMMON_DEPEND} |
95 |
|
96 |
diff --git a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
97 |
index ca39cb54e8e..7476d450f20 100644 |
98 |
--- a/dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
99 |
+++ b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
100 |
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
101 |
!dev-db/mariadb:10.1 |
102 |
!dev-db/mariadb:10.3 |
103 |
!dev-db/mariadb:10.4 |
104 |
+ !dev-db/mariadb:10.5 |
105 |
!<virtual/mysql-5.6-r11 |
106 |
${COMMON_DEPEND} |
107 |
server? ( |
108 |
|
109 |
diff --git a/dev-db/mariadb/mariadb-10.2.33.ebuild b/dev-db/mariadb/mariadb-10.2.33.ebuild |
110 |
index 9671215c778..636a95ff869 100644 |
111 |
--- a/dev-db/mariadb/mariadb-10.2.33.ebuild |
112 |
+++ b/dev-db/mariadb/mariadb-10.2.33.ebuild |
113 |
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
114 |
!dev-db/mariadb:10.1 |
115 |
!dev-db/mariadb:10.3 |
116 |
!dev-db/mariadb:10.4 |
117 |
+ !dev-db/mariadb:10.5 |
118 |
!<virtual/mysql-5.6-r11 |
119 |
${COMMON_DEPEND} |
120 |
server? ( |
121 |
|
122 |
diff --git a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
123 |
index f63ef5a0ee5..815d86f66db 100644 |
124 |
--- a/dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
125 |
+++ b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
126 |
@@ -99,6 +99,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
127 |
!dev-db/mariadb:10.1 |
128 |
!dev-db/mariadb:10.2 |
129 |
!dev-db/mariadb:10.4 |
130 |
+ !dev-db/mariadb:10.5 |
131 |
!<virtual/mysql-5.6-r11 |
132 |
${COMMON_DEPEND} |
133 |
server? ( |
134 |
|
135 |
diff --git a/dev-db/mariadb/mariadb-10.3.24.ebuild b/dev-db/mariadb/mariadb-10.3.24.ebuild |
136 |
index bb73a04a666..d32933c9d72 100644 |
137 |
--- a/dev-db/mariadb/mariadb-10.3.24.ebuild |
138 |
+++ b/dev-db/mariadb/mariadb-10.3.24.ebuild |
139 |
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
140 |
!dev-db/mariadb:10.1 |
141 |
!dev-db/mariadb:10.2 |
142 |
!dev-db/mariadb:10.4 |
143 |
+ !dev-db/mariadb:10.5 |
144 |
!<virtual/mysql-5.6-r11 |
145 |
${COMMON_DEPEND} |
146 |
server? ( |
147 |
|
148 |
diff --git a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
149 |
index c3f5498cbf0..f879d6f9a0e 100644 |
150 |
--- a/dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
151 |
+++ b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
152 |
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
153 |
!dev-db/mariadb:10.1 |
154 |
!dev-db/mariadb:10.2 |
155 |
!dev-db/mariadb:10.3 |
156 |
+ !dev-db/mariadb:10.5 |
157 |
!<virtual/mysql-5.6-r11 |
158 |
!<virtual/libmysqlclient-18-r1 |
159 |
${COMMON_DEPEND} |
160 |
|
161 |
diff --git a/dev-db/mariadb/mariadb-10.4.14.ebuild b/dev-db/mariadb/mariadb-10.4.14.ebuild |
162 |
index 6507572001a..2f7ec2673f4 100644 |
163 |
--- a/dev-db/mariadb/mariadb-10.4.14.ebuild |
164 |
+++ b/dev-db/mariadb/mariadb-10.4.14.ebuild |
165 |
@@ -98,6 +98,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
166 |
!dev-db/mariadb:10.1 |
167 |
!dev-db/mariadb:10.2 |
168 |
!dev-db/mariadb:10.3 |
169 |
+ !dev-db/mariadb:10.5 |
170 |
!<virtual/mysql-5.6-r11 |
171 |
!<virtual/libmysqlclient-18-r1 |
172 |
${COMMON_DEPEND} |
173 |
|
174 |
diff --git a/dev-db/mariadb/mariadb-10.4.14.ebuild b/dev-db/mariadb/mariadb-10.5.5.ebuild |
175 |
similarity index 97% |
176 |
copy from dev-db/mariadb/mariadb-10.4.14.ebuild |
177 |
copy to dev-db/mariadb/mariadb-10.5.5.ebuild |
178 |
index 6507572001a..225a5523321 100644 |
179 |
--- a/dev-db/mariadb/mariadb-10.4.14.ebuild |
180 |
+++ b/dev-db/mariadb/mariadb-10.5.5.ebuild |
181 |
@@ -10,7 +10,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \ |
182 |
multiprocessing java-pkg-opt-2 cmake |
183 |
|
184 |
# Patch version |
185 |
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.14-patches-01.tar.xz" |
186 |
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.5-patches-01.tar.xz" |
187 |
|
188 |
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz |
189 |
${PATCH_SET}" |
190 |
@@ -18,11 +18,11 @@ SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz |
191 |
HOMEPAGE="https://mariadb.org/" |
192 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
193 |
LICENSE="GPL-2 LGPL-2.1+" |
194 |
-SLOT="10.4/${SUBSLOT:-0}" |
195 |
-IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4 |
196 |
+SLOT="10.5/${SUBSLOT:-0}" |
197 |
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4 |
198 |
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga |
199 |
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx |
200 |
- sst-rsync sst-mariabackup static systemd systemtap tcmalloc |
201 |
+ sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc |
202 |
test tokudb xml yassl" |
203 |
|
204 |
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests |
205 |
@@ -42,29 +42,30 @@ S="${WORKDIR}/mysql" |
206 |
# Be warned, *DEPEND are version-dependant |
207 |
# These are used for both runtime and compiletime |
208 |
COMMON_DEPEND=" |
209 |
- kernel_linux? ( |
210 |
- sys-process/procps:0= |
211 |
- dev-libs/libaio:0= |
212 |
- ) |
213 |
+ >=dev-libs/libpcre-8.41-r1:3= |
214 |
>=sys-apps/sed-4 |
215 |
>=sys-apps/texinfo-4.7-r1 |
216 |
- jemalloc? ( dev-libs/jemalloc:0= ) |
217 |
- tcmalloc? ( dev-util/google-perftools:0= ) |
218 |
- systemtap? ( >=dev-util/systemtap-1.3:0= ) |
219 |
- >=sys-libs/zlib-1.2.3:0= |
220 |
- kerberos? ( virtual/krb5 ) |
221 |
- yassl? ( net-libs/gnutls:0= ) |
222 |
- !yassl? ( |
223 |
- !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
224 |
- libressl? ( dev-libs/libressl:0= ) |
225 |
- ) |
226 |
sys-libs/ncurses:0= |
227 |
+ >=sys-libs/zlib-1.2.3:0= |
228 |
!bindist? ( |
229 |
sys-libs/binutils-libs:0= |
230 |
>=sys-libs/readline-4.1:0= |
231 |
) |
232 |
+ jemalloc? ( dev-libs/jemalloc:0= ) |
233 |
+ kerberos? ( virtual/krb5 ) |
234 |
+ kernel_linux? ( |
235 |
+ sys-process/procps:0= |
236 |
+ dev-libs/libaio:0= |
237 |
+ ) |
238 |
server? ( |
239 |
+ app-arch/bzip2 |
240 |
+ app-arch/xz-utils |
241 |
backup? ( app-arch/libarchive:0= ) |
242 |
+ columnstore? ( |
243 |
+ app-arch/snappy |
244 |
+ dev-libs/boost:0= |
245 |
+ dev-libs/libxml2:2= |
246 |
+ ) |
247 |
cracklib? ( sys-libs/cracklib:0= ) |
248 |
extraengine? ( |
249 |
odbc? ( dev-db/unixODBC:0= ) |
250 |
@@ -77,31 +78,42 @@ COMMON_DEPEND=" |
251 |
numa? ( sys-process/numactl ) |
252 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
253 |
pam? ( sys-libs/pam:0= ) |
254 |
+ s3? ( net-misc/curl ) |
255 |
systemd? ( sys-apps/systemd:= ) |
256 |
tokudb? ( app-arch/snappy ) |
257 |
) |
258 |
- >=dev-libs/libpcre-8.41-r1:3= |
259 |
+ systemtap? ( >=dev-util/systemtap-1.3:0= ) |
260 |
+ tcmalloc? ( dev-util/google-perftools:0= ) |
261 |
+ yassl? ( net-libs/gnutls:0= ) |
262 |
+ !yassl? ( |
263 |
+ !libressl? ( >=dev-libs/openssl-1.0.0:0= ) |
264 |
+ libressl? ( dev-libs/libressl:0= ) |
265 |
+ ) |
266 |
" |
267 |
BDEPEND="virtual/yacc |
268 |
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
269 |
" |
270 |
-DEPEND="static? ( sys-libs/ncurses[static-libs] ) |
271 |
+DEPEND="${COMMON_DEPEND} |
272 |
server? ( |
273 |
extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) |
274 |
test? ( acct-group/mysql acct-user/mysql ) |
275 |
) |
276 |
- ${COMMON_DEPEND}" |
277 |
-RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
278 |
+ static? ( sys-libs/ncurses[static-libs] ) |
279 |
+" |
280 |
+RDEPEND="${COMMON_DEPEND} |
281 |
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster |
282 |
!dev-db/mariadb:0 |
283 |
!dev-db/mariadb:5.5 |
284 |
!dev-db/mariadb:10.1 |
285 |
!dev-db/mariadb:10.2 |
286 |
!dev-db/mariadb:10.3 |
287 |
+ !dev-db/mariadb:10.4 |
288 |
!<virtual/mysql-5.6-r11 |
289 |
!<virtual/libmysqlclient-18-r1 |
290 |
- ${COMMON_DEPEND} |
291 |
+ selinux? ( sec-policy/selinux-mysql ) |
292 |
server? ( |
293 |
+ columnstore? ( dev-db/mariadb-connector-c ) |
294 |
+ extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) |
295 |
galera? ( |
296 |
sys-apps/iproute2 |
297 |
=sys-cluster/galera-26* |
298 |
@@ -109,7 +121,6 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
299 |
sst-mariabackup? ( net-misc/socat[ssl] ) |
300 |
) |
301 |
!prefix? ( dev-db/mysql-init-scripts acct-group/mysql acct-user/mysql ) |
302 |
- extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) |
303 |
) |
304 |
perl? ( |
305 |
!dev-db/mytop |
306 |
@@ -381,7 +392,8 @@ src_configure() { |
307 |
if ! use extraengine ; then |
308 |
mycmakeargs+=( |
309 |
-DPLUGIN_FEDERATED=NO |
310 |
- -DPLUGIN_FEDERATEDX=NO ) |
311 |
+ -DPLUGIN_FEDERATEDX=NO |
312 |
+ ) |
313 |
fi |
314 |
|
315 |
mycmakeargs+=( |
316 |
@@ -394,6 +406,8 @@ src_configure() { |
317 |
-DPLUGIN_CASSANDRA=NO |
318 |
-DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
319 |
-DPLUGIN_SPIDER=$(usex extraengine YES NO) |
320 |
+ -DPLUGIN_S3=$(usex s3 YES NO) |
321 |
+ -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO) |
322 |
-DPLUGIN_CONNECT=$(usex extraengine YES NO) |
323 |
-DCONNECT_WITH_MYSQL=1 |
324 |
-DCONNECT_WITH_LIBXML2=$(usex xml) |
325 |
|
326 |
diff --git a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild |
327 |
index c89f8fe71c5..017c5030683 100644 |
328 |
--- a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild |
329 |
+++ b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild |
330 |
@@ -100,6 +100,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
331 |
!dev-db/mariadb:10.2 |
332 |
!dev-db/mariadb:10.3 |
333 |
!dev-db/mariadb:10.4 |
334 |
+ !dev-db/mariadb:10.5 |
335 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
336 |
${COMMON_DEPEND} |
337 |
perl? ( !dev-db/mytop |
338 |
|
339 |
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml |
340 |
index 3419b52226e..74d8b5649ce 100644 |
341 |
--- a/dev-db/mariadb/metadata.xml |
342 |
+++ b/dev-db/mariadb/metadata.xml |
343 |
@@ -8,6 +8,7 @@ |
344 |
<use> |
345 |
<flag name="backup">Build mariadb-backup which supports SST and hot backup of InnoDB, Aria and MyISAM including compression and encryption</flag> |
346 |
<flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages</flag> |
347 |
+ <flag name="columnstore">Build the ColumnStore storage engine</flag> |
348 |
<flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag> |
349 |
<flag name="galera">Enables galera replication</flag> |
350 |
<flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag> |
351 |
@@ -28,6 +29,7 @@ |
352 |
<flag name="sst-mariabackup">Add tools needed to support the mariabackup SST method</flag> |
353 |
<flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag> |
354 |
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag> |
355 |
+ <flag name="s3">Build the S3 storage engine</flag> |
356 |
<flag name="test">Install upstream testsuites for end use.</flag> |
357 |
<flag name="tokudb">Add support for TokuDB storage engine</flag> |
358 |
<flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag> |