| 1 |
commit: a2c9bd466dc0002cf2ccdf3dd291e95b7da378b6 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 2 01:02:41 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Wed Jul 2 01:02:41 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a2c9bd46 |
| 7 |
|
| 8 |
[eclass] sync multilib eclass |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-multilib.eclass | 18 ++++++++++++++---- |
| 12 |
1 file changed, 14 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 15 |
index 42f965e..1c352aa 100644 |
| 16 |
--- a/eclass/mysql-multilib.eclass |
| 17 |
+++ b/eclass/mysql-multilib.eclass |
| 18 |
@@ -178,8 +178,14 @@ SLOT="0" |
| 19 |
IUSE="+community cluster debug embedded extraengine jemalloc latin1 max-idx-128 minimal |
| 20 |
+perl profiling selinux ssl systemtap static static-libs tcmalloc test" |
| 21 |
|
| 22 |
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
| 23 |
- mysql_version_is_at_least "5.5" || mysql_check_version_range "5.5.38 to 5.6.11.99" ; then |
| 24 |
+# This probably could be simplified, but the syntax would have to be just right |
| 25 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 26 |
+ IUSE="bindist ${IUSE}" |
| 27 |
+elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
| 28 |
+ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
| 29 |
+ IUSE="bindist ${IUSE}" |
| 30 |
+elif [[ ${PN} == "mysql-cluster" ]] && \ |
| 31 |
+ mysql_check_version_range "7.2 to 7.2.99.99" ; then |
| 32 |
IUSE="bindist ${IUSE}" |
| 33 |
fi |
| 34 |
|
| 35 |
@@ -222,8 +228,12 @@ DEPEND=" |
| 36 |
" |
| 37 |
|
| 38 |
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit |
| 39 |
-if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then |
| 40 |
- DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
| 41 |
+# This probably could be simplified |
| 42 |
+if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
| 43 |
+ mysql_version_is_at_least "5.6.12" ; then |
| 44 |
+ DEPEND="${DEPEND} dev-libs/libedit" |
| 45 |
+elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then |
| 46 |
+ DEPEND="${DEPEND} dev-libs/libedit" |
| 47 |
else |
| 48 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
| 49 |
fi |
Archives