1 |
grknight 14/09/03 13:05:50 |
2 |
|
3 |
Modified: ChangeLog mysql-multilib.eclass |
4 |
Log: |
5 |
Fix libedit MULTILIB_USEDEP wrt bug 521964 |
6 |
|
7 |
Revision Changes Path |
8 |
1.1363 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1363&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1362&r2=1.1363 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1362 |
18 |
retrieving revision 1.1363 |
19 |
diff -u -r1.1362 -r1.1363 |
20 |
--- ChangeLog 2 Sep 2014 15:28:05 -0000 1.1362 |
21 |
+++ ChangeLog 3 Sep 2014 13:05:50 -0000 1.1363 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1362 2014/09/02 15:28:05 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1363 2014/09/03 13:05:50 grknight Exp $ |
27 |
+ |
28 |
+ 03 Sep 2014; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
29 |
+ Fix libedit MULTILIB_USEDEP wrt bug 521964 |
30 |
|
31 |
02 Sep 2014; Michał Górny <mgorny@g.o> bash-completion-r1.eclass: |
32 |
Add bashcomp_alias function to create command aliases for completion. |
33 |
|
34 |
|
35 |
|
36 |
1.7 eclass/mysql-multilib.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.7&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.6&r2=1.7 |
41 |
|
42 |
Index: mysql-multilib.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
45 |
retrieving revision 1.6 |
46 |
retrieving revision 1.7 |
47 |
diff -u -r1.6 -r1.7 |
48 |
--- mysql-multilib.eclass 29 Aug 2014 18:50:39 -0000 1.6 |
49 |
+++ mysql-multilib.eclass 3 Sep 2014 13:05:50 -0000 1.7 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.6 2014/08/29 18:50:39 grknight Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.7 2014/09/03 13:05:50 grknight Exp $ |
55 |
|
56 |
# @ECLASS: mysql-multilib.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -240,9 +240,9 @@ |
59 |
# This probably could be simplified |
60 |
if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \ |
61 |
mysql_version_is_at_least "5.6.12" ; then |
62 |
- DEPEND="${DEPEND} dev-libs/libedit" |
63 |
+ DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
64 |
elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then |
65 |
- DEPEND="${DEPEND} dev-libs/libedit" |
66 |
+ DEPEND="${DEPEND} dev-libs/libedit:0=[${MULTILIB_USEDEP}]" |
67 |
else |
68 |
DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0=[${MULTILIB_USEDEP}] )" |
69 |
fi |