commit:     d04f8446b1b3dc2d19ea1174f06fe76913c0df51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 07:39:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 07:42:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04f8446

dev-db/mariadb: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-db/mariadb/Manifest                 |   4 -
 dev-db/mariadb/files/my.cnf-5.5         | 149 -----
 dev-db/mariadb/files/my.cnf-5.6-r1      | 142 -----
 dev-db/mariadb/mariadb-10.1.47.ebuild   | 925 --------------------------------
 dev-db/mariadb/mariadb-5.5.68-r1.ebuild | 841 -----------------------------
 profiles/package.mask                   |   7 -
 6 files changed, 2068 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1d9a00a2c70..d740ccf3a6d 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,3 @@
-DIST mariadb-10.1.46-patches-01.tar.xz 8824 BLAKE2B 
b30d1c6625d87605fc934007ebfbd449f327969b1f65bb22a1d432691a3927a3f20c55f646f9a4e8cbdcdcadf16a2518e05441ab0088bac876a81f87bb62b925
 SHA512 
93ef056f697d83ced4d585c31558dded94667447fc6785ed79b15dbbde4df4a3667cefec1f2007649dd0fed3c1cf86cfe5cf626588678d2a851f8c5f7b3d4092
-DIST mariadb-10.1.47.tar.gz 63751492 BLAKE2B 
4e01a641e1c387c4d61b3fc8747685ce549628304da7ec4375a5dd3ec1e1b5ec67e501eff2f12c47d73e84cc8a6b78bb79a7b326951e3f58131d918495c55039
 SHA512 
68ca6471a3dca91b7c8cdb1fb19b5387d3ef29a3598eeae70428373dc319eab9371d73cc5d06582f8d14f53ee9c0d7c6969b379f3961c8960308717fa6070349
 DIST mariadb-10.2.22.tar.gz 71907765 BLAKE2B 
e7781a9e1bb0becca543ebb0b9e03912fbafa9de45bbd5c7232f92d29b934148dd124ad462bf8aa5aec2e4ee0bf75a03fae5e5fe97a77e1d93095052a577c14b
 SHA512 
cd61d0c2d528b23b975e6ea142560d9b9ebff7ecda6fa9b3659b25b3406e8cc925918f4c3bb0e200ddb8d0520bcaa4d4f70d245b4731896f9ba2f1bdf0a817b2
 DIST mariadb-10.2.32-patches-03.tar.xz 6048 BLAKE2B 
a6f8f25ec23d1d86d228d719927daa9131779239917b86eab9f82086744294c0a4f03b1a73a3baa599e367775457d6c345fa0820b89063b2e6379c0fb7076ad0
 SHA512 
324804f13f59593d26cc5fd8c1cdeac2f16cf55012ca65b0a7223512920e1ea94619991fdcb3d19184b6428e4a627fec75532c88ae8297f9b8398fcf730058a9
 DIST mariadb-10.2.32.tar.gz 73646729 BLAKE2B 
581906d67f0aada9e85aec7bfee03ed8927a4e836f0639fa5f31576f5df70ce2b6ed3da0b96ad616f5ed71d7717531a073cb911c6d92274f6724911e086104af
 SHA512 
824aa94724b639337a5b4c2e86a1f5ceaeaa940eb234f852df1ba0aafd64e269335e2aca0b05d52164e090cfd6f7d14477df9e096473aa5d9286d47944a765b4
@@ -15,6 +13,4 @@ DIST mariadb-10.4.14-patches-01.tar.xz 5512 BLAKE2B 
f32e1d383ffd99de431bc34c3610
 DIST mariadb-10.4.15.tar.gz 80777094 BLAKE2B 
576e06c1d62b399851e13fe0ac55ea94c462889bbd16ec25a2358e174e2822521008ad0dc021d742b1a12c5b22424208b6df92c2c0fb698a083b6a67a771bd64
 SHA512 
d7090e9e2a2b6fc5611fe498c44b00dbcd02e04456aaff3dc4cef7ef8cd284523776d01511f6f25f717306f6c49fca3f914d298f80e1c920cb6f9f87abebc0ca
 DIST mariadb-10.5.5-patches-02.tar.xz 6060 BLAKE2B 
185a2016836721f76c19228ca39c1c7610c34210e23b42f254e4c4fde34c74d9c77bb0d1a441175c14938ecafea3e9575fa3b7349db826aef63e7d7e7a21901a
 SHA512 
8a26bdbec19d45739ef7accd3cea999bde465714141532d999500df2ebd93bb98a00b8b86b1e855ea4f0cba6984b21ff09beee75372f840282a91f5dc95db432
 DIST mariadb-10.5.6.tar.gz 86884252 BLAKE2B 
b0230acf43d54e976c4e757139dbaa2bb6ed992b0d056728142fc7fa41bd62539be22eae5aac614ea49acf220646ee57ecc67ff1373c6aa142434e6743a4d174
 SHA512 
c62bd6278d389baf179962bc6f617693cf3ba748382e96963b1ef5bbee8d1c9f0964025cf00fb7ff5de088a79362b65657ed30a8adbb61fe524bfd0d8d753421
-DIST mariadb-5.5.68.tar.gz 45969389 BLAKE2B 
5b3a647649c614825adccbc83faa40ba330dae0a1f8005b2297cc6a44fbc00bf817f2d854af315f995e1065bd4d14a2f21a9cec44b5c78402524467d876d8157
 SHA512 
3419790aa88a7e2a5d80e56ca94683d22ca2d5d817dfe19904d11454f34cfc3b9d55e603295ea58580a3c9fe96a6c6f9b650e1058c4e8f2f2e82f09165436865
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 
1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43
 SHA512 
ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
-DIST mysql-extras-20200523-1221Z.tar.bz2 345015 BLAKE2B 
3ad0da663c31831d3b511b88df34b6a28bb781cfd88fd4479b43273aa15946e63c7ae43d5497207edc6cc53a72bd42b8ce2e2058dfb236afd940bd0282190e98
 SHA512 
8f7b39017efb08e1ae98c4c68728bc86f8427b88b2a22688abf6975c6706122086dc93289beb511bbaf17cd5a790c76406e81315a11830829efe9170ce4f6a42

