| 1 |
commit: 714caeebbdf6ef835c3ac6c066b475493c637985 |
| 2 |
Author: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 3 |
AuthorDate: Tue Nov 26 15:11:18 2013 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Tue Nov 26 15:11:18 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=714caeeb |
| 7 |
|
| 8 |
Fine tune galera depend and minor keyword ordering |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-v2.eclass | 5 ++++- |
| 12 |
sys-cluster/galera/galera-23.2.7.ebuild | 2 +- |
| 13 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 16 |
index 3fc297d..ccd5e8f 100644 |
| 17 |
--- a/eclass/mysql-v2.eclass |
| 18 |
+++ b/eclass/mysql-v2.eclass |
| 19 |
@@ -313,8 +313,11 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 20 |
fi |
| 21 |
|
| 22 |
if [[ ${PN} == "mariadb-galera" ]] ; then |
| 23 |
+ # The wsrep API version must match between the ebuild and sys-cluster/galera. |
| 24 |
+ # This will be indicated by WSREP_REVISION in the ebuild and the first number |
| 25 |
+ # in the version of sys-cluster/galera |
| 26 |
RDEPEND="${RDEPEND} |
| 27 |
- >=sys-cluster/galera-${WSREP_REVISION:0}.0 |
| 28 |
+ =sys-cluster/galera-${WSREP_REVISION}* |
| 29 |
" |
| 30 |
fi |
| 31 |
|
| 32 |
|
| 33 |
diff --git a/sys-cluster/galera/galera-23.2.7.ebuild b/sys-cluster/galera/galera-23.2.7.ebuild |
| 34 |
index e67cfae..dea040f 100644 |
| 35 |
--- a/sys-cluster/galera/galera-23.2.7.ebuild |
| 36 |
+++ b/sys-cluster/galera/galera-23.2.7.ebuild |
| 37 |
@@ -14,7 +14,7 @@ LICENSE="GPL-3" |
| 38 |
|
| 39 |
SLOT="0" |
| 40 |
|
| 41 |
-KEYWORDS="~x86 ~amd64" |
| 42 |
+KEYWORDS="~amd64 ~x86" |
| 43 |
IUSE="garbd ssl test" |
| 44 |
|
| 45 |
RDEPEND=" |
Archives