commit:     fc079d7ec75987306855ada1a27de618cad5c10d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 22:36:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 23:22:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc079d7e

dev-db/mariadb: bump to v10.5.9

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/mariadb/Manifest              |    2 +
 dev-db/mariadb/mariadb-10.5.9.ebuild | 1035 ++++++++++++++++++++++++++++++++++
 2 files changed, 1037 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bb98ea26e54..60d9aa0d4cd 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -29,4 +29,6 @@ DIST mariadb-10.5.7-patches-02.tar.xz 8992 BLAKE2B 
ec9acc1f09ac08319c5ad7e952e75
 DIST mariadb-10.5.7.tar.gz 88214625 BLAKE2B 
8ec53b4b98565d99a707899fd6adfdc5bffbf722528e0042ab16b5e186d32229a386881f2781a0ce435585f338b48dc66459bef9d8921fadc00a3d770b62bf5c
 SHA512 
d964c61d6ba7cf21fea97b8e0b6a0bf1ee50fc7a7995753dafd710f4656001bd6e03c243896efb5802cce16dd6470849ed036d09b17415a538e008f64e974a9f
 DIST mariadb-10.5.8-patches-01.tar.xz 6212 BLAKE2B 
7e4358d02d25edc51f5926a75646052ccf07fe2b5cab1901a133b27764793c94ca2a6c4d4b90b5d911b25a6d86f1cb7d2659edbcdab52c445fd6959ea080275d
 SHA512 
f7a5d948c6d7d97896538b7df0de60c8e7969dd15b4ff406e8955a282e69fb7f19fe91424afc332029ac2a36c52781617bbf1c5f6d57dd3bfc21d3ea20ff4c5a
 DIST mariadb-10.5.8.tar.gz 88206163 BLAKE2B 
eaaddaf240102428a23602655920bdf543d25cf85e669b1b07bedba5119a5e0f4498e999db39031dcff168ac810ed0b28f5fa9ac995b3634b84b99b753b4636c
 SHA512 
9801a68440a3502b49655e34dcbfd09734f4a4f1ba8621ed9b895e194cea461a8c69fb0ff66488d5defd3065b43f73e5083a60142e11cc7e4a442f86769b06e5
+DIST mariadb-10.5.9-patches-01.tar.xz 6208 BLAKE2B 
08c77747fa9d41b70a10e0056fdc8f4df4fae8f818d51c1762cb75b563c61844352511aff1da3e5571bb78f4b5060728321dab8e1f4ec52fd631ba1b4e3edff1
 SHA512 
0e14f2d3bc1d3c3d591ba6d2c27958c6bd9924395ff75993f598a743aae61c7d9489e79caa4827f786b573f013868d4a501655207948f17079ad289f05b8866d
+DIST mariadb-10.5.9.tar.gz 88639930 BLAKE2B 
512c3fb0541bbeb19878979104f7858ce18ce67187507c8395798cfc9ffe92bd83e39bd47251419363600348a85716406286bd27b3c28662ea63e8ec761a4e01
 SHA512 
d23d5bf8510b3c36a6521fb3244cf323ef0f5d100ba379ed7b5bbc2acae1765a5b46c17bd929f0b27b28923eb1b5975314abdf7ffb96905cf7a93a5c8837294e
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 
1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43
 SHA512 
ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c