diff --git a/dev-db/mariadb/files/my.cnf-5.5 b/dev-db/mariadb/files/my.cnf-5.5
deleted file mode 100644
index 289af8a24d0..00000000000
--- a/dev-db/mariadb/files/my.cnf-5.5
+++ /dev/null
@@ -1,149 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password                                      = your_password
-port                                           = 3306
-socket                                         = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log                                                = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server           = utf8
-user                                           = mysql
-port                                           = 3306
-socket                                                 = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file                                       = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error                                      = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir                                        = @GENTOO_PORTAGE_EPREFIX@/usr
-datadir                                        = @DATADIR@
-skip-external-locking
-key_buffer_size                                = 16M
-max_allowed_packet                     = 1M
-table_open_cache                       = 64
-sort_buffer_size                       = 512K
-net_buffer_length                      = 8K
-read_buffer_size                       = 256K
-read_rnd_buffer_size           = 512K
-myisam_sort_buffer_size        = 8M
-lc_messages_dir                        = 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb
-#Set this to your desired error message language
-lc_messages                    = en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address                           = 127.0.0.1
-
-log-bin
-server-id                                      = 1
-
-# point the following paths to different dedicated disks
-tmpdir                                                 = 
@GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update                            = 
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue 
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log                                           = 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug                                         = d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the following is the InnoDB configuration
-# if you wish to disable innodb instead
-# uncomment just the next line
-#skip-innodb
-#
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 16M
-# this is the default, increase it if you have lots of tables
-innodb_additional_mem_pool_size = 2M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is 
seen as a database :-(
-# and upstream wants things to be under 
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir          = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir           = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir     = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to 
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 5M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet                     = 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer                            = 2M
-write_buffer                           = 2M
-
-[myisamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer_size                       = 2M
-write_buffer_size                      = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-[mariadb]

diff --git a/dev-db/mariadb/files/my.cnf-5.6-r1 
b/dev-db/mariadb/files/my.cnf-5.6-r1
deleted file mode 100644
index cde5312a568..00000000000
--- a/dev-db/mariadb/files/my.cnf-5.6-r1
+++ /dev/null
@@ -1,142 +0,0 @@
-# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration 
file.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password                                      = your_password
-port                                           = 3306
-socket                                         = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-
-[mysql]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqladmin]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlcheck]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqldump]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlimport]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[mysqlshow]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-default-character-set=utf8
-
-[myisamchk]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-
-[myisampack]
-character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb/charsets
-
-# use [safe_mysqld] with mysql-3
-[mysqld_safe]
-err-log                                                = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysql.err
-
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
-[mysqld]
-character-set-server           = utf8
-user                                           = mysql
-port                                           = 3306
-socket                                                 = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock
-pid-file                                       = 
@GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.pid
-log-error                                      = 
@GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err
-basedir                                        = @GENTOO_PORTAGE_EPREFIX@/usr
-datadir                                        = @DATADIR@
-skip-external-locking
-key_buffer_size                                = 16M
-max_allowed_packet                     = 4M
-table_open_cache                       = 400
-sort_buffer_size                       = 512K
-net_buffer_length                      = 16K
-read_buffer_size                       = 256K
-read_rnd_buffer_size           = 512K
-myisam_sort_buffer_size        = 8M
-lc_messages_dir                        = 
@GENTOO_PORTAGE_EPREFIX@/usr/share/mariadb
-#Set this to your desired error message language
-lc_messages                    = en_US
-
-# security:
-# using "localhost" in connects uses sockets by default
-# skip-networking
-bind-address                           = 127.0.0.1
-
-log-bin
-server-id                                      = 1
-
-# point the following paths to different dedicated disks
-tmpdir                                                 = 
@GENTOO_PORTAGE_EPREFIX@/tmp/
-#log-update                            = 
@GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname
-
-# you need the debug USE flag enabled to use the following directives,
-# if needed, uncomment them, start the server and issue
-# #tail -f @GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.trace
-# this will show you *exactly* what's happening in your server ;)
-
-#log                                           = 
@GENTOO_PORTAGE_EPREFIX@/tmp/mysqld.sql
-#gdb
-#debug                                         = d:t:i:o,/tmp/mysqld.trace
-#one-thread
-
-# the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes
-# you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size = 128M
-#
-# i'd like to use @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/innodb, but that is 
seen as a database :-(
-# and upstream wants things to be under 
@GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/, so that's the route
-# we have to take for the moment
-#innodb_data_home_dir          = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_arch_dir           = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-#innodb_log_group_home_dir     = @GENTOO_PORTAGE_EPREFIX@/var/lib/mysql/
-# you may wish to change this size to be more suitable for your system
-# the max is there to avoid run-away growth on your machine
-innodb_data_file_path = ibdata1:10M:autoextend:max:128M
-# we keep this at around 25% of of innodb_buffer_pool_size
-# sensible values range from 1MB to 
(1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size = 48M
-# this is the default, increase it if you have very large transactions going on
-innodb_log_buffer_size = 8M
-# this is the default and won't hurt you
-# you shouldn't need to tweak it
-innodb_log_files_in_group=2
-# see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit = 1
-innodb_lock_wait_timeout = 50
-innodb_file_per_table
-
-# Uncomment this to get FEDERATED engine support
-#plugin-load=federated=ha_federated.so
-loose-federated
-
-[mysqldump]
-quick
-max_allowed_packet                     = 16M
-
-[mysql]
-# uncomment the next directive if you are not familiar with SQL
-#safe-updates
-
-[isamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer                            = 2M
-write_buffer                           = 2M
-
-[myisamchk]
-key_buffer_size                                = 20M
-sort_buffer_size                       = 20M
-read_buffer_size                       = 2M
-write_buffer_size                      = 2M
-
-[mysqlhotcopy]
-interactive-timeout
-
-[mariadb]

diff --git a/dev-db/mariadb/mariadb-10.1.47.ebuild 
b/dev-db/mariadb/mariadb-10.1.47.ebuild
deleted file mode 100644
index fd560e8d61a..00000000000
--- a/dev-db/mariadb/mariadb-10.1.47.ebuild
+++ /dev/null
@@ -1,925 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-SUBSLOT="18"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit eutils systemd flag-o-matic prefix toolchain-funcs \
-       multiprocessing java-pkg-opt-2 cmake multilib-build
-
-# Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.1.46-patches-01.tar.xz";
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
-       ${PATCH_SET}"
-
-HOMEPAGE="https://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="10.1/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc 
jemalloc kerberos
-       innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc 
oqgraph pam
-       +perl profiling selinux +server sphinx sst-rsync sst-mariabackup 
sst-xtrabackup
-       systemd systemtap static static-libs tcmalloc test tokudb xml yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static )
-       server? ( tokudb? ( jemalloc !tcmalloc ) )
-       ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 
chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-       kernel_linux? (
-               sys-process/procps:0=
-               dev-libs/libaio:0=
-       )
-       >=sys-apps/sed-4
-       >=sys-apps/texinfo-4.7-r1
-       jemalloc? ( dev-libs/jemalloc:0= )
-       tcmalloc? ( dev-util/google-perftools:0= )
-       systemtap? ( >=dev-util/systemtap-1.3:0= )
-       >=sys-libs/zlib-1.2.3:0=
-       kerberos? ( virtual/krb5 )
-       !yassl? (
-               !libressl? ( dev-libs/openssl:0= !>=dev-libs/openssl-1.1 )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       sys-libs/ncurses:0=
-       !bindist? (
-               sys-libs/binutils-libs:0=
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               backup? ( app-arch/libarchive:0= )
-               cracklib? ( sys-libs/cracklib:0= )
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-                       sys-libs/zlib[minizip]
-               )
-               innodb-lz4? ( app-arch/lz4 )
-               innodb-lzo? ( dev-libs/lzo )
-               innodb-snappy? ( app-arch/snappy )
-               mroonga? ( app-text/groonga-normalizer-mysql 
>=app-text/groonga-7.0.4 )
-               numa? ( sys-process/numactl )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( sys-libs/pam:0= )
-               systemd? ( sys-apps/systemd:= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.41-r1:3=
-       !client-libs? ( 
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-BDEPEND="virtual/yacc
-       || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-"
-DEPEND="static? ( sys-libs/ncurses[static-libs] )
-       server? (
-               extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
-               test? ( acct-group/mysql acct-user/mysql )
-       )
-       ${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       client-libs? ( !dev-db/mysql-connector-c )
-       !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
-       !dev-db/mariadb:0
-       !dev-db/mariadb:5.5
-       !dev-db/mariadb:10.2
-       !dev-db/mariadb:10.3
-       !dev-db/mariadb:10.4
-       !dev-db/mariadb:10.5
-       ${COMMON_DEPEND}
-       server? (
-               galera? (
-                       sys-apps/iproute2
-                       =sys-cluster/galera-25*
-                       sst-rsync? ( sys-process/lsof )
-                       sst-mariabackup? ( net-misc/socat[ssl] )
-                       sst-xtrabackup? ( net-misc/socat[ssl] )
-               )
-               !prefix? ( dev-db/mysql-init-scripts acct-group/mysql 
acct-user/mysql )
-               extraengine? ( jdbc? ( >=virtual/jre-1.6 ) )
-       )
-       perl? (
-               !dev-db/mytop
-               virtual/perl-Getopt-Long
-               dev-perl/TermReadKey
-               virtual/perl-Term-ANSIColor
-               virtual/perl-Time-HiRes
-       )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not 
already installed
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-        server? ( galera? ( sst-xtrabackup? ( || ( 
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
-
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-       if [[ -z "${MY_DATADIR}" ]] ; then
-               MY_DATADIR=""
-               if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-                       MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1)
-                       if [[ -z "${MY_DATADIR}" ]] ; then
-                               MY_DATADIR=$(grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
-                               | sed -e 's/.*=\s*//' \
-                               | tail -n1)
-                       fi
-               fi
-               if [[ -z "${MY_DATADIR}" ]] ; then
-                       MY_DATADIR="${MY_LOCALSTATEDIR}"
-                       einfo "Using default MY_DATADIR"
-               fi
-               elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-               if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-                       if [[ -e "${MY_DATADIR}" ]] ; then
-                               # If you get this and you're wondering about 
it, see bug #207636
-                               elog "MySQL datadir found in ${MY_DATADIR}"
-                               elog "A new one will not be created."
-                               PREVIOUS_DATADIR="yes"
-                       else
-                               PREVIOUS_DATADIR="no"
-                       fi
-                       export PREVIOUS_DATADIR
-               fi
-       else
-               if [[ ${EBUILD_PHASE} == "config" ]]; then
-                       local new_MY_DATADIR
-                       new_MY_DATADIR=$(my_print_defaults mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1)
-
-                       if [[ ( -n "${new_MY_DATADIR}" ) && ( 
"${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-                               ewarn "MySQL MY_DATADIR has changed"
-                               ewarn "from ${MY_DATADIR}"
-                               ewarn "to ${new_MY_DATADIR}"
-                               MY_DATADIR="${new_MY_DATADIR}"
-                       fi
-               fi
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_DATADIR
-}
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               local GCC_MAJOR_SET=$(gcc-major-version)
-               local GCC_MINOR_SET=$(gcc-minor-version)
-
-               if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
-                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
-                       eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
-                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
-                       die
-               fi
-
-               # Bug 565584.  InnoDB now requires atomic functions introduced 
with gcc-4.7 on
-               # non x86{,_64} arches
-               if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
-                       eerror "${PN} needs to be built with gcc-4.7 or later."
-                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
-                       die
-               fi
-
-               if has test ${FEATURES} ; then
-                       # Bug #213475 - MySQL _will_ object strenuously if your 
machine is named
-                       # localhost. Also causes weird failures.
-                       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine 
must NOT be named localhost"
-
-                       if ! has userpriv ${FEATURES} ; then
-                               die "Testing with FEATURES=-userpriv is no 
longer supported by upstream. Tests MUST be run as non-root."
-                       fi
-               fi
-       fi
-
-       java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-       unpack ${A}
-
-       mv -f "${WORKDIR%/}/${PN%%-galera}-${PV}" "${S}" || die
-}
-
-src_prepare() {
-       eapply "${WORKDIR}"/mariadb-patches
-
-       eapply_user
-
-       _disable_plugin() {
-               echo > "${S}/plugin/${1}/CMakeLists.txt" || die
-       }
-       _disable_engine() {
-               echo > "${S}/storage/${1}/CMakeLists.txt" || die
-       }
-
-       if use tcmalloc; then
-               echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> 
"${S%/}/sql/CMakeLists.txt" || die
-       fi
-
-       # Don't build bundled xz-utils for tokudb
-       echo > 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-       sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' 
"${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
-       sed -i -e 's/add_dependencies\(tokuportability_static_conv 
build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" 
|| die
-
-       # Fix -fno-common error
-       sed -i -e '/^datasink_t datasink_buffer;$/d' 
extra/mariabackup/xbstream.c || die
-
-       local plugin
-       local server_plugins=( handler_socket auth_socket feedback 
metadata_lock_info
-                                locale_info qc_info server_audit semisync 
sql_errlog )
-       local test_plugins=( audit_null auth_examples daemon_example fulltext )
-       if ! use server; then # These plugins are for the server
-               for plugin in "${server_plugins[@]}" ; do
-                       _disable_plugin "${plugin}"
-               done
-       fi
-
-       if ! use test; then # These plugins are only used during testing
-               for plugin in "${test_plugins[@]}" ; do
-                       _disable_plugin "${plugin}"
-               done
-       fi
-
-       # Collides with mariadb-connector-c bug 655980
-       _disable_plugin auth_dialog
-
-       # Avoid useless library checks
-       use mroonga || _disable_engine mroonga
-       use oqgraph || _disable_engine oqgraph
-       _disable_engine example
-
-       cmake_src_prepare
-       java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-       # bug 508724 mariadb cannot use ld.gold
-       tc-ld-disable-gold
-       # Bug #114895, bug #110149
-       filter-flags "-O" "-O[01]"
-
-       append-cxxflags -felide-constructors
-
-       # bug #283926, with GCC4.4, this is required to get correct behavior.
-       append-flags -fno-strict-aliasing
-
-       CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-       # debug hack wrt #497532
-       mycmakeargs=(
-               -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-               -DINSTALL_BINDIR=bin
-               -DINSTALL_DOCDIR=share/doc/${PF}
-               -DINSTALL_DOCREADMEDIR=share/doc/${PF}
-               -DINSTALL_INCLUDEDIR=include/mysql
-               -DINSTALL_INFODIR=share/info
-               -DINSTALL_LIBDIR=$(get_libdir)
-               -DINSTALL_MANDIR=share/man
-               -DINSTALL_MYSQLSHAREDIR=share/mariadb
-               -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' 
'')
-               -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-               -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-               -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-               -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-               -DWITH_UNIT_TESTS=$(usex test ON OFF)
-               -DWITH_ZLIB=system
-               -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-               -DWITH_DEFAULT_COMPILER_OPTIONS=0
-               -DWITH_DEFAULT_FEATURE_SET=0
-               -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
-               # The build forces this to be defined when cross-compiling.  We 
pass it
-               # all the time for simplicity and to make sure it is actually 
correct.
-               -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-               -DWITHOUT_CLIENTLIBS=YES
-               -DWITH_READLINE=$(usex bindist 1 0)
-               -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-               -DENABLE_DTRACE=$(usex systemtap)
-               -DWITH_SSL=$(usex yassl bundled system)
-               -DPLUGIN_CLIENT_ED25519=NO
-               -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-       )
-
-       if use server ; then
-
-               # Federated{,X} must be treated special otherwise they will not 
be built as plugins
-               if ! use extraengine ; then
-                       mycmakeargs+=(
-                               -DPLUGIN_FEDERATED=NO
-                               -DPLUGIN_FEDERATEDX=NO )
-               fi
-
-               mycmakeargs+=(
-                       -DWITH_JEMALLOC=$(usex jemalloc system)
-                       -DWITH_PCRE=system
-                       -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
-                       -DPLUGIN_SPHINX=$(usex sphinx YES NO)
-                       -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-                       -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-                       -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-                       -DPLUGIN_CASSANDRA=NO
-                       -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-                       -DPLUGIN_SPIDER=$(usex extraengine YES NO)
-                       -DPLUGIN_CONNECT=$(usex extraengine YES NO)
-                       -DCONNECT_WITH_MYSQL=1
-                       -DCONNECT_WITH_LIBXML2=$(usex xml)
-                       -DCONNECT_WITH_ODBC=$(usex odbc)
-                       -DCONNECT_WITH_JDBC=$(usex jdbc)
-                       # Build failure and autodep wrt bug 639144
-                       -DCONNECT_WITH_MONGO=OFF
-                       -DWITH_WSREP=$(usex galera)
-                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-                       -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-                       -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-                       -DWITH_MARIABACKUP=$(usex backup ON OFF)
-                       -DWITH_LIBARCHIVE=$(usex backup ON OFF)
-                       -DWITH_SYSTEMD=$(usex systemd yes no)
-                       -DWITH_NUMA=$(usex numa ON OFF)
-                       -DINSTALL_SQLBENCHDIR=''
-               )
-
-               if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
-                       ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
-                       ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-                       ewarn "You MUST file bugs without these variables set."
-
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-                               -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-                       )
-
-               elif ! use latin1 ; then
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=utf8
-                               -DDEFAULT_COLLATION=utf8_general_ci
-                       )
-               else
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=latin1
-                               -DDEFAULT_COLLATION=latin1_swedish_ci
-                       )
-               fi
-               mycmakeargs+=(
-                       -DEXTRA_CHARSETS=all
-                       -DMYSQL_USER=mysql
-                       -DDISABLE_SHARED=$(usex static YES NO)
-                       -DWITH_DEBUG=$(usex debug)
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DENABLED_PROFILING=$(usex profiling)
-               )
-
-               if use static; then
-                       mycmakeargs+=( -DWITH_PIC=1 )
-               fi
-
-               if use jemalloc || use tcmalloc ; then
-                       mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-               fi
-
-               # Storage engines
-               mycmakeargs+=(
-                       -DWITH_ARCHIVE_STORAGE_ENGINE=1
-                       -DWITH_BLACKHOLE_STORAGE_ENGINE=1
-                       -DWITH_CSV_STORAGE_ENGINE=1
-                       -DWITH_HEAP_STORAGE_ENGINE=1
-                       -DWITH_INNOBASE_STORAGE_ENGINE=1
-                       -DWITH_MYISAMMRG_STORAGE_ENGINE=1
-                       -DWITH_MYISAM_STORAGE_ENGINE=1
-                       -DWITH_PARTITION_STORAGE_ENGINE=1
-               )
-
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_SERVER=1
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DEXTRA_CHARSETS=none
-                       -DINSTALL_SQLBENCHDIR=
-                       -DWITH_SYSTEMD=no
-               )
-       fi
-
-       cmake_src_configure
-}
-
-src_compile() {
-       cmake_src_compile
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-       _disable_test() {
-               local rawtestname bug reason
-               rawtestname="${1}" ; shift
-               bug="${1}" ; shift
-               reason="${@}"
-               ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})"
-               echo "${rawtestname} : BUG#${bug} ${reason}" >> 
"${T}/disabled.def"
-       }
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       if ! use server ; then
-               einfo "Skipping server tests due to minimal build."
-               return 0
-       fi
-
-       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-       # Run CTest (test-units)
-       cmake_src_test
-       retstatus_unit=$?
-
-       # Ensure that parallel runs don't die
-       export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-
-       if [[ -z "${MTR_PARALLEL}" ]] ; then
-               local -x MTR_PARALLEL=$(makeopts_jobs)
-
-               if [[ ${MTR_PARALLEL} -gt 4 ]] ; then
-                       # Running multiple tests in parallel usually require 
higher ulimit
-                       # and fs.aio-max-nr setting. In addition, tests like 
main.multi_update
-                       # are known to hit timeout when system is busy.
-                       # To avoid test failure we will limit MTR_PARALLEL to 4 
instead of
-                       # using "auto".
-                       local info_msg="Parallel MySQL test suite jobs limited 
to 4 (MAKEOPTS=${MTR_PARALLEL})"
-                       info_msg+=" to avoid test failures. Set MTR_PARALLEL if 
you know what you are doing!"
-                       einfo "${info_msg}"
-                       unset info_msg
-                       MTR_PARALLEL=4
-               fi
-       else
-               einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'"
-       fi
-
-       # Try to increase file limits to increase test coverage
-       if ! ulimit -n 16500 1>/dev/null 2>&1 ; then
-               # Upper limit comes from parts.partition_* tests
-               ewarn "For maximum test coverage please raise open file limit 
to 16500 (ulimit -n 16500) before calling the package manager."
-
-               if ! ulimit -n 4162 1>/dev/null 2>&1 ; then
-                       # Medium limit comes from '[Warning] Buffered warning: 
Could not increase number of max_open_files to more than 3000 (request: 4162)'
-                       ewarn "For medium test coverage please raise open file 
limit to 4162 (ulimit -n 4162) before calling the package manager."
-
-                       if ! ulimit -n 3000 1>/dev/null 2>&1 ; then
-                               ewarn "For minimum test coverage please raise 
open file limit to 3000 (ulimit -n 3000) before calling the package manager."
-                       else
-                               einfo "Will run test suite with open file limit 
set to 3000 (minimum test coverage)."
-                       fi
-               else
-                       einfo "Will run test suite with open file limit set to 
4162 (medium test coverage)."
-               fi
-       else
-               einfo "Will run test suite with open file limit set to 16500 
(best test coverage)."
-       fi
-
-       # create directories because mysqladmin might run out of order
-       mkdir -p "${T}"/var-tests{,/log} || die
-
-       cp "${S}"/mysql-test/unstable-tests "${T}/disabled.def" || die
-
-       local -a disabled_tests
-       disabled_tests+=( "compat/oracle.plugin;0;Needs example plugin which 
Gentoo disables" )
-       disabled_tests+=( "main.explain_non_select;0;Sporadically failing test" 
)
-       disabled_tests+=( "main.func_time;0;Dependent on time test was written" 
)
-       disabled_tests+=( "main.grant;0;Sporadically failing test" )
-       disabled_tests+=( "main.join_cache;0;Sporadically failing test" )
-       disabled_tests+=( "main.plugin_auth;0;Needs client libraries built" )
-       disabled_tests+=( "main.stat_tables;0;Sporadically failing test" )
-       disabled_tests+=( "main.stat_tables_innodb;0;Sporadically failing test" 
)
-       disabled_tests+=( "mariabackup.*;0;Broken test suite" )
-       disabled_tests+=( "plugins.auth_ed25519;0;Needs client libraries built" 
)
-       disabled_tests+=( "plugins.cracklib_password_check;0;False positive due 
to varying policies" )
-       disabled_tests+=( "plugins.two_password_validations;0;False positive 
due to varying policies" )
-       disabled_tests+=( "roles.acl_statistics;0;False positive due to a user 
count mismatch caused by previous test" )
-
-       if ! use latin1 ; then
-               disabled_tests+=( "funcs_1.is_columns_mysql;0;Requires 
USE=latin1" )
-               disabled_tests+=( "main.information_schema;0;Requires 
USE=latin1" )
-               disabled_tests+=( "main.mysql;0;Requires USE=latin1" )
-               disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
-       fi
-
-       if ! use profiling ; then
-               disabled_tests+=( 
"sys_vars.sysvars_server_notembedded;0;Requires USE=profiling" )
-       fi
-
-       local test_infos_str test_infos_arr
-       for test_infos_str in "${disabled_tests[@]}" ; do
-               IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}"
-
-               if [[ ${#test_infos_arr[@]} != 3 ]] ; then
-                       die "Invalid test data set, not matching format: 
${test_infos_str}"
-               fi
-
-               _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" 
"${test_infos_arr[2]}"
-       done
-       unset test_infos_str test_infos_arr
-
-       # run mysql-test tests
-       pushd "${TESTDIR}" &>/dev/null || die
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder 
--skip-test=tokudb --skip-test-list="${T}/disabled.def"
-       retstatus_tests=$?
-
-       popd &>/dev/null || die
-
-       # Cleanup is important for these testcases.
-       pkill -9 -f "${S}/ndb" 2>/dev/null
-       pkill -9 -f "${S}/sql" 2>/dev/null
-
-       local failures=""
-       [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-       [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-       [[ -z "$failures" ]] || die "Test failures: $failures"
-       einfo "Tests successfully completed"
-}
-
-src_install() {
-       cmake_src_install
-
-       # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
-       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${ED}/usr/include/mysql/server/private/config.h" || die
-       fi
-
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       # Convenience links
-       einfo "Making Convenience links for mysqlcheck multi-call binary"
-       dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-       dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-       dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-       # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-       if [[ -d "${ED}/usr/data" ]] ; then
-               rm -Rf "${ED}/usr/data" || die
-       fi
-
-       # Unless they explicitly specific USE=test, then do not install the
-       # testsuite. It DOES have a use to be installed, esp. when you want to 
do a
-       # validation of your database configuration after tuning it.
-       if ! use test ; then
-               rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
-       fi
-
-       # Configuration stuff
-       einfo "Building default configuration ..."
-       insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-       [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins 
"${S}"/scripts/mysqlaccess.conf
-       local mycnf_src="my.cnf-5.6-r1"
-       sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-               "${FILESDIR}/${mycnf_src}" \
-               > "${TMPDIR}/my.cnf.ok" || die
-       use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' 
"${TMPDIR}/my.cnf.ok"
-       if use latin1 ; then
-               sed -i \
-                       -e "/character-set/s|utf8|latin1|g" \
-                       "${TMPDIR}/my.cnf.ok" || die
-       fi
-       eprefixify "${TMPDIR}/my.cnf.ok"
-       newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-       if use server ; then
-               einfo "Including support files and sample configurations"
-               docinto "support-files"
-               local script
-               for script in \
-                       "${S}"/support-files/magic
-               do
-                       [[ -f "$script" ]] && dodoc "${script}"
-               done
-
-               docinto "scripts"
-               for script in "${S}"/scripts/mysql* ; do
-                       [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" 
) ]] && dodoc "${script}"
-               done
-               # Manually install supporting files that conflict with other 
packages
-               # but are needed for galera and initial installation
-               exeinto /usr/libexec/mariadb
-               doexe "${BUILD_DIR}/extra/my_print_defaults" 
"${BUILD_DIR}/extra/perror"
-       fi
-
-       # Remove mytop if perl is not selected
-       if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then
-               rm -f "${ED}/usr/bin/mytop" || die
-       fi
-}
-
-pkg_preinst() {
-       java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       # Create log directory securely if it does not exist
-       [[ -d "${ROOT}/${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}/${MY_LOGDIR}"
-
-       if use server ; then
-               if use pam; then
-                       einfo
-                       elog "This install includes the PAM authentication 
plugin."
-                       elog "To activate and configure the PAM plugin, please 
read:"
-                       elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
-                       einfo
-               fi
-
-               if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-                       einfo
-                       elog "You might want to run:"
-                       elog "\"emerge --config =${CATEGORY}/${PF}\""
-                       elog "if this is a new install."
-                       elog
-                       elog "If you are switching server implentations, you 
should run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               else
-                       einfo
-                       elog "If you are upgrading major versions, you should 
run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               fi
-
-               einfo
-               elog "Be sure to edit the my.cnf file to activate your cluster 
settings."
-               elog "This should be done after running \"emerge --config 
=${CATEGORY}/${PF}\""
-               elog "The first time the cluster is activated, you should add"
-               elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql 
for one node."
-               elog "This option should then be removed for subsequent starts."
-               einfo
-       fi
-}
-
-pkg_config() {
-       _getoptval() {
-               local mypd="${EROOT}"/usr/libexec/mariadb/my_print_defaults
-               local section="$1"
-               local flag="--${2}="
-               local extra_options="${3}"
-               "${mypd}" $extra_options $section | sed -n 
"/^${flag}/s,${flag},,gp"
-       }
-       local old_MY_DATADIR="${MY_DATADIR}"
-       local old_HOME="${HOME}"
-       # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX}/root
-
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-               die "Minimal builds do NOT include the MySQL server"
-       fi
-
-       if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != 
"${old_MY_DATADIR}" ) ]]; then
-               local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-               MY_DATADIR_s="${MY_DATADIR_s%%/}"
-               local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-               old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-               if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" 
!= / ) ]]; then
-                       if [[ -d "${MY_DATADIR_s}" ]]; then
-                               ewarn "Both ${old_MY_DATADIR_s} and 
${MY_DATADIR_s} exist"
-                               ewarn "Attempting to use ${MY_DATADIR_s} and 
preserving ${old_MY_DATADIR_s}"
-                       else
-                               elog "Moving MY_DATADIR from 
${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-                               mv --strip-trailing-slashes -T 
"${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-                               || die "Moving MY_DATADIR failed"
-                       fi
-               else
-                       ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does 
not exist"
-                       if [[ -d "${MY_DATADIR_s}" ]]; then
-                               ewarn "Attempting to use ${MY_DATADIR_s}"
-                       else
-                               eerror "New MY_DATADIR (${MY_DATADIR_s}) does 
not exist"
-                               die "Configuration Failed! Please reinstall 
${CATEGORY}/${PN}"
-                       fi
-               fi
-       fi
-
-       local pwd1="a"
-       local pwd2="b"
-       local maxtry=15
-
-       if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-               local tmp_mysqld_password_source=
-
-               for tmp_mysqld_password_source in mysql client; do
-                       einfo "Trying to get password for mysql 'root' user 
from '${tmp_mysqld_password_source}' section ..."
-                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password)"
-                       if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-                               if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-                                       ewarn "Ignoring password from 
'${tmp_mysqld_password_source}' section due to newline character (do you have 
multiple password options set?)!"
-                                       MYSQL_ROOT_PASSWORD=
-                                       continue
-                               fi
-
-                               einfo "Found password in 
'${tmp_mysqld_password_source}' section!"
-                               break
-                       fi
-               done
-
-               # Sometimes --show is required to display passwords in some 
implementations of my_print_defaults
-               if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password --show)"
-               fi
-
-               unset tmp_mysqld_password_source
-       fi
-       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n1)"
-       # These are dir+prefix
-       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n1)"
-       MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n1)"
-       MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-       if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-               einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-       fi
-       if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-               einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-       fi
-       if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-               einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-       fi
-
-       if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-               ewarn "You have already a MySQL database in place."
-               ewarn "(${ROOT}/${MY_DATADIR}/*)"
-               ewarn "Please rename or delete it if you wish to replace it."
-               die "MySQL database already exists!"
-       fi
-
-       # Bug #213475 - MySQL _will_ object strenously if your machine is named
-       # localhost. Also causes weird failures.
-       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-       if [[ -z "${MYSQL_ROOT_PASSWORD}" ]]; then
-
-               einfo "Please provide a password for the mysql 
'root'@'localhost' user now"
-               einfo "or through the ${HOME}/.my.cnf file."
-               ewarn "Avoid [\"'\\_%] characters in the password"
-               read -rsp "    >" pwd1 ; echo
-
-               einfo "Retype the password"
-               read -rsp "    >" pwd2 ; echo
-
-               if [[ "x$pwd1" != "x$pwd2" ]] ; then
-                       die "Passwords are not the same"
-               fi
-
-               MYSQL_ROOT_PASSWORD="${pwd1}"
-               unset pwd1 pwd2
-       fi
-
-       local options
-       local sqltmp="$(emktemp)"
-
-       # Fix bug 446200. Don't reference host my.cnf, needs to come first,
-       # see https://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-       # Figure out which options we need to disable to do the setup
-       local helpfile="${TMPDIR}/mysqld-help"
-       "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-       for opt in grant-tables host-cache name-resolve networking slave-start \
-               federated ssl log-bin relay-log slow-query-log external-locking 
\
-               log-slave-updates \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-
-       einfo "Creating the mysql database and setting proper permissions on it 
..."
-
-       # Now that /var/run is a tmpfs mount point, we need to ensure it exists 
before using it
-       PID_DIR="${EROOT}/var/run/mysqld"
-       if [[ ! -d "${PID_DIR}" ]]; then
-               install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could 
not create pid directory"
-       fi
-
-       if [[ ! -d "${MY_DATADIR}" ]]; then
-               install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die 
"Could not create data directory"
-       fi
-
-       pushd "${TMPDIR}" &>/dev/null || die
-
-       # Filling timezones, see
-       # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-       "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
-
-       local cmd=( "${EROOT}/usr/share/mariadb/scripts/mysql_install_db" )
-       [[ -f "${cmd}" ]] || cmd=( "${EROOT}/usr/bin/mysql_install_db" )
-       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-       einfo "Command: ${cmd[*]}"
-       su -s /bin/sh -c "${cmd[*]}" mysql \
-               >"${TMPDIR}"/mysql_install_db.log 2>&1
-       if [[ $? -ne 0 ]]; then
-               grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-       fi
-       popd &>/dev/null || die
-       [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-               || die "MySQL databases not installed"
-
-       use prefix || options="${options} --user=mysql"
-
-       local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-       local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-       local mysqld="${EROOT}/usr/sbin/mysqld \
-               ${options} \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --socket=${socket} \
-               --pid-file=${pidfile} \
-               --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-       #einfo "About to start mysqld: ${mysqld}"
-       ebegin "Starting mysqld"
-       einfo "Command ${mysqld}"
-       ${mysqld} &
-       rc=$?
-       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-               maxtry=$((${maxtry}-1))
-               echo -n "."
-               sleep 1
-       done
-       eend $rc
-
-       if ! [[ -S "${socket}" ]]; then
-               die "Completely failed to start up mysqld with: ${mysqld}"
-       fi
-
-       ebegin "Setting root password"
-       # Do this from memory, as we don't want clear text passwords in temp 
files
-       local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-       "${EROOT}/usr/bin/mysql" \
-               "--socket=${socket}" \
-               -hlocalhost \
-               -e "${sql}"
-       eend $?
-
-       if [[ -n "${sqltmp}" ]] ; then
-               ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
-               "${EROOT}/usr/bin/mysql" \
-                       "--socket=${socket}" \
-                       -hlocalhost \
-                       -uroot \
-                       --password="${MYSQL_ROOT_PASSWORD}" \
-                       mysql < "${sqltmp}"
-               rc=$?
-               eend $?
-               [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-       fi
-
-       # Stop the server and cleanup
-       einfo "Stopping the server ..."
-       kill $(< "${pidfile}" )
-       rm -f "${sqltmp}"
-       wait %1
-       einfo "Done"
-}

diff --git a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild 
b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
deleted file mode 100644
index 017c5030683..00000000000
--- a/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
+++ /dev/null
@@ -1,841 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20200523-1221Z"
-SUBSLOT="18"
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils flag-o-matic prefix toolchain-funcs user cmake-utils 
multilib-build
-
-SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-       SRC_URI="${SRC_URI}
-               mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2";
-fi
-
-HOMEPAGE="https://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2"
-SLOT="5.5/${SUBSLOT:-0}"
-IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
-       oqgraph pam +perl profiling selinux +server sphinx
-       static static-libs systemtap tcmalloc
-       test tokudb yassl"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
-RESTRICT="!bindist? ( bindist ) libressl? ( test ) !test? ( test )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) )
-       ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 
chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-       inherit git-r3
-       EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-       EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-       EGIT_CLONE_TYPE=shallow
-else
-       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-       "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
-       "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-5.5.68.patch"
-       "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-5.5.50.patch"
-       "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
-       
"${MY_PATCH_DIR}/20018_all_mariadb-5.5.60-without-clientlibs-tools.patch"
-)
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-COMMON_DEPEND="
-       kernel_linux? (
-               sys-process/procps:0=
-               dev-libs/libaio:0=
-       )
-       >=sys-apps/sed-4
-       >=sys-apps/texinfo-4.7-r1
-       jemalloc? ( dev-libs/jemalloc:0= )
-       tcmalloc? ( dev-util/google-perftools:0= )
-       systemtap? ( >=dev-util/systemtap-1.3:0= )
-       !yassl? (
-               !libressl? ( <dev-libs/openssl-1.1.0:0= )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       >=sys-libs/zlib-1.2.3:0=
-       sys-libs/ncurses:0=
-       !bindist? (
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( sys-libs/pam:0= )
-       )
-       !client-libs? ( 
dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
-"
-DEPEND="virtual/yacc
-       static? ( sys-libs/ncurses[static-libs] )
-       || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-       ${COMMON_DEPEND}"
-RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] 
!dev-db/mysql-connector-c )
-       !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
-       !dev-db/mariadb:0
-       !dev-db/mariadb:10.1
-       !dev-db/mariadb:10.2
-       !dev-db/mariadb:10.3
-       !dev-db/mariadb:10.4
-       !dev-db/mariadb:10.5
-       server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-       ${COMMON_DEPEND}
-       perl? ( !dev-db/mytop
-               virtual/perl-Getopt-Long
-               dev-perl/TermReadKey
-               virtual/perl-Term-ANSIColor
-               virtual/perl-Time-HiRes )
-"
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-pkg_setup() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               local GCC_MAJOR_SET=$(gcc-major-version)
-               local GCC_MINOR_SET=$(gcc-minor-version)
-               if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
-                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
-                       eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
-                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
-                       die
-               fi
-               # Bug 565584.  InnoDB now requires atomic functions introduced 
with gcc-4.7 on
-               # non x86{,_64} arches
-               if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
-                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
-                       eerror "${PN} needs to be built with gcc-4.7 or later."
-                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
-                       die
-               fi
-       fi
-       if has test ${FEATURES} && \
-               use server && ! has userpriv ${FEATURES} ; then
-                       eerror "Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root."
-       fi
-
-       # This should come after all of the die statements
-       enewgroup mysql 60 || die "problem adding 'mysql' group"
-       enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' 
user"
-}
-
-pkg_postinst() {
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       # Create log directory securely if it does not exist
-       [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}${MY_LOGDIR}"
-
-       if use server ; then
-               if use pam; then
-                       einfo
-                       elog "This install includes the PAM authentication 
plugin."
-                       elog "To activate and configure the PAM plugin, please 
read:"
-                       elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
-                       einfo
-               fi
-
-               if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-                       einfo
-                       elog "You might want to run:"
-                       elog "\"emerge --config =${CATEGORY}/${PF}\""
-                       elog "if this is a new install."
-                       elog
-                       elog "If you are switching server implentations, you 
should run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               else
-                       einfo
-                       elog "If you are upgrading major versions, you should 
run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               fi
-
-               einfo
-               elog "Be sure to edit the my.cnf file to activate your cluster 
settings."
-               elog "This should be done after running \"emerge --config 
=${CATEGORY}/${PF}\""
-               elog "The first time the cluster is activated, you should add"
-               elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql 
for one node."
-               elog "This option should then be removed for subsequent starts."
-               einfo
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       # Grab the patches
-       [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" 
git-r3_src_unpack
-
-       mv -f "${WORKDIR%/}/${P}" "${S}" || die
-}
-
-src_prepare() {
-       _disable_engine() {
-               echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
-       }
-
-       _disable_plugin() {
-               echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
-       }
-
-       if use tcmalloc; then
-               echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> 
"${S%/}/sql/CMakeLists.txt" || die
-       fi
-
-       # Don't build bundled xz-utils for tokudb
-       echo > 
"${S%/}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-       sed -i -e 's/ build_lzma//' 
"${S%/}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-       sed -i -e 's/add_dependencies\(tokuportability_static_conv 
build_jemalloc\)//' "${S%/}/storage/tokudb/ft-index/portability/CMakeLists.txt" 
|| die
-
-       local plugin
-       local server_plugins=( handler_socket auth_socket feedback qc_info 
server_audit semisync sql_errlog )
-       local test_plugins=( audit_null auth_examples daemon_example fulltext )
-       if ! use server; then # These plugins are for the server
-               for plugin in "${server_plugins[@]}" ; do
-                       _disable_plugin "${plugin}"
-               done
-       fi
-
-       if ! use test; then # These plugins are only used during testing
-               for plugin in "${test_plugins[@]}" ; do
-                       _disable_plugin "${plugin}"
-               done
-       fi
-
-       # Collides with mariadb-connector-c bug 655980
-       _disable_plugin auth_dialog
-
-       # Don't build example
-       _disable_engine example
-
-       if ! use oqgraph ; then # avoids extra library checks
-               _disable_engine oqgraph
-       fi
-
-       # Don't clash with dev-db/mysql-connector-c
-       sed -i -e 's/ my_print_defaults.1//' \
-               -e 's/ perror.1//' \
-               "${S}"/man/CMakeLists.txt || die
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       # bug 508724 mariadb cannot use ld.gold
-       tc-ld-disable-gold
-       # Bug #114895, bug #110149
-       filter-flags "-O" "-O[01]"
-
-       append-cxxflags -felide-constructors
-
-       # bug #283926, with GCC4.4, this is required to get correct behavior.
-       append-flags -fno-strict-aliasing
-
-       CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-       # debug hack wrt #497532
-       mycmakeargs=(
-               -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
-               -DINSTALL_BINDIR=bin
-               -DINSTALL_DOCDIR=share/doc/${PF}
-               -DINSTALL_DOCREADMEDIR=share/doc/${PF}
-               -DINSTALL_INCLUDEDIR=include/mysql
-               -DINSTALL_INFODIR=share/info
-               -DINSTALL_LIBDIR=$(get_libdir)
-               -DINSTALL_MANDIR=share/man
-               -DINSTALL_MYSQLSHAREDIR=share/mariadb
-               -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
-               -DINSTALL_SCRIPTDIR=share/mariadb/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
-               -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
-               -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
-               -DWITH_UNIT_TESTS=$(usex test ON OFF)
-               -DWITH_ZLIB=system
-               -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-               # The build forces this to be defined when cross-compiling.  We 
pass it
-               # all the time for simplicity and to make sure it is actually 
correct.
-               -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
-               -DWITHOUT_CLIENTLIBS=YES
-               -DWITH_READLINE=$(usex bindist 1 0)
-               -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-               -DENABLE_DTRACE=$(usex systemtap)
-       )
-       if use test ; then
-               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
-       else
-               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-       fi
-
-       if ! use yassl ; then
-               mycmakeargs+=( -DWITH_SSL=system )
-       else
-               mycmakeargs+=( -DWITH_SSL=bundled )
-       fi
-
-       if use server ; then
-
-               # Federated{,X} must be treated special otherwise they will not 
be built as plugins
-               if ! use extraengine ; then
-                       mycmakeargs+=(
-                               -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-                               -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1 )
-               fi
-
-               mycmakeargs+=(
-                       -DWITH_JEMALLOC=$(usex jemalloc system)
-                       -D$(usex sphinx WITH WITHOUT)_SPHINX_STORAGE_ENGINE=1
-                       -D$(usex tokudb WITH WITHOUT)_TOKUDB_STORAGE_ENGINE=1
-                       -D$(usex oqgraph WITH WITHOUT)_AUTH_PAM=1
-                       -DINSTALL_SQLBENCHDIR=share/mariadb
-               )
-
-               if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
-                       ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
-                       ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-                       ewarn "You MUST file bugs without these variables set."
-
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-                               -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-                       )
-
-               elif ! use latin1 ; then
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=utf8
-                               -DDEFAULT_COLLATION=utf8_general_ci
-                       )
-               else
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=latin1
-                               -DDEFAULT_COLLATION=latin1_swedish_ci
-                       )
-               fi
-               mycmakeargs+=(
-                       -DEXTRA_CHARSETS=all
-                       -DDISABLE_SHARED=$(usex static YES NO)
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DENABLED_PROFILING=$(usex profiling)
-               )
-
-               if use static; then
-                       mycmakeargs+=( -DWITH_PIC=1 )
-               fi
-
-               if use jemalloc || use tcmalloc ; then
-                       mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-               fi
-
-               # Storage engines
-               mycmakeargs+=(
-                       -DWITH_ARCHIVE_STORAGE_ENGINE=1
-                       -DWITH_BLACKHOLE_STORAGE_ENGINE=1
-                       -DWITH_CSV_STORAGE_ENGINE=1
-                       -DWITH_HEAP_STORAGE_ENGINE=1
-                       -DWITH_INNOBASE_STORAGE_ENGINE=1
-                       -DWITH_MYISAMMRG_STORAGE_ENGINE=1
-                       -DWITH_MYISAM_STORAGE_ENGINE=1
-                       -DWITH_PARTITION_STORAGE_ENGINE=1
-               )
-
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_SERVER=1
-                       -DEXTRA_CHARSETS=none
-                       -DINSTALL_SQLBENCHDIR=
-               )
-       fi
-
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       cmake-utils_src_compile
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
-       if [[ -f "${ED%/}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${ED%/}/usr/include/mysql/server/private/config.h" || die
-       fi
-
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       # Convenience links
-       einfo "Making Convenience links for mysqlcheck multi-call binary"
-       dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
-       dosym "mysqlcheck" "/usr/bin/mysqlrepair"
-       dosym "mysqlcheck" "/usr/bin/mysqloptimize"
-
-       # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-       if [[ -d "${ED%/}/usr/data" ]] ; then
-               rm -Rf "${ED%/}/usr/data" || die
-       fi
-
-       # Unless they explicitly specific USE=test, then do not install the
-       # testsuite. It DOES have a use to be installed, esp. when you want to 
do a
-       # validation of your database configuration after tuning it.
-       if ! use test ; then
-               rm -rf "${D%/}/${MY_SHAREDSTATEDIR}/mysql-test"
-       fi
-
-       # Configuration stuff
-       einfo "Building default configuration ..."
-       insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-       [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins 
"${S%/}"/scripts/mysqlaccess.conf
-       local mycnf_src="my.cnf-5.5"
-       sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
-               "${FILESDIR%/}/${mycnf_src}" \
-               > "${TMPDIR%/}/my.cnf.ok" || die
-       use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' 
"${TMPDIR%/}/my.cnf.ok"
-       if use latin1 ; then
-               sed -i \
-                       -e "/character-set/s|utf8|latin1|g" \
-                       "${TMPDIR%/}/my.cnf.ok" || die
-       fi
-       eprefixify "${TMPDIR%/}/my.cnf.ok"
-       newins "${TMPDIR}/my.cnf.ok" my.cnf
-
-       if use server ; then
-               einfo "Including support files and sample configurations"
-               docinto "support-files"
-               local script
-               for script in \
-                       "${S%/}"/support-files/magic
-               do
-                       [[ -f "$script" ]] && dodoc "${script}"
-               done
-
-               docinto "scripts"
-               for script in "${S%/}"/scripts/mysql* ; do
-                       [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" 
) ]] && dodoc "${script}"
-               done
-               # Manually install supporting files that conflict with other 
packages
-               # but are needed for galera and initial installation
-               exeinto /usr/libexec/mariadb
-               doexe "${BUILD_DIR}/extra/my_print_defaults" 
"${BUILD_DIR}/extra/perror"
-       fi
-
-       #Remove mytop if perl is not selected
-       [[ -e "${ED%/}/usr/bin/mytop" ]] && ! use perl && rm -f 
"${ED%/}/usr/bin/mytop"
-}
-
-# Official test instructions:
-# USE='extraengine perl server' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-       _disable_test() {
-               local rawtestname reason
-               rawtestname="${1}" ; shift
-               reason="${@}"
-               ewarn "test '${rawtestname}' disabled: '${reason}'"
-               echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-       }
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       if ! use server ; then
-               einfo "Skipping server tests due to minimal build."
-               return 0
-       fi
-
-       # Bug #213475 - MySQL _will_ object strenously if your machine is named
-       # localhost. Also causes weird failures.
-       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-       if [[ $UID -eq 0 ]]; then
-               die "Testing with FEATURES=-userpriv is no longer supported by 
upstream. Tests MUST be run as non-root."
-       fi
-       has usersandbox $FEATURES && ewarn "Some tests may fail with 
FEATURES=usersandbox"
-
-       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-       # Run CTest (test-units)
-       cmake-utils_src_test
-       retstatus_unit=$?
-
-       # Ensure that parallel runs don't die
-       export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-       # Enable parallel testing, auto will try to detect number of cores
-       # You may set this by hand.
-       # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-       export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-       # create directories because mysqladmin might run out of order
-       mkdir -p "${T}"/var-tests{,/log} || die
-
-       # Run mysql tests
-       pushd "${TESTDIR}" > /dev/null || die
-
-       touch "${T}/disabled.def"
-       # These are failing in MariaDB 5.5 for now and are believed to be
-       # false positives:
-       #
-       # main.information_schema, binlog.binlog_statement_insert_delayed,
-       # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
-       # funcs_1.is_columns_mysql
-       # fails due to USE=-latin1 / utf8 default
-       #
-       # main.mysql_client_test, main.mysql_client_test_nonblock:
-       # segfaults at random under Portage only, suspect resource limits.
-       #
-       # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-       # fails due to bad cleanup of previous tests when run in parallel
-       # The tool is deprecated anyway
-       # Bug 532288
-
-       local t
-       for t in main.mysql_client_test main.mysql_client_test_nonblock \
-                       binlog.binlog_statement_insert_delayed 
main.information_schema \
-                       main.mysqld--help \
-                       archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-                       funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
-               _disable_test  "$t" "False positives in Gentoo"
-       done
-
-       if ! use client-libs ; then
-               _disable_test main.plugin_auth "Needs client libraries built"
-       fi
-
-       # run mysql-test tests
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder 
--skip-test=tokudb --skip-test-list="${T}/disabled.def"
-       retstatus_tests=$?
-
-       popd > /dev/null || die
-
-       # Cleanup is important for these testcases.
-       pkill -9 -f "${S}/ndb" 2>/dev/null
-       pkill -9 -f "${S}/sql" 2>/dev/null
-
-       local failures=""
-       [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-       [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-       [[ -z "$failures" ]] || die "Test failures: $failures"
-       einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-       if [[ -z "${MY_DATADIR}" ]] ; then
-               MY_DATADIR=""
-               if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-                       MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-                       if [[ -z "${MY_DATADIR}" ]] ; then
-                               MY_DATADIR=`grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
-                               | sed -e 's/.*=\s*//' \
-                               | tail -n1`
-                       fi
-               fi
-               if [[ -z "${MY_DATADIR}" ]] ; then
-                       MY_DATADIR="${MY_LOCALSTATEDIR}"
-                       einfo "Using default MY_DATADIR"
-               fi
-               elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-               if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-                       if [[ -e "${MY_DATADIR}" ]] ; then
-                               # If you get this and you're wondering about 
it, see bug #207636
-                               elog "MySQL datadir found in ${MY_DATADIR}"
-                               elog "A new one will not be created."
-                               PREVIOUS_DATADIR="yes"
-                       else
-                               PREVIOUS_DATADIR="no"
-                       fi
-                       export PREVIOUS_DATADIR
-               fi
-       else
-               if [[ ${EBUILD_PHASE} == "config" ]]; then
-                       local new_MY_DATADIR
-                       new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-
-                       if [[ ( -n "${new_MY_DATADIR}" ) && ( 
"${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-                               ewarn "MySQL MY_DATADIR has changed"
-                               ewarn "from ${MY_DATADIR}"
-                               ewarn "to ${new_MY_DATADIR}"
-                               MY_DATADIR="${new_MY_DATADIR}"
-                       fi
-               fi
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_DATADIR
-}
-
-pkg_config() {
-       _getoptval() {
-               local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults
-               local section="$1"
-               local flag="--${2}="
-               local extra_options="${3}"
-               "${mypd}" $extra_options $section | sed -n 
"/^${flag}/s,${flag},,gp"
-       }
-       local old_MY_DATADIR="${MY_DATADIR}"
-       local old_HOME="${HOME}"
-       # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX}/root
-
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
-       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
-               die "Minimal builds do NOT include the MySQL server"
-       fi
-
-       if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != 
"${old_MY_DATADIR}" ) ]]; then
-               local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
-               MY_DATADIR_s="${MY_DATADIR_s%%/}"
-               local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
-               old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
-
-               if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" 
!= / ) ]]; then
-                       if [[ -d "${MY_DATADIR_s}" ]]; then
-                               ewarn "Both ${old_MY_DATADIR_s} and 
${MY_DATADIR_s} exist"
-                               ewarn "Attempting to use ${MY_DATADIR_s} and 
preserving ${old_MY_DATADIR_s}"
-                       else
-                               elog "Moving MY_DATADIR from 
${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
-                               mv --strip-trailing-slashes -T 
"${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
-                               || die "Moving MY_DATADIR failed"
-                       fi
-               else
-                       ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does 
not exist"
-                       if [[ -d "${MY_DATADIR_s}" ]]; then
-                               ewarn "Attempting to use ${MY_DATADIR_s}"
-                       else
-                               eerror "New MY_DATADIR (${MY_DATADIR_s}) does 
not exist"
-                               die "Configuration Failed! Please reinstall 
${CATEGORY}/${PN}"
-                       fi
-               fi
-       fi
-
-       local pwd1="a"
-       local pwd2="b"
-       local maxtry=15
-
-       if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-               local tmp_mysqld_password_source=
-
-               for tmp_mysqld_password_source in mysql client; do
-                       einfo "Trying to get password for mysql 'root' user 
from '${tmp_mysqld_password_source}' section ..."
-                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password)"
-                       if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
-                               if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
-                                       ewarn "Ignoring password from 
'${tmp_mysqld_password_source}' section due to newline character (do you have 
multiple password options set?)!"
-                                       MYSQL_ROOT_PASSWORD=
-                                       continue
-                               fi
-
-                               einfo "Found password in 
'${tmp_mysqld_password_source}' section!"
-                               break
-                       fi
-               done
-
-               # Sometimes --show is required to display passwords in some 
implementations of my_print_defaults
-               if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
-                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password --show)"
-               fi
-
-               unset tmp_mysqld_password_source
-       fi
-       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir | tail -n 1)"
-       # These are dir+prefix
-       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log | tail -n 1)"
-       MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin | tail -n 1)"
-       MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
-
-       if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
-               einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_TMPDIR"
-       fi
-       if [[ ! -d "${ROOT}/$MYSQL_LOG_BIN" ]]; then
-               einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_LOG_BIN"
-       fi
-       if [[ ! -d "${EROOT}/$MYSQL_RELAY_LOG" ]]; then
-               einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
-               install -d -m 770 -o mysql -g mysql "${EROOT}/$MYSQL_RELAY_LOG"
-       fi
-
-       if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
-               ewarn "You have already a MySQL database in place."
-               ewarn "(${ROOT}/${MY_DATADIR}/*)"
-               ewarn "Please rename or delete it if you wish to replace it."
-               die "MySQL database already exists!"
-       fi
-
-       # Bug #213475 - MySQL _will_ object strenously if your machine is named
-       # localhost. Also causes weird failures.
-       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-       if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
-
-               einfo "Please provide a password for the mysql 'root' user now"
-               einfo "or through the ${HOME}/.my.cnf file."
-               ewarn "Avoid [\"'\\_%] characters in the password"
-               read -rsp "    >" pwd1 ; echo
-
-               einfo "Retype the password"
-               read -rsp "    >" pwd2 ; echo
-
-               if [[ "x$pwd1" != "x$pwd2" ]] ; then
-                       die "Passwords are not the same"
-               fi
-               MYSQL_ROOT_PASSWORD="${pwd1}"
-               unset pwd1 pwd2
-       fi
-
-       local options
-       local sqltmp="$(emktemp)"
-
-       # Fix bug 446200. Don't reference host my.cnf, needs to come first,
-       # see https://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-       # Figure out which options we need to disable to do the setup
-       local helpfile="${TMPDIR}/mysqld-help"
-       "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-       for opt in grant-tables host-cache name-resolve networking slave-start \
-               federated ssl log-bin relay-log slow-query-log external-locking 
\
-               log-slave-updates \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-
-       einfo "Creating the mysql database and setting proper permissions on it 
..."
-
-       # Now that /var/run is a tmpfs mount point, we need to ensure it exists 
before using it
-       PID_DIR="${EROOT}/var/run/mysqld"
-       if [[ ! -d "${PID_DIR}" ]]; then
-               install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could 
not create pid directory"
-       fi
-
-       if [[ ! -d "${MY_DATADIR}" ]]; then
-               install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die 
"Could not create data directory"
-       fi
-
-       pushd "${TMPDIR}" &>/dev/null || die
-
-       # Filling timezones, see
-       # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-       "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
-
-       local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
-       [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-       einfo "Command: ${cmd[*]}"
-       su -s /bin/sh -c "${cmd[*]}" mysql \
-               >"${TMPDIR}"/mysql_install_db.log 2>&1
-       if [ $? -ne 0 ]; then
-               grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-       fi
-       popd &>/dev/null || die
-       [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-       || die "MySQL databases not installed"
-
-       use prefix || options="${options} --user=mysql"
-
-       local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-       local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-       local mysqld="${EROOT}/usr/sbin/mysqld \
-               ${options} \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --socket=${socket} \
-               --pid-file=${pidfile} \
-               --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-       #einfo "About to start mysqld: ${mysqld}"
-       ebegin "Starting mysqld"
-       einfo "Command ${mysqld}"
-       ${mysqld} &
-       rc=$?
-       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-               maxtry=$((${maxtry}-1))
-               echo -n "."
-               sleep 1
-       done
-       eend $rc
-
-       if ! [[ -S "${socket}" ]]; then
-               die "Completely failed to start up mysqld with: ${mysqld}"
-       fi
-
-       ebegin "Setting root password"
-       # Do this from memory, as we don't want clear text passwords in temp 
files
-       local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-       "${EROOT}/usr/bin/mysql" \
-               "--socket=${socket}" \
-               -hlocalhost \
-               -e "${sql}"
-       eend $?
-
-       if [[ -n "${sqltmp}" ]] ; then
-               ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
-               "${EROOT}/usr/bin/mysql" \
-                       "--socket=${socket}" \
-                       -hlocalhost \
-                       -uroot \
-                       --password="${MYSQL_ROOT_PASSWORD}" \
-                       mysql < "${sqltmp}"
-               rc=$?
-               eend $?
-               [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-       fi
-
-       # Stop the server and cleanup
-       einfo "Stopping the server ..."
-       kill $(< "${pidfile}" )
-       rm -f "${sqltmp}"
-       wait %1
-       einfo "Done"
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 176cf074d58..3f6dcc810be 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -419,13 +419,6 @@ app-admin/recursos
 # Removal in 30 days.  Bug #664120, #742008.
 sci-chemistry/ortep3
 
-# Thomas Deutschmann <whi...@gentoo.org> (2020-09-11)
-# These versions are not compatible with current stable
-# dev-libs/openssl version, bug #741622.
-# Removal in 30 days. Please migrate to newer slots.
-dev-db/mariadb:5.5
-dev-db/mariadb:10.1
-
 # Michał Górny <mgo...@gentoo.org> (2020-09-09)
 # These packages (or package versions) still require Python 2.7.
 # They are either dead upstream, their Python 3 porting efforts are

Reply via email to