| 1 |
commit: 7bf4bb752f352989a2e8616595f8426971f99278 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 26 18:40:51 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 26 18:40:51 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7bf4bb75 |
| 7 |
|
| 8 |
Sync from tree for mariadb-galera IUSE |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/mariadb-galera/metadata.xml | 4 ++-- |
| 12 |
eclass/mysql-multilib.eclass | 8 ++++---- |
| 13 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml |
| 16 |
index ef7b189..94a23ae 100644 |
| 17 |
--- a/dev-db/mariadb-galera/metadata.xml |
| 18 |
+++ b/dev-db/mariadb-galera/metadata.xml |
| 19 |
@@ -18,8 +18,8 @@ dev-db/mariadb |
| 20 |
<flag name='minimal'>Install client programs only, no server</flag> |
| 21 |
<flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag> |
| 22 |
<flag name='profiling'>Add support for statement profiling (requires USE=community).</flag> |
| 23 |
- <flag name='sst_rsync'>Add tools needed to support the rsync SST method</flag> |
| 24 |
- <flag name='sst_xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag> |
| 25 |
+ <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag> |
| 26 |
+ <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag> |
| 27 |
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag> |
| 28 |
<flag name='sphinx'>Add suport for the sphinx full-text search engine</flag> |
| 29 |
<flag name='test'>Install upstream testsuites for end use.</flag> |
| 30 |
|
| 31 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 32 |
index 80c069b..ca4d6c3 100644 |
| 33 |
--- a/eclass/mysql-multilib.eclass |
| 34 |
+++ b/eclass/mysql-multilib.eclass |
| 35 |
@@ -1,6 +1,6 @@ |
| 36 |
# Copyright 1999-2014 Gentoo Foundation |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ |
| 39 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.9 2014/09/26 17:56:29 grknight Exp $ |
| 40 |
|
| 41 |
# @ECLASS: mysql-multilib.eclass |
| 42 |
# @MAINTAINER: |
| 43 |
@@ -208,7 +208,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 44 |
fi |
| 45 |
|
| 46 |
if [[ ${PN} == "mariadb-galera" ]]; then |
| 47 |
- IUSE="${IUSE} +sst_rsync sst_xtrabackup" |
| 48 |
+ IUSE="${IUSE} +sst-rsync sst-xtrabackup" |
| 49 |
fi |
| 50 |
|
| 51 |
if [[ ${PN} == "percona-server" ]]; then |
| 52 |
@@ -317,8 +317,8 @@ if [[ ${PN} == "mariadb-galera" ]] ; then |
| 53 |
RDEPEND="${RDEPEND} |
| 54 |
sys-apps/iproute2 |
| 55 |
=sys-cluster/galera-${WSREP_REVISION}* |
| 56 |
- sst_rsync? ( sys-process/lsof ) |
| 57 |
- sst_xtrabackup? ( |
| 58 |
+ sst-rsync? ( sys-process/lsof ) |
| 59 |
+ sst-xtrabackup? ( |
| 60 |
dev-db/xtrabackup-bin |
| 61 |
net-misc/socat[ssl] |
| 62 |
) |
Archives