diff --git a/dev-db/mariadb/mariadb-10.5.9.ebuild 
b/dev-db/mariadb/mariadb-10.5.9.ebuild
new file mode 100644
index 00000000000..a475f7aecbf
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.5.9.ebuild
@@ -0,0 +1,1035 @@
+# Copyright 1999-2021 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
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.5.9-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 LGPL-2.1+"
+SLOT="10.5/${SUBSLOT:-0}"
+IUSE="+backup bindist columnstore cracklib debug extraengine galera innodb-lz4
+       innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+       numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+       sst-rsync sst-mariabackup static systemd systemtap s3 tcmalloc
+       test 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 )
+       ?? ( 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 ~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="
+       >=dev-libs/libpcre-8.41-r1:3=
+       >=sys-apps/sed-4
+       >=sys-apps/texinfo-4.7-r1
+       sys-libs/ncurses:0=
+       >=sys-libs/zlib-1.2.3:0=
+       !bindist? (
+               sys-libs/binutils-libs:0=
+               >=sys-libs/readline-4.1:0=
+       )
+       jemalloc? ( dev-libs/jemalloc:0= )
+       kerberos? ( virtual/krb5 )
+       kernel_linux? (
+               sys-process/procps:0=
+               dev-libs/libaio:0=
+       )
+       server? (
+               app-arch/bzip2
+               app-arch/xz-utils
+               backup? ( app-arch/libarchive:0= )
+               columnstore? (
+                       app-arch/snappy
+                       dev-libs/boost:0=
+                       dev-libs/libxml2:2=
+               )
+               cracklib? ( sys-libs/cracklib:0= )
+               extraengine? (
+                       odbc? ( dev-db/unixODBC:0= )
+                       xml? ( dev-libs/libxml2:2= )
+               )
+               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= )
+               s3? ( net-misc/curl )
+               systemd? ( sys-apps/systemd:= )
+       )
+       systemtap? ( >=dev-util/systemtap-1.3:0= )
+       tcmalloc? ( dev-util/google-perftools:0= )
+       yassl? ( net-libs/gnutls:0= )
+       !yassl? (
+               !libressl? ( >=dev-libs/openssl-1.0.0:0= )
+               libressl? ( dev-libs/libressl:0= )
+       )
+"
+BDEPEND="virtual/yacc
+       || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+"
+DEPEND="${COMMON_DEPEND}
+       server? (
+               extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) )
+               test? ( acct-group/mysql acct-user/mysql )
+       )
+       static? ( sys-libs/ncurses[static-libs] )
+"
+RDEPEND="${COMMON_DEPEND}
+       !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.1
+       !dev-db/mariadb:10.2
+       !dev-db/mariadb:10.3
+       !dev-db/mariadb:10.4
+       !<virtual/mysql-5.6-r11
+       !<virtual/libmysqlclient-18-r1
+       selinux? ( sec-policy/selinux-mysql )
+       server? (
+               columnstore? ( dev-db/mariadb-connector-c )
+               extraengine? ( jdbc? ( >=virtual/jre-1.6 ) )
+               galera? (
+                       sys-apps/iproute2
+                       =sys-cluster/galera-26*
+                       sst-rsync? ( sys-process/lsof )
+                       sst-mariabackup? ( net-misc/socat[ssl] )
+               )
+               !prefix? ( dev-db/mysql-init-scripts acct-group/mysql 
acct-user/mysql )
+       )
+       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 )"
+
+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)
+
+               # 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}/${P/_rc/}" "${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 jemalloc; then
+               echo "TARGET_LINK_LIBRARIES(mariadbd jemalloc)" >> 
"${S}/sql/CMakeLists.txt"
+       elif use tcmalloc; then
+               echo "TARGET_LINK_LIBRARIES(mariadbd tcmalloc)" >> 
"${S}/sql/CMakeLists.txt"
+       fi
+
+       local plugin
+       local server_plugins=( handler_socket auth_socket feedback 
metadata_lock_info
+                               locale_info qc_info server_audit sql_errlog 
auth_ed25519 )
+       local test_plugins=( audit_null auth_examples daemon_example fulltext
+                               debug_key_management example_key_management 
versioning )
+       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
+               _disable_engine test_sql_discovery
+               echo > "${S}/plugin/auth_pam/testing/CMakeLists.txt" || die
+       fi
+
+       _disable_engine example
+
+       if ! use oqgraph ; then # avoids extra library checks
+               _disable_engine oqgraph
+       fi
+
+       if use mroonga ; then
+               # Remove the bundled groonga
+               # There is no CMake flag, it simply checks for existance
+               rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
+       else
+               _disable_engine mroonga
+       fi
+
+       # Fix static bindings in galera replication
+       sed -i -e 's~add_library(wsrep_api_v26$~add_library(wsrep_api_v26 
STATIC~' \
+               "${S}"/wsrep-lib/wsrep-API/CMakeLists.txt || die
+       sed -i -e 's~add_library(wsrep-lib$~add_library(wsrep-lib STATIC~' \
+               "${S}"/wsrep-lib/src/CMakeLists.txt || die
+
+       # Fix galera_recovery.sh script
+       sed -i -e 
"s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~"
 \
