[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     88856ea27eb404cf197226d2bf489ff052b59a9a
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  8 23:24:29 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> 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