commit:     00c894c18e48868a9e8d135cf1bfb6f638ece877
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 15:28:45 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 15:41:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c894c1

dev-db/mariadb: Drop security vulnerable versions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-db/mariadb/Manifest                  |   3 -
 dev-db/mariadb/mariadb-10.0.28.ebuild    | 208 -------------------------------
 dev-db/mariadb/mariadb-10.1.19-r1.ebuild | 207 ------------------------------
 dev-db/mariadb/mariadb-10.1.20.ebuild    | 207 ------------------------------
 4 files changed, 625 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index dc63b5cb6b..be2fc55eff 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,7 +1,4 @@
-DIST mariadb-10.0.28.tar.gz 63297461 SHA256 
0a5033d56f1c5403df7fabd519ccbdc4da308b30a1ecd52e06a19be182a9bab2 SHA512 
af4a0e830902d8916b4727e8d3d70ff5c5b7871b46fedb5d890881b5d22f196a423da0d4b1e9e0e6a25a40cfacd7fb1781d4a85dc1f9b31c89bbde8b50ffabc3
 WHIRLPOOL 
65c889d663f5ccacd9bebf87d5631d4ccb86df2245008db802697efb54f4db99fa461019b6aa58d3e95a76903de184e17590b2c606a1661a9686c6b448ade6aa
 DIST mariadb-10.0.29.tar.gz 63385696 SHA256 
f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 
187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c
 WHIRLPOOL 
ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b
-DIST mariadb-10.1.19.tar.gz 61222929 SHA256 
5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 SHA512 
28fb7178b71ec287f91f06ec0939ec877097ed21ff96b013c139a9584ccffbc9fc8694707e0d3c44cd61da33b54311116f858d31931ba289cdb22776c872f285
 WHIRLPOOL 
8e24d87054ccabde4873a4faae5c9ce82aa5f84c1afd39c9152e9bff6aadc7bc73b5532e7944173fc9ea2ce1bd13d68122deb941718819c617d8b1daee974a3b
-DIST mariadb-10.1.20.tar.gz 61312731 SHA256 
c24e83f24d674d9912319f9e9422f093c8ca6be1721a4380cbd74792b89ba0b9 SHA512 
926067a30e54354f6482e28152694e747f4deb8b4ba6d054e089955b45f98f628ea8cca4cfbc12f6220fa6b8b6f2ba9fef7c23c09cb82b23f370acdd32a9e892
 WHIRLPOOL 
ff7d3e180ab6e1a546d0e7c0517ec9138ce0dabf1768fe1270a018446c0a5727017ef94e2495295237d54ac21690c96ca7fce0d9f3f416584ce75b38470314b4
 DIST mariadb-10.1.21.tar.gz 61406584 SHA256 
5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 SHA512 
241467ce7c04603261509e45b3c476632a11754f15dead67434bb8a0fbad6ebcf44c63ffeb7075574e54d14039b22702d48732c1fd8a498948d8b6fc54d54714
 WHIRLPOOL 
2d8acd6141272a552470fda6169e3c52b8516c82242d86965461b2a9be927db9ba7e0427ce88e95a88780da827aa3a406f3daddeec4b8abbaa1207ed25a4f7ff
 DIST mariadb-10.2.1.tar.gz 55721519 SHA256 
90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 
3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff
 WHIRLPOOL 
cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31
 DIST mariadb-5.5.54.tar.gz 45765936 SHA256 
54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 
fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3
 WHIRLPOOL 
6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe

diff --git a/dev-db/mariadb/mariadb-10.0.28.ebuild 
b/dev-db/mariadb/mariadb-10.0.28.ebuild
deleted file mode 100644
index d7a4afaf9e..0000000000
--- a/dev-db/mariadb/mariadb-10.0.28.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-MY_EXTRAS_VER="20160629-1442Z"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( 
extraengine server !static )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
-
-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.26.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= )
-               )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.35:3=
-"
-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
-
-               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)
-                       -DWITHOUT_CASSANDRA=0
-                       $(mysql-cmake_use_plugin extraengine SEQUENCE)
-                       $(mysql-cmake_use_plugin extraengine SPIDER)
-                       $(mysql-cmake_use_plugin extraengine CONNECT)
-                       -DCONNECT_WITH_MYSQL=1
-                       -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='embedded 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 main.mysql_client_test main.mysql_client_test_nonblock 
\
-#                      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.1.19-r1.ebuild 
b/dev-db/mariadb/mariadb-10.1.19-r1.ebuild
deleted file mode 100644
index 79b9614bb1..0000000000
--- a/dev-db/mariadb/mariadb-10.1.19-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-MY_EXTRAS_VER="20160721-1526Z"
-# The wsrep API version must match between upstream WSREP and 
sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy 
jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd 
xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( 
extraengine server !static )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
-       "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
-       "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-       "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
-       mroonga? ( app-text/groonga-normalizer-mysql )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:= )
-       !bindist? (
-               sys-libs/binutils-libs:0=
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               cracklib? ( sys-libs/cracklib:0= )
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-               )
-               innodb-lz4? ( app-arch/lz4 )
-               innodb-lzo? ( dev-libs/lzo )
-               innodb-snappy? ( app-arch/snappy )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.35:3=
-"
-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}
-       galera? (
-               sys-apps/iproute2
-               =sys-cluster/galera-${WSREP_REVISION}*
-               sst-rsync? ( sys-process/lsof )
-               sst-xtrabackup? ( net-misc/socat[ssl] )
-       )
-       perl? ( !dev-db/mytop
-               virtual/perl-Getopt-Long
-               dev-perl/TermReadKey
-               virtual/perl-Term-ANSIColor
-               virtual/perl-Time-HiRes )
-       server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already 
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 
dev-db/percona-xtrabackup ) ) )"
-
-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
-       )
-       local MYSQL_CMAKE_EXTRA_DEFINES=(
-                       -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
-       )
-       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+=(
-                               -DPLUGIN_FEDERATED=NO
-                               -DPLUGIN_FEDERATEDX=NO )
-               fi
-
-               MYSQL_CMAKE_NATIVE_DEFINES+=(
-                       -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
-                       -DPLUGIN_SPHINX=$(usex sphinx YES NO)
-                       -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-                       -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-                       -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-                       -DPLUGIN_CASSANDRA=NO
-                       -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-                       -DPLUGIN_SPIDER=$(usex extraengine YES NO)
-                       -DPLUGIN_CONNECT=$(usex extraengine YES NO)
-                       -DCONNECT_WITH_MYSQL=1
-                       -DCONNECT_WITH_LIBXML2=$(usex xml)
-                       -DCONNECT_WITH_ODBC=$(usex odbc)
-                       -DCONNECT_WITH_JDBC=$(usex jdbc)
-                       -DWITH_WSREP=$(usex galera)
-                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-                       -DPLUGIN_MROONGA=$(usex mroonga YES NO)
-                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
-               )
-       fi
-       mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded 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
-               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}
-
-       # Run mysql tests
-       pushd "${TESTDIR}" || die
-
-       # run mysql-test tests
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-       retstatus_tests=$?
-
-       popd || 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" ]] || eerror "Test failures: $failures"
-       einfo "Tests successfully completed"
-}

