diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-09-26 17:49:11 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-09-26 17:49:11 +0000 |
| commit | 19f1b6492e85ba135ede56d47ac89ed280278fcc (patch) | |
| tree | 35b1966c43ca49fd3a782eceb1c8fc317632d59d /eclass | |
| parent | Version bump, remove old (diff) | |
| download | gentoo-2-19f1b6492e85ba135ede56d47ac89ed280278fcc.tar.gz gentoo-2-19f1b6492e85ba135ede56d47ac89ed280278fcc.tar.bz2 gentoo-2-19f1b6492e85ba135ede56d47ac89ed280278fcc.zip | |
Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 20 |
2 files changed, 21 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e40b4d285295..d0d9e6180279 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1374 2014/09/22 00:03:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1375 2014/09/26 17:49:11 grknight Exp $ + + 26 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: + Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera 22 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass, qt5-build.eclass: diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index b529e4750202..a98a0513736a 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.8 2014/09/26 17:49:11 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -188,7 +188,8 @@ IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 +perl profiling selinux ssl systemtap static static-libs tcmalloc test" # This probably could be simplified, but the syntax would have to be just right -if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_check_version_range "5.5.37 to 10.0.13.99" ; then IUSE="bindist ${IUSE}" elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then @@ -206,6 +207,10 @@ 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" +fi + if [[ ${PN} == "percona-server" ]]; then IUSE="${IUSE} pam" fi @@ -237,12 +242,16 @@ DEPEND=" " # dev-db/mysql-5.6.12+ only works with dev-libs/libedit +# mariadb 10.0.14 fixes libedit detection. changed to follow mysql # This probably could be simplified if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_version_is_at_least "5.6.12" ; then DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" +elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_version_is_at_least "10.0.14" ; then + DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" else DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi @@ -306,8 +315,13 @@ if [[ ${PN} == "mariadb-galera" ]] ; then # # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst RDEPEND="${RDEPEND} + sys-apps/iproute2 =sys-cluster/galera-${WSREP_REVISION}* - sys-process/lsof + sst_rsync? ( sys-process/lsof ) + sst_xtrabackup? ( + dev-db/xtrabackup-bin + net-misc/socat[ssl] + ) " fi |