[gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, eclass/

[gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, eclass/

[Brian Evans]

commit:     714caeebbdf6ef835c3ac6c066b475493c637985
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue Nov 26 15:11:18 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Nov 26 15:11:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=714caeeb

Fine tune galera depend and minor keyword ordering

---
 eclass/mysql-v2.eclass                  | 5 ++++-
 sys-cluster/galera/galera-23.2.7.ebuild | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3fc297d..ccd5e8f 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -313,8 +313,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
 fi
 
 if [[ ${PN} == "mariadb-galera" ]] ; 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
 	RDEPEND="${RDEPEND} 
-		>=sys-cluster/galera-${WSREP_REVISION:0}.0
+		=sys-cluster/galera-${WSREP_REVISION}*
 	"
 fi
 

diff --git a/sys-cluster/galera/galera-23.2.7.ebuild b/sys-cluster/galera/galera-23.2.7.ebuild
index e67cfae..dea040f 100644
--- a/sys-cluster/galera/galera-23.2.7.ebuild
+++ b/sys-cluster/galera/galera-23.2.7.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="garbd ssl test"
 
 RDEPEND="