commit: 7bf4bb752f352989a2e8616595f8426971f99278
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 18:40:51 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 18:40:51 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7bf4bb75
Sync from tree for mariadb-galera IUSE
---
dev-db/mariadb-galera/metadata.xml | 4 ++--
eclass/mysql-multilib.eclass | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-db/mariadb-galera/metadata.xml
b/dev-db/mariadb-galera/metadata.xml
index ef7b189..94a23ae 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -18,8 +18,8 @@ dev-db/mariadb
<flag name='minimal'>Install client programs only, no server</flag>
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
<flag name='profiling'>Add support for statement profiling (requires
USE=community).</flag>
- <flag name='sst_rsync'>Add tools needed to support the rsync SST
method</flag>
- <flag name='sst_xtrabackup'>Add tools needed to support the xtrabackup and
xtrabackup-v2 SST methods</flag>
+ <flag name='sst-rsync'>Add tools needed to support the rsync SST
method</flag>
+ <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and
xtrabackup-v2 SST methods</flag>
<flag name="systemtap">Build support for profiling and tracing using
<pkg>dev-util/systemtap</pkg></flag>
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
<flag name='test'>Install upstream testsuites for end use.</flag>
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 80c069b..ca4d6c3 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.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]
)