+               scripts/galera_recovery.sh || die
+
+       sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \
+               "${S}"/scripts/mysql_install_db.sh || die
+
+       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]"
+
+       # It fails on alpha without this
+       use alpha && append-ldflags "-Wl,--no-relax"
+
+       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')"
+               -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+               -DSYSCONFDIR="${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"
+               -DWITH_COMMENT="Gentoo Linux ${PF}"
+               -DWITH_UNIT_TESTS=$(usex test ON OFF)
+               -DWITH_LIBEDIT=0
+               -DWITH_ZLIB=system
+               -DWITHOUT_LIBWRAP=1
+               -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)
+               -DPKG_CONFIG_EXECUTABLE="${EPREFIX}/usr/bin/$(tc-getPKG_CONFIG)"
+               -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+               -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+               -DCONC_WITH_EXTERNAL_ZLIB=YES
+               -DWITH_EXTERNAL_ZLIB=YES
+               -DSUFFIX_INSTALL_DIR=""
+               -DWITH_UNITTEST=OFF
+               -DWITHOUT_CLIENTLIBS=YES
+               -DCLIENT_PLUGIN_DIALOG=OFF
+               -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
+               -DCLIENT_PLUGIN_CLIENT_ED25519=OFF
+               -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+               -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
+       )
+       if use test ; then
+               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+       else
+               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+       fi
+
+       if ! use yassl ; then
+               mycmakeargs+=( -DWITH_SSL=system 
-DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC )
+       else
+               mycmakeargs+=( -DWITH_SSL=bundled )
+       fi
+
+       # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
+       mycmakeargs+=(
+               -DWITH_READLINE=$(usex bindist 1 0)
+               -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
+               -DENABLE_DTRACE=$(usex systemtap)
+       )
+
+       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_PCRE=system
+                       -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+                       -DPLUGIN_SPHINX=$(usex sphinx 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_S3=$(usex s3 YES NO)
+                       -DPLUGIN_COLUMNSTORE=$(usex columnstore 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)
+                       -DWITH_MARIABACKUP=$(usex backup ON OFF)
+                       -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+                       -DINSTALL_SQLBENCHDIR=""
+                       -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+                       # systemd is only linked to for server notification
+                       -DWITH_SYSTEMD=$(usex systemd yes no)
+                       -DWITH_NUMA=$(usex numa ON OFF)
+               )
+
+               if use test ; then
+                       # This is needed for the new client lib which tests a 
real, open server
+                       mycmakeargs+=( -DSKIP_TESTS=ON )
+               fi
+
+               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
+                       -DWITH_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.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+=( "perfschema.nesting;23458;Known to be broken" )
+       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.sp2;24177;Requires USE=latin1" )
+               disabled_tests+=( "main.system_mysql_db;0;Requires USE=latin1" )
+               disabled_tests+=( "main.upgrade_MDEV-19650;24178;Requires 
USE=latin1" )
+       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-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
+       cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+       eprefixify "${TMPDIR}/my.cnf"
+       doins "${TMPDIR}/my.cnf"
+       insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+       cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" 
|| die
+       eprefixify "${TMPDIR}/50-distro-client.cnf"
+       doins "${TMPDIR}/50-distro-client.cnf"
+
+       if use server ; then
+               mycnf_src="my.cnf.distro-server"
+               sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+                       "${FILESDIR}/${mycnf_src}" \
+                       > "${TMPDIR}/my.cnf.ok" || die
+               if use prefix ; then
+                       sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+                               "${TMPDIR}/my.cnf.ok" || die
+               fi
+               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" 50-distro-server.cnf
+
+               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"
+
+               if use pam ; then
+                       keepdir 
/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir
+               fi
+       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
+
+       # Fix a dangling symlink when galera is not built
+       if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then
+               rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
+       fi
+
+       # Remove broken SST scripts that are incompatible
+       local scriptremove
+       for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do
+               if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then
+                       rm "${ED}/usr/bin/${scriptremove}" || die
+               fi
+       done
+}
+
+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
+                       chown mysql:mysql 
"${EROOT}/usr/$(get_libdir)/mariadb/plugin/auth_pam_tool_dir" || die
+               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
+
+               if use galera ; then
+                       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
+                       if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+                               local rver
+                               for rver in ${REPLACING_VERSIONS} ; do
+                                       if ver_test "${rver}" -lt "10.4.0" ; 
then
+                                               ewarn "Upgrading galera from a 
previous version requires admin restart of the entire cluster."
+                                               ewarn "Please refer to 
https://mariadb.com/kb/en/library/changes-improvements-in-mariadb-104/#galera-4";
+                                               ewarn "for more information"
+                                       fi
+                               done
+                       fi
+               fi
+       fi
+
+       # Note about configuration change
+       einfo
+       elog "This version of mariadb reorganizes the configuration from a 
single my.cnf"
+       elog "to several files in /etc/mysql/${PN}.d."
+       elog "Please backup any changes you made to /etc/mysql/my.cnf"
+       elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf 
extension."
+       elog "You may have as many files as needed and they are read 
alphabetically."
+       elog "Be sure the options have the appropriate section headers, i.e. 
[mysqld]."
+       einfo
+}
+
+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"
+               einfo "Not entering a password defaults to UNIX authentication"
+               read -rsp "    >" pwd1 ; echo
+
+               if [[ -n "${pwd1}" ]] ; then
+                       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}"
+               fi
+
+               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 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"
+
+       if [[ -z ${sqltmp} && -z ${MYSQL_ROOT_PASSWORD} ]] ; then
+               einfo "Done"
+               exit 0
+       fi
+
+       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
+
+       if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then
+               ebegin "Setting root password"
+               # Do this from memory, as we don't want clear text passwords in 
temp files
+               local sql="SET PASSWORD FOR 'root'@'localhost' = 
PASSWORD('${MYSQL_ROOT_PASSWORD}')"
+               "${EROOT}/usr/bin/mysql" \
+                       "--socket=${socket}" \
+                       -hlocalhost \
+                       -e "${sql}"
+               unset sql
+               eend $?
+       fi
+
+       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"
+}

Reply via email to