1 |
commit: cda61c8ce44038cb1b9685098b99762ee97d0a4f |
2 |
Author: layman <layman <AT> localhost> |
3 |
AuthorDate: Thu Jun 25 14:25:04 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 25 14:25:04 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cda61c8c |
7 |
|
8 |
Fix dependencies |
9 |
|
10 |
dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild | 10 +++++----- |
11 |
eclass/mysql-multilib.eclass | 4 ++-- |
12 |
2 files changed, 7 insertions(+), 7 deletions(-) |
13 |
|
14 |
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild |
15 |
index 289f2d6..771a07b 100644 |
16 |
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild |
17 |
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.5.ebuild |
18 |
@@ -26,12 +26,12 @@ CDEPEND=" |
19 |
ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] ) |
20 |
" |
21 |
RDEPEND="${CDEPEND} |
22 |
- !dev-db/mysql |
23 |
- !dev-db/mysql-cluster |
24 |
- !dev-db/mariadb |
25 |
+ !dev-db/mysql[client-libs(+)] |
26 |
+ !dev-db/mysql-cluster[client-libs(+)] |
27 |
+ !dev-db/mariadb[client-libs(+)] |
28 |
!dev-db/mariadb-connector-c[mysqlcompat] |
29 |
- !dev-db/mariadb-galera |
30 |
- !dev-db/percona-server |
31 |
+ !dev-db/mariadb-galera[client-libs(+)] |
32 |
+ !dev-db/percona-server[client-libs(+)] |
33 |
" |
34 |
DEPEND="${CDEPEND} |
35 |
>=dev-util/cmake-2.8.9 |
36 |
|
37 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
38 |
index 175f455..a786828 100644 |
39 |
--- a/eclass/mysql-multilib.eclass |
40 |
+++ b/eclass/mysql-multilib.eclass |
41 |
@@ -370,9 +370,9 @@ RDEPEND="${DEPEND} |
42 |
" |
43 |
|
44 |
if [[ ${HAS_TOOLS_PATCH} ]] ; then |
45 |
- RDEPEND="${RDEPEND} |
46 |
+ RDEPEND="${RDEPEND} |
47 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
48 |
- !client-libs? ( virtual/libmysqclient )" |
49 |
+ !client-libs? ( virtual/libmysqlclient )" |
50 |
else |
51 |
RDEPEND="${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )" |
52 |
fi |