commit: 69cbac782eeef839d3e9e1a219d2edeabd5324fb Author: layman <layman <AT> localhost> AuthorDate: Fri May 1 12:41:03 2015 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Fri May 1 12:41:03 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=69cbac78
Sync headers and changes from portage eclass/mysql-multilib.eclass | 2 +- eclass/mysql-v2.eclass | 5 ++++- eclass/mysql.eclass | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index c7c2696..e6432f7 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.18 2015/03/17 19:39:43 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.19 2015/05/01 12:34:31 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index f613204..9f7b0e7 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.36 2015/02/16 14:37:50 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.38 2015/05/01 12:34:31 grknight Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -222,12 +222,15 @@ IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling" if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \ mysql_version_is_at_least "5.5" ; then IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_check_version_range "5.5.37 to 5.6.11.99" ; then IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" elif [[ ${PN} == "mysql-cluster" ]] && \ mysql_check_version_range "7.2 to 7.2.99.99" ; then IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" fi if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 4271a6c..7a129fc 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.181 2014/07/29 20:24:00 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.182 2015/05/01 12:34:31 grknight Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: