diff options
| author |   Brian Evans <grknight@gentoo.org> | 2014-09-03 13:05:50 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2014-09-03 13:05:50 +0000 |
| commit | 8496359d950cdd07d869b8c8a8c323da0690ab9f (patch) | |
| tree | 4dc2298636d80f42d253d167620c5d9f62cc4eed /eclass | |
| parent | Version bump (diff) | |
| download | gentoo-2-8496359d950cdd07d869b8c8a8c323da0690ab9f.tar.gz gentoo-2-8496359d950cdd07d869b8c8a8c323da0690ab9f.tar.bz2 gentoo-2-8496359d950cdd07d869b8c8a8c323da0690ab9f.zip | |
Fix libedit MULTILIB_USEDEP wrt bug 521964
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-multilib.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 70868e52e879..d08019c3202b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <grknight@gentoo.org> mysql-multilib.eclass: + Fix libedit MULTILIB_USEDEP wrt bug 521964 02 Sep 2014; Michał Górny <mgorny@gentoo.org> bash-completion-r1.eclass: Add bashcomp_alias function to create command aliases for completion. diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index d88d180849fa..b529e4750202 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -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 @@ DEPEND=" # 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 |