commit:     81292ba06c5f9b0f6ace14b43baa6a7c3b8e7df2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 22:53:24 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 22:53:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81292ba0

dev-db/mariadb: Version bump to 10.2.8

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-db/mariadb/Manifest              |    2 +
 dev-db/mariadb/mariadb-10.2.8.ebuild | 1030 ++++++++++++++++++++++++++++++++++
 2 files changed, 1032 insertions(+)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index ddd4aedcce1..e719bacd061 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -4,9 +4,11 @@ DIST mariadb-10.0.32.tar.gz 63567828 SHA256 
f7a8d9ba88b01d426f5d69e5044e505e444a
 DIST mariadb-10.1.24.tar.gz 61780687 SHA256 
b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 
0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9
 WHIRLPOOL 
91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
 DIST mariadb-10.1.26.tar.gz 61887132 SHA256 
ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 
a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b
 WHIRLPOOL 
8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21
 DIST mariadb-10.2.7.tar.gz 67669554 SHA256 
225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc SHA512 
fa595acc0f5c9c62077db000f1721af79628994c08e82b2eb95d265e3c556e80942c487fc1b91299c382becd71f21a0a117ca93d7428752f436ed83683a4f4cd
 WHIRLPOOL 
d76d584924dac41fd787c1a02f79de90ae5334b217b66deb59756490a8c42b801fddac425542e371d68b04fa462a3f438626896749a1c12be70e9d22d857771e
+DIST mariadb-10.2.8.tar.gz 73488662 SHA256 
8dd250fe79f085e26f52ac448fbdb7af2a161f735fae3aed210680b9f2492393 SHA512 
c0527481a99249caef829a3ad2f610f6ebb30ed9af49c56b783695ce4fe83db93021ef0f60efad92750038c8894b957cbb1f2c4ee56fe8d5c15c878c83ba46d1
 WHIRLPOOL 
6b3b2ffe69cffbe88ad41f133618e0277745e99b927deda2853dc031941353540486a49fcd1c01f5f75f2ab466c3cf5ec07c0a040af8cef3619813eed272b287
 DIST mariadb-5.5.57.tar.gz 45783940 SHA256 
5dbde98d7e4a5a1721b6cbed7898b2549a88866247951cf586057975c6cea641 SHA512 
5d6350abd6f0ba98326633a36bb7ec67525e34e08cbe43f79c9b30bf0b872b0a8f9f0bfd5f3a4c2800a52d25b9c6f3a3a4a62e0f41574153bbf4b881f5347c71
 WHIRLPOOL 
c2af12fb71b3fcc9989cd2208a44dc81401fe1387ae2d03981fd5d00277d480a35f23bdb8f1564f91b4c345bdb18a610b46ee91f47772ba5de1baf8f808eaec3
 DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 
c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 
1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715
 WHIRLPOOL 
d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 
45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 
c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 WHIRLPOOL 
becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
 DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 
23f5becec389fc49e7cf0d52c6c914cbc8d7e3fc5851ee38881ee6884ffc5732 SHA512 
2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157
 WHIRLPOOL 
9f459d9e58938597e7919b29fc819d87920a51461d274bf87520fe322a67ad8638ef19212855ba8e37507d3b160d29ecad0099f4632f078cc503e1be0f809fb4
 DIST mysql-extras-20170316-1355Z.tar.bz2 308933 SHA256 
ebcb4f03413ccf42877558ad365db01bbb5ef2e12620a9be479ffc2514d9830e SHA512 
5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c
 WHIRLPOOL 
701871ff554970adef8e5eb1e2e966a09c4b59ac7931df125f78a4fcfa415e87767184a9d3418013d27410ad0482673942f1df48d5e5de68917f49e1efa96689
 DIST mysql-extras-20170803-1814Z.tar.bz2 311860 SHA256 
6d07ac00913e8a5911bc041b1da36b6792ab7ce24a8723acd37d145871ca6a82 SHA512 
1a96ad61ebdeacadbc43a26e0ffbac4968272e115c5ad0f618aa7404d9904ebff1497023898de4b6820705ec0c08490e6bece89bc9d8bed7e32b78e1acd2d4a8
 WHIRLPOOL 
