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/mysql/
Date: Mon, 15 Oct 2018 01:30:06
Message-Id: 1539566986.67c0f43602376ec05ab33e0f63956f5526a55cc5.whissi@gentoo
1 commit: 67c0f43602376ec05ab33e0f63956f5526a55cc5
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 15 01:26:49 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 15 01:29:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c0f436
7
8 dev-db/mysql: rename USE=mecab to USE=cjk
9
10 Package-Manager: Portage-2.3.50, Repoman-2.3.11
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 dev-db/mysql/metadata.xml | 2 +-
14 dev-db/mysql/mysql-5.7.23-r1.ebuild | 6 +++---
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
18 index 102079013c4..c20a8004a28 100644
19 --- a/dev-db/mysql/metadata.xml
20 +++ b/dev-db/mysql/metadata.xml
21 @@ -11,12 +11,12 @@ dev-db/mysql
22 dev-db/mariadb
23 -->
24 <use>
25 + <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
26 <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
27 <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
28 <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
29 <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
30 <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
31 - <flag name="mecab">Build MeCab full-text parser plugin using <pkg>app-text/mecab</pkg></flag>
32 <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
33 <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
34 <flag name="server">Build the server program</flag>
35
36 diff --git a/dev-db/mysql/mysql-5.7.23-r1.ebuild b/dev-db/mysql/mysql-5.7.23-r1.ebuild
37 index 6d781dc5a4c..d9f2fd4117b 100644
38 --- a/dev-db/mysql/mysql-5.7.23-r1.ebuild
39 +++ b/dev-db/mysql/mysql-5.7.23-r1.ebuild
40 @@ -26,7 +26,7 @@ HOMEPAGE="https://www.mysql.com/"
41 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
42 LICENSE="GPL-2"
43 SLOT="0/18"
44 -IUSE="client-libs cracklib debug jemalloc latin1 libressl mecab numa +perl profiling selinux
45 +IUSE="cjk client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
46 +server static static-libs systemtap tcmalloc test yassl"
47
48 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
49 @@ -81,7 +81,7 @@ COMMON_DEPEND="net-misc/curl
50 )
51 server? (
52 >=app-arch/lz4-0_p131:=
53 - mecab? ( app-text/mecab:= )
54 + cjk? ( app-text/mecab:= )
55 numa? ( sys-process/numactl )
56 )
57 systemtap? ( >=dev-util/systemtap-1.3:0= )
58 @@ -372,7 +372,7 @@ multilib_src_configure() {
59 mycmakeargs+=(
60 -DWITH_LIBEVENT=system
61 -DWITH_LZ4=system
62 - -DWITH_MECAB=$(usex mecab system OFF)
63 + -DWITH_MECAB=$(usex cjk system OFF)
64 -DWITH_NUMA=$(usex numa ON OFF)
65 )