[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     3912b1d0557bf1f5ec66ddcb96cb048d08b661d2
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 16:37:51 2014 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 16:37:51 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3912b1d0

More changes for MariaDB 10.1

---
 eclass/mysql-cmake.eclass    |  3 +++
 eclass/mysql-multilib.eclass | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1f38c70..bae11ca 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -209,6 +209,9 @@ configure_cmake_standard() {
                                $(cmake-utils_use odbc CONNECT_WITH_ODBC)
                        )
                fi
+               if in_iuse galera ; then
+                       mycmakeargs+=( $(cmake-utils_use_with galera WSREP) )
+               fi
        fi
 
        if [[ ${PN} == "percona-server" ]]; then

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 079c86f..0f3895b 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -207,8 +207,13 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; 
then
        REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( 
jemalloc )"
 fi
 
-if [[ ${PN} == "mariadb-galera" ]]; then
-       IUSE="${IUSE} +sst-rsync sst-xtrabackup"
+if [[ -n "${WSREP_REVISION}" ]]; then
+       if [[ ${PN} == "mariadb" ]]; then
+               IUSE="${IUSE} galera sst-rsync sst-xtrabackup"
+               REQUIRED_USE="${REQUIRED_USE} sst-rsync? ( galera ) 
sst-xtrabackup? ( galera )"
+       else
+               IUSE="${IUSE} +sst-rsync sst-xtrabackup"
+       fi
 fi
 
 if [[ ${PN} == "percona-server" ]]; then
@@ -308,18 +313,23 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] 
; then
                virtual/perl-Time-HiRes ) "
 fi
 
-if [[ ${PN} == "mariadb-galera" ]] ; then
+if [[ -n "${WSREP_REVISION}" ]] ; then
        # The wsrep API version must match between the ebuild and 
sys-cluster/galera.
        # This will be indicated by WSREP_REVISION in the ebuild and the first 
number
        # in the version of sys-cluster/galera
        #
        # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst
-       RDEPEND="${RDEPEND}
-               sys-apps/iproute2
+
+       GALERA_RDEPEND="sys-apps/iproute2
                =sys-cluster/galera-${WSREP_REVISION}*
+               "
+       if [[ ${PN} == "mariadb" ]]; then
+               GALERA_RDEPEND="galera? ( ${GALERA_RDEPEND} )"
+       fi
+       RDEPEND="${RDEPEND} ${GALERA_RDEPEND}
                sst-rsync? ( sys-process/lsof )
                sst-xtrabackup? (
-                       dev-db/xtrabackup-bin
+                       >=dev-db/xtrabackup-bin-2.2.4
                        net-misc/socat[ssl]
                )
        "