Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/
Date: Fri, 23 Aug 2019 20:04:09
Message-Id: 1566590583.cfc9cf48bd080d734ee8e178b8c5a3750c81513d.whissi@gentoo
1 commit: cfc9cf48bd080d734ee8e178b8c5a3750c81513d
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 23 19:46:35 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 23 20:03:03 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc9cf48
7
8 dev-db/percona-server: allow for dev-python/mysqlclient
9
10 Package-Manager: Portage-2.3.72, Repoman-2.3.17
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild | 8 ++++++--
14 1 file changed, 6 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
17 index 1eccb63ed0a..81b46f88e3a 100644
18 --- a/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
19 +++ b/dev-db/percona-server/percona-server-5.7.26.29-r1.ebuild
20 @@ -133,8 +133,11 @@ DEPEND="${COMMON_DEPEND}
21 static? ( sys-libs/ncurses[static-libs] )
22 test? (
23 acct-group/mysql acct-user/mysql
24 - $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
25 dev-perl/JSON
26 + || (
27 + $(python_gen_any_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]')
28 + $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]')
29 + )
30 )
31 "
32 RDEPEND="${COMMON_DEPEND}
33 @@ -153,7 +156,8 @@ RDEPEND="${COMMON_DEPEND}
34 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
35
36 python_check_deps() {
37 - has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
38 + has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" \
39 + || has_version "dev-python/mysql-python[${PYTHON_USEDEP}]"
40 }
41
42 mysql_init_vars() {