diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d0d9e6180279..48fb2a7d7874 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.1375 2014/09/26 17:49:11 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1376 2014/09/26 17:56:29 grknight Exp $ + + 26 Sep 2014; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass: + Fix up invalid general IUSE with underscores 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 diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index a98a0513736a..ca4d6c3d6510 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.8 2014/09/26 17:49:11 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.9 2014/09/26 17:56:29 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -208,7 +208,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then fi if [[ ${PN} == "mariadb-galera" ]]; then - IUSE="${IUSE} +sst_rsync sst_xtrabackup" + IUSE="${IUSE} +sst-rsync sst-xtrabackup" fi if [[ ${PN} == "percona-server" ]]; then @@ -317,8 +317,8 @@ if [[ ${PN} == "mariadb-galera" ]] ; then RDEPEND="${RDEPEND} sys-apps/iproute2 =sys-cluster/galera-${WSREP_REVISION}* - sst_rsync? ( sys-process/lsof ) - sst_xtrabackup? ( + sst-rsync? ( sys-process/lsof ) + sst-xtrabackup? ( dev-db/xtrabackup-bin net-misc/socat[ssl] ) |