From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CF104138989 for ; Fri, 1 May 2015 12:40:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26456E0843; Fri, 1 May 2015 12:40:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC7D1E0843 for ; Fri, 1 May 2015 12:40:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB9D8340E0A for ; Fri, 1 May 2015 12:40:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F329A9A7 for ; Fri, 1 May 2015 12:40:49 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1430484063.69cbac782eeef839d3e9e1a219d2edeabd5324fb.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass eclass/mysql-v2.eclass eclass/mysql.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 69cbac782eeef839d3e9e1a219d2edeabd5324fb X-VCS-Branch: master Date: Fri, 1 May 2015 12:40:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c6ec0844-22cf-4a29-868e-b987f54bd6c3 X-Archives-Hash: c8666ba1fff05211674a0fa77f075464 commit: 69cbac782eeef839d3e9e1a219d2edeabd5324fb Author: layman localhost> AuthorDate: Fri May 1 12:41:03 2015 +0000 Commit: Brian Evans gentoo 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: