| 1 |
grknight 14/09/26 17:49:11 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-multilib.eclass |
| 4 |
Log: |
| 5 |
Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1375 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1374&r2=1.1375 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1374 |
| 18 |
retrieving revision 1.1375 |
| 19 |
diff -u -r1.1374 -r1.1375 |
| 20 |
--- ChangeLog 22 Sep 2014 00:03:25 -0000 1.1374 |
| 21 |
+++ ChangeLog 26 Sep 2014 17:49:11 -0000 1.1375 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1374 2014/09/22 00:03:25 pesa Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1375 2014/09/26 17:49:11 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 26 Sep 2014; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 29 |
+ Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera |
| 30 |
|
| 31 |
22 Sep 2014; Davide Pesavento <pesa@g.o> qt4-build.eclass, |
| 32 |
qt5-build.eclass: |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.8 eclass/mysql-multilib.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.7&r2=1.8 |
| 41 |
|
| 42 |
Index: mysql-multilib.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
| 45 |
retrieving revision 1.7 |
| 46 |
retrieving revision 1.8 |
| 47 |
diff -u -r1.7 -r1.8 |
| 48 |
--- mysql-multilib.eclass 3 Sep 2014 13:05:50 -0000 1.7 |
| 49 |
+++ mysql-multilib.eclass 26 Sep 2014 17:49:11 -0000 1.8 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2014 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.8 2014/09/26 17:49:11 grknight Exp $ |
| 55 |
|
| 56 |
# @ECLASS: mysql-multilib.eclass |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -188,7 +188,8 @@ |
| 59 |
+perl profiling selinux ssl systemtap static static-libs tcmalloc test" |
| 60 |
|
| 61 |
# This probably could be simplified, but the syntax would have to be just right |
| 62 |
-if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 63 |
+if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
| 64 |
+ mysql_check_version_range "5.5.37 to 10.0.13.99" ; then |
| 65 |
IUSE="bindist ${IUSE}" |
| 66 |
elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
| 67 |
mysql_check_version_range "5.5.37 to 5.6.11.99" ; then |
| 68 |
@@ -206,6 +207,10 @@ |
| 69 |
REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" |
| 70 |
fi |
| 71 |
|
| 72 |
+if [[ ${PN} == "mariadb-galera" ]]; then |
| 73 |
+ IUSE="${IUSE} +sst_rsync sst_xtrabackup" |
| 74 |
+fi |
| 75 |
+ |
| 76 |
if [[ ${PN} == "percona-server" ]]; then |
| 77 |
IUSE="${IUSE} pam" |
| 78 |
fi |
| 79 |
@@ -237,12 +242,16 @@ |
| 80 |
" |
| 81 |
|
| 82 |
# dev-db/mysql-5.6.12+ only works with dev-libs/libedit |
| 83 |
+# mariadb 10.0.14 fixes libedit detection. changed to follow mysql |
| 84 |
# This probably could be simplified |
| 85 |
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
| 86 |
mysql_version_is_at_least "5.6.12" ; then |
| 87 |
DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
| 88 |
elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then |
| 89 |
DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
| 90 |
+elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ |
| 91 |
+ mysql_version_is_at_least "10.0.14" ; then |
| 92 |
+ DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
| 93 |
else |
| 94 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
| 95 |
fi |
| 96 |
@@ -306,8 +315,13 @@ |
| 97 |
# |
| 98 |
# lsof is required as of 5.5.38 and 10.0.11 for the rsync sst |
| 99 |
RDEPEND="${RDEPEND} |
| 100 |
+ sys-apps/iproute2 |
| 101 |
=sys-cluster/galera-${WSREP_REVISION}* |
| 102 |
- sys-process/lsof |
| 103 |
+ sst_rsync? ( sys-process/lsof ) |
| 104 |
+ sst_xtrabackup? ( |
| 105 |
+ dev-db/xtrabackup-bin |
| 106 |
+ net-misc/socat[ssl] |
| 107 |
+ ) |
| 108 |
" |
| 109 |
fi |
Archives