commit:     1cbce15f0344d08bdb98e87b76d7a143a6329016
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 02:13:31 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 02:13:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbce15f

dev-db/mariadb: Drop old

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 dev-db/mariadb/Manifest                 |    4 -
 dev-db/mariadb/mariadb-10.0.35.ebuild   |  210 -------
 dev-db/mariadb/mariadb-10.2.15.ebuild   | 1011 ------------------------------
 dev-db/mariadb/mariadb-10.3.6_rc.ebuild | 1022 -------------------------------
 dev-db/mariadb/mariadb-5.5.60.ebuild    |  124 ----
 dev-db/mariadb/metadata.xml             |    4 -
 6 files changed, 2375 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f4226834c84..65dd6560c56 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -6,14 +6,10 @@ DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 
40b94ed519522f16ee4687a9c569a0e5263
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 
1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f
 SHA512 
db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 
3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76
 SHA512 
1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e
 DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 
3f3af7b8bad68a08f69befd3f3e7bd88b8cf058feb20309dc2cdbd16bf5d015c2cb0d1d9d2fdf831f6183c0b9bb25405124c24b2940467489e05d42c57f7b0a6
 SHA512 
3c18359006b340dcf724d1fce36dcc19916c42492269a7545e0726172b8f7b84860e10725c74e4458dae34572395f1650bf17838e9058544e0a6cfcbffd54f6d
-DIST mariadb-10.2.15.tar.gz 73329750 BLAKE2B 
e588f54d1b8807df1a57b87831294c70a7d21ed73bba96487a091338ee94855c2b796c939057546b9437b2caf96600ef6f7e111557249adaa9e18795a5a35ade
 SHA512 
7702af8787973b15784dc8a89f9d56765725a420e2e68f1924b67c88c134c7d83d3249dddd16707fa9e5f05ed747f813f16feefbb477e999a6698b1dcfb5a88f
 DIST mariadb-10.2.16.tar.gz 73363798 BLAKE2B 
31b4d21612f72ff2784b038479ccb866f8d870019c1ff86ff8fa11256e56e659203c83ba52294cc16d0d73531f1d30f5e4ab218a1daadd02223cda3e4c984590
 SHA512 
3ee476987580c9105645936bbbf29e5614753120247d8909833221c66d68bd507c99643b8b17f23e99644825ad03e03c841309731915e9101f3b5cf47c14e902
-DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 
681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9
 SHA512 
cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1
 DIST mariadb-10.3.7.tar.gz 71816160 BLAKE2B 
213cfe2999b48c088e08e8289a6243d79b91e465fce51850a253a121896f69df03f935940f25ac290e15e29f97b3a16f75711044b8986f6ec3841ef8beafa0b4
 SHA512 
b1b3ad9ddc45bdfd3d03888ba160f9991b23187341deac402d5dc4b735511e29767a5dc64ca557bea9bf3d3b413b941ef2e1f5fa30be056dfaec4542a43895f1
 DIST mariadb-10.3.8.tar.gz 72152953 BLAKE2B 
4742be1d533c7958b61efd430411a1e7390faffc25ceccc09c736647fb263dc3797064725335abf17f9362c7a92293ea5fc72bc2ddd70636f83c25e35c4c83aa
 SHA512 
e1b61900a06fa57992a2f8516771f5fb98799ed5a4bbe74f858c0fe87b907cc6b600942d6fe97b6064cb39b610a7213cb3bc9634a336f9ebffe11dfe67746422
-DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 
150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807
 SHA512 
eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c
 DIST mariadb-5.5.61.tar.gz 45839038 BLAKE2B 
2755963d51aee3b9b560531e00b9df6f5637c90a44ad181cf826234d27c15e9fd1b61ae4faf4d9a4ff06779e605c6a5757192407e6e402ad68dfb3ae45a94088
 SHA512 
a2bebb47ec62eb6cd15e003dea7708948cd96fd7f0fc631a85cfc4691b55e220ed78f3e3b16542b5152ad5bcc61e50a831c71cf8f29481f7de86816ec0bae594
-DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 
23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7
 SHA512 
c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 
3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a
 SHA512 
556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
 DIST mysql-extras-20180515-0123Z.tar.bz2 320380 BLAKE2B 
a56e3ef19f4e30628fea9889dbb55379a8c92f08c9c493fe3f524b98fabf3505150fbe7cc65f97fc8b75632b5dd7360ddb9bd1542714c5e9916f94c2792ff3db
 SHA512 
3e0b36ab4cb3f2e7d30f1fb2d8d3a916439611f1714475f2ab0480ba51176f47dcccd40931de4bd0a46b0aca6dfcb62cfc92b6939eed2e61628947bf664008ee
 DIST mysql-extras-20180515-1334Z.tar.bz2 321462 BLAKE2B 
48fc1e0058fa824e6234b0f3319d261997e99f334c8583c0def4cdac4b59f2380d7153ab0fa2ca9a6ab15e35899c2a7586e3b61f4044c4c949110cc8ab9fb0e6
 SHA512 
de3000f0c65eed9595b52d53205cdcac60cb4a06a5aca27057c8beca6a7890f453aeeda0bb8487b8de75cfb4caa48682b7706273574876c5cefd0d03988c4f7e

