grknight 14/09/03 13:05:50 Modified: ChangeLog mysql-multilib.eclass Log: Fix libedit MULTILIB_USEDEP wrt bug 521964
Revision Changes Path 1.1363 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1362&r2=1.1363 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1362 retrieving revision 1.1363 diff -u -r1.1362 -r1.1363 --- ChangeLog 2 Sep 2014 15:28:05 -0000 1.1362 +++ ChangeLog 3 Sep 2014 13:05:50 -0000 1.1363 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1362 2014/09/02 15:28:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1363 2014/09/03 13:05:50 grknight Exp $ + + 03 Sep 2014; Brian Evans <[email protected]> mysql-multilib.eclass: + Fix libedit MULTILIB_USEDEP wrt bug 521964 02 Sep 2014; Michał Górny <[email protected]> bash-completion-r1.eclass: Add bashcomp_alias function to create command aliases for completion. 1.7 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.6&r2=1.7 Index: mysql-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mysql-multilib.eclass 29 Aug 2014 18:50:39 -0000 1.6 +++ mysql-multilib.eclass 3 Sep 2014 13:05:50 -0000 1.7 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -240,9 +240,9 @@ # This probably could be simplified if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ mysql_version_is_at_least "5.6.12" ; then - DEPEND="${DEPEND} dev-libs/libedit" + DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then - DEPEND="${DEPEND} dev-libs/libedit" + DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" else DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" fi
