Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-galera/, dev-db/mariadb-galera/files/
Date: Mon, 17 Jul 2017 19:26:50
Message-Id: 1500319586.c3de5f879a1719367ba012424670b16a1efd5916.grknight@gentoo
1 commit: c3de5f879a1719367ba012424670b16a1efd5916
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 17 19:26:26 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 17 19:26:26 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c3de5f87
7
8 Drop deprecated mariadb-galera from overlay
9
10 dev-db/mariadb-galera/ChangeLog | 55 -------
11 dev-db/mariadb-galera/Manifest | 24 ----
12 dev-db/mariadb-galera/files/my.cnf-5.5 | 159 ---------------------
13 dev-db/mariadb-galera/files/my.cnf-5.6 | 159 ---------------------
14 .../mariadb-galera/mariadb-galera-10.0.22.ebuild | 135 -----------------
15 dev-db/mariadb-galera/metadata.xml | 37 -----
16 6 files changed, 569 deletions(-)
17
18 diff --git a/dev-db/mariadb-galera/ChangeLog b/dev-db/mariadb-galera/ChangeLog
19 deleted file mode 100644
20 index f53d068..0000000
21 --- a/dev-db/mariadb-galera/ChangeLog
22 +++ /dev/null
23 @@ -1,55 +0,0 @@
24 - 19 Nov 2015; Brian Evans <grknight@g.o> -mariadb-galera-10.0.20.ebuild,
25 - -mariadb-galera-10.0.21.ebuild, metadata.xml:
26 - dev-db/mariadb-galera: Drop old vulnerable versions
27 -
28 - 19 Nov 2015; Brian Evans <grknight@g.o> metadata.xml:
29 - dev-db/mariadb-galera: Remove old cluster description from metadata
30 -
31 -*mariadb-galera-10.0.22 (19 Nov 2015)
32 -
33 - 19 Nov 2015; Brian Evans <grknight@g.o> +mariadb-galera-10.0.22.ebuild:
34 - dev-db/mariadb-galera: Version bump
35 -
36 -*mariadb-galera-10.0.21 (19 Aug 2015)
37 -
38 - 19 Aug 2015; Brian Evans <grknight@g.o> +mariadb-galera-10.0.21.ebuild,
39 - -mariadb-galera-10.0.20-r1.ebuild:
40 - dev-db/mariadb-galera: Version bump
41 -
42 -*mariadb-galera-10.0.19 (10 Jun 2015)
43 -
44 - 10 Jun 2015; Brian Evans <grknight@g.o> +mariadb-galera-10.0.19.ebuild,
45 - -mariadb-galera-10.0.16.ebuild, -mariadb-galera-10.0.17.ebuild:
46 - Version bump; drop old
47 -
48 -*mariadb-galera-10.0.17 (03 Apr 2015)
49 -
50 - 03 Apr 2015; Brian Evans <grknight@g.o> +mariadb-galera-10.0.17.ebuild:
51 - Version bump
52 -
53 -*mariadb-galera-10.0.12 (30 Jul 2014)
54 -
55 - 30 Jul 2014; Robin H. Johnson <robbat2@g.o>
56 - +mariadb-galera-10.0.12.ebuild, -mariadb-galera-10.0.10_beta.ebuild,
57 - -mariadb-galera-10.0.11.ebuild:
58 - mariadb-galera merge back from the tree. unsure if we should keep the 5.5
59 - series for reference.
60 -
61 -*mariadb-galera-5.5.35 (14 Feb 2014)
62 -
63 - 14 Feb 2014; <grknight@g.o> +mariadb-galera-5.5.35.ebuild,
64 - -mariadb-galera-5.5.33a.ebuild:
65 - [mariadb-galera] Version bump to 5.5.35
66 -
67 -*mariadb-galera-5.5.33a (09 Oct 2013)
68 -
69 - 09 Oct 2013; Brian Evans <grknight@××××××××.com>
70 - +mariadb-galera-5.5.33a.ebuild:
71 - [mariadb-galera] Version bump to 5.5.33a
72 -
73 -*mariadb-galera-5.5.32 (17 Sep 2013)
74 -
75 - 17 Sep 2013; Brian Evans <grknight@××××××××.com>
76 - +mariadb-galera-5.5.32.ebuild:
77 - [mariadb-galera] Version bump to 5.5.32 sys_vars.all_vars test fails but known
78 - upstream per IRC as a variable name was missed and not added in test
79
80 diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
81 deleted file mode 100644
82 index c354846..0000000
83 --- a/dev-db/mariadb-galera/Manifest
84 +++ /dev/null
85 @@ -1,24 +0,0 @@
86 ------BEGIN PGP SIGNED MESSAGE-----
87 -Hash: SHA256
88 -
89 -DIST mariadb-galera-10.0.22.tar.gz 56593286 SHA256 03707fe86add4ed3a1039d1c2d2a1eca768feef15bf8499d6a61bdeb0802de9e SHA512 4dd508293235fc786f1d3ada37b20284f591e16c50aea06514de3d5310f01ef22d01c8345226395ddccc0ee8c96b952a6e7b17f94b248cb6977bf40fff7c117f WHIRLPOOL 612f8910a9549aab4e77f1580570500fc4591d6f034728be55c2af8cd861e1170289c82db622cb34116aa0131c2ba89b32290fff5e863c96693ed1825eeaf070
90 -DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
91 ------BEGIN PGP SIGNATURE-----
92 -Version: GnuPG v2.1
93 -
94 -iQJ8BAEBCABmBQJWTip1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
95 -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
96 -MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2jSQP+QEtmpkWzztGxTDchLTSS+K0
97 -8bZ4Y1h0NUVNUBuWMtGYO+rB5Li3PWkEjdImstNyUSEml0BABKgXf5natiXQx/Tw
98 -C2+b21ISkSMg8Y37QHeTiCh6YDF3rXIXq0hL62cBbAe+9kb5aFTggnzZVWUX3Tcv
99 -DzTvB6J3pe/ki5FZ65bUXAf8jNxatmOtfC+f2oREwUbd+yxjAb9aHFBzooBUKhNn
100 -zlGhBerBWD38f/Fw4L+4XP5bHvaeyrZ5rw934ZE7kUDpXcBKUDDLSZNtvHNgwCGa
101 -YUvz5sWncQHFg3EUmmeo0j2rKOC9jKRTXPgGxDPEH1Q21Te5pzPZua91dVq6rRmB
102 -3NKnUdKmwL2SjgLqzXFDmGHQtuEy0VHx67UOvS/x5NaktuAkAGxOjP+BxaGXaKEk
103 -FKcTMbFE+7o8hvA8jkLCGzgXSSiufwp7UYDl2WZ6oWCzBPl4HzHxoS6T9vh4uYh6
104 -NqwjRZZNggGh7+wTm+FTHWzGPjye+VFi8cCYqSdMOR1qTDDuIAV8d1etIn8p8qHr
105 -edNUIrEeqalDck9o1KXm4pk59ULMK6tpUqD/hiC7ByH9sVroLGGgJfEjWN/ftg28
106 -2mKqdoc+U7/Dttn2NPnyIZz1px1qOQvhLaTvzJj4QqYuchKtC0tElrMhcl1fa6Tr
107 -+4pK3qIPk8BNzOjmf2wB
108 -=95rh
109 ------END PGP SIGNATURE-----
110
111 diff --git a/dev-db/mariadb-galera/files/my.cnf-5.5 b/dev-db/mariadb-galera/files/my.cnf-5.5
112 deleted file mode 100644
113 index 08a2060..0000000
114 --- a/dev-db/mariadb-galera/files/my.cnf-5.5
115 +++ /dev/null
116 @@ -1,159 +0,0 @@
117 -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
118 -# $Id$
119 -
120 -# The following options will be passed to all MySQL clients
121 -[client]
122 -#password = your_password
123 -port = 3306
124 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
125 -
126 -[mysql]
127 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
128 -default-character-set=utf8
129 -
130 -[mysqladmin]
131 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
132 -default-character-set=utf8
133 -
134 -[mysqlcheck]
135 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
136 -default-character-set=utf8
137 -
138 -[mysqldump]
139 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
140 -default-character-set=utf8
141 -
142 -[mysqlimport]
143 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
144 -default-character-set=utf8
145 -
146 -[mysqlshow]
147 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
148 -default-character-set=utf8
149 -
150 -[myisamchk]
151 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
152 -
153 -[myisampack]
154 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
155 -
156 -# use [safe_mysqld] with mysql-3
157 -[mysqld_safe]
158 -err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
159 -
160 -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
161 -[mysqld]
162 -character-set-server = utf8
163 -user = mysql
164 -port = 3306
165 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
166 -pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
167 -log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
168 -basedir = @GENTOO_PORTAGE_EPREFIX@/usr
169 -datadir = @DATADIR@
170 -skip-external-locking
171 -key_buffer_size = 16M
172 -max_allowed_packet = 1M
173 -table_open_cache = 64
174 -sort_buffer_size = 512K
175 -net_buffer_length = 8K
176 -read_buffer_size = 256K
177 -read_rnd_buffer_size = 512K
178 -myisam_sort_buffer_size = 8M
179 -lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
180 -#Set this to your desired error message language
181 -lc_messages = en_US
182 -
183 -log-bin
184 -server-id = 1
185 -
186 -# point the following paths to different dedicated disks
187 -tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
188 -#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
189 -
190 -# you need the debug USE flag enabled to use the following directives,
191 -# if needed, uncomment them, start the server and issue
192 -# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
193 -# this will show you *exactly* what's happening in your server ;)
194 -
195 -#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
196 -#gdb
197 -#debug = d:t:i:o,/tmp/mysqld.trace
198 -#one-thread
199 -
200 -# the following is the InnoDB configuration
201 -# if you wish to disable innodb instead
202 -# uncomment just the next line
203 -#skip-innodb
204 -#
205 -# the rest of the innodb config follows:
206 -# don't eat too much memory, we're trying to be safe on 64Mb boxes
207 -# you might want to bump this up a bit on boxes with more RAM
208 -innodb_buffer_pool_size = 16M
209 -# this is the default, increase it if you have lots of tables
210 -innodb_additional_mem_pool_size = 2M
211 -#
212 -# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
213 -# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
214 -# we have to take for the moment
215 -#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
216 -#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
217 -#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
218 -# you may wish to change this size to be more suitable for your system
219 -# the max is there to avoid run-away growth on your machine
220 -innodb_data_file_path = ibdata1:10M:autoextend:max:128M
221 -# we keep this at around 25% of of innodb_buffer_pool_size
222 -# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
223 -innodb_log_file_size = 5M
224 -# this is the default, increase it if you have very large transactions going on
225 -innodb_log_buffer_size = 8M
226 -# this is the default and won't hurt you
227 -# you shouldn't need to tweak it
228 -innodb_log_files_in_group=2
229 -# see the innodb config docs, the other options are not always safe
230 -innodb_flush_log_at_trx_commit = 1
231 -innodb_lock_wait_timeout = 50
232 -innodb_file_per_table
233 -
234 -# Uncomment this to get FEDERATED engine support
235 -#plugin-load=federated=ha_federated.so
236 -loose-federated
237 -
238 -# These settings are required for Galera clustering
239 -#mysql settings
240 -binlog_format=ROW
241 -default-storage-engine=innodb
242 -innodb_autoinc_lock_mode=2
243 -query_cache_size=0
244 -query_cache_type=0
245 -bind-address=0.0.0.0
246 -# Uncomment this section to activate Galera clustering
247 -#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
248 -# You should change this name to something meaningful
249 -#wsrep_cluster_name="my_wsrep_cluster"
250 -# List all nodes of the cluster including this one
251 -#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
252 -#wsrep_sst_method=rsync
253 -
254 -[mysqldump]
255 -quick
256 -max_allowed_packet = 16M
257 -
258 -[mysql]
259 -# uncomment the next directive if you are not familiar with SQL
260 -#safe-updates
261 -
262 -[isamchk]
263 -key_buffer_size = 20M
264 -sort_buffer_size = 20M
265 -read_buffer = 2M
266 -write_buffer = 2M
267 -
268 -[myisamchk]
269 -key_buffer_size = 20M
270 -sort_buffer_size = 20M
271 -read_buffer_size = 2M
272 -write_buffer_size = 2M
273 -
274 -[mysqlhotcopy]
275 -interactive-timeout
276
277 diff --git a/dev-db/mariadb-galera/files/my.cnf-5.6 b/dev-db/mariadb-galera/files/my.cnf-5.6
278 deleted file mode 100644
279 index c0b221c..0000000
280 --- a/dev-db/mariadb-galera/files/my.cnf-5.6
281 +++ /dev/null
282 @@ -1,159 +0,0 @@
283 -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file.
284 -# $Id$
285 -
286 -# The following options will be passed to all MySQL clients
287 -[client]
288 -#password = your_password
289 -port = 3306
290 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
291 -
292 -[mysql]
293 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
294 -default-character-set=utf8
295 -
296 -[mysqladmin]
297 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
298 -default-character-set=utf8
299 -
300 -[mysqlcheck]
301 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
302 -default-character-set=utf8
303 -
304 -[mysqldump]
305 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
306 -default-character-set=utf8
307 -
308 -[mysqlimport]
309 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
310 -default-character-set=utf8
311 -
312 -[mysqlshow]
313 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
314 -default-character-set=utf8
315 -
316 -[myisamchk]
317 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
318 -
319 -[myisampack]
320 -character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets
321 -
322 -# use [safe_mysqld] with mysql-3
323 -[mysqld_safe]
324 -err-log = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
325 -
326 -# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
327 -[mysqld]
328 -character-set-server = utf8
329 -user = mysql
330 -port = 3306
331 -socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
332 -pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
333 -log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
334 -basedir = @GENTOO_PORTAGE_EPREFIX@/usr
335 -datadir = @DATADIR@
336 -skip-external-locking
337 -key_buffer_size = 16M
338 -max_allowed_packet = 4M
339 -table_open_cache = 400
340 -sort_buffer_size = 512K
341 -net_buffer_length = 16K
342 -read_buffer_size = 256K
343 -read_rnd_buffer_size = 512K
344 -myisam_sort_buffer_size = 8M
345 -lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql
346 -#Set this to your desired error message language
347 -lc_messages = en_US
348 -
349 -# security:
350 -# using "localhost" in connects uses sockets by default
351 -# skip-networking
352 -bind-address = 127.0.0.1
353 -
354 -log-bin
355 -server-id = 1
356 -
357 -# point the following paths to different dedicated disks
358 -tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/
359 -#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
360 -
361 -# you need the debug USE flag enabled to use the following directives,
362 -# if needed, uncomment them, start the server and issue
363 -# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
364 -# this will show you *exactly* what's happening in your server ;)
365 -
366 -#log = @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
367 -#gdb
368 -#debug = d:t:i:o,/tmp/mysqld.trace
369 -#one-thread
370 -
371 -# the rest of the innodb config follows:
372 -# don't eat too much memory, we're trying to be safe on 64Mb boxes
373 -# you might want to bump this up a bit on boxes with more RAM
374 -innodb_buffer_pool_size = 128M
375 -#
376 -# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is seen as a database :-(
377 -# and upstream wants things to be under @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
378 -# we have to take for the moment
379 -#innodb_data_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
380 -#innodb_log_arch_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
381 -#innodb_log_group_home_dir = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
382 -# you may wish to change this size to be more suitable for your system
383 -# the max is there to avoid run-away growth on your machine
384 -innodb_data_file_path = ibdata1:10M:autoextend:max:128M
385 -# we keep this at around 25% of of innodb_buffer_pool_size
386 -# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
387 -innodb_log_file_size = 48M
388 -# this is the default, increase it if you have very large transactions going on
389 -innodb_log_buffer_size = 8M
390 -# this is the default and won't hurt you
391 -# you shouldn't need to tweak it
392 -innodb_log_files_in_group=2
393 -# see the innodb config docs, the other options are not always safe
394 -innodb_flush_log_at_trx_commit = 1
395 -innodb_lock_wait_timeout = 50
396 -innodb_file_per_table
397 -
398 -# Uncomment this to get FEDERATED engine support
399 -#plugin-load=federated=ha_federated.so
400 -loose-federated
401 -
402 -# These settings are required for Galera clustering
403 -#mysql settings
404 -binlog_format=ROW
405 -default-storage-engine=innodb
406 -innodb_autoinc_lock_mode=2
407 -query_cache_size=0
408 -query_cache_type=0
409 -bind-address=0.0.0.0
410 -# Uncomment this section to activate Galera clustering
411 -#wsrep_provider=@GENTOO_PORTAGE_EPREFIX@/usr/lib/galera/libgalera_smm.so
412 -# You should change this name to something meaningful
413 -#wsrep_cluster_name="my_wsrep_cluster"
414 -# List all nodes of the cluster including this one
415 -#wsrep_cluster_address="gcomm://172.16.8.5,172.16.8.6,172.16.8.4"
416 -#wsrep_sst_method=rsync
417 -
418 -[mysqldump]
419 -quick
420 -max_allowed_packet = 16M
421 -
422 -[mysql]
423 -# uncomment the next directive if you are not familiar with SQL
424 -#safe-updates
425 -
426 -[isamchk]
427 -key_buffer_size = 20M
428 -sort_buffer_size = 20M
429 -read_buffer = 2M
430 -write_buffer = 2M
431 -
432 -[myisamchk]
433 -key_buffer_size = 20M
434 -sort_buffer_size = 20M
435 -read_buffer_size = 2M
436 -write_buffer_size = 2M
437 -
438 -[mysqlhotcopy]
439 -interactive-timeout
440 -
441 -[mariadb]
442
443 diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
444 deleted file mode 100644
445 index 6c42d50..0000000
446 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.22.ebuild
447 +++ /dev/null
448 @@ -1,135 +0,0 @@
449 -# Copyright 1999-2017 Gentoo Foundation
450 -# Distributed under the terms of the GNU General Public License v2
451 -
452 -EAPI="5"
453 -MY_EXTRAS_VER="20150717-1707Z"
454 -WSREP_REVISION="25"
455 -HAS_TOOLS_PATCH="1"
456 -SUBSLOT="18"
457 -
458 -inherit toolchain-funcs mysql-multilib
459 -# only to make repoman happy. it is really set in the eclass
460 -IUSE="$IUSE"
461 -
462 -# REMEMBER: also update eclass/mysql*.eclass before committing!
463 -KEYWORDS="~amd64 ~x86"
464 -
465 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
466 -EPATCH_EXCLUDE=''
467 -
468 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
469 -RDEPEND="${RDEPEND}"
470 -
471 -# Please do not add a naive src_unpack to this ebuild
472 -# If you want to add a single patch, copy the ebuild to an overlay
473 -# and create your own mysql-extras tarball, looking at 000_index.txt
474 -
475 -# Official test instructions:
476 -# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
477 -# FEATURES='test userpriv -usersandbox' \
478 -# ebuild mariadb-galera-X.X.XX.ebuild \
479 -# digest clean package
480 -multilib_src_test() {
481 -
482 - if ! multilib_is_native_abi ; then
483 - einfo "Server tests not available on non-native abi".
484 - return 0;
485 - fi
486 -
487 - local TESTDIR="${BUILD_DIR}/mysql-test"
488 - local retstatus_unit
489 - local retstatus_tests
490 -
491 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
492 - # localhost. Also causes weird failures.
493 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
494 -
495 - if use server ; then
496 -
497 - if [[ $UID -eq 0 ]]; then
498 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
499 - fi
500 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
501 -
502 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
503 - addpredict /this-dir-does-not-exist/t9.MYI
504 -
505 - # Run CTest (test-units)
506 - cmake-utils_src_test
507 - retstatus_unit=$?
508 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
509 -
510 - # Ensure that parallel runs don't die
511 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
512 - # Enable parallel testing, auto will try to detect number of cores
513 - # You may set this by hand.
514 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
515 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
516 -
517 - # create directories because mysqladmin might right out of order
518 - mkdir -p "${T}"/var-tests{,/log}
519 -
520 - # Create a symlink to provided binaries so the tests can find them when client-libs is off
521 - if ! use client-libs ; then
522 - ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
523 - ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
524 - mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
525 - fi
526 -
527 - # These are failing in MariaDB 10.0 for now and are believed to be
528 - # false positives:
529 - #
530 - # main.information_schema, binlog.binlog_statement_insert_delayed,
531 - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
532 - # funcs_1.is_columns_mysql, main.bootstrap
533 - # fails due to USE=-latin1 / utf8 default
534 - #
535 - # main.mysql_client_test, main.mysql_client_test_nonblock
536 - # main.mysql_client_test_comp:
537 - # segfaults at random under Portage only, suspect resource limits.
538 - #
539 - # wsrep.variables:
540 - # Expects the sys-cluster/galera library to be installed and configured
541 - #
542 - # wsrep.foreign_key:
543 - # Issues a configuration deprecation warning which does not affect data
544 - #
545 -
546 - for t in main.mysql_client_test main.mysql_client_test_nonblock \
547 - main.mysql_client_test_comp main.bootstrap \
548 - binlog.binlog_statement_insert_delayed main.information_schema \
549 - main.mysqld--help wsrep.variables wsrep.foreign_key \
550 - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
551 - mysql-multilib_disable_test "$t" "False positives in Gentoo"
552 - done
553 -
554 - # Run mysql tests
555 - pushd "${TESTDIR}"
556 -
557 - # run mysql-test tests
558 - # The PATH addition is required for the galera suite to find the sst scripts
559 - WSREP_LOG_DIR="${T}/var-tests/wsrep" \
560 - PATH="${BUILD_DIR}/scripts:${PATH}" \
561 - perl mysql-test-run.pl --force --vardir="${T}/var-tests"
562 - retstatus_tests=$?
563 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
564 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
565 -
566 - popd
567 -
568 - # Cleanup is important for these testcases.
569 - pkill -9 -f "${S}/ndb" 2>/dev/null
570 - pkill -9 -f "${S}/sql" 2>/dev/null
571 -
572 - failures=""
573 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
574 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
575 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
576 -
577 - [[ -z "$failures" ]] || die "Test failures: $failures"
578 - einfo "Tests successfully completed"
579 - else
580 -
581 - einfo "Skipping server tests due to minimal build."
582 - fi
583 -}
584
585 diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
586 deleted file mode 100644
587 index 7315496..0000000
588 --- a/dev-db/mariadb-galera/metadata.xml
589 +++ /dev/null
590 @@ -1,37 +0,0 @@
591 -<?xml version="1.0" encoding="UTF-8"?>
592 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
593 -<pkgmetadata>
594 - <maintainer type="project">
595 - <email>mysql-bugs@g.o</email>
596 - <name>MySQL</name>
597 - </maintainer>
598 - <maintainer type="person">
599 - <email>hasufell@g.o</email>
600 - <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
601 - </maintainer>
602 -<!--
603 -Please note that this list is shared between the following packages:
604 -dev-db/mysql
605 -dev-db/mariadb
606 --->
607 -<use>
608 - <flag name="client-libs">Build the libmysqlclient libraries</flag>
609 - <flag name="embedded">Build embedded server (libmysqld)</flag>
610 - <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
611 - <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
612 - <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
613 - <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
614 - <flag name="oqgraph">Add support for the Open Query GRAPH engine</flag>
615 - <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
616 - <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
617 - <flag name="server">Build the server program</flag>
618 - <flag name="sst-rsync">Add tools needed to support the rsync SST method</flag>
619 - <flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
620 - <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
621 - <flag name="sphinx">Add suport for the sphinx full-text search engine</flag>
622 - <flag name="test">Install upstream testsuites for end use.</flag>
623 - <flag name="tokudb">Add support for TokuDB storage engine</flag>
624 - <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
625 - <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
626 -</use>
627 -</pkgmetadata>