grknight 14/09/26 17:49:11 Modified: ChangeLog mysql-multilib.eclass Log: Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera
Revision Changes Path 1.1375 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1375&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1374&r2=1.1375 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1374 retrieving revision 1.1375 diff -u -r1.1374 -r1.1375 --- ChangeLog 22 Sep 2014 00:03:25 -0000 1.1374 +++ ChangeLog 26 Sep 2014 17:49:11 -0000 1.1375 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1374 2014/09/22 00:03:25 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1375 2014/09/26 17:49:11 grknight Exp $ + + 26 Sep 2014; Brian Evans <grkni...@gentoo.org> mysql-multilib.eclass: + Adjust deps for >=mariadb-10.0.14 and add USE base deps for mariadb-galera 22 Sep 2014; Davide Pesavento <p...@gentoo.org> qt4-build.eclass, qt5-build.eclass: 1.8 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.7&r2=1.8 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mysql-multilib.eclass 3 Sep 2014 13:05:50 -0000 1.7 +++ mysql-multilib.eclass 26 Sep 2014 17:49:11 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.8 2014/09/26 17:49:11 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -188,7 +188,8 @@ +perl profiling selinux ssl systemtap static static-libs tcmalloc test" # This probably could be simplified, but the syntax would have to be just right -if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_check_version_range "5.5.37 to 10.0.13.99" ; then IUSE="bindist ${IUSE}" elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then @@ -206,6 +207,10 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc )" fi +if [[ ${PN} == "mariadb-galera" ]]; then + IUSE="${IUSE} +sst_rsync sst_xtrabackup" +fi + if [[ ${PN} == "percona-server" ]]; then IUSE="${IUSE} pam" fi @@ -237,12 +242,16 @@ " # dev-db/mysql-5.6.12+ only works with dev-libs/libedit +# mariadb 10.0.14 fixes libedit detection. changed to follow mysql # This probably could be simplified if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_version_is_at_least "5.6.12" ; then DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" +elif [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ + mysql_version_is_at_least "10.0.14" ; then + DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" else DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi @@ -306,8 +315,13 @@ # # lsof is required as of 5.5.38 and 10.0.11 for the rsync sst RDEPEND="${RDEPEND} + sys-apps/iproute2 =sys-cluster/galera-${WSREP_REVISION}* - sys-process/lsof + sst_rsync? ( sys-process/lsof ) + sst_xtrabackup? ( + dev-db/xtrabackup-bin + net-misc/socat[ssl] + ) " fi