d240ceba8d35af5ece80747ba6d3d32e12b982f7dddd5f0a5db17f0b4b93090fa38b944145f3d6c18e93e3d9eca222a75d164cb876b03f153016d754067fc7e3
+DIST mysql-extras-20170820-2245Z.tar.bz2 312101 SHA256 
619afb88752e461434709ed91e91c2104845a9a9ee67ac944212833f4a715ed8 SHA512 
34868c8ba3509ed5e3625c973e16f5015390ca9fc656cbcdbe8f5568bc7cab3708bb7c88b1af324ebb66f86433dfee71b90adf6451556fcfc12ad4e7d32256dd
 WHIRLPOOL 
f8e08f47bb0789c25dc096c76340b1ca9db8a264d89aca816e3b45e4dd984dc9dea90554c6c114179dc972026c703404aa8521b3c93fb882d7eadd1295635fb9

diff --git a/dev-db/mariadb/mariadb-10.2.8.ebuild 
b/dev-db/mariadb/mariadb-10.2.8.ebuild
new file mode 100644
index 00000000000..8a9288bd01b
--- /dev/null
+++ b/dev-db/mariadb/mariadb-10.2.8.ebuild
@@ -0,0 +1,1030 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+MY_EXTRAS_VER="20170820-2245Z"
+SUBSLOT="18"
+
+JAVA_PKG_OPT_USE="jdbc"
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit eutils systemd flag-o-matic prefix toolchain-funcs \
+       java-pkg-opt-2 user cmake-utils multilib-minimal
+
+SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz "
+
+# Gentoo patches to MySQL
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
+       SRC_URI="${SRC_URI}
+               mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+               
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+               
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+               
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
+               
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2";
+fi
+
+HOMEPAGE="http://mariadb.org/";
+DESCRIPTION="An enhanced, drop-in replacement for MySQL"
+LICENSE="GPL-2 LGPL-2.1+"
+SLOT="0/${SUBSLOT:-0}"
+IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
+       innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
+       odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
+       sst-rsync sst-xtrabackup static static-libs systemd systemtap tcmalloc
+       test tokudb xml yassl"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the 
tests
+RESTRICT="!bindist? ( bindist ) libressl? ( test )"
+
+REQUIRED_USE="jdbc? ( extraengine server !static )
+       server? ( tokudb? ( jemalloc !tcmalloc ) )
+       !server? ( !extraengine !embedded )
+       ?? ( tcmalloc jemalloc )
+       static? ( yassl !pam )"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107 
chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
+       MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+else
+       MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+fi
+
+PATCHES=(
+       "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
+       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
+       "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
+       "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+       "${MY_PATCH_DIR}"/20026_all_mariadb-add-pkgdatadir.patch
+)
+
+# 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
+COMMON_DEPEND="
+       kernel_linux? (
+               sys-process/procps:0=
+               dev-libs/libaio:0=
+       )
+       >=sys-apps/sed-4
+       >=sys-apps/texinfo-4.7-r1
+       !dev-db/mariadb-connector-c[mysqlcompat]
+       jemalloc? ( dev-libs/jemalloc:0= )
+       tcmalloc? ( dev-util/google-perftools:0= )
+       systemtap? ( >=dev-util/systemtap-1.3:0= )
+       !yassl? (
+               !libressl? ( 
>=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=
+       mroonga? ( app-text/groonga-normalizer-mysql )
+       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+       !bindist? (
+               sys-libs/binutils-libs:0=
+               >=sys-libs/readline-4.1:0=
+       )
+       server? (
+               backup? ( app-arch/libarchive:0= )
+               cracklib? ( sys-libs/cracklib:0= )
+               extraengine? (
+                       odbc? ( dev-db/unixODBC:0= )
+                       xml? ( dev-libs/libxml2:2= )
+               )
+               innodb-lz4? ( app-arch/lz4 )
+               innodb-lzo? ( dev-libs/lzo )
+               innodb-snappy? ( app-arch/snappy )
+               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
+               pam? ( virtual/pam:0= )
+               systemd? ( sys-apps/systemd:= )
+               tokudb? ( app-arch/snappy )
+       )
+       >=dev-libs/libpcre-8.35:3=
+"
+DEPEND="virtual/yacc
+       static? ( sys-libs/ncurses[static-libs] )
+       || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
+       server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
+       ${COMMON_DEPEND}"
+RDEPEND="selinux? ( sec-policy/selinux-mysql )
+       abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
+       !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
+       server? ( !prefix? ( dev-db/mysql-init-scripts ) )
+       !<virtual/mysql-5.6-r9
+       ${COMMON_DEPEND}
+       server? ( galera? (
+               sys-apps/iproute2
+               =sys-cluster/galera-25*
+               sst-rsync? ( sys-process/lsof )
+               sst-xtrabackup? ( net-misc/socat[ssl] )
+       ) )
+       perl? ( !dev-db/mytop
+               virtual/perl-Getopt-Long
+               dev-perl/TermReadKey
+               virtual/perl-Term-ANSIColor
+               virtual/perl-Time-HiRes )
+       server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
+"
+# For other stuff to bring us in
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+# xtrabackup-bin causes a circular dependency if DBD-mysql is not already 
installed
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
+        server? ( ~virtual/mysql-5.6[embedded=,static=] )
+        virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]
+       server? ( galera? ( sst-xtrabackup? ( || ( 
>=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+
+pkg_setup() {
+       if [[ ${MERGE_TYPE} != binary ]] ; then
+               local GCC_MAJOR_SET=$(gcc-major-version)
+               local GCC_MINOR_SET=$(gcc-minor-version)
+               if use tokudb && [[ ${GCC_MAJOR_SET} -lt 4 || \
+                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
+                       eerror "${PN} with tokudb needs to be built with 
gcc-4.7 or later."
+                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
+                       die
+               fi
+               # Bug 565584.  InnoDB now requires atomic functions introduced 
with gcc-4.7 on
+               # non x86{,_64} arches
+               if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
+                       ${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; 
then
+                       eerror "${PN} needs to be built with gcc-4.7 or later."
+                       eerror "Please use gcc-config to switch to gcc-4.7 or 
later version."
+                       die
+               fi
+       fi
+       java-pkg-opt-2_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"
+}
+
+pkg_preinst() {
+       java-pkg-opt-2_pkg_preinst
+
+       # 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 libpath
+       if [[ -z ${REPLACING_VERSIONS} && -e 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
+               libpath=$(readlink 
"${EROOT}usr/$(get_libdir)/libmysqlclient.so")
+               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 ${libpath}"
+               ewarn "Failure to run revdep-rebuild may cause issues with 
other programs or libraries"
+       fi
+}
+
+pkg_postinst() {
+       # Make sure the vars are correctly initialized
+       mysql_init_vars
+
+       # Check FEATURES="collision-protect" before removing this
+       [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}${MY_LOGDIR}"
+
+       # Secure the logfiles
+       touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+       chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+       chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+       # Minimal builds don't have the MySQL server
+       if use server ; then
+               if use pam; then
+                       einfo
+                       elog "This install includes the PAM authentication 
plugin."
+                       elog "To activate and configure the PAM plugin, please 
read:"
+                       elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
+                       einfo
+               fi
+
+               if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+                       einfo
+                       elog "You might want to run:"
+                       elog "\"emerge --config =${CATEGORY}/${PF}\""
+                       elog "if this is a new install."
+                       elog
+                       elog "If you are switching server implentations, you 
should run the"
+                       elog "mysql_upgrade tool."
+                       einfo
+               else
+                       einfo
+                       elog "If you are upgrading major versions, you should 
run the"
+                       elog "mysql_upgrade tool."
+                       einfo
+               fi
+
+               if use galera ; then
+                       einfo
+                       elog "Be sure to edit the my.cnf file to activate your 
cluster settings."
+                       elog "This should be done after running \"emerge 
--config =${CATEGORY}/${PF}\""
+                       elog "The first time the cluster is activated, you 
should add"
+                       elog "--wsrep-new-cluster to the options in 
/etc/conf.d/mysql for one node."
+                       elog "This option should then be removed for subsequent 
starts."
+                       einfo
+               fi
+       fi
+
+       # Note about configuration change
+       einfo
+       elog "This version of mariadb reorganizes the configuration from a 
single my.cnf"
+       elog "to several files in /etc/mysql/${PN}.d."
+       elog "Please backup any changes you made to /etc/mysql/my.cnf"
+       elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf 
extension."
+       elog "You may have as many files as needed and they are read 
alphabetically."
+       elog "Be sure the options have the appropitate section headers, i.e. 
[mysqld]."
+       einfo
+}
+
+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}/${P}" "${S}" || die
+}
+
+src_prepare() {
+       java-pkg-opt-2_src_prepare
+       if use tcmalloc; then
+               echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> 
"${S}/sql/CMakeLists.txt"
+       fi
+
+       # Don't build bundled xz-utils for tokudb
+       echo > 
"${S}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake" || die
+       sed -i -e 's/ build_lzma//' -e 's/ build_snappy//' 
"${S}/storage/tokudb/PerconaFT/ft/CMakeLists.txt" || die
+       sed -i -e 's/add_dependencies\(tokuportability_static_conv 
build_jemalloc\)//' "${S}/storage/tokudb/PerconaFT/portability/CMakeLists.txt" 
|| die
+
+       # Remove the bundled groonga
+       # There is no CMake flag, it simply checks for existance
+       rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove 
packaged groonga"
+
+       eapply "${PATCHES[@]}"
+       eapply_user
+}
+
+src_configure(){
+       # bug 508724 mariadb cannot use ld.gold
+       tc-ld-disable-gold
+       # Bug #114895, bug #110149
+       filter-flags "-O" "-O[01]"
+
+       append-cxxflags -felide-constructors
+
+       # bug #283926, with GCC4.4, this is required to get correct behavior.
+       append-flags -fno-strict-aliasing
+
+       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_MANDIR=share/man
+               -DINSTALL_MYSQLSHAREDIR=share/mariadb
+               -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
+               -DINSTALL_SCRIPTDIR=share/mariadb/scripts
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
+               -DINSTALL_SBINDIR=sbin
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
+               -DWITH_COMMENT="Gentoo Linux ${PF}"
+               -DWITH_UNIT_TESTS=$(usex test ON OFF)
+               -DWITH_LIBEDIT=0
+               -DWITH_ZLIB=system
+               -DWITHOUT_LIBWRAP=1
+               -DENABLED_LOCAL_INFILE=1
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+               -DWITH_DEFAULT_COMPILER_OPTIONS=0
+               -DWITH_DEFAULT_FEATURE_SET=0
+               -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
+               -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)"
+               -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+               -DAUTH_GSSAPI_PLUGIN_TYPE=$(usex kerberos DYNAMIC OFF)
+               -DCONC_WITH_EXTERNAL_ZLIB=YES
+               -DWITH_EXTERNAL_ZLIB=YES
+               -DSUFFIX_INSTALL_DIR=""
+               -DWITH_UNITTEST=OFF
+       )
+       if use test ; then
+               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )
+       else
+               mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
+       fi
+
+       if ! use yassl ; then
+               mycmakeargs+=( -DWITH_SSL=system )
+       else
+               mycmakeargs+=( -DWITH_SSL=bundled )
+       fi
+
+       # 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+=(
+                       -DWITHOUT_TOOLS=1
+                       -DWITH_READLINE=1
+                       -DNOT_FOR_DISTRIBUTION=0
+               )
+       fi
+
+       if multilib_is_native_abi && use server ; then
+
+               # Federated{,X} must be treated special otherwise they will not 
be built as plugins
+               if ! use extraengine ; then
+                       mycmakeargs+=(
+                               -DPLUGIN_FEDERATED=NO
+                               -DPLUGIN_FEDERATEDX=NO )
+               fi
+
+               mycmakeargs+=(
+                       -DWITH_JEMALLOC=$(usex jemalloc system)
+                       -DWITH_PCRE=system
+                       -DPLUGIN_OQGRAPH=$(usex oqgraph DYNAMIC NO)
+                       -DPLUGIN_SPHINX=$(usex sphinx YES NO)
+                       -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
+                       -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
+                       -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
+                       -DPLUGIN_CASSANDRA=NO
+                       -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
+                       -DPLUGIN_SPIDER=$(usex extraengine YES NO)
+                       -DPLUGIN_CONNECT=$(usex extraengine YES NO)
+                       -DCONNECT_WITH_MYSQL=1
+                       -DCONNECT_WITH_LIBXML2=$(usex xml)
+                       -DCONNECT_WITH_ODBC=$(usex odbc)
+                       -DCONNECT_WITH_JDBC=$(usex jdbc)
+                       -DWITH_WSREP=$(usex galera)
+                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
+                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
+                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
+                       -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
+                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
+                       -DWITH_MARIABACKUP=$(usex backup ON OFF)
+                       -DWITH_LIBARCHIVE=$(usex backup ON OFF)
+                       -DINSTALL_SQLBENCHDIR=share/mariadb
+                       -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
+                       # systemd is only linked to for server notification
+                       -DWITH_SYSTEMD=$(usex systemd)
+               )
+               if use test ; then
+                       # This is needed for the new client lib which tests a 
real, open server
+                       mycmakeargs+=( -DSKIP_TESTS=ON )
+               fi
+
+               if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
+                       ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
+                       ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
+                       ewarn "You MUST file bugs without these variables set."
+
+                       mycmakeargs+=(
+                               -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+                               -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+                       )
+
+               elif ! use latin1 ; then
+                       mycmakeargs+=(
+                               -DDEFAULT_CHARSET=utf8
+                               -DDEFAULT_COLLATION=utf8_general_ci
+                       )
+               else
+                       mycmakeargs+=(
+                               -DDEFAULT_CHARSET=latin1
+                               -DDEFAULT_COLLATION=latin1_swedish_ci
+                       )
+               fi
+               mycmakeargs+=(
+                       -DEXTRA_CHARSETS=all
+                       -DMYSQL_USER=mysql
+                       -DDISABLE_SHARED=$(usex static YES NO)
+                       -DWITH_DEBUG=$(usex debug)
+                       -DWITH_EMBEDDED_SERVER=$(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
+               )
+
+       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) )
+       else
+               mycmakeargs+=( -DENABLE_DTRACE=0 )
+       fi
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       multilib-minimal_src_compile
+}
+
+multilib_src_compile() {
+       cmake-utils_src_compile
+}
+
+src_install() {
+       # headers with ABI specific data
+       local MULTILIB_WRAPPED_HEADERS=(
+               /usr/include/mysql/my_config.h
+               /usr/include/mysql/private/embedded_priv.h
+               /usr/include/mysql/mysql_version.h
+               /usr/include/mariadb/mariadb_version.h
+               /usr/include/mysql/mariadb_version.h
+               /usr/include/mysql/private/probes_mysql_nodtrace.h
+               /usr/include/mysql/private/probes_mysql_dtrace.h )
+
+       # wrap the config scripts
+       local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config 
/usr/bin/mysql_config )
+       multilib-minimal_src_install
+}
+
+# Intentionally override eclass function
+multilib_src_install() {
+       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}/usr/include/mysql/private/config.h" ]] ; then
+               rm "${D}/usr/include/mysql/private/config.h" || die
+       fi
+
+       if ! multilib_is_native_abi && use server ; then
+               insinto /usr/include/mysql/private
+               doins "${S}"/sql/*.h
+       fi
+
+       # Install compatible symlinks to libmysqlclient
+#      use static-libs && dosym libmariadbclient.a 
"${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a"
+#      dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so"
+       dosym libmariadb.so.3 
"${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
+
+       # Kill old libmysqclient_r symlinks if they exist.  Time to fix what 
depends on them.
+       find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
+}
+
+multilib_src_install_all() {
+       # Make sure the vars are correctly initialized
+       mysql_init_vars
+
+       # Convenience links
+       einfo "Making Convenience links for mysqlcheck multi-call binary"
+       dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
+       dosym "mysqlcheck" "/usr/bin/mysqlrepair"
+       dosym "mysqlcheck" "/usr/bin/mysqloptimize"
+
+       # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
+       if [[ -d "${ED}/usr/data" ]] ; then
+               rm -Rf "${ED}/usr/data" || die
+       fi
+
+       # Unless they explicitly specific USE=test, then do not install the
+       # testsuite. It DOES have a use to be installed, esp. when you want to 
do a
+       # validation of your database configuration after tuning it.
+       if ! use test ; then
+               rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
+       fi
+
+       # Configuration stuff
+       einfo "Building default configuration ..."
+       insinto "${MY_SYSCONFDIR#${EPREFIX}}"
+       [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins 
"${S}"/scripts/mysqlaccess.conf
+       cp "${FILESDIR}/my.cnf-10.2" "${TMPDIR}/my.cnf" || die
+       eprefixify "${TMPDIR}/my.cnf"
+       doins "${TMPDIR}/my.cnf"
+       insinto "${MY_SYSCONFDIR#${EPREFIX}}/mariadb.d"
+       cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" 
|| die
+       eprefixify "${TMPDIR}/50-distro-client.cnf"
+       doins "${TMPDIR}/50-distro-client.cnf"
+
+       if use server ; then
+               mycnf_src="my.cnf.distro-server"
+               sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
+                       "${FILESDIR}/${mycnf_src}" \
+                       > "${TMPDIR}/my.cnf.ok" || die
+               if use prefix ; then
+                       sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \
+                               "${TMPDIR}/my.cnf.ok" || die
+               fi
+               if use latin1 ; then
+                       sed -i \
+                               -e "/character-set/s|utf8|latin1|g" \
+                               "${TMPDIR}/my.cnf.ok" || die
+               fi
+               eprefixify "${TMPDIR}/my.cnf.ok"
+               newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf
+               einfo "Creating initial directories"
+               # Empty directories ...
+               diropts "-m0750"
+               if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+                       dodir "${MY_DATADIR#${EPREFIX}}"
+                       keepdir "${MY_DATADIR#${EPREFIX}}"
+                       chown -R mysql:mysql "${D}/${MY_DATADIR}"
+               fi
+
+               diropts "-m0755"
+               local folder
+               for folder in "${MY_LOGDIR#${EPREFIX}}" ; do
+                       dodir "${folder}"
+                       keepdir "${folder}"
+                       chown -R mysql:mysql "${ED}/${folder}"
+               done
+
+               einfo "Including support files and sample configurations"
+               docinto "support-files"
+               local script
+               for script in \
+                       "${S}"/support-files/magic
+               do
+                       [[ -f "$script" ]] && dodoc "${script}"
+               done
+
+               docinto "scripts"
+               for script in "${S}"/scripts/mysql* ; do
+                       [[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" 
) ]] && dodoc "${script}"
+               done
+       fi
+
+       #Remove mytop if perl is not selected
+       [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f 
"${ED}/usr/bin/mytop"
+}
+
+# Official test instructions:
+# USE='extraengine perl server static-libs' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+       if ! multilib_is_native_abi ; then
+               einfo "Server tests not available on non-native abi".
+               return 0;
+       fi
+
+       _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
+       }
+
+       local TESTDIR="${BUILD_DIR}/mysql-test"
+       local retstatus_unit
+       local retstatus_tests
+
+       if ! use server ; then
+               einfo "Skipping server tests due to minimal build."
+               return 0
+       fi
+
+       # Bug #213475 - MySQL _will_ object strenously if your machine is named
+       # localhost. Also causes weird failures.
+       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
+
+       if [[ $UID -eq 0 ]]; then
+               die "Testing with FEATURES=-userpriv is no longer supported by 
upstream. Tests MUST be run as non-root."
+       fi
+       has usersandbox $FEATURES && ewarn "Some tests may fail with 
FEATURES=usersandbox"
+
+       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+
+       # Run CTest (test-units)
+       cmake-utils_src_test
+       retstatus_unit=$?
+
+       # Ensure that parallel runs don't die
+       export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+       # Enable parallel testing, auto will try to detect number of cores
+       # You may set this by hand.
+       # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+       export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+       # create directories because mysqladmin might run out of order
+       mkdir -p "${T}"/var-tests{,/log} || die
+
+       # Run mysql tests
+       pushd "${TESTDIR}" > /dev/null || die
+
+       # These are failing in MariaDB 10.0 for now and are believed to be
+       # false positives:
+       #
+       # main.mysql_client_test, main.mysql_client_test_nonblock
+       # main.mysql_client_test_comp:
+       # segfaults at random under Portage only, suspect resource limits.
+
+       local t
+       for t in plugins.cracklib_password_check 
plugins.two_password_validations ; do
+               _disable_test  "$t" "False positive due to varying policies"
+       done
+
+       for t in main.mysql_client_test main.mysql_client_test_nonblock \
+               main.mysql_client_test_comp ; do
+                       _disable_test  "$t" "False positives in Gentoo"
+       done
+
+       # run mysql-test tests
+       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
+       retstatus_tests=$?
+
+       popd > /dev/null || die
+
+       # Cleanup is important for these testcases.
+       pkill -9 -f "${S}/ndb" 2>/dev/null
+       pkill -9 -f "${S}/sql" 2>/dev/null
+
+       local failures=""
+       [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+       [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+
+       [[ -z "$failures" ]] || die "Test failures: $failures"
+       einfo "Tests successfully completed"
+}
+
+mysql_init_vars() {
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
+
+       if [[ -z "${MY_DATADIR}" ]] ; then
+               MY_DATADIR=""
+               if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
+                       MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+                               | sed -ne '/datadir/s|^--datadir=||p' \
+                               | tail -n1`
+                       if [[ -z "${MY_DATADIR}" ]] ; then
+                               MY_DATADIR=`grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
+                               | sed -e 's/.*=\s*//' \
+                               | tail -n1`
+                       fi
+               fi
+               if [[ -z "${MY_DATADIR}" ]] ; then
+                       MY_DATADIR="${MY_LOCALSTATEDIR}"
+                       einfo "Using default MY_DATADIR"
+               fi
+               elog "MySQL MY_DATADIR is ${MY_DATADIR}"
+
+               if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
+                       if [[ -e "${MY_DATADIR}" ]] ; then
+                               # If you get this and you're wondering about 
it, see bug #207636
+                               elog "MySQL datadir found in ${MY_DATADIR}"
+                               elog "A new one will not be created."
+                               PREVIOUS_DATADIR="yes"
+                       else
+                               PREVIOUS_DATADIR="no"
+                       fi
+                       export PREVIOUS_DATADIR
+               fi
+       else
+               if [[ ${EBUILD_PHASE} == "config" ]]; then
+                       local new_MY_DATADIR
+                       new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
+                               | sed -ne '/datadir/s|^--datadir=||p' \
+                               | tail -n1`
+
+                       if [[ ( -n "${new_MY_DATADIR}" ) && ( 
"${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
+                               ewarn "MySQL MY_DATADIR has changed"
+                               ewarn "from ${MY_DATADIR}"
+                               ewarn "to ${new_MY_DATADIR}"
+                               MY_DATADIR="${new_MY_DATADIR}"
+                       fi
+               fi
+       fi
+
+       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
+       export MY_LOCALSTATEDIR MY_LOGDIR
+       export MY_DATADIR
+}
+
+pkg_config() {
+       _getoptval() {
+               local mypd="${EROOT}"/usr/bin/my_print_defaults
+               local section="$1"
+               local flag="--${2}="
+               local extra_options="${3}"
+               "${mypd}" $extra_options $section | sed -n 
"/^${flag}/s,${flag},,gp"
+       }
+       local old_MY_DATADIR="${MY_DATADIR}"
+       local old_HOME="${HOME}"
+       # my_print_defaults needs to read stuff in $HOME/.my.cnf
+       export HOME=${EPREFIX}/root
+
+       # Make sure the vars are correctly initialized
+       mysql_init_vars
+
+       [[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
+       if [[ ! -x "${EROOT}/usr/sbin/mysqld" ]] ; then
+               die "Minimal builds do NOT include the MySQL server"
+       fi
+
+       if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != 
"${old_MY_DATADIR}" ) ]]; then
+               local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
+               MY_DATADIR_s="${MY_DATADIR_s%%/}"
+               local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
+               old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
+
+               if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" 
!= / ) ]]; then
+                       if [[ -d "${MY_DATADIR_s}" ]]; then
+                               ewarn "Both ${old_MY_DATADIR_s} and 
${MY_DATADIR_s} exist"
+                               ewarn "Attempting to use ${MY_DATADIR_s} and 
preserving ${old_MY_DATADIR_s}"
+                       else
+                               elog "Moving MY_DATADIR from 
${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
+                               mv --strip-trailing-slashes -T 
"${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
+                               || die "Moving MY_DATADIR failed"
+                       fi
+               else
+                       ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does 
not exist"
+                       if [[ -d "${MY_DATADIR_s}" ]]; then
+                               ewarn "Attempting to use ${MY_DATADIR_s}"
+                       else
+                               eerror "New MY_DATADIR (${MY_DATADIR_s}) does 
not exist"
+                               die "Configuration Failed! Please reinstall 
${CATEGORY}/${PN}"
+                       fi
+               fi
+       fi
+
+       local pwd1="a"
+       local pwd2="b"
+       local maxtry=15
+
+       if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
+               local tmp_mysqld_password_source=
+
+               for tmp_mysqld_password_source in mysql client; do
+                       einfo "Trying to get password for mysql 'root' user 
from '${tmp_mysqld_password_source}' section ..."
+                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password)"
+                       if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
+                               if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
+                                       ewarn "Ignoring password from 
'${tmp_mysqld_password_source}' section due to newline character (do you have 
multiple password options set?)!"
+                                       MYSQL_ROOT_PASSWORD=
+                                       continue
+                               fi
+
+                               einfo "Found password in 
'${tmp_mysqld_password_source}' section!"
+                               break
+                       fi
+               done
+
+               # Sometimes --show is required to display passwords in some 
implementations of my_print_defaults
+               if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
+                       MYSQL_ROOT_PASSWORD="$(_getoptval 
"${tmp_mysqld_password_source}" password --show)"
+               fi
+
+               unset tmp_mysqld_password_source
+       fi
+       MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+       # These are dir+prefix
+       MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+       MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
+       MYSQL_LOG_BIN="$(_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'"
+
+       # Figure out which options we need to disable to do the setup
+       local helpfile="${TMPDIR}/mysqld-help"
+       "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
+       for opt in grant-tables host-cache name-resolve networking slave-start \
+               federated ssl log-bin relay-log slow-query-log external-locking 
\
+               log-slave-updates \
+               ; do
+               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
+               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
+       done
+
+       use prefix || options="${options} --user=mysql"
+
+       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
+               mkdir -p "${PID_DIR}" || die "Could not create pid directory"
+               chown mysql:mysql "${PID_DIR}" || die "Could not set ownership 
on pid directory"
+               chmod 755 "${PID_DIR}" || die "Could not set permissions on pid 
directory"
+       fi
+
+       pushd "${TMPDIR}" &>/dev/null
+
+       # 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=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
+       [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
+       einfo "Command: ${cmd[*]}"
+       "${cmd[@]}" \
+               >"${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
+       [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
+       || die "MySQL databases not installed"
+       chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
+       chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
+
+       local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
+       local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
+       local mysqld="${EROOT}/usr/sbin/mysqld \
+               ${options} \
+               --log-warnings=0 \
+               --basedir=${EROOT}/usr \
+               --datadir=${ROOT}/${MY_DATADIR} \
+               --max_allowed_packet=8M \
+               --net_buffer_length=16K \
+               --socket=${socket} \
+               --pid-file=${pidfile}
+               --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
+       #einfo "About to start mysqld: ${mysqld}"
+       ebegin "Starting mysqld"
+       einfo "Command ${mysqld}"
+       ${mysqld} &
+       rc=$?
+       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
+               maxtry=$((${maxtry}-1))
+               echo -n "."
+               sleep 1
+       done
+       eend $rc
+
+       if ! [[ -S "${socket}" ]]; then
+               die "Completely failed to start up mysqld with: ${mysqld}"
+       fi
+
+       ebegin "Setting root password"
+       # Do this from memory, as we don't want clear text passwords in temp 
files
+       local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
+       "${EROOT}/usr/bin/mysql" \
+               "--socket=${socket}" \
+               -hlocalhost \
+               -e "${sql}"
+       eend $?
+
+       if [[ -n "${sqltmp}" ]] ; then
+               ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
+               "${EROOT}/usr/bin/mysql" \
+                       "--socket=${socket}" \
+                       -hlocalhost \
+                       -uroot \
+                       --password="${MYSQL_ROOT_PASSWORD}" \
+                       mysql < "${sqltmp}"
+               rc=$?
+               eend $?
+               [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
+       fi
+
+       # Stop the server and cleanup
+       einfo "Stopping the server ..."
+       kill $(< "${pidfile}" )
+       rm -f "${sqltmp}"
+       wait %1
+       einfo "Done"
+}

Reply via email to