Add conditional bindist restriction, bug 541486.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 0be109a313228747166654633b01b85635143a37..4599fbc0403ba6f0345e08cc07f6ee05b7ef9465 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1559 2015/03/06 14:08:07 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1560 2015/03/08 09:39:55 ulm Exp $
+
+  08 Mar 2015; Ulrich Müller <ulm@gentoo.org> mysql-multilib.eclass,
+  mysql-v2.eclass:
+  Add conditional bindist restriction, bug 541486.
 
   06 Mar 2015; Yixun Lan <dlan@gentoo.org> qt4-build.eclass,
   qt4-build-multilib.eclass:

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 923ea312792e38ef47bd753fb0ca2844ad31f78e..d696ebfae2dde258d06a3466d5341798e662e2a0 100644 (file)
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.16 2015/03/08 09:39:55 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

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 351335902ad1bf343987fce737e15fe7a0b6c990..d4ddcb67f688eb95871f532c5e99d0c8cbf66a56 100644 (file)
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.37 2015/03/08 09:39:55 ulm 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