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 5AC9D138CBF for ; Sun, 8 Mar 2015 23:48:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFDACE09B2; Sun, 8 Mar 2015 23:48:37 +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 4BE1FE09B2 for ; Sun, 8 Mar 2015 23:48:37 +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 629A6340688 for ; Sun, 8 Mar 2015 23:48:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B9DD13569 for ; Sun, 8 Mar 2015 23:48:35 +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: <1425857069.88856ea27eb404cf197226d2bf489ff052b59a9a.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 88856ea27eb404cf197226d2bf489ff052b59a9a X-VCS-Branch: master Date: Sun, 8 Mar 2015 23:48:35 +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: afa728f6-2a59-485d-8476-057c84adf0e0 X-Archives-Hash: e2fff8d2991f8f80a93ed3e11c9a88f7 commit: 88856ea27eb404cf197226d2bf489ff052b59a9a Author: Brian Evans gentoo org> AuthorDate: Sun Mar 8 23:24:29 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Mar 8 23:24:29 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=88856ea2 Sync from portage eclass/mysql-multilib.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index fc82bc6..839b372 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.15 2015/02/16 17:25:14 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.17 2015/03/08 09:42:19 ulm Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -206,6 +206,7 @@ IUSE="+community cluster debug embedded extraengine jemalloc latin1 minimal if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" fi ### End readline/libedit @@ -373,8 +374,8 @@ if [[ -n "${WSREP_REVISION}" ]] ; then fi if [[ ${PN} == "mysql-cluster" ]] ; then - mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \ - DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )" + mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \ + DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )" fi # compile-time-only @@ -590,7 +591,7 @@ multilib_src_configure() { ) mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system ) - fi + fi configure_cmake_locale