From e00cdf03a5981db60bca3bbecf48ea1305b1a4cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 8 Mar 2015 09:39:55 +0000 Subject: [PATCH] Add conditional bindist restriction, bug 541486. --- eclass/ChangeLog | 6 +++++- eclass/mysql-multilib.eclass | 5 +++-- eclass/mysql-v2.eclass | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0be109a31322..4599fbc0403b 100644 --- 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 mysql-multilib.eclass, + mysql-v2.eclass: + Add conditional bindist restriction, bug 541486. 06 Mar 2015; Yixun Lan qt4-build.eclass, qt4-build-multilib.eclass: diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 923ea312792e..d696ebfae2dd 100644 --- 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 351335902ad1..d4ddcb67f688 100644 --- 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 -- 2.26.2