diff --git a/dev-db/mariadb/mariadb-10.1.20.ebuild 
b/dev-db/mariadb/mariadb-10.1.20.ebuild
deleted file mode 100644
index 79b9614bb1..0000000000
--- a/dev-db/mariadb/mariadb-10.1.20.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-MY_EXTRAS_VER="20160721-1526Z"
-# The wsrep API version must match between upstream WSREP and 
sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/";
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy 
jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd 
xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( 
extraengine server !static )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris ~x86-solaris"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-
-PATCHES=(
-       "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch
-       "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
-       "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
-)
-
-COMMON_DEPEND="
-       mroonga? ( app-text/groonga-normalizer-mysql )
-       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       systemd? ( sys-apps/systemd:= )
-       !bindist? (
-               sys-libs/binutils-libs:0=
-               >=sys-libs/readline-4.1:0=
-       )
-       server? (
-               cracklib? ( sys-libs/cracklib:0= )
-               extraengine? (
-                       odbc? ( dev-db/unixODBC:0= )
-                       xml? ( dev-libs/libxml2:2= )
-               )
-               innodb-lz4? ( app-arch/lz4 )
-               innodb-lzo? ( dev-libs/lzo )
-               innodb-snappy? ( app-arch/snappy )
-               oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
-               pam? ( virtual/pam:0= )
-               tokudb? ( app-arch/snappy )
-       )
-       >=dev-libs/libpcre-8.35:3=
-"
-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}
-       galera? (
-               sys-apps/iproute2
-               =sys-cluster/galera-${WSREP_REVISION}*
-               sst-rsync? ( sys-process/lsof )
-               sst-xtrabackup? ( net-misc/socat[ssl] )
-       )
-       perl? ( !dev-db/mytop
-               virtual/perl-Getopt-Long
-               dev-perl/TermReadKey
-               virtual/perl-Term-ANSIColor
-               virtual/perl-Time-HiRes )
-       server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already 
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 
dev-db/percona-xtrabackup ) ) )"
-
-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
-       )
-       local MYSQL_CMAKE_EXTRA_DEFINES=(
-                       -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
-       )
-       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+=(
-                               -DPLUGIN_FEDERATED=NO
-                               -DPLUGIN_FEDERATEDX=NO )
-               fi
-
-               MYSQL_CMAKE_NATIVE_DEFINES+=(
-                       -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
-                       -DPLUGIN_SPHINX=$(usex sphinx YES NO)
-                       -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
-                       -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
-                       -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
-                       -DPLUGIN_CASSANDRA=NO
-                       -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
-                       -DPLUGIN_SPIDER=$(usex extraengine YES NO)
-                       -DPLUGIN_CONNECT=$(usex extraengine YES NO)
-                       -DCONNECT_WITH_MYSQL=1
-                       -DCONNECT_WITH_LIBXML2=$(usex xml)
-                       -DCONNECT_WITH_ODBC=$(usex odbc)
-                       -DCONNECT_WITH_JDBC=$(usex jdbc)
-                       -DWITH_WSREP=$(usex galera)
-                       -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF)
-                       -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF)
-                       -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF)
-                       -DPLUGIN_MROONGA=$(usex mroonga YES NO)
-                       -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO)
-               )
-       fi
-       mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded 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
-               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}
-
-       # Run mysql tests
-       pushd "${TESTDIR}" || die
-
-       # run mysql-test tests
-       perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-       retstatus_tests=$?
-
-       popd || 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" ]] || eerror "Test failures: $failures"
-       einfo "Tests successfully completed"
-}

Reply via email to