1 |
commit: 27b7d345c61d929086d632ecc3fbcaa10c6db488 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 3 18:10:50 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 3 18:10:50 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=27b7d345 |
7 |
|
8 |
Sync multilib dep change from tree |
9 |
|
10 |
--- |
11 |
eclass/mysql-multilib.eclass | 6 +++--- |
12 |
1 file changed, 3 insertions(+), 3 deletions(-) |
13 |
|
14 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
15 |
index d88d180..b529e47 100644 |
16 |
--- a/eclass/mysql-multilib.eclass |
17 |
+++ b/eclass/mysql-multilib.eclass |
18 |
@@ -1,6 +1,6 @@ |
19 |
# Copyright 1999-2014 Gentoo Foundation |
20 |
# Distributed under the terms of the GNU General Public License v2 |
21 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $ |
22 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ |
23 |
|
24 |
# @ECLASS: mysql-multilib.eclass |
25 |
# @MAINTAINER: |
26 |
@@ -240,9 +240,9 @@ DEPEND=" |
27 |
# This probably could be simplified |
28 |
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
29 |
mysql_version_is_at_least "5.6.12" ; then |
30 |
- DEPEND="${DEPEND} dev-libs/libedit" |
31 |
+ DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
32 |
elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then |
33 |
- DEPEND="${DEPEND} dev-libs/libedit" |
34 |
+ DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
35 |
else |
36 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
37 |
fi |