ulm 15/03/08 09:39:56 Modified: mysql-v2.eclass mysql-multilib.eclass ChangeLog Log: Add conditional bindist restriction, bug 541486.
Revision Changes Path 1.37 eclass/mysql-v2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-v2.eclass?r1=1.36&r2=1.37 Index: mysql-v2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mysql-v2.eclass 16 Feb 2015 14:37:50 -0000 1.36 +++ mysql-v2.eclass 8 Mar 2015 09:39:55 -0000 1.37 @@ -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 @@ 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 1.16 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.15&r2=1.16 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mysql-multilib.eclass 16 Feb 2015 17:25:14 -0000 1.15 +++ mysql-multilib.eclass 8 Mar 2015 09:39:55 -0000 1.16 @@ -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 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then IUSE="bindist ${IUSE}" + RESTRICT="${RESTRICT} !bindist? ( bindist )" fi ### End readline/libedit 1.1560 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1560&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1560&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1559&r2=1.1560 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1559 retrieving revision 1.1560 diff -u -r1.1559 -r1.1560 --- ChangeLog 6 Mar 2015 14:08:07 -0000 1.1559 +++ ChangeLog 8 Mar 2015 09:39:55 -0000 1.1560 @@ -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 <u...@gentoo.org> mysql-multilib.eclass, + mysql-v2.eclass: + Add conditional bindist restriction, bug 541486. 06 Mar 2015; Yixun Lan <d...@gentoo.org> qt4-build.eclass, qt4-build-multilib.eclass:
