summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2014-09-03 13:05:50 +0000
committerBrian Evans <grknight@gentoo.org>2014-09-03 13:05:50 +0000
commitde76f4b01fe62ffa8d86135480740bfc851bd3ed (patch)
tree9a5c043663d49bf09406a04ed2db6160e5cfc0a6 /eclass
parentVersion bump (diff)
downloadhistorical-de76f4b01fe62ffa8d86135480740bfc851bd3ed.tar.gz
historical-de76f4b01fe62ffa8d86135480740bfc851bd3ed.tar.bz2
historical-de76f4b01fe62ffa8d86135480740bfc851bd3ed.zip
Fix libedit MULTILIB_USEDEP wrt bug 521964
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/mysql-multilib.eclass6
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