commit:     3bb2cffb5ada03f00b9e503d71953a42eda43b2a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  9 14:43:03 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 14:43:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb2cffb

eclass: Remove deprecated mysql eclasses

These are no longer used as the forks have diverged, features changed and became
increasingly difficult to maintain

Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 eclass/mysql-cmake.eclass       |  541 -------------------
 eclass/mysql-multilib-r1.eclass | 1142 ---------------------------------------
 eclass/mysql-v2.eclass          |  915 -------------------------------
 eclass/mysql_fx.eclass          |  321 -----------
 4 files changed, 2919 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
deleted file mode 100644
index a3c05a5fa98..00000000000
--- a/eclass/mysql-cmake.eclass
+++ /dev/null
@@ -1,541 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: mysql-cmake.eclass
-# @MAINTAINER:
-# Maintainers:
-#      - MySQL Team <[email protected]>
-#      - Robin H. Johnson <[email protected]>
-#      - Jorge Manuel B. S. Vicetto <[email protected]>
-#      - Brian Evans <[email protected]>
-# @BLURB: This eclass provides the support for cmake based mysql releases
-# @DESCRIPTION:
-# The mysql-cmake.eclass provides the support to build the mysql
-# ebuilds using the cmake build system. This eclass provides
-# the src_prepare, src_configure, src_compile, and src_install
-# phase hooks.
-
-inherit cmake-utils flag-o-matic multilib prefix eutils toolchain-funcs 
versionator
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql_cmake_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-cmake_disable_test() {
-
-       local rawtestname testname testsuite reason mysql_disabled_file 
mysql_disabled_dir
-       rawtestname="${1}" ; shift
-       reason="${@}"
-       ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-       testsuite="${rawtestname/.*}"
-       testname="${rawtestname/*.}"
-       for mysql_disabled_file in \
-               ${S}/mysql-test/disabled.def \
-               ${S}/mysql-test/t/disabled.def ; do
-               [[ -f ${mysql_disabled_file} ]] && break
-       done
-       #mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-       #einfo "rawtestname=${rawtestname} testname=${testname} 
testsuite=${testsuite}"
-       echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-       if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-               for mysql_disabled_file in \
-                       ${S}/mysql-test/suite/${testsuite}/disabled.def \
-                       ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
-                       FAILED ; do
-                       [[ -f ${mysql_disabled_file} ]] && break
-               done
-               if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-                       echo "${testname} : ${reason}" >> 
"${mysql_disabled_file}"
-               else
-                       for mysql_disabled_dir in \
-                               ${S}/mysql-test/suite/${testsuite} \
-                               ${S}/mysql-test/suite/${testsuite}/t \
-                               FAILED ; do
-                               [[ -d ${mysql_disabled_dir} ]] && break
-                       done
-                       if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-                               echo "${testname} : ${reason}" >> 
"${mysql_disabled_dir}/disabled.def"
-                       else
-                               ewarn "Could not find testsuite disabled.def 
location for ${rawtestname}"
-                       fi
-               fi
-       fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-       [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-       if use_if_iuse $1 ; then
-               echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
-       else
-               echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
-       fi
-}
-
-# @FUNCTION: configure_cmake_locale
-# @DESCRIPTION:
-# Helper function to configure locale cmake options
-configure_cmake_locale() {
-
-       if use_if_iuse minimal ; then
-               :
-       elif ! in_iuse server || use_if_iuse server ; then
-               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
-       fi
-}
-
-# @FUNCTION: configure_cmake_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_cmake_minimal() {
-
-       mycmakeargs+=(
-               -DWITHOUT_SERVER=1
-               -DWITHOUT_EMBEDDED_SERVER=1
-               -DEXTRA_CHARSETS=none
-               -DINSTALL_SQLBENCHDIR=
-               -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
-               -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
-               -DWITHOUT_CSV_STORAGE_ENGINE=1
-               -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-               -DWITHOUT_HEAP_STORAGE_ENGINE=1
-               -DWITHOUT_INNOBASE_STORAGE_ENGINE=1
-               -DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
-               -DWITHOUT_MYISAM_STORAGE_ENGINE=1
-               -DWITHOUT_PARTITION_STORAGE_ENGINE=1
-               -DPLUGIN_ARCHIVE=NO
-               -DPLUGIN_BLACKHOLE=NO
-               -DPLUGIN_CSV=NO
-               -DPLUGIN_FEDERATED=NO
-               -DPLUGIN_HEAP=NO
-               -DPLUGIN_INNOBASE=NO
-               -DPLUGIN_MYISAMMRG=NO
-               -DPLUGIN_MYISAM=NO
-               -DPLUGIN_PARTITION=NO
-       )
-}
-
-# @FUNCTION: configure_cmake_standard
-# @DESCRIPTION:
-# Helper function to configure standard build
-configure_cmake_standard() {
-
-       mycmakeargs+=(
-               -DEXTRA_CHARSETS=all
-               -DMYSQL_USER=mysql
-               -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-               $(cmake-utils_use_disable !static SHARED)
-               $(cmake-utils_use_with debug)
-               $(cmake-utils_use_with embedded EMBEDDED_SERVER)
-               $(cmake-utils_use_with profiling)
-               $(cmake-utils_use_enable systemtap DTRACE)
-       )
-
-       if use static; then
-               mycmakeargs+=( -DWITH_PIC=1 )
-       fi
-
-       if use jemalloc; then
-               mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-       fi
-
-       if 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
-       )
-
-       if in_iuse pbxt ; then
-               mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) 
)
-       fi
-
-       if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; 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
-                               -DPLUGIN_FEDERATED=NO
-                               -DWITHOUT_FEDERATEDX_STORAGE_ENGINE=1
-                               -DPLUGIN_FEDERATEDX=NO )
-               fi
-
-               mycmakeargs+=(
-                       $(mysql-cmake_use_plugin oqgraph OQGRAPH)
-                       $(mysql-cmake_use_plugin sphinx SPHINX)
-                       $(mysql-cmake_use_plugin tokudb TOKUDB)
-                       $(mysql-cmake_use_plugin pam AUTH_PAM)
-               )
-
-               if mysql_version_is_at_least 10.0.5 ; then
-                       # CassandraSE needs Apache Thrift which is not in 
portage
-                       mycmakeargs+=(
-                               -DWITHOUT_CASSANDRA=1 -DWITH_CASSANDRA=0
-                               -DPLUGIN_CASSANDRA=NO
-                               $(mysql-cmake_use_plugin extraengine SEQUENCE)
-                               $(mysql-cmake_use_plugin extraengine SPIDER)
-                               $(mysql-cmake_use_plugin extraengine CONNECT)
-                               -DCONNECT_WITH_MYSQL=1
-                               $(cmake-utils_use xml CONNECT_WITH_LIBXML2)
-                               $(cmake-utils_use odbc CONNECT_WITH_ODBC)
-                       )
-               fi
-
-               if in_iuse mroonga ; then
-                       use mroonga || mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-               else
-                       mycmakeargs+=( -DWITHOUT_MROONGA=1 )
-               fi
-
-               if in_iuse galera ; then
-                       mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
-               fi
-
-               if mysql_version_is_at_least "10.1.1" ; then
-                       mycmakeargs+=(  $(cmake-utils_use_with innodb-lz4 
INNODB_LZ4)
-                                       $(cmake-utils_use_with innodb-lzo 
INNODB_LZO) )
-               fi
-
-               if in_iuse innodb-snappy ; then
-                       mycmakeargs+=( $(cmake-utils_use_with innodb-snappy 
INNODB_SNAPPY)  )
-               fi
-
-               if mysql_version_is_at_least "10.1.2" ; then
-                       mycmakeargs+=( $(mysql-cmake_use_plugin cracklib 
CRACKLIB_PASSWORD_CHECK ) )
-               fi
-
-               # 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.
-               mycmakeargs+=( -DSTACK_DIRECTION=$(tc-stack-grows-down && echo 
-1 || echo 1) )
-       else
-               mycmakeargs+=( $(cmake-utils_use_with extraengine 
FEDERATED_STORAGE_ENGINE) )
-       fi
-
-       if [[ ${PN} == "percona-server" ]]; then
-               mycmakeargs+=(
-                       $(cmake-utils_use_with pam PAM)
-               )
-               if in_iuse tokudb ; then
-                       # TokuDB Backup plugin requires valgrind unconditionally
-                       mycmakeargs+=(
-                               $(mysql-cmake_use_plugin tokudb TOKUDB)
-                               $(usex tokudb-backup-plugin "" 
-DTOKUDB_BACKUP_DISABLED=1)
-                       )
-               fi
-       fi
-
-       if [[ ${PN} == "mysql-cluster" ]]; then
-               # TODO: This really should include the following options,
-               # but the memcached package doesn't install the files it seeks.
-               # -DWITH_BUNDLED_MEMCACHED=OFF
-               # -DMEMCACHED_HOME=${EPREFIX}/usr
-               mycmakeargs+=(
-                       -DWITH_BUNDLED_LIBEVENT=OFF
-                       $(cmake-utils_use_with java NDB_JAVA)
-               )
-       fi
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-cmake_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-cmake_src_prepare() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       cd "${S}"
-
-       if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-               # Apply the patches for this MySQL version
-               EPATCH_SUFFIX="patch"
-               mkdir -p "${EPATCH_SOURCE}" || die "Unable to create epatch 
directory"
-               # Clean out old items
-               rm -f "${EPATCH_SOURCE}"/*
-               # Now link in right patches
-               mysql_mv_patches
-               # And apply
-               epatch
-       fi
-
-       # last -fPIC fixup, per bug #305873
-       i="${S}"/storage/innodb_plugin/plug.in
-       [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
-
-       rm -f "scripts/mysqlbug"
-       if use jemalloc && ! ( [[ ${PN} == "mariadb" ]] && 
mysql_version_is_at_least "5.5.33" ); then
-               echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> 
"${S}/sql/CMakeLists.txt" || die
-       fi
-
-       if use tcmalloc; then
-               echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> 
"${S}/sql/CMakeLists.txt"
-       fi
-
-       if in_iuse tokudb ; then
-               # Don't build bundled xz-utils
-               if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-                       rm -f 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-                       touch 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-                       sed -i 's/ build_lzma//' 
"${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-               elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-                       rm 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
-                       touch 
"${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
-               fi
-
-               if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use 
tokudb-backup-plugin ; then
-                        rm -r 
"${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
-               fi
-       fi
-
-       # Remove the bundled groonga if it exists
-       # There is no CMake flag, it simply checks for existance
-       if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
-               rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
-       fi
-
-       cmake-utils_src_prepare
-}
-
-# @FUNCTION: mysql-cmake_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-cmake_src_configure() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-       # debug hack wrt #497532
-       mycmakeargs=(
-               -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-               -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")"
-               -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-               -DMYSQL_DATADIR=${EPREFIX}/var/lib/mysql
-               -DSYSCONFDIR=${EPREFIX}/etc/mysql
-               -DINSTALL_BINDIR=bin
-               -DINSTALL_DOCDIR=share/doc/${P}
-               -DINSTALL_DOCREADMEDIR=share/doc/${P}
-               -DINSTALL_INCLUDEDIR=include/mysql
-               -DINSTALL_INFODIR=share/info
-               -DINSTALL_LIBDIR=$(get_libdir)
-               -DINSTALL_ELIBDIR=$(get_libdir)/mysql
-               -DINSTALL_MANDIR=share/man
-               -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-               -DINSTALL_MYSQLSHAREDIR=share/mysql
-               -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test
-               -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-               -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SCRIPTDIR=share/mysql/scripts
-               -DINSTALL_SQLBENCHDIR=share/mysql
-               -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-               -DWITH_COMMENT="Gentoo Linux ${PF}"
-               $(cmake-utils_use_with test UNIT_TESTS)
-               -DWITH_LIBEDIT=0
-               -DWITH_ZLIB=system
-               -DWITHOUT_LIBWRAP=1
-               -DENABLED_LOCAL_INFILE=1
-               $(cmake-utils_use_enable static-libs STATIC_LIBS)
-               -DWITH_SSL=$(usex ssl system bundled)
-               -DWITH_DEFAULT_COMPILER_OPTIONS=0
-               -DWITH_DEFAULT_FEATURE_SET=0
-       )
-
-       if in_iuse bindist ; then
-               mycmakeargs+=(
-                       -DWITH_READLINE=$(usex bindist 1 0)
-                       -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-                       $(usex bindist -DHAVE_BFD_H=0 '')
-               )
-       fi
-
-       mycmakeargs+=( -DWITH_EDITLINE=system )
-
-       if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-               mycmakeargs+=(
-                       -DWITH_JEMALLOC=$(usex jemalloc system)
-               )
-               mysql_version_is_at_least "10.0.9" && mycmakeargs+=( 
-DWITH_PCRE=system )
-       fi
-
-       configure_cmake_locale
-
-       if use_if_iuse minimal ; then
-               configure_cmake_minimal
-       else
-               configure_cmake_standard
-       fi
-
-       # Bug #114895, bug #110149
-       filter-flags "-O" "-O[01]"
-
-       CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-       CXXFLAGS="${CXXFLAGS} -felide-constructors"
-       # Causes linkage failures. Upstream bug #59607 removes it
-       if ! mysql_version_is_at_least "5.6" ; then
-               CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-       fi
-       # As of 5.7, exceptions and rtti are used!
-       if [[ ${PN} -eq 'percona-server' ]] && mysql_version_is_at_least 
"5.6.26" ; then
-               CXXFLAGS="${CXXFLAGS} -fno-rtti"
-       elif ! mysql_version_is_at_least "5.7" ; then
-               CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-rtti"
-       fi
-       export CXXFLAGS
-
-       # bug #283926, with GCC4.4, this is required to get correct behavior.
-       append-flags -fno-strict-aliasing
-
-       cmake-utils_src_configure
-}
-
-# @FUNCTION: mysql-cmake_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-cmake_src_compile() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       cmake-utils_src_compile
-}
-
-# @FUNCTION: mysql-cmake_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-cmake_src_install() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       cmake-utils_src_install
-
-       if ! in_iuse tools || use_if_iuse tools ; then
-               # Convenience links
-               einfo "Making Convenience links for mysqlcheck multi-call 
binary"
-               dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-               dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-               dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
-       fi
-
-       # Create a mariadb_config symlink
-       [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && dosym 
"/usr/bin/mysql_config" "/usr/bin/mariadb_config"
-
-       # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
-       rm -Rf "${ED}/usr/data"
-
-       # Various junk (my-*.cnf moved elsewhere)
-       einfo "Removing duplicate /usr/share/mysql files"
-
-       # 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
-       case ${MYSQL_PV_MAJOR} in
-               5.[1-4]*) mysql_mycnf_version="5.1" ;;
-               5.5) mysql_mycnf_version="5.5" ;;
-               5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
-       esac
-       einfo "Building default my.cnf (${mysql_mycnf_version})"
-       insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-       [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins 
"${S}"/scripts/mysqlaccess.conf
-       mycnf_src="my.cnf-${mysql_mycnf_version}"
-       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
-
-       # Minimal builds don't have the MySQL server
-       if use_if_iuse minimal ; then
-               :
-       elif ! in_iuse server || use_if_iuse server; then
-               einfo "Including support files and sample configurations"
-               docinto "support-files"
-               for script in \
-                       "${S}"/support-files/my-*.cnf.sh \
-                       "${S}"/support-files/magic \
-                       "${S}"/support-files/ndb-config-2-node.ini.sh
-               do
-                       [[ -f $script ]] && dodoc "${script}"
-               done
-
-               docinto "scripts"
-               for script in "${S}"/scripts/mysql* ; do
-                       [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] 
&& dodoc "${script}"
-               done
-       fi
-
-       #Remove mytop if perl is not selected
-       [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && ! use perl \
-       && rm -f "${ED}/usr/bin/mytop"
-
-       in_iuse client-libs && ! use client-libs && return
-
-       # Percona has decided to rename libmysqlclient to libperconaserverclient
-       # Use a symlink to preserve linkages for those who don't use 
mysql_config
-       if [[ ${PN} == "percona-server" ]] && mysql_version_is_at_least 
"5.5.36" ; then
-               dosym libperconaserverclient.so 
/usr/$(get_libdir)/libmysqlclient.so
-               dosym libperconaserverclient.so 
/usr/$(get_libdir)/libmysqlclient_r.so
-               if use static-libs ; then
-                       dosym libperconaserverclient.a 
/usr/$(get_libdir)/libmysqlclient.a
-                       dosym libperconaserverclient.a 
/usr/$(get_libdir)/libmysqlclient_r.a
-               fi
-       fi
-}

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
deleted file mode 100644
index 2a0aea6a5b0..00000000000
--- a/eclass/mysql-multilib-r1.eclass
+++ /dev/null
@@ -1,1142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: mysql-multilib-r1.eclass
-# @MAINTAINER:
-# Maintainers:
-#      - MySQL Team <[email protected]>
-#      - Robin H. Johnson <[email protected]>
-#      - Jorge Manuel B. S. Vicetto <[email protected]>
-#      - Brian Evans <[email protected]>
-# @SUPPORTED_EAPIS: 5 6
-# @BLURB: This eclass provides common functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-multilib-r1.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# Provider and version specific settings will be included in each ebuild.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of extra CMake arguments for native multilib builds
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of extra CMake arguments for non-native multilib builds
-
-# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# An array of CMake arguments added to native and non-native
-
-# Keeping eutils in EAPI=6 for emktemp in pkg_config
-
-inherit eutils systemd flag-o-matic ${MYSQL_EXTRAS} versionator \
-       prefix toolchain-funcs user cmake-utils multilib-minimal
-
-if [[ "${EAPI}x" == "5x" ]]; then
-       inherit multilib mysql_fx
-fi
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-       5|6) ;;
-       *) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure 
src_compile src_install pkg_preinst pkg_postinst pkg_config
-
-#
-# VARIABLES:
-#
-
-# 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"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-       EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-       EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
-       EGIT_CLONE_TYPE=shallow
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-if [[ -z ${MYSQL_PV_MAJOR} ]] ; then 
MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})" ; fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all 
[0..99]
-# This is an important part, because many of the choices the MySQL ebuild will 
do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-if [[ "${EAPI}x" == "5x" ]]; then
-       MYSQL_VERSION_ID=""
-       tpv="${PV%[a-z]}"
-       tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; 
tpv[3]="${tpv[3]##*-r}"
-       for vatom in 0 1 2 3 ; do
-               # pad to length 2
-               tpv[${vatom}]="00${tpv[${vatom}]}"
-               MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-       done
-       # strip leading "0" (otherwise it's considered an octal number by BASH)
-       MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-fi
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-       if [[ ${PN} == "mariadb" ]]; then
-               # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc 
on their tarball names
-               MARIA_FULL_PV=$(get_version_component_range 1-3)
-               MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-               
SERVER_URI="https://downloads.mariadb.org/interstitial/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz";
-       elif [[ ${PN} == "percona-server" ]]; then
-               PERCONA_PN="Percona-Server"
-               MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-               MY_PV=$(get_version_component_range 1-3 ${PV})
-               PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-               PERCONA_RC=$(get_version_component_range 6 ${PV})
-               
SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz";
-       else
-               if [[ "${PN}" == "mysql-cluster" ]] ; then
-                       URI_DIR="MySQL-Cluster"
-                       URI_FILE="mysql-cluster-gpl"
-               else
-                       URI_DIR="MySQL"
-                       URI_FILE="mysql"
-               fi
-               [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-               URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-               MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-               # Recently upstream switched to an archive site, and not on 
mirrors
-               
SERVER_URI="http://cdn.mysql.com/Downloads/${URI_DIR}-${MIRROR_PV}/${URI_A}
-                       
http://downloads.mysql.com/archives/${URI_DIR}-${MIRROR_PV}/${URI_A}";
-       fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# 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
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="https://www.mysql.com/";
-LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
-
-IUSE="debug embedded extraengine jemalloc latin1 libressl +openssl
-       +perl profiling selinux +server systemtap static static-libs tcmalloc 
test yassl"
-
-REQUIRED_USE="^^ ( yassl openssl libressl )"
-
-# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
-RESTRICT="libressl? ( test )"
-
-REQUIRED_USE="${REQUIRED_USE} !server? ( !extraengine !embedded )
-        ?? ( tcmalloc jemalloc )
-        static? ( !libressl !openssl yassl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-# MULTILIB_USEDEP only set for libraries used by the client library
-DEPEND="
-       kernel_linux? (
-               sys-process/procps:0=
-               dev-libs/libaio:0=
-       )
-       >=sys-apps/sed-4
-       >=sys-apps/texinfo-4.7-r1
-       !dev-db/mariadb-native-client[mysqlcompat]
-       jemalloc? ( dev-libs/jemalloc:0= )
-       tcmalloc? ( dev-util/google-perftools:0= )
-       systemtap? ( >=dev-util/systemtap-1.3:0= )
-       openssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] 
)
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-       >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-       sys-libs/ncurses:0=
-"
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-       selinux? ( sec-policy/selinux-mysql )
-"
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; 
do
-       [[ ${i} == ${PN} ]] ||
-       RDEPEND="${RDEPEND} !dev-db/${i}"
-done
-
-RDEPEND="${RDEPEND}
-       server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-       !<virtual/mysql-5.6-r4"
-
-# compile-time-only
-# ncurses only needs multilib for compile time due to a binary that will be 
not installed
-DEPEND="${DEPEND}
-       virtual/yacc
-       static? ( sys-libs/ncurses[static-libs] )
-"
-
-# For other stuff to bring us in
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="${PDEPEND} perl? ( >=dev-perl/DBD-mysql-2.9004 )
-        server? ( ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=] )
-        virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]"
-
-# my_config.h includes ABI specific data
-MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h 
/usr/include/mysql/private/embedded_priv.h )
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-multilib-r1_pkg_pretend
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_pretend phase:
-mysql-multilib-r1_pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]] ; then
-               local GCC_MAJOR_SET=$(gcc-major-version)
-               local GCC_MINOR_SET=$(gcc-minor-version)
-               if in_iuse tokudb && 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
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#   die if FEATURES="test", USE="server" and not using FEATURES="userpriv"
-#   create new user and group for mysql
-#   warn about deprecated features
-mysql-multilib-r1_pkg_setup() {
-
-       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"
-}
-
-# @FUNCTION: mysql-multilib-r1_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-multilib-r1_src_unpack() {
-
-       # Initialize the proper variables first
-       mysql_init_vars
-
-       unpack ${A}
-       # Grab the patches
-       [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" 
git-r3_src_unpack
-
-       mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-multilib-r1_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-multilib-r1_src_prepare() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       cd "${S}"
-
-       if [[ ${MY_EXTRAS_VER} != none ]]; then
-
-               # Apply the patches for this MySQL version
-               if [[ "${EAPI}x" == "5x" ]]; then
-                       EPATCH_SUFFIX="patch"
-                       mkdir -p "${EPATCH_SOURCE}" || die "Unable to create 
epatch directory"
-                       # Clean out old items
-                       rm -f "${EPATCH_SOURCE}"/*
-                       # Now link in right patches
-                       mysql_mv_patches
-                       # And apply
-                       epatch
-               fi
-       fi
-
-       # last -fPIC fixup, per bug #305873
-       i="${S}"/storage/innodb_plugin/plug.in
-       if [[ -f ${i} ]] ; then sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" 
|| die ; fi
-
-       rm -f "scripts/mysqlbug"
-       if use jemalloc && [[ ${PN} != "mariadb" ]] ; then
-               echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> 
"${S}/sql/CMakeLists.txt" || die
-       fi
-
-       if use tcmalloc; then
-               echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> 
"${S}/sql/CMakeLists.txt"
-       fi
-
-       if in_iuse tokudb ; then
-               # Don't build bundled xz-utils
-               if [[ -d "${S}/storage/tokudb/ft-index" ]] ; then
-                       echo > 
"${S}/storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake" || die
-                       sed -i 's/ build_lzma//' 
"${S}/storage/tokudb/ft-index/ft/CMakeLists.txt" || die
-               elif [[ -d "${S}/storage/tokudb/PerconaFT" ]] ; then
-                       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
-               fi
-
-               if [[ -d "${S}/plugin/tokudb-backup-plugin" ]] && ! use 
tokudb-backup-plugin ; then
-                        rm -r 
"${S}/plugin/tokudb-backup-plugin/Percona-TokuBackup" || die
-               fi
-       fi
-
-       # Remove the bundled groonga if it exists
-       # There is no CMake flag, it simply checks for existance
-       if [[ -d "${S}"/storage/mroonga/vendor/groonga ]] ; then
-               rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not 
remove packaged groonga"
-       fi
-
-       # Remove the centos and rhel selinux policies to support mysqld_safe 
under SELinux
-       if [[ -d "${S}/support-files/SELinux" ]] ; then
-               echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
-       fi
-
-       cmake-utils_src_prepare
-}
-
-# @FUNCTION: mysql-multilib-r1_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-multilib-r1_src_configure() {
-       # 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
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       CMAKE_BUILD_TYPE="RelWithDebInfo"
-
-       # debug hack wrt #497532
-       mycmakeargs=(
-               -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
-               -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_ELIBDIR=$(get_libdir)/mysql
-               -DINSTALL_MANDIR=share/man
-               -DINSTALL_MYSQLDATADIR=${EPREFIX}/var/lib/mysql
-               -DINSTALL_MYSQLSHAREDIR=share/mysql
-               -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
-               -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SCRIPTDIR=share/mysql/scripts
-               -DINSTALL_SQLBENCHDIR=share/mysql
-               -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql
-               -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)"
-               -DENABLE_STATIC_LIBS=$(usex static-libs ON OFF)
-               # 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)"
-       )
-
-       if use test ; then
-               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test )
-       else
-               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
-       fi
-
-       if use openssl || use libressl ; then
-               mycmakeargs+=( -DWITH_SSL=system )
-       else
-               mycmakeargs+=( -DWITH_SSL=bundled )
-       fi
-
-       if ! multilib_is_native_abi ; then
-               mycmakeargs+=( -DWITHOUT_TOOLS=1 )
-       fi
-
-       if in_iuse bindist ; then
-               # bfd.h is only used starting with 10.1 and can be controlled 
by NOT_FOR_DISTRIBUTION
-               if multilib_is_native_abi; then
-                       mycmakeargs+=(
-                               -DWITH_READLINE=$(usex bindist 1 0)
-                               -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-                       )
-               else
-                       mycmakeargs+=(
-                               -DWITH_READLINE=1
-                               -DNOT_FOR_DISTRIBUTION=0
-                       )
-               fi
-       fi
-
-       ### TODO: make this system but issues with UTF-8 prevent it
-       mycmakeargs+=( -DWITH_EDITLINE=bundled )
-
-       if multilib_is_native_abi && use server ; then
-
-               # systemd is only linked to for server notification
-               if in_iuse systemd ; then
-                       mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd yes no) )
-               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
-                       -DMYSQL_UNIX_ADDR=${EPREFIX}/var/run/mysqld/mysqld.sock
-                       -DDISABLE_SHARED=$(usex static YES NO)
-                       -DWITH_DEBUG=$(usex debug)
-                       -DWITH_EMBEDDED_SERVER=$(usex embedded)
-                       -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
-               )
-
-               mycmakeargs+=( -DWITH_FEDERATED_STORAGE_ENGINE=$(usex 
extraengine) )
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_SERVER=1
-                       -DWITHOUT_EMBEDDED_SERVER=1
-                       -DEXTRA_CHARSETS=none
-                       -DINSTALL_SQLBENCHDIR=
-                       -DWITH_SYSTEMD=no
-               )
-       fi
-
-       # systemtap only works on native ABI  bug 530132
-       if multilib_is_native_abi; then
-               mycmakeargs+=( -DENABLE_DTRACE=$(usex systemtap)
-                       "${MYSQL_CMAKE_NATIVE_DEFINES[@]}" )
-       else
-               mycmakeargs+=( -DENABLE_DTRACE=0
-                       "${MYSQL_CMAKE_NONNATIVE_DEFINES[@]}" )
-       fi
-
-       mycmakeargs+=( "${MYSQL_CMAKE_EXTRA_DEFINES[@]}" )
-
-       cmake-utils_src_configure
-}
-
-mysql-multilib-r1_src_compile() {
-       local _cmake_args=( "${@}" )
-
-       multilib-minimal_src_compile
-}
-
-multilib_src_compile() {
-
-       cmake-utils_src_compile "${_cmake_args[@]}"
-}
-
-
-# @FUNCTION: mysql-multilib-r1_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-multilib-r1_src_install() {
-       # wrap the config script
-       MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
-
-       multilib-minimal_src_install
-}
-
-multilib_src_install() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       cmake-utils_src_install
-       # Make sure the vars are correctly initialized
-       mysql_init_vars
-
-       # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
-       if [[ -f "${D}${MY_INCLUDEDIR}/private/config.h" ]] ; then
-               rm "${D}${MY_INCLUDEDIR}/private/config.h" || die
-       fi
-
-       if multilib_is_native_abi; then
-
-               # Convenience links
-               einfo "Making Convenience links for mysqlcheck multi-call 
binary"
-               dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
-               dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
-               dosym "/usr/bin/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
-               case ${MYSQL_PV_MAJOR} in
-                       5.5) mysql_mycnf_version="5.5" ;;
-                       5.[6-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.6" ;;
-               esac
-               einfo "Building default my.cnf (${mysql_mycnf_version})"
-               insinto "${MY_SYSCONFDIR#${EPREFIX}}"
-               [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins 
"${S}"/scripts/mysqlaccess.conf
-               mycnf_src="my.cnf-${mysql_mycnf_version}"
-               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"
-                       for script in \
-                               "${S}"/support-files/my-*.cnf.sh \
-                               "${S}"/support-files/magic \
-                               "${S}"/support-files/ndb-config-2-node.ini.sh
-                       do
-                               [[ -f $script ]] && dodoc "${script}"
-                       done
-
-                       docinto "scripts"
-                       for script in "${S}"/scripts/mysql* ; do
-                               [[ ( -f $script ) && ( ${script%.sh} == 
${script} ) ]] && dodoc "${script}"
-                       done
-               fi
-
-               #Remove mytop if perl is not selected
-               [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f 
"${ED}/usr/bin/mytop"
-
-               # Percona has decided to rename libmysqlclient to 
libperconaserverclient
-               # Use a symlink to preserve linkages for those who don't use 
mysql_config
-               local suffix
-               for suffix in ".so" "_r.so" ".a" "_r.a" ; do
-                       if [[ -e 
"${ED}/usr/$(get_libdir)/libperconaserverclient${suffix}" ]] ; then
-                               dosym libperconaserverclient${suffix} 
/usr/$(get_libdir)/libmysqlclient${suffix}
-                       fi
-               done
-       else
-               if [[ "${PN}" == "mariadb" ]] && use server ; then
-                       insinto /usr/include/mysql/private
-                       doins "${S}"/sql/*.h
-               fi
-       fi
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_preinst
-# @DESCRIPTION:
-# Warn about ABI changes when switching providers
-mysql-multilib-r1_pkg_preinst() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       # Here we need to see if the implementation switched client libraries
-       # We check if this is a new instance of the package and a client 
library already exists
-       local SHOW_ABI_MESSAGE
-        if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
-                elog "Due to ABI changes when switching between different 
client libraries,"
-                elog "revdep-rebuild must find and rebuild all packages 
linking to libmysqlclient."
-                elog "Please run: revdep-rebuild --library 
libmysqlclient.so.${SUBSLOT:-18}"
-                ewarn "Failure to run revdep-rebuild may cause issues with 
other programs or libraries"
-        fi
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#   create the dir for logfiles if non-existant
-#   touch the logfiles and secure them
-#   install scripts
-#   issue required steps for optional features
-#   issue deprecation warnings
-mysql-multilib-r1_pkg_postinst() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       # 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
-               docinto "support-files"
-               for script in \
-                       support-files/my-*.cnf \
-                       support-files/magic \
-                       support-files/ndb-config-2-node.ini
-               do
-                       [[ -f "${script}" ]] \
-                       && dodoc "${script}"
-               done
-
-               docinto "scripts"
-               for script in scripts/mysql* ; do
-                       if [[ -f "${script}" && "${script%.sh}" == "${script}" 
]]; then
-                               dodoc "${script}"
-                       fi
-               done
-
-               if in_iuse pam && use pam; then
-                       einfo
-                       elog "This install includes the PAM authentication 
plugin."
-                       elog "To activate and configure the PAM plugin, please 
read:"
-                       if [[ ${PN} == "mariadb" ]] ; then
-                               elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
-                       elif [[ ${PN} == "percona-server" ]] ; then
-                               elog 
"https://www.percona.com/doc/percona-server/5.6/management/pam_plugin.html";
-                       fi
-                       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
-
-               if in_iuse galera && 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 galera cluster is activated, 
the database daemon"
-                       elog "should be run as \"/etc/init.d/mysql 
bootstrap_galera\" on the primary node."
-                       einfo
-               fi
-       fi
-}
-
-# @FUNCTION: mysql-multilib-r1_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib-r1_getopt() {
-       local mypd="${EROOT}"/usr/bin/my_print_defaults
-       section="$1"
-       flag="--${2}="
-       "${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-multilib-r1_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-multilib-r1_getoptval() {
-       local mypd="${EROOT}"/usr/bin/my_print_defaults
-       local section="$1"
-       local flag="--${2}="
-       local extra_options="${3}"
-       "${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-multilib-r1_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-multilib-r1_pkg_config() {
-
-       debug-print-function ${FUNCNAME} "$@"
-
-       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="$(mysql-multilib-r1_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="$(mysql-multilib-r1_getoptval 
"${tmp_mysqld_password_source}" password --show)"
-               fi
-
-               unset tmp_mysqld_password_source
-       fi
-       MYSQL_TMPDIR="$(mysql-multilib-r1_getoptval mysqld tmpdir)"
-       # These are dir+prefix
-       MYSQL_RELAY_LOG="$(mysql-multilib-r1_getoptval mysqld relay-log)"
-       MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(mysql-multilib-r1_getoptval mysqld log-bin)"
-       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 http://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-       local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-       [[ -r "${help_tables}" ]] \
-       && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-       || touch "${TMPDIR}/fill_help_tables.sql"
-       help_tables="${TMPDIR}/fill_help_tables.sql"
-
-       # 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 
\
-               ndbcluster log-slave-updates wsrep-on \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-       # But some options changed names
-       egrep -sq external-locking "${helpfile}" && \
-       options="${options/skip-locking/skip-external-locking}"
-
-       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
-       # http://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
-       local initialize_options
-        if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
-               # --initialize-insecure will not set root password
-               # --initialize would set a random one in the log which we don't 
need as we set it ourselves
-               cmd=( "${EROOT}usr/sbin/mysqld" )
-               initialize_options="--initialize-insecure  
--init-file='${sqltmp}'"
-               sqltmp="" # the initialize will take care of it
-       else
-               cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-               [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-               if [[ -r "${help_tables}" ]] ; then
-                       cat "${help_tables}" >> "${sqltmp}"
-               fi
-       fi
-       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" 
${initialize_options} )
-       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"
-
-       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} \
-               $(use prefix || echo --user=mysql) \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --default-storage-engine=MyISAM \
-               --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"
-}
-
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-multilib-r1_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-multilib-r1_disable_test() {
-
-       local rawtestname testname testsuite reason mysql_disabled_file 
mysql_disabled_dir
-       rawtestname="${1}" ; shift
-       reason="${@}"
-       ewarn "test '${rawtestname}' disabled: '${reason}'"
-
-       testsuite="${rawtestname/.*}"
-       testname="${rawtestname/*.}"
-       for mysql_disabled_file in \
-               ${S}/mysql-test/disabled.def \
-               ${S}/mysql-test/t/disabled.def ; do
-               [[ -f ${mysql_disabled_file} ]] && break
-       done
-       #mysql_disabled_file="${S}/mysql-test/t/disabled.def"
-       #einfo "rawtestname=${rawtestname} testname=${testname} 
testsuite=${testsuite}"
-       echo ${testname} : ${reason} >> "${mysql_disabled_file}"
-
-       if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
-               for mysql_disabled_file in \
-                       ${S}/mysql-test/suite/${testsuite}/disabled.def \
-                       ${S}/mysql-test/suite/${testsuite}/t/disabled.def \
-                       FAILED ; do
-                       [[ -f ${mysql_disabled_file} ]] && break
-               done
-               if [[ ${mysql_disabled_file} != "FAILED" ]]; then
-                       echo "${testname} : ${reason}" >> 
"${mysql_disabled_file}"
-               else
-                       for mysql_disabled_dir in \
-                               ${S}/mysql-test/suite/${testsuite} \
-                               ${S}/mysql-test/suite/${testsuite}/t \
-                               FAILED ; do
-                               [[ -d ${mysql_disabled_dir} ]] && break
-                       done
-                       if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
-                               echo "${testname} : ${reason}" >> 
"${mysql_disabled_dir}/disabled.def"
-                       else
-                               ewarn "Could not find testsuite disabled.def 
location for ${rawtestname}"
-                       fi
-               fi
-       fi
-}
-
-# @FUNCTION: mysql-cmake_use_plugin
-# @DESCRIPTION:
-# Helper function to enable/disable plugins by use flags
-# cmake-utils_use_with is not enough as some references check WITH_ (0|1)
-# and some check WITHOUT_. Also, this can easily extend to non-storage plugins.
-mysql-cmake_use_plugin() {
-       [[ -z $2 ]] && die "mysql-cmake_use_plugin <USE flag> <flag name>"
-       if in_iuse $1 && use $1 ; then
-               echo "-DWITH_$2=1 -DPLUGIN_$2=YES"
-       else
-               echo "-DWITHOUT_$2=1 -DWITH_$2=0 -DPLUGIN_$2=NO"
-       fi
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <[email protected]>
-if [[ "${EAPI}x" != "5x" ]]; then
-
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-       MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-       MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/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
-
-       if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-               MY_SOURCEDIR=${SERVER_URI##*/}
-               MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}
-fi

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
deleted file mode 100644
index 9b9d6087e11..00000000000
--- a/eclass/mysql-v2.eclass
+++ /dev/null
@@ -1,915 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: mysql-v2.eclass
-# @MAINTAINER:
-# Maintainers:
-#      - MySQL Team <[email protected]>
-#      - Robin H. Johnson <[email protected]>
-#      - Jorge Manuel B. S. Vicetto <[email protected]>
-#      - Brian Evans <[email protected]>
-# @SUPPORTED_EAPIS: 4 5
-# @BLURB: This eclass provides most of the functions for mysql ebuilds
-# @DESCRIPTION:
-# The mysql-v2.eclass is the base eclass to build the mysql and
-# alternative projects (mariadb and percona) ebuilds.
-# This eclass uses the mysql-autotools and mysql-cmake eclasses for the
-# specific bits related to the build system.
-# It provides the src_unpack, src_prepare, src_configure, src_compile,
-# src_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
-# phase hooks.
-
-# @ECLASS-VARIABLE: BUILD
-# @DESCRIPTION:
-# Build type of the mysql version
-: ${BUILD:=autotools}
-
-case ${BUILD} in
-       "cmake")
-               BUILD_INHERIT="mysql-cmake"
-               ;;
-       "autotools")
-               BUILD_INHERIT="mysql-autotools"
-
-               WANT_AUTOCONF="latest"
-               WANT_AUTOMAKE="latest"
-               ;;
-       *)
-               die "${BUILD} is not a valid build system for mysql"
-               ;;
-esac
-
-MYSQL_EXTRAS=""
-
-# @ECLASS-VARIABLE: MYSQL_EXTRAS_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The version of the MYSQL_EXTRAS repo to use to build mysql
-# Use "none" to disable it's use
-[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-r3"
-
-inherit eutils flag-o-matic ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx 
versionator toolchain-funcs user
-
-#
-# Supported EAPI versions and export functions
-#
-
-case "${EAPI:-0}" in
-       4|5) ;;
-       *) die "Unsupported EAPI: ${EAPI}" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile 
src_install pkg_preinst pkg_postinst pkg_config pkg_postrm
-
-#
-# VARIABLES:
-#
-
-# 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"
-
-[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
-if [[ ${MY_EXTRAS_VER} == "live" ]]; then
-       EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-       EGIT_CHECKOUT_DIR=${WORKDIR}/mysql-extras
-       EGIT_CLONE_TYPE=shallow
-fi
-
-# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
-# @DESCRIPTION:
-# Upstream MySQL considers the first two parts of the version number to be the
-# major version. Upgrades that change major version should always run
-# mysql_upgrade.
-MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
-
-# Cluster is a special case...
-if [[ ${PN} == "mysql-cluster" ]]; then
-       case ${PV} in
-               6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-               7.2*) MYSQL_PV_MAJOR=5.5 ;;
-               7.3*) MYSQL_PV_MAJOR=5.6 ;;
-       esac
-fi
-
-# MariaDB has left the numbering schema but keeping compatibility
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-       case ${PV} in
-               10.0*|10.1*) MYSQL_PV_MAJOR="5.6" ;;
-       esac
-fi
-
-# @ECLASS-VARIABLE: MYSQL_VERSION_ID
-# @DESCRIPTION:
-# MYSQL_VERSION_ID will be:
-# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all 
[0..99]
-# This is an important part, because many of the choices the MySQL ebuild will 
do
-# depend on this variable.
-# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
-# We also strip off upstream's trailing letter that they use to respin tarballs
-MYSQL_VERSION_ID=""
-tpv="${PV%[a-z]}"
-tpv=( ${tpv//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
-for vatom in 0 1 2 3 ; do
-       # pad to length 2
-       tpv[${vatom}]="00${tpv[${vatom}]}"
-       MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
-done
-# strip leading "0" (otherwise it's considered an octal number by BASH)
-MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
-
-# This eclass should only be used with at least mysql-5.1.50
-mysql_version_is_at_least "5.1.50" || die "This eclass should only be used 
with >=mysql-5.1.50"
-
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
-# Work out the default SERVER_URI correctly
-if [[ -z ${SERVER_URI} ]]; then
-       [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}"
-       if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-               # Beginning with 5.5, MariaDB stopped putting beta, alpha or rc 
on their tarball names
-               mysql_version_is_at_least "5.5" && 
MARIA_FULL_PV=$(get_version_component_range 1-3) || \
-                       MARIA_FULL_PV=$(replace_version_separator 3 '-' 
${MY_PV})
-               MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
-               SERVER_URI="
-               
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
-               
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               
http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               
http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
-               "
-               if [[ ${PN} == "mariadb-galera" ]]; then
-                       MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}"
-               fi
-       elif [[ ${PN} == "percona-server" ]]; then
-               PERCONA_PN="Percona-Server"
-               MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-               MY_PV=$(get_version_component_range 1-3 ${PV})
-               PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV})
-               PERCONA_RC=$(get_version_component_range 6 ${PV})
-               
SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz";
-#              
http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz
-#              
http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz
-       else
-               if [[ "${PN}" == "mysql-cluster" ]] ; then
-                       URI_DIR="MySQL-Cluster"
-                       URI_FILE="mysql-cluster-gpl"
-               else
-                       URI_DIR="MySQL"
-                       URI_FILE="mysql"
-               fi
-               URI_A="${URI_FILE}-${MY_PV}.tar.gz"
-               MIRROR_PV=$(get_version_component_range 1-2 ${PV})
-               # Recently upstream switched to an archive site, and not on 
mirrors
-               
SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
-                                       
https://downloads.skysql.com/files/${URI_FILE}-${MIRROR_PV}/${URI_A}
-                                       
mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-       fi
-fi
-
-# Define correct SRC_URIs
-SRC_URI="${SERVER_URI}"
-
-# 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://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
-               
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2";
-fi
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="https://www.mysql.com/";
-if [[ ${PN} == "mariadb" ]]; then
-       HOMEPAGE="https://mariadb.org/";
-       DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-fi
-if [[ ${PN} == "mariadb-galera" ]]; then
-       HOMEPAGE="https://mariadb.org/";
-       DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera 
Replication"
-fi
-if [[ ${PN} == "percona-server" ]]; then
-       
HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server";
-       DESCRIPTION="An enhanced, drop-in replacement for MySQL from the 
Percona team"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-
-case "${BUILD}" in
-       "autotools")
-               IUSE="big-tables debug embedded minimal +perl selinux ssl 
static test"
-               ;;
-       "cmake")
-               IUSE="debug embedded minimal +perl selinux ssl static 
static-libs test"
-               ;;
-esac
-
-# Common IUSE
-IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
-
-# This probably could be simplified, but the syntax would have to be just right
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
-       mysql_version_is_at_least "5.5" ; then
-       IUSE="bindist ${IUSE}"
-       RESTRICT="${RESTRICT} !bindist? ( bindist )"
-elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
-       mysql_check_version_range "5.5.37 to 5.6.11.99" ; then
-       IUSE="bindist ${IUSE}"
-       RESTRICT="${RESTRICT} !bindist? ( bindist )"
-elif [[ ${PN} == "mysql-cluster" ]] && \
-       mysql_check_version_range "7.2 to 7.2.99.99"  ; then
-       IUSE="bindist ${IUSE}"
-       RESTRICT="${RESTRICT} !bindist? ( bindist )"
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then
-       mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent"
-       mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" && \
-               REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph )"
-       mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" && \
-               REQUIRED_USE="${REQUIRED_USE} minimal? ( !sphinx )"
-       mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam"
-       # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
-       mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} tokudb odbc xml" && 
\
-               REQUIRED_USE="${REQUIRED_USE} odbc? ( extraengine ) xml? ( 
extraengine ) tokudb? ( jemalloc !tcmalloc )"
-       mysql_check_version_range "5.5.33 to 5.5.99" && IUSE="${IUSE} tokudb" 
&& \
-               REQUIRED_USE="${REQUIRED_USE} tokudb? ( jemalloc !tcmalloc )"
-fi
-
-if mysql_version_is_at_least "5.5"; then
-       REQUIRED_USE="${REQUIRED_USE} tcmalloc? ( !jemalloc ) jemalloc? ( 
!tcmalloc )"
-       IUSE="${IUSE} jemalloc tcmalloc"
-fi
-
-if mysql_version_is_at_least "5.5.7"; then
-       IUSE="${IUSE} systemtap"
-fi
-
-if [[ ${PN} == "percona-server" ]]; then
-       mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam"
-fi
-
-REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) 
static? ( !ssl )"
-
-#
-# DEPENDENCIES:
-#
-
-# Be warned, *DEPEND are version-dependant
-# These are used for both runtime and compiletime
-DEPEND="
-       ssl? ( >=dev-libs/openssl-0.9.6d:0 )
-       kernel_linux? ( sys-process/procps )
-       >=sys-apps/sed-4
-       >=sys-apps/texinfo-4.7-r1
-       >=sys-libs/zlib-1.2.3
-"
-# TODO: add this as a dep if it is moved from the overlay
-#      !dev-db/mariadb-native-client[mysqlcompat]
-
-# dev-db/mysql-5.6.12+ only works with dev-libs/libedit
-# This probably could be simplified
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
-       mysql_version_is_at_least "5.6.12" ; then
-       DEPEND="${DEPEND} dev-libs/libedit"
-elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then
-       DEPEND="${DEPEND} dev-libs/libedit"
-else
-       if mysql_version_is_at_least "5.5" ; then
-               DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )"
-       else
-               DEPEND="${DEPEND} >=sys-libs/readline-4.1:0"
-       fi
-fi
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-       mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} 
libevent? ( >=dev-libs/libevent-1.4 )"
-       mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( 
>=dev-libs/boost-1.40.0 )"
-       mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( 
pam? ( virtual/pam ) )"
-       # Bug 441700 MariaDB >=5.3 include custom mytop
-       mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( 
!dev-db/mytop )"
-       if mysql_version_is_at_least "10.0.5" ; then
-               DEPEND="${DEPEND}
-                       odbc? ( dev-db/unixODBC )
-                       xml? ( dev-libs/libxml2 )
-                       "
-       fi
-       mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( 
dev-libs/judy )"
-       if mysql_version_is_at_least "10.0.9" ; then
-               DEPEND="${DEPEND} >=dev-libs/libpcre-8.35"
-       fi
-fi
-
-# Having different flavours at the same time is not a good idea
-for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; 
do
-       [[ ${i} == ${PN} ]] ||
-       DEPEND="${DEPEND} !dev-db/${i}"
-done
-
-if mysql_version_is_at_least "5.5.7" ; then
-       DEPEND="${DEPEND}
-               jemalloc? ( dev-libs/jemalloc[static-libs?] )
-               tcmalloc? ( dev-util/google-perftools )
-               >=sys-libs/zlib-1.2.3[static-libs?]
-               ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] )
-               systemtap? ( >=dev-util/systemtap-1.3 )
-               kernel_linux? ( dev-libs/libaio )
-       "
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-       # TODO: This really should include net-misc/memcached
-       # but the package does not install the files it seeks.
-       mysql_version_is_at_least "7.2.3" && \
-               DEPEND="${DEPEND} dev-libs/libevent"
-fi
-
-# prefix: first need to implement something for #196294
-RDEPEND="${DEPEND}
-       !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
-       selinux? ( sec-policy/selinux-mysql )
-"
-
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-       # Bug 455016 Add dependencies of mytop
-       if mysql_version_is_at_least "5.3" ; then
-               RDEPEND="${RDEPEND}
-                       perl? (
-                               virtual/perl-Getopt-Long
-                               dev-perl/TermReadKey
-                               virtual/perl-Term-ANSIColor
-                               virtual/perl-Time-HiRes
-                       )
-               "
-       fi
-fi
-
-if [[ ${PN} == "mariadb-galera" ]] ; then
-       # The wsrep API version must match between the ebuild and 
sys-cluster/galera.
-       # This will be indicated by WSREP_REVISION in the ebuild and the first 
number
-       # in the version of sys-cluster/galera
-       RDEPEND="${RDEPEND}
-               =sys-cluster/galera-${WSREP_REVISION}*
-       "
-fi
-
-if [[ ${PN} == "mysql-cluster" ]] ; then
-       mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( 
>=virtual/jre-1.6 )" && \
-               DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
-fi
-
-DEPEND="${DEPEND}
-       virtual/yacc
-"
-
-DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
-
-# compile-time-only
-DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
-
-# compile-time-only
-if mysql_version_is_at_least "5.5.8" ; then
-       DEPEND="${DEPEND} >=dev-util/cmake-2.6.3"
-fi
-
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-# For other stuff to bring us in
-PDEPEND="${PDEPEND} ~virtual/mysql-${MYSQL_PV_MAJOR}"
-
-#
-# External patches
-#
-
-# MariaDB has integrated PBXT until it was dropped in version 5.5.33
-# PBXT_VERSION means that we have a PBXT patch for this PV
-# PBXT was only introduced after 5.1.12
-pbxt_patch_available() {
-       [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n 
"${PBXT_VERSION}" ) ]]
-       return $?
-}
-
-pbxt_available() {
-       pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == 
"mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32"
-       return $?
-}
-
-# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
-# MariaDB has integrated XtraDB
-# XTRADB_VERS means that we have a XTRADB patch for this PV
-# XTRADB was only introduced after 5.1.26
-xtradb_patch_available() {
-       [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera"
-               && ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]]
-       return $?
-}
-
-if pbxt_patch_available; then
-
-       PBXT_P="pbxt-${PBXT_VERSION}"
-       PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz 
mirror://sourceforge/pbxt/${PBXT_P}.tar.gz"
-       SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )"
-fi
-
-# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
-# vs. built outside the dir
-if pbxt_available; then
-
-       IUSE="${IUSE} pbxt"
-       PBXT_NEWSTYLE=1
-       REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) "
-fi
-
-if xtradb_patch_available; then
-       XTRADB_P="percona-xtradb-${XTRADB_VER}"
-       XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz"
-       XTRADB_SRC_B1="http://www.percona.com/";
-       XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/"
-       
XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}"
-       XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}"
-       XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}"
-       SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} 
${XTRADB_SRC_URI3} )"
-       IUSE="${IUSE} xtradb"
-       REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) "
-fi
-
-#
-# HELPER FUNCTIONS:
-#
-
-# @FUNCTION: mysql-v2_disable_test
-# @DESCRIPTION:
-# Helper function to disable specific tests.
-mysql-v2_disable_test() {
-       ${BUILD_INHERIT}_disable_test "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_minimal
-# @DESCRIPTION:
-# Helper function to configure minimal build
-configure_minimal() {
-       ${BUILD_INHERIT}_configure_minimal "$@"
-}
-
-# @FUNCTION: mysql-v2_configure_common
-# @DESCRIPTION:
-# Helper function to configure common builds
-configure_common() {
-       ${BUILD_INHERIT}_configure_common "$@"
-}
-
-#
-# EBUILD FUNCTIONS
-#
-
-# @FUNCTION: mysql-v2_pkg_setup
-# @DESCRIPTION:
-# Perform some basic tests and tasks during pkg_setup phase:
-#      die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
-#      check for conflicting use flags
-#      create new user and group for mysql
-#      warn about deprecated features
-mysql-v2_pkg_setup() {
-
-       if has test ${FEATURES} ; then
-               if ! use minimal ; then
-                       if ! has userpriv ${FEATURES} ; then
-                               eerror "Testing with FEATURES=-userpriv is no 
longer supported by upstream. Tests MUST be run as non-root."
-                       fi
-               fi
-       fi
-
-       # Check for USE flag problems in pkg_setup
-       if ! mysql_version_is_at_least "5.2" && use debug ; then
-               # Also in package.use.mask
-               die "Bug #344885: Upstream has broken USE=debug for 5.1 series 
>=5.1.51"
-       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"
-
-       if use cluster && [[ "${PN}" != "mysql-cluster" ]]; then
-               ewarn "Upstream has noted that the NDB cluster support in the 
5.0 and"
-               ewarn "5.1 series should NOT be put into production. In the 
near"
-               ewarn "future, it will be disabled from building."
-       fi
-
-       if [[ ${PN} == "mysql-cluster" ]] ; then
-               mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_setup
-       fi
-
-       if use_if_iuse tokudb && [[ $(gcc-major-version) -lt 4 || 
$(gcc-major-version) -eq 4 && $(gcc-minor-version) -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
-
-}
-
-# @FUNCTION: mysql-v2_src_unpack
-# @DESCRIPTION:
-# Unpack the source code
-mysql-v2_src_unpack() {
-
-       # Initialize the proper variables first
-       mysql_init_vars
-
-       unpack ${A}
-       # Grab the patches
-       [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" 
git-r3_src_unpack
-
-       mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-}
-
-# @FUNCTION: mysql-v2_src_prepare
-# @DESCRIPTION:
-# Apply patches to the source code and remove unneeded bundled libs.
-mysql-v2_src_prepare() {
-       ${BUILD_INHERIT}_src_prepare "$@"
-       if [[ ${PN} == "mysql-cluster" ]] ; then
-               mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_src_prepare
-       fi
-}
-
-# @FUNCTION: mysql-v2_src_configure
-# @DESCRIPTION:
-# Configure mysql to build the code for Gentoo respecting the use flags.
-mysql-v2_src_configure() {
-       ${BUILD_INHERIT}_src_configure "$@"
-}
-
-# @FUNCTION: mysql-v2_src_compile
-# @DESCRIPTION:
-# Compile the mysql code.
-mysql-v2_src_compile() {
-       ${BUILD_INHERIT}_src_compile "$@"
-}
-
-# @FUNCTION: mysql-v2_src_install
-# @DESCRIPTION:
-# Install mysql.
-mysql-v2_src_install() {
-       ${BUILD_INHERIT}_src_install "$@"
-}
-
-# @FUNCTION: mysql-v2_pkg_preinst
-# @DESCRIPTION:
-# Create the user and groups for mysql - die if that fails.
-mysql-v2_pkg_preinst() {
-       if [[ ${PN} == "mysql-cluster" ]] ; then
-               mysql_version_is_at_least "7.2.9" && java-pkg-opt-2_pkg_preinst
-       fi
-       enewgroup mysql 60 || die "problem adding 'mysql' group"
-       enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' 
user"
-}
-
-# @FUNCTION: mysql-v2_pkg_postinst
-# @DESCRIPTION:
-# Run post-installation tasks:
-#      create the dir for logfiles if non-existant
-#      touch the logfiles and secure them
-#      install scripts
-#      issue required steps for optional features
-#      issue deprecation warnings
-mysql-v2_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}"
-
-       # Minimal builds don't have the MySQL server
-       if ! use minimal ; then
-               docinto "support-files"
-               for script in \
-                       support-files/my-*.cnf \
-                       support-files/magic \
-                       support-files/ndb-config-2-node.ini
-               do
-                       [[ -f "${script}" ]] \
-                       && dodoc "${script}"
-               done
-
-               docinto "scripts"
-               for script in scripts/mysql* ; do
-                       if [[ -f "${script}" && "${script%.sh}" == "${script}" 
]]; then
-                               dodoc "${script}"
-                       fi
-               done
-
-               if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
-                       if use_if_iuse pam ; then
-                               einfo
-                               elog "This install includes the PAM 
authentication plugin."
-                               elog "To activate and configure the PAM plugin, 
please read:"
-                               elog 
"https://kb.askmonty.org/en/pam-authentication-plugin/";
-                               einfo
-                       fi
-               fi
-
-               einfo
-               elog "You might want to run:"
-               elog "\"emerge --config =${CATEGORY}/${PF}\""
-               elog "if this is a new install."
-               einfo
-
-               einfo
-               elog "If you are upgrading major versions, you should run the"
-               elog "mysql_upgrade tool."
-               einfo
-
-               if [[ ${PN} == "mariadb-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
-               fi
-       fi
-
-       if use_if_iuse pbxt ; then
-               elog "Note: PBXT is now statically built when enabled."
-               elog ""
-               elog "If, you previously installed as a plugin and "
-               elog "you cannot start the MySQL server,"
-               elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
-               elog "use the MySQL upgrade script to restore the table"
-               elog "or execute the following SQL command:"
-               elog "  CREATE TABLE IF NOT EXISTS plugin ("
-               elog "          name char(64) binary DEFAULT '' NOT NULL,"
-               elog "          dl char(128) DEFAULT '' NOT NULL,"
-               elog "          PRIMARY KEY (name)"
-               elog "  ) CHARACTER SET utf8 COLLATE utf8_bin;"
-       fi
-}
-
-# @FUNCTION: mysql-v2_getopt
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getopt() {
-       local mypd="${EROOT}"/usr/bin/my_print_defaults
-       section="$1"
-       flag="--${2}="
-       "${mypd}" $section | sed -n "/^${flag}/p"
-}
-
-# @FUNCTION: mysql-v2_getoptval
-# @DESCRIPTION:
-# Use my_print_defaults to extract specific config options
-mysql-v2_getoptval() {
-       local mypd="${EROOT}"/usr/bin/my_print_defaults
-       section="$1"
-       flag="--${2}="
-       "${mypd}" $section | sed -n "/^${flag}/s,${flag},,gp"
-}
-
-# @FUNCTION: mysql-v2_pkg_config
-# @DESCRIPTION:
-# Configure mysql environment.
-mysql-v2_pkg_config() {
-
-       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
-               MYSQL_ROOT_PASSWORD="$(mysql-v2_getoptval 'client mysql' 
password)"
-       fi
-       MYSQL_TMPDIR="$(mysql-v2_getoptval mysqld tmpdir)"
-       # These are dir+prefix
-       MYSQL_RELAY_LOG="$(mysql-v2_getoptval mysqld relay-log)"
-       MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(mysql-v2_getoptval mysqld log-bin)"
-       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 "${ROOT}"/$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 "${ROOT}"/$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, 
in the"
-               einfo "MYSQL_ROOT_PASSWORD env var 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 http://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
--defaults-file=${MY_SYSCONFDIR}/my.cnf"
-
-       local help_tables="${ROOT}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
-       [[ -r "${help_tables}" ]] \
-       && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
-       || touch "${TMPDIR}/fill_help_tables.sql"
-       help_tables="${TMPDIR}/fill_help_tables.sql"
-
-       # Figure out which options we need to disable to do the setup
-       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 
\
-               ndbcluster log-slave-updates wsrep-on \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-       # But some options changed names
-       egrep -sq external-locking "${helpfile}" && \
-       options="${options/skip-locking/skip-external-locking}"
-
-       # MySQL 5.6+ needs InnoDB
-       if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then
-               mysql_version_is_at_least "5.6" || options="${options} 
--loose-skip-innodb"
-       fi
-
-       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
-       #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' 
'--basedir=${EPREFIX}/usr' ${options}"
-       cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
-       [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
-       cmd="'$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 run mysql_install_db. 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"
-
-       # Filling timezones, see
-       # http://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
-
-       if [[ -r "${help_tables}" ]] ; then
-               cat "${help_tables}" >> "${sqltmp}"
-       fi
-
-       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} \
-               $(use prefix || echo --user=mysql) \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --default-storage-engine=MyISAM \
-               --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 $?
-
-       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!"
-
-       # Stop the server and cleanup
-       einfo "Stopping the server ..."
-       kill $(< "${pidfile}" )
-       rm -f "${sqltmp}"
-       wait %1
-       einfo "Done"
-}
-
-# @FUNCTION: mysql-v2_pkg_postrm
-# @DESCRIPTION:
-# Remove mysql symlinks.
-mysql-v2_pkg_postrm() {
-
-       : # mysql_lib_symlinks "${ED}"
-}

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
deleted file mode 100644
index 6ecf4d1a4ff..00000000000
--- a/eclass/mysql_fx.eclass
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# DEPRECATED
-# Recent versions have begun deprecating this eclass.
-# Do not use it in new series.
-
-# @DEAD
-# @ECLASS: mysql_fx.eclass
-# @MAINTAINER:
-#   - MySQL Team <[email protected]>
-#   - Luca Longinotti <[email protected]>
-# @AUTHOR: Francesco Riosa (Retired) <[email protected]>
-# @BLURB: This eclass provides some helper functions for mysql ebuilds
-# @DESCRIPTION:
-# This eclass providers helpers to build mysql servers including patching
-# from an index and initializing certain variables as part of the build.
-
-inherit multilib
-
-# @FUNCTION: stripdots
-# @DESCRIPTION:
-# Helper function, version (integer) may have sections separated by dots
-# for readability.
-stripdots() {
-       local dotver=${1:-"0"}
-       local v=""
-       local ret=0
-       if [[ "${dotver/./}" != "${dotver}" ]] ; then
-               # dotted version number
-               for i in 1000000 10000 100 1 ; do
-                       v=${dotver%%\.*}
-                       # remove leading zeroes
-                       while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do 
v=${v#0} ; done
-                       # increment integer version number
-                       ret=$(( ${v} * ${i} + ${ret} ))
-                       if [[ "${dotver}" == "${dotver/\.}" ]] ; then
-                               dotver=0
-                       else
-                               dotver=${dotver#*\.}
-                       fi
-               done
-               echo "${ret}"
-       else
-               # already an integer
-               v=${dotver}
-               while [[ ${#v} -gt 1 ]] && [[ ${v:0:1} == "0" ]] ; do v=${v#0} 
; done
-               echo "${v}"
-       fi
-}
-
-# @FUNCTION: mysql_check_version_range
-# @DESCRIPTION:
-# Check if a version number falls inside a given range.
-# The range includes the extremes and must be specified as
-# "low_version to high_version" i.e. "4.1.2 to 5.1.99.99".
-# Returns true if inside the range.
-mysql_check_version_range() {
-       local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
-       local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
-       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-       [[ ${lbound} -le ${my_ver} ]] && [[ ${my_ver} -le ${rbound} ]] && 
return 0
-       return 1
-}
-
-# @FUNCTION: _mysql_test_patch_ver_pn
-# @INTERNAL
-# @DESCRIPTION:
-# True if at least one applicable range is found for the patch.
-_mysql_test_patch_ver_pn() {
-       local allelements=", version, package name"
-       # So that it fails the directory test if none of them exist
-       local filesdir="/dev/null"
-       for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-               "${WORKDIR}/mysql-extras" ; do
-               if [ -d "${d}" ]; then
-                       filesdir="${d}"
-                       break
-               fi
-       done
-
-       [[ -d "${filesdir}" ]] || die "Source dir must be a directory"
-       local flags=$1 pname=$2
-       if [[ $(( $flags & $(( 1 + 4 + 16 )) )) -eq 21 ]] ; then
-               einfo "using '${pname}'"
-               ln -sf "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die 
"Couldn't move ${pname}"
-               return 0
-       fi
-
-       [[ $(( $flags & $(( 2 + 4 )) )) -gt 0 ]] \
-       && allelements="${allelements//", version"}"
-
-       [[ $(( $flags & $(( 8 + 16 )) )) -gt 0 ]] \
-       && allelements="${allelements//", package name"}"
-
-       [[ -n "${allelements}" ]] && [[ "${flags}" -gt 0 ]] \
-       && ewarn "QA notice: ${allelements} missing in ${pname} patch"
-
-       return 1
-}
-
-# @FUNCTION: mysql_mv_patches
-# @DESCRIPTION:
-# Parse a "index_file" looking for patches to apply to the
-# current MySQL version.
-# If the patch applies, print its description.
-#
-mysql_mv_patches() {
-       # So that it fails the directory test if none of them exist
-       local filesdir="/dev/null"
-       if [[ -z "${1}" ]]; then
-               for d in "${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" \
-                       "${WORKDIR}/mysql-extras" ; do
-                       if [ -d "${d}" ]; then
-                               filesdir="${d}"
-                               break
-                       fi
-               done
-               [[ -d "${filesdir}" ]] || die "No patches directory found!"
-       fi
-
-       for i in "$1" "${filesdir}/0000_index.txt" "${filesdir}/000_index.txt" 
; do
-               if [ -n "$i" -a -f "$i" ]; then
-                       local index_file="$i"
-                       break
-               fi
-       done
-
-       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
-       local my_test_fx=${3:-"_mysql_test_patch_ver_pn"}
-       _mysql_mv_patches "${index_file}" "${my_ver}" "${my_test_fx}"
-}
-
-# @FUNCTION: _mysql_mv_patches
-# @INTERNAL
-_mysql_mv_patches() {
-       local index_file="${1}"
-       local my_ver="${2}"
-       local my_test_fx="${3}"
-       local dsc ndsc=0 i
-       dsc=( )
-
-       # Values for flags are (2^x):
-       #  1 - one patch found
-       #  2 - at least one version range is wrong
-       #  4 - at least one version range is ok
-       #  8 - at least one ${PN} did not match
-       #  16 - at least one ${PN} has been matched
-       local flags=0 pname=""
-       while read row ; do
-               case "${row}" in
-                       @patch\ *)
-                               [[ -n "${pname}" ]] \
-                               && ${my_test_fx} ${flags} "${pname}" \
-                               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo 
">    ${dsc[$i]}" ; done
-                               flags=1 ; ndsc=0 ; dsc=( )
-                               pname=${row#"@patch "}
-                               ;;
-                       @ver\ *)
-                               if mysql_check_version_range "${row#"@ver "}" 
"${my_ver}" ; then
-                                       flags=$(( ${flags} | 4 ))
-                               else
-                                       flags=$(( ${flags} | 2 ))
-                               fi
-                               ;;
-                       @pn\ *)
-                               if [[ ${row#"@pn "} == "${PN}" ]] ; then
-                                       flags=$(( ${flags} | 16 ))
-                               else
-                                       flags=$(( ${flags} | 8 ))
-                               fi
-                               ;;
-                       # @use\ *) ;;
-                       @@\ *)
-                               dsc[$ndsc]="${row#"@@ "}"
-                               (( ++ndsc ))
-                               ;;
-               esac
-       done < "${index_file}"
-
-       ${my_test_fx} ${flags} "${pname}" \
-       && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
-}
-
-# @FUNCTION: mysql_version_is_at_least
-# @DESCRIPTION:
-# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
-# (nice) idea from versionator.eclass
-#
-mysql_version_is_at_least() {
-       local want_s=$(stripdots "$1") have_s=$(stripdots 
"${2:-${MYSQL_VERSION_ID}}")
-       [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value to 
check"
-       [[ ${want_s} -le ${have_s} ]] && return 0 || return 1
-}
-
-# @FUNCTION: mysql_lib_symlinks
-# @DESCRIPTION:
-# To be called on the live filesystem, reassigning symlinks of each MySQL
-# library to the best version available. (Obsolete)
-#
-mysql_lib_symlinks() {
-
-       local d dirlist maxdots libname libnameln libsuffix reldir
-       libsuffix=$(get_libname)
-
-       einfo "libsuffix = ${libsuffix}"
-       einfo "Updating MySQL libraries symlinks"
-
-       reldir="${1}"
-       pushd "${reldir}/usr/$(get_libdir)" &> /dev/null
-
-       # dirlist must contain the less significative directory left
-       dirlist="mysql"
-
-       # waste some time in removing and recreating symlinks
-       for d in $dirlist ; do
-               for libname in $( find "${d}" -mindepth 1 -maxdepth 1 -name 
"*${libsuffix}*" -and -not -type "l" 2>/dev/null ) ; do
-                       # maxdot is a limit versus infinite loop
-                       maxdots=0
-                       libnameln=${libname##*/}
-                       # loop in version of the library to link it, similar to 
how
-                       # libtool works
-                       if [[ ${CHOST} == *-darwin* ]] ; then
-                               # macho: libname.x.y.z.dylib
-                               local libbasename=${libnameln%%.*}       # 
libname
-                               local libver=${libnameln#${libbasename}} # 
.x.y.z.dylib
-                               libver=${libver%${libsuffix}}            # 
.x.y.z
-                               while [[ -n ${libver} ]] && [[ ${maxdots} -lt 6 
]] ; do
-                                       
libnameln="${libbasename}${libver}${libsuffix}"
-                                       rm -f "${libnameln}"
-                                       ln -s "${libname}" "${libnameln}"
-                                       (( ++maxdots ))
-                                       libver=${libver%.*}
-                               done
-                               libnameln="${libbasename}${libsuffix}"
-                               rm -f "${libnameln}"
-                               ln -s "${libname}" "${libnameln}"
-                       else
-                               # elf: libname.so.x.y.z
-                               while [[ ${libnameln:0-3} != '${libsuffix}' ]] 
&& [[ ${maxdots} -lt 6 ]] ; do
-                                       rm -f "${libnameln}"
-                                       ln -s "${libname}" "${libnameln}"
-                                       (( ++maxdots ))
-                                       libnameln="${libnameln%.*}"
-                               done
-                               rm -f "${libnameln}"
-                               ln -s "${libname}" "${libnameln}"
-                       fi
-               done
-       done
-
-       popd &> /dev/null
-}
-
-# @FUNCTION: mysql_init_vars
-# @DESCRIPTION:
-# void mysql_init_vars()
-# Initialize global variables
-# 2005-11-19 <[email protected]>
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-       MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
-       MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/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
-
-       if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
-               MY_SOURCEDIR=${SERVER_URI##*/}
-               MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
-}

Reply via email to