diff --git a/dev-db/mariadb/mariadb-10.0.35.ebuild 
b/dev-db/mariadb/mariadb-10.0.35.ebuild
deleted file mode 100644
index e4d1ee85dcf..00000000000
--- a/dev-db/mariadb/mariadb-10.0.35.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20170926-1321Z"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="https://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( 
jemalloc !tcmalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-PATCHES=(
-       "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
-       "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch"
-       "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
-       
"${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch"
-)
-COMMON_DEPEND="
-       !bindist? ( >=sys-libs/readline-4.1:0=  )
-       server? (
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-                       sys-libs/zlib[minizip]
-               )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.41-r1:3=[${MULTILIB_USEDEP}]
-       openssl? ( !>=dev-libs/openssl-1.1 )
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-       server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
-       ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
-       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 ) ) )
-"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
-       /usr/include/mysql/private/probes_mysql_nodtrace.h
-       /usr/include/mysql/private/probes_mysql_dtrace.h )
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
-       java-pkg-opt-2_pkg_preinst
-       mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
-       java-pkg-opt-2_src_prepare
-       mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
-       # bug 508724 mariadb cannot use ld.gold
-       tc-ld-disable-gold
-       local MYSQL_CMAKE_NATIVE_DEFINES=(
-                       -DWITH_JEMALLOC=$(usex jemalloc system)
-                       -DWITH_PCRE=system
-       )
-       if use server ; then
-               # Federated{,X} must be treated special otherwise they will not 
be built as plugins
-               if ! use extraengine ; then
-                       MYSQL_CMAKE_NATIVE_DEFINES+=(
-                               -DWITHOUT_FEDERATED=1
-                               -DWITHOUT_FEDERATEDX=1 )
-               fi
-
-               # Connect with Zip is currently broken and does not compile
-               # Reported upstream https://jira.mariadb.org/browse/MDEV-11809
-
-               MYSQL_CMAKE_NATIVE_DEFINES+=(
-                       $(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)
-                       $(mysql-cmake_use_plugin extraengine SEQUENCE)
-                       $(mysql-cmake_use_plugin extraengine SPIDER)
-                       $(mysql-cmake_use_plugin extraengine CONNECT)
-                       -DCONNECT_WITH_LIBXML2=$(usex xml)
-                       -DCONNECT_WITH_ODBC=$(usex odbc)
-                       -DCONNECT_WITH_JDBC=$(usex jdbc)
-                       -DWITHOUT_MROONGA=1
-               )
-       fi
-       mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='extraengine perl server openssl 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
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       if use server ; then
-
-               # 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 && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-               addpredict /this-dir-does-not-exist/t9.MYI
-
-               # Run CTest (test-units)
-               cmake-utils_src_test
-               retstatus_unit=$?
-               [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-               # 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}
-
-               # These are failing in MariaDB 10.0 for now and are believed to 
be
-               # false positives:
-               #
-               # main.information_schema, 
binlog.binlog_statement_insert_delayed,
-               # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
-               # funcs_1.is_columns_mysql main.bootstrap
-               # fails due to USE=-latin1 / utf8 default
-               #
-               # main.mysql_client_test, main.mysql_client_test_nonblock
-               # main.mysql_client_test_comp:
-               # segfaults at random under Portage only, suspect resource 
limits.
-               #
-               # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-               # fails due to bad cleanup of previous tests when run in 
parallel
-               # The tool is deprecated anyway
-               # Bug 532288
-
-#main.bootstrap \
-               for t in connect.drop-open-error ; do
-#                      main.mysql_client_test_comp \
-#                      binlog.binlog_statement_insert_delayed 
main.information_schema \
-#                      main.mysqld--help \
-#                      archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-#                      funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
-                               mysql-multilib-r1_disable_test  "$t" "False 
positives in Gentoo"
-               done
-
-               # Run mysql tests
-               pushd "${TESTDIR}" || die
-
-               # run mysql-test tests
-               perl mysql-test-run.pl --force --vardir="${T}/var-tests" 
--reorder
-
-               retstatus_tests=$?
-               [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-               has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               popd || die
-
-               # Cleanup is important for these testcases.
-               pkill -9 -f "${S}/ndb" 2>/dev/null
-               pkill -9 -f "${S}/sql" 2>/dev/null
-
-               failures=""
-               [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-               [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-               has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               [[ -z "$failures" ]] || die "Test failures: $failures"
-               einfo "Tests successfully completed"
-
-       else
-               einfo "Skipping server tests due to minimal build."
-       fi
-}

diff --git a/dev-db/mariadb/mariadb-10.2.15.ebuild 
b/dev-db/mariadb/mariadb-10.2.15.ebuild
deleted file mode 100644
index 6e8b31cdccb..00000000000
--- a/dev-db/mariadb/mariadb-10.2.15.ebuild
+++ /dev/null
@@ -1,1011 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180515-1334Z"
-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="https://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-       innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
-       numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-       sst-rsync sst-mariabackup 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 )
-       ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux 
~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# Shorten the path because the socket path length must be shorter than 107 
chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/mysql"
-
-if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
-       inherit git-r3
-       EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
-       EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-       EGIT_CLONE_TYPE=shallow
-else
-       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
-fi
-
-PATCHES=(
-       "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-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}"/20035_all_mariadb-10.2-atomic-detection.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
-       jemalloc? ( dev-libs/jemalloc:0= )
-       tcmalloc? ( dev-util/google-perftools:0= )
-       systemtap? ( >=dev-util/systemtap-1.3:0= )
-       client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-               yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
-               !yassl? (
-                       !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-                       libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-               )
-       )
-       !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 )
-               yassl? ( net-libs/gnutls:0= )
-               !yassl? (
-                       !libressl? ( >=dev-libs/openssl-1.0.0:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       sys-libs/ncurses:0=
-       !bindist? (
-               sys-libs/binutils-libs:0=
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               backup? ( app-arch/libarchive:0= )
-               cracklib? ( sys-libs/cracklib:0= )
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-               )
-               innodb-lz4? ( app-arch/lz4 )
-               innodb-lzo? ( dev-libs/lzo )
-               innodb-snappy? ( app-arch/snappy )
-               mroonga? ( app-text/groonga-normalizer-mysql 
>=app-text/groonga-7.0.4 )
-               numa? ( sys-process/numactl )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               systemd? ( sys-apps/systemd:= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.41-r1:3=
-       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] 
dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
-"
-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 )
-       client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] 
!dev-db/mysql-connector-c )
-       !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
-       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-mariabackup? ( net-misc/socat[ssl] )
-               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
-# percona-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[static=]
-                galera? ( sst-xtrabackup? ( || ( 
>=dev-db/percona-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
-
-       # Create log directory securely if it does not exist
-       [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}${MY_LOGDIR}"
-
-       if use server ; then
-               if use pam; then
-                       einfo
-                       elog "This install includes the PAM authentication 
plugin."
-                       elog "To activate and configure the PAM plugin, please 
read:"
-                       elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
-                       einfo
-               fi
-
-               if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-                       einfo
-                       elog "You might want to run:"
-                       elog "\"emerge --config =${CATEGORY}/${PF}\""
-                       elog "if this is a new install."
-                       elog
-                       elog "If you are switching server implentations, you 
should run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               else
-                       einfo
-                       elog "If you are upgrading major versions, you should 
run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               fi
-
-               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() {
-       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"
-
-       if ! use server; then
-               rm -r "${S}"/plugin/handler_socket || die
-       fi
-
-       cmake-utils_src_prepare
-}
-
-src_configure(){
-       # bug 508724 mariadb cannot use ld.gold
-       tc-ld-disable-gold
-       # Bug #114895, bug #110149
-       filter-flags "-O" "-O[01]"
-
-       append-cxxflags -felide-constructors
-
-       # bug #283926, with GCC4.4, this is required to get correct behavior.
-       append-flags -fno-strict-aliasing
-
-       if use client-libs ; then
-               multilib-minimal_src_configure
-       else
-               multilib_src_configure
-       fi
-}
-
-multilib_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       if ! multilib_is_native_abi && ! use client-libs ; then
-               return
-       fi
-
-       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
-
-       if ! use client-libs ; then
-               mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-       fi
-
-       # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
-       # systemtap only works on native ABI  bug 530132
-       if multilib_is_native_abi; then
-               mycmakeargs+=(
-                       -DWITH_READLINE=$(usex bindist 1 0)
-                       -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-                       -DENABLE_DTRACE=$(usex systemtap)
-               )
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_TOOLS=1
-                       -DWITH_READLINE=1
-                       -DNOT_FOR_DISTRIBUTION=0
-                       -DENABLE_DTRACE=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)
-                       # Build failure and autodep wrt bug 639144
-                       -DCONNECT_WITH_MONGO=OFF
-                       -DWITH_WSREP=$(usex galera)
-                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-                       -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-                       -DWITH_MARIABACKUP=$(usex backup ON OFF)
-                       -DWITH_LIBARCHIVE=$(usex backup ON OFF)
-                       -DINSTALL_SQLBENCHDIR=share/mariadb
-                       -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-                       # systemd is only linked to for server notification
-                       -DWITH_SYSTEMD=$(usex systemd yes no)
-                       -DWITH_NUMA=$(usex numa ON OFF)
-               )
-
-               # Workaround for MDEV-14524
-               use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
-
-               if use test ; then
-                       # This is needed for the new client lib which tests a 
real, open server
-                       mycmakeargs+=( -DSKIP_TESTS=ON )
-               fi
-
-               if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
-                       ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
-                       ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-                       ewarn "You MUST file bugs without these variables set."
-
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-                               -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-                       )
-
-               elif ! use latin1 ; then
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=utf8
-                               -DDEFAULT_COLLATION=utf8_general_ci
-                       )
-               else
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=latin1
-                               -DDEFAULT_COLLATION=latin1_swedish_ci
-                       )
-               fi
-               mycmakeargs+=(
-                       -DEXTRA_CHARSETS=all
-                       -DMYSQL_USER=mysql
-                       -DDISABLE_SHARED=$(usex static YES NO)
-                       -DWITH_DEBUG=$(usex debug)
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DWITH_PROFILING=$(usex profiling)
-               )
-
-               if use static; then
-                       mycmakeargs+=( -DWITH_PIC=1 )
-               fi
-
-               if use jemalloc || use tcmalloc ; then
-                       mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-               fi
-
-               # Storage engines
-               mycmakeargs+=(
-                       -DWITH_ARCHIVE_STORAGE_ENGINE=1
-                       -DWITH_BLACKHOLE_STORAGE_ENGINE=1
-                       -DWITH_CSV_STORAGE_ENGINE=1
-                       -DWITH_HEAP_STORAGE_ENGINE=1
-                       -DWITH_INNOBASE_STORAGE_ENGINE=1
-                       -DWITH_MYISAMMRG_STORAGE_ENGINE=1
-                       -DWITH_MYISAM_STORAGE_ENGINE=1
-                       -DWITH_PARTITION_STORAGE_ENGINE=1
-               )
-
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_SERVER=1
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DEXTRA_CHARSETS=none
-                       -DINSTALL_SQLBENCHDIR=
-                       -DWITH_SYSTEMD=no
-               )
-       fi
-
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       if use client-libs ; then
-               multilib-minimal_src_compile
-       else
-               multilib_src_compile
-       fi
-}
-
-multilib_src_compile() {
-       cmake-utils_src_compile
-}
-
-src_install() {
-       local MULTILIB_WRAPPED_HEADERS
-       local MULTILIB_CHOST_TOOLS
-       if use client-libs ; then
-               # headers with ABI specific data
-               MULTILIB_WRAPPED_HEADERS=(
-                       /usr/include/mysql/server/my_config.h
-                       /usr/include/mysql/server/private/embedded_priv.h
-                       /usr/include/mysql/server/mysql_version.h
-                       /usr/include/mariadb/mariadb_version.h
-                       /usr/include/mysql/mariadb_version.h
-                       
/usr/include/mysql/server/private/probes_mysql_nodtrace.h
-                       /usr/include/mysql/server/private/probes_mysql_dtrace.h 
)
-
-               # wrap the config scripts
-               MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config 
/usr/bin/mysql_config )
-               multilib-minimal_src_install
-       else
-               multilib_src_install
-               multilib_src_install_all
-       fi
-}
-
-# Intentionally override eclass function
-multilib_src_install() {
-
-       cmake-utils_src_install
-
-       # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
-       if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${ED}/usr/include/mysql/server/private/config.h" || die
-       fi
-
-       if ! multilib_is_native_abi && use server ; then
-               insinto /usr/include/mysql/server/private
-               doins "${S}"/sql/*.h
-       fi
-
-       if use client-libs ; then
-       # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a 
"/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-       fi
-
-       # 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 "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
-src_test() {
-
-       _disable_test() {
-               local rawtestname reason
-               rawtestname="${1}" ; shift
-               reason="${@}"
-               ewarn "test '${rawtestname}' disabled: '${reason}'"
-               echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-       }
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       if ! use server ; then
-               einfo "Skipping server tests due to minimal build."
-               return 0
-       fi
-
-       # Bug #213475 - MySQL _will_ object strenously if your machine is named
-       # localhost. Also causes weird failures.
-       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-       if [[ $UID -eq 0 ]]; then
-               die "Testing with FEATURES=-userpriv is no longer supported by 
upstream. Tests MUST be run as non-root."
-       fi
-       has usersandbox $FEATURES && ewarn "Some tests may fail with 
FEATURES=usersandbox"
-
-       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-       # Run CTest (test-units)
-       cmake-utils_src_test
-       retstatus_unit=$?
-
-       # Ensure that parallel runs don't die
-       export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-       # Enable parallel testing, auto will try to detect number of cores
-       # You may set this by hand.
-       # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-       export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-       # create directories because mysqladmin might run out of order
-       mkdir -p "${T}"/var-tests{,/log} || die
-
-       # Run mysql tests
-       pushd "${TESTDIR}" > /dev/null || die
-
-       touch "${T}/disabled.def"
-       # These are failing in MariaDB 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 rpl.rpl_extra_col_master_myisam ; do
-                       _disable_test  "$t" "False positives in Gentoo"
-       done
-
-       if ! use client-libs ; then
-               _disable_test main.plugin_auth "Needs client libraries built"
-       fi
-
-       # run mysql-test tests
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder 
--skip-test=tokudb --skip-test-list="${T}/disabled.def"
-       retstatus_tests=$?
-
-       popd > /dev/null || die
-
-       # Cleanup is important for these testcases.
-       pkill -9 -f "${S}/ndb" 2>/dev/null
-       pkill -9 -f "${S}/sql" 2>/dev/null
-
-       local failures=""
-       [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-       [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-       [[ -z "$failures" ]] || die "Test failures: $failures"
-       einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-       if [[ -z "${MY_DATADIR}" ]] ; then
-               MY_DATADIR=""
-               if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-                       MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-                       if [[ -z "${MY_DATADIR}" ]] ; then
-                               MY_DATADIR=`grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
-                               | sed -e 's/.*=\s*//' \
-                               | tail -n1`
-                       fi
-               fi
-               if [[ -z "${MY_DATADIR}" ]] ; then
-                       MY_DATADIR="${MY_LOCALSTATEDIR}"
-                       einfo "Using default MY_DATADIR"
-               fi
-               elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-               if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-                       if [[ -e "${MY_DATADIR}" ]] ; then
-                               # If you get this and you're wondering about 
it, see bug #207636
-                               elog "MySQL datadir found in ${MY_DATADIR}"
-                               elog "A new one will not be created."
-                               PREVIOUS_DATADIR="yes"
-                       else
-                               PREVIOUS_DATADIR="no"
-                       fi
-                       export PREVIOUS_DATADIR
-               fi
-       else
-               if [[ ${EBUILD_PHASE} == "config" ]]; then
-                       local new_MY_DATADIR
-                       new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-
-                       if [[ ( -n "${new_MY_DATADIR}" ) && ( 
"${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-                               ewarn "MySQL MY_DATADIR has changed"
-                               ewarn "from ${MY_DATADIR}"
-                               ewarn "to ${new_MY_DATADIR}"
-                               MY_DATADIR="${new_MY_DATADIR}"
-                       fi
-               fi
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_DATADIR
-}
-
-pkg_config() {
-       _getoptval() {
-               local mypd="${EROOT}"/usr/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 https://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-       # Figure out which options we need to disable to do the setup
-       local helpfile="${TMPDIR}/mysqld-help"
-       "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-       for opt in grant-tables host-cache name-resolve networking slave-start \
-               federated ssl log-bin relay-log slow-query-log external-locking 
\
-               log-slave-updates \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-
-       einfo "Creating the mysql database and setting proper permissions on it 
..."
-
-       # Now that /var/run is a tmpfs mount point, we need to ensure it exists 
before using it
-       PID_DIR="${EROOT}/var/run/mysqld"
-       if [[ ! -d "${PID_DIR}" ]]; then
-               install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could 
not create pid directory"
-       fi
-
-       if [[ ! -d "${MY_DATADIR}" ]]; then
-               install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die 
"Could not create data directory"
-       fi
-
-       pushd "${TMPDIR}" &>/dev/null || die
-
-       # Filling timezones, see
-       # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-       "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
-
-       local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
-       [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-       einfo "Command: ${cmd[*]}"
-       su -s /bin/sh -c "${cmd[*]}" mysql \
-               >"${TMPDIR}"/mysql_install_db.log 2>&1
-       if [ $? -ne 0 ]; then
-               grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-       fi
-       popd &>/dev/null || die
-       [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-       || die "MySQL databases not installed"
-
-       use prefix || options="${options} --user=mysql"
-
-       local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-       local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-       local mysqld="${EROOT}/usr/sbin/mysqld \
-               ${options} \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --socket=${socket} \
-               --pid-file=${pidfile}
-               --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-       #einfo "About to start mysqld: ${mysqld}"
-       ebegin "Starting mysqld"
-       einfo "Command ${mysqld}"
-       ${mysqld} &
-       rc=$?
-       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-               maxtry=$((${maxtry}-1))
-               echo -n "."
-               sleep 1
-       done
-       eend $rc
-
-       if ! [[ -S "${socket}" ]]; then
-               die "Completely failed to start up mysqld with: ${mysqld}"
-       fi
-
-       ebegin "Setting root password"
-       # Do this from memory, as we don't want clear text passwords in temp 
files
-       local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-       "${EROOT}/usr/bin/mysql" \
-               "--socket=${socket}" \
-               -hlocalhost \
-               -e "${sql}"
-       eend $?
-
-       if [[ -n "${sqltmp}" ]] ; then
-               ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
-               "${EROOT}/usr/bin/mysql" \
-                       "--socket=${socket}" \
-                       -hlocalhost \
-                       -uroot \
-                       --password="${MYSQL_ROOT_PASSWORD}" \
-                       mysql < "${sqltmp}"
-               rc=$?
-               eend $?
-               [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-       fi
-
-       # Stop the server and cleanup
-       einfo "Stopping the server ..."
-       kill $(< "${pidfile}" )
-       rm -f "${sqltmp}"
-       wait %1
-       einfo "Done"
-}

diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild 
b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
deleted file mode 100644
index 57430a63fa3..00000000000
--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
+++ /dev/null
@@ -1,1022 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20180515-1334Z"
-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/_rc/}/source/${P/_rc/}.tar.gz
 "
-
-# Gentoo patches to MySQL
-if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
-       SRC_URI="${SRC_URI}
-               mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
-               
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2";
-fi
-
-HOMEPAGE="https://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
-       innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
-       numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
-       sst-rsync sst-mariabackup 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 )
-       ?? ( tcmalloc jemalloc )
-       static? ( yassl !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux 
~x86-linux ~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
-       inherit git-r3
-       EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git";
-       EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
-       EGIT_CLONE_TYPE=shallow
-       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.9-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}"/20035_all_mariadb-10.3-atomic-detection.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
-       jemalloc? ( dev-libs/jemalloc:0= )
-       tcmalloc? ( dev-util/google-perftools:0= )
-       systemtap? ( >=dev-util/systemtap-1.3:0= )
-       client-libs? (
-               >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-               yassl? ( net-libs/gnutls:0=[${MULTILIB_USEDEP},static-libs?] )
-               !yassl? (
-                       !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-                       libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-               )
-       )
-       !client-libs? (
-               >=sys-libs/zlib-1.2.3:0=
-               kerberos? ( virtual/krb5 )
-               yassl? ( net-libs/gnutls:0= )
-               !yassl? (
-                       !libressl? ( >=dev-libs/openssl-1.0.0:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       sys-libs/ncurses:0=
-       !bindist? (
-               sys-libs/binutils-libs:0=
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               backup? ( app-arch/libarchive:0= )
-               cracklib? ( sys-libs/cracklib:0= )
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-               )
-               innodb-lz4? ( app-arch/lz4 )
-               innodb-lzo? ( dev-libs/lzo )
-               innodb-snappy? ( app-arch/snappy )
-               mroonga? ( app-text/groonga-normalizer-mysql 
>=app-text/groonga-7.0.4 )
-               numa? ( sys-process/numactl )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               systemd? ( sys-apps/systemd:= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.41-r1: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 )
-       client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] 
!dev-db/mysql-connector-c )
-       !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
-       server? ( !prefix? ( dev-db/mysql-init-scripts ) )
-       !<virtual/mysql-5.6-r11
-       ${COMMON_DEPEND}
-       server? ( galera? (
-               sys-apps/iproute2
-               =sys-cluster/galera-25*
-               sst-rsync? ( sys-process/lsof )
-               sst-mariabackup? ( net-misc/socat[ssl] )
-               sst-xtrabackup? ( net-misc/socat[ssl] )
-       ) )
-       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
-# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not 
already installed
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] 
dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
-        server? ( ~virtual/mysql-5.6[static=]
-                galera? ( sst-xtrabackup? ( || ( 
>=dev-db/percona-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
-
-       # Create log directory securely if it does not exist
-       [[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql 
"${ROOT}${MY_LOGDIR}"
-
-       if use server ; then
-               if use pam; then
-                       einfo
-                       elog "This install includes the PAM authentication 
plugin."
-                       elog "To activate and configure the PAM plugin, please 
read:"
-                       elog 
"https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/";
-                       einfo
-               fi
-
-               if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-                       einfo
-                       elog "You might want to run:"
-                       elog "\"emerge --config =${CATEGORY}/${PF}\""
-                       elog "if this is a new install."
-                       elog
-                       elog "If you are switching server implentations, you 
should run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               else
-                       einfo
-                       elog "If you are upgrading major versions, you should 
run the"
-                       elog "mysql_upgrade tool."
-                       einfo
-               fi
-
-               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/_rc/}" "${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"
-
-       if ! use server; then
-               rm -r "${S}"/plugin/handler_socket || die
-       fi
-
-       cmake-utils_src_prepare
-}
-
-src_configure(){
-       # bug 508724 mariadb cannot use ld.gold
-       tc-ld-disable-gold
-       # Bug #114895, bug #110149
-       filter-flags "-O" "-O[01]"
-
-       append-cxxflags -felide-constructors
-
-       # bug #283926, with GCC4.4, this is required to get correct behavior.
-       append-flags -fno-strict-aliasing
-
-       if use client-libs ; then
-               multilib-minimal_src_configure
-       else
-               multilib_src_configure
-       fi
-}
-
-multilib_src_configure() {
-       debug-print-function ${FUNCNAME} "$@"
-
-       if ! multilib_is_native_abi && ! use client-libs ; then
-               return
-       fi
-
-       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
-
-       if ! use client-libs ; then
-               mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-       fi
-
-       # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
-       # systemtap only works on native ABI  bug 530132
-       if multilib_is_native_abi; then
-               mycmakeargs+=(
-                       -DWITH_READLINE=$(usex bindist 1 0)
-                       -DNOT_FOR_DISTRIBUTION=$(usex bindist 0 1)
-                       -DENABLE_DTRACE=$(usex systemtap)
-               )
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_TOOLS=1
-                       -DWITH_READLINE=1
-                       -DNOT_FOR_DISTRIBUTION=0
-                       -DENABLE_DTRACE=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)
-                       # Build failure and autodep wrt bug 639144
-                       -DCONNECT_WITH_MONGO=OFF
-                       -DWITH_WSREP=$(usex galera)
-                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-                       -DPLUGIN_MROONGA=$(usex mroonga DYNAMIC NO)
-                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos DYNAMIC NO)
-                       -DWITH_MARIABACKUP=$(usex backup ON OFF)
-                       -DWITH_LIBARCHIVE=$(usex backup ON OFF)
-                       -DINSTALL_SQLBENCHDIR=share/mariadb
-                       -DPLUGIN_ROCKSDB=$(usex rocksdb DYNAMIC NO)
-                       # systemd is only linked to for server notification
-                       -DWITH_SYSTEMD=$(usex systemd yes no)
-                       -DWITH_NUMA=$(usex numa ON OFF)
-               )
-
-               # Workaround for MDEV-14524
-               use tokudb && mycmakeargs+=( -DTOKUDB_OK=1 )
-
-               if use test ; then
-                       # This is needed for the new client lib which tests a 
real, open server
-                       mycmakeargs+=( -DSKIP_TESTS=ON )
-               fi
-
-               if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
-                       ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
-                       ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
-                       ewarn "You MUST file bugs without these variables set."
-
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
-                               -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
-                       )
-
-               elif ! use latin1 ; then
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=utf8
-                               -DDEFAULT_COLLATION=utf8_general_ci
-                       )
-               else
-                       mycmakeargs+=(
-                               -DDEFAULT_CHARSET=latin1
-                               -DDEFAULT_COLLATION=latin1_swedish_ci
-                       )
-               fi
-               mycmakeargs+=(
-                       -DEXTRA_CHARSETS=all
-                       -DMYSQL_USER=mysql
-                       -DDISABLE_SHARED=$(usex static YES NO)
-                       -DWITH_DEBUG=$(usex debug)
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DWITH_PROFILING=$(usex profiling)
-               )
-
-               if use static; then
-                       mycmakeargs+=( -DWITH_PIC=1 )
-               fi
-
-               if use jemalloc || use tcmalloc ; then
-                       mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
-               fi
-
-               # Storage engines
-               mycmakeargs+=(
-                       -DWITH_ARCHIVE_STORAGE_ENGINE=1
-                       -DWITH_BLACKHOLE_STORAGE_ENGINE=1
-                       -DWITH_CSV_STORAGE_ENGINE=1
-                       -DWITH_HEAP_STORAGE_ENGINE=1
-                       -DWITH_INNOBASE_STORAGE_ENGINE=1
-                       -DWITH_MYISAMMRG_STORAGE_ENGINE=1
-                       -DWITH_MYISAM_STORAGE_ENGINE=1
-                       -DWITH_PARTITION_STORAGE_ENGINE=1
-               )
-
-       else
-               mycmakeargs+=(
-                       -DWITHOUT_SERVER=1
-                       -DWITH_EMBEDDED_SERVER=OFF
-                       -DEXTRA_CHARSETS=none
-                       -DINSTALL_SQLBENCHDIR=
-                       -DWITH_SYSTEMD=no
-               )
-       fi
-
-       cmake-utils_src_configure
-}
-
-src_compile() {
-       if use client-libs ; then
-               multilib-minimal_src_compile
-       else
-               multilib_src_compile
-       fi
-}
-
-multilib_src_compile() {
-       cmake-utils_src_compile
-}
-
-src_install() {
-       local MULTILIB_WRAPPED_HEADERS
-       local MULTILIB_CHOST_TOOLS
-       if use client-libs ; then
-               # headers with ABI specific data
-               MULTILIB_WRAPPED_HEADERS=(
-                       /usr/include/mysql/server/my_config.h
-                       /usr/include/mysql/server/private/embedded_priv.h
-                       /usr/include/mysql/server/mysql_version.h
-                       /usr/include/mariadb/mariadb_version.h
-                       /usr/include/mysql/mariadb_version.h
-                       
/usr/include/mysql/server/private/probes_mysql_nodtrace.h
-                       /usr/include/mysql/server/private/probes_mysql_dtrace.h 
)
-
-               # wrap the config scripts
-               MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config 
/usr/bin/mysql_config )
-               multilib-minimal_src_install
-       else
-               multilib_src_install
-               multilib_src_install_all
-       fi
-}
-
-# 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 "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
-               rm "${ED}/usr/include/mysql/server/private/config.h" || die
-       fi
-
-       if ! multilib_is_native_abi && use server ; then
-               insinto /usr/include/mysql/server/private
-               doins "${S}"/sql/*.h
-       fi
-
-       if use client-libs ; then
-       # Install compatible symlinks to libmysqlclient
-#      use static-libs && dosym libmariadbclient.a 
"/usr/$(get_libdir)/libmysqlclient.a"
-#      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
-       dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-       fi
-
-       # 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 "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
-src_test() {
-
-       _disable_test() {
-               local rawtestname reason
-               rawtestname="${1}" ; shift
-               reason="${@}"
-               ewarn "test '${rawtestname}' disabled: '${reason}'"
-               echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
-       }
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       if ! use server ; then
-               einfo "Skipping server tests due to minimal build."
-               return 0
-       fi
-
-       # Bug #213475 - MySQL _will_ object strenously if your machine is named
-       # localhost. Also causes weird failures.
-       [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be 
named localhost"
-
-       if [[ $UID -eq 0 ]]; then
-               die "Testing with FEATURES=-userpriv is no longer supported by 
upstream. Tests MUST be run as non-root."
-       fi
-       has usersandbox $FEATURES && ewarn "Some tests may fail with 
FEATURES=usersandbox"
-
-       einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-       # Run CTest (test-units)
-       cmake-utils_src_test
-       retstatus_unit=$?
-
-       # Ensure that parallel runs don't die
-       export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
-       # Enable parallel testing, auto will try to detect number of cores
-       # You may set this by hand.
-       # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
-       export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
-       # create directories because mysqladmin might run out of order
-       mkdir -p "${T}"/var-tests{,/log} || die
-
-       # Run mysql tests
-       pushd "${TESTDIR}" > /dev/null || die
-
-       touch "${T}/disabled.def"
-       # These are failing in MariaDB 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 rpl.rpl_extra_col_master_myisam ; do
-                       _disable_test  "$t" "False positives in Gentoo"
-       done
-
-       if ! use client-libs ; then
-               _disable_test main.plugin_auth "Needs client libraries built"
-       fi
-
-       # run mysql-test tests
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder 
--skip-test=tokudb --skip-test-list="${T}/disabled.def"
-       retstatus_tests=$?
-
-       popd > /dev/null || die
-
-       # Cleanup is important for these testcases.
-       pkill -9 -f "${S}/ndb" 2>/dev/null
-       pkill -9 -f "${S}/sql" 2>/dev/null
-
-       local failures=""
-       [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-       [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
-       [[ -z "$failures" ]] || die "Test failures: $failures"
-       einfo "Tests successfully completed"
-}
-
-mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
-
-       if [[ -z "${MY_DATADIR}" ]] ; then
-               MY_DATADIR=""
-               if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
-                       MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-                       if [[ -z "${MY_DATADIR}" ]] ; then
-                               MY_DATADIR=`grep ^datadir 
"${MY_SYSCONFDIR}/my.cnf" \
-                               | sed -e 's/.*=\s*//' \
-                               | tail -n1`
-                       fi
-               fi
-               if [[ -z "${MY_DATADIR}" ]] ; then
-                       MY_DATADIR="${MY_LOCALSTATEDIR}"
-                       einfo "Using default MY_DATADIR"
-               fi
-               elog "MySQL MY_DATADIR is ${MY_DATADIR}"
-
-               if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
-                       if [[ -e "${MY_DATADIR}" ]] ; then
-                               # If you get this and you're wondering about 
it, see bug #207636
-                               elog "MySQL datadir found in ${MY_DATADIR}"
-                               elog "A new one will not be created."
-                               PREVIOUS_DATADIR="yes"
-                       else
-                               PREVIOUS_DATADIR="no"
-                       fi
-                       export PREVIOUS_DATADIR
-               fi
-       else
-               if [[ ${EBUILD_PHASE} == "config" ]]; then
-                       local new_MY_DATADIR
-                       new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
-                               | sed -ne '/datadir/s|^--datadir=||p' \
-                               | tail -n1`
-
-                       if [[ ( -n "${new_MY_DATADIR}" ) && ( 
"${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
-                               ewarn "MySQL MY_DATADIR has changed"
-                               ewarn "from ${MY_DATADIR}"
-                               ewarn "to ${new_MY_DATADIR}"
-                               MY_DATADIR="${new_MY_DATADIR}"
-                       fi
-               fi
-       fi
-
-       export MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_DATADIR
-}
-
-pkg_config() {
-       _getoptval() {
-               local mypd="${EROOT}"/usr/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 https://bugs.mysql.com/bug.php?id=31312
-       use prefix && options="${options} 
'--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
-
-       # Figure out which options we need to disable to do the setup
-       local helpfile="${TMPDIR}/mysqld-help"
-       "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
-       for opt in grant-tables host-cache name-resolve networking slave-start \
-               federated ssl log-bin relay-log slow-query-log external-locking 
\
-               log-slave-updates \
-               ; do
-               optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
-               egrep -sq -- "${optexp}" "${helpfile}" && options="${options} 
${optfull}"
-       done
-
-       einfo "Creating the mysql database and setting proper permissions on it 
..."
-
-       # Now that /var/run is a tmpfs mount point, we need to ensure it exists 
before using it
-       PID_DIR="${EROOT}/var/run/mysqld"
-       if [[ ! -d "${PID_DIR}" ]]; then
-               install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could 
not create pid directory"
-       fi
-
-       if [[ ! -d "${MY_DATADIR}" ]]; then
-               install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die 
"Could not create data directory"
-       fi
-
-       pushd "${TMPDIR}" &>/dev/null || die
-
-       # Filling timezones, see
-       # https://dev.mysql.com/doc/mysql/en/time-zone-support.html
-       "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
-
-       local cmd=( "${EROOT}usr/share/mariadb/scripts/mysql_install_db" )
-       [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
-       cmd+=( "--basedir=${EPREFIX}/usr" ${options} 
"--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" )
-       einfo "Command: ${cmd[*]}"
-       su -s /bin/sh -c "${cmd[*]}" mysql \
-               >"${TMPDIR}"/mysql_install_db.log 2>&1
-       if [ $? -ne 0 ]; then
-               grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review 
${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
-       fi
-       popd &>/dev/null || die
-       [[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
-       || die "MySQL databases not installed"
-
-       use prefix || options="${options} --user=mysql"
-
-       local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
-       local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
-       local mysqld="${EROOT}/usr/sbin/mysqld \
-               ${options} \
-               --log-warnings=0 \
-               --basedir=${EROOT}/usr \
-               --datadir=${ROOT}/${MY_DATADIR} \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --socket=${socket} \
-               --pid-file=${pidfile}
-               --tmpdir=${ROOT}/${MYSQL_TMPDIR}"
-       #einfo "About to start mysqld: ${mysqld}"
-       ebegin "Starting mysqld"
-       einfo "Command ${mysqld}"
-       ${mysqld} &
-       rc=$?
-       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
-               maxtry=$((${maxtry}-1))
-               echo -n "."
-               sleep 1
-       done
-       eend $rc
-
-       if ! [[ -S "${socket}" ]]; then
-               die "Completely failed to start up mysqld with: ${mysqld}"
-       fi
-
-       ebegin "Setting root password"
-       # Do this from memory, as we don't want clear text passwords in temp 
files
-       local sql="UPDATE mysql.user SET Password = 
PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'; FLUSH PRIVILEGES"
-       "${EROOT}/usr/bin/mysql" \
-               "--socket=${socket}" \
-               -hlocalhost \
-               -e "${sql}"
-       eend $?
-
-       if [[ -n "${sqltmp}" ]] ; then
-               ebegin "Loading \"zoneinfo\", this step may require a few 
seconds"
-               "${EROOT}/usr/bin/mysql" \
-                       "--socket=${socket}" \
-                       -hlocalhost \
-                       -uroot \
-                       --password="${MYSQL_ROOT_PASSWORD}" \
-                       mysql < "${sqltmp}"
-               rc=$?
-               eend $?
-               [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
-       fi
-
-       # Stop the server and cleanup
-       einfo "Stopping the server ..."
-       kill $(< "${pidfile}" )
-       rm -f "${sqltmp}"
-       wait %1
-       einfo "Done"
-}

diff --git a/dev-db/mariadb/mariadb-5.5.60.ebuild 
b/dev-db/mariadb/mariadb-5.5.60.ebuild
deleted file mode 100644
index 84fdbafdf4a..00000000000
--- a/dev-db/mariadb/mariadb-5.5.60.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-MY_EXTRAS_VER="20160721-1526Z"
-
-# Build system
-BUILD="cmake"
-
-inherit toolchain-funcs mysql-v2
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
-       ssl? ( !>=dev-libs/openssl-1.1 )"
-RDEPEND="${RDEPEND}"
-SLOT="0/18"
-
-# Please do not add a naive src_unpack to this ebuild
-# If you want to add a single patch, copy the ebuild to an overlay
-# and create your own mysql-extras tarball, looking at 000_index.txt
-
-# Official test instructions:
-# USE='extraengine perl ssl static-libs community' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-src_test() {
-
-       local TESTDIR="${BUILD_DIR}/mysql-test"
-       local retstatus_unit
-       local retstatus_tests
-
-       # 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 ! use "minimal" ; then
-
-               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 && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-               addpredict /this-dir-does-not-exist/t9.MYI
-
-               # Run CTest (test-units)
-               cmake-utils_src_test
-               retstatus_unit=$?
-               [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
-               # 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 right out of order
-               mkdir -p "${T}"/var-tests{,/log}
-
-               # create symlink for the tests to find the replace util
-               ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
-
-               # These are failing in MariaDB 5.5 for now and are believed to 
be
-               # false positives:
-               #
-               # main.information_schema, 
binlog.binlog_statement_insert_delayed,
-               # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
-               # funcs_1.is_columns_mysql
-               # fails due to USE=-latin1 / utf8 default
-               #
-               # main.mysql_client_test, main.mysql_client_test_nonblock:
-               # segfaults at random under Portage only, suspect resource 
limits.
-               #
-               # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
-               # fails due to bad cleanup of previous tests when run in 
parallel
-               # The tool is deprecated anyway
-               # Bug 532288
-
-               for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
-                       binlog.binlog_statement_insert_delayed 
main.information_schema \
-                       main.mysqld--help \
-                       archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
-                       funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
-                               mysql-v2_disable_test  "$t" "False positives in 
Gentoo"
-               done
-
-               # Run mysql tests
-               pushd "${TESTDIR}"
-
-               # run mysql-test tests
-               perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-                       --testcase-timeout=30
-               retstatus_tests=$?
-               [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
-               has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               popd
-
-               # Cleanup is important for these testcases.
-               pkill -9 -f "${S}/ndb" 2>/dev/null
-               pkill -9 -f "${S}/sql" 2>/dev/null
-
-               failures=""
-               [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
-               [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-               has usersandbox $FEATURES && eerror "Some tests may fail with 
FEATURES=usersandbox"
-
-               [[ -z "$failures" ]] || die "Test failures: $failures"
-               einfo "Tests successfully completed"
-
-       else
-
-               einfo "Skipping server tests due to minimal build."
-       fi
-}

diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index dc1b8fcb633..d17a7410d92 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -8,8 +8,6 @@
 <use>
   <flag name="backup">Build mariadb-backup which supports SST and hot backup 
of InnoDB, Aria and MyISAM including compression and encryption</flag>
   <flag name="client-libs">Build the client libraries from the server package 
instead of the C Connector packages</flag>
-  <flag name="cluster">Add support for NDB clustering (deprecated)</flag>
-  <flag name="community">Enables the community features from upstream.</flag>
   <flag name="embedded">Build embedded server (libmysqld)</flag>
   <flag name="extraengine">Add support for alternative storage engines 
(Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="galera">Enables galera replication</flag>
@@ -20,8 +18,6 @@
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for 
allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using 
<pkg>dev-libs/libressl</pkg></flag>
-  <flag name="max-idx-128">Raise the max index per table limit from 64 to 
128</flag>
-  <flag name="minimal">Install client programs only, no server</flag>
   <flag name="mroonga">Add support for the Mroonga engine for interfacing with 
the Groonga text search</flag>
   <flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel 
support is also required)</flag>
   <flag name="openssl">Enable SSL connections and crypto functions using 
<pkg>dev-libs/openssl</pkg></flag>

Reply via email to