dev-db/mysql: rename USE=mecab to USE=cjk

Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 102079013c4366bfbb12e10b9a028cfc24807bc4..c20a8004a281c80ab79309262a47a34eb465b4d7 100644 (file)
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -11,12 +11,12 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
+  <flag name="cjk">Add CJK support for InnoDB fulltext search using <pkg>app-text/mecab</pkg></flag>
   <flag name="client-libs">Build the client libraries from the server package instead of the C Connector packages (not recommended)</flag>
   <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
   <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
   <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name="mecab">Build MeCab full-text parser plugin using <pkg>app-text/mecab</pkg></flag>
   <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="server">Build the server program</flag>

diff --git a/dev-db/mysql/mysql-5.7.23-r1.ebuild b/dev-db/mysql/mysql-5.7.23-r1.ebuild
index 6d781dc5a4c66410c7705a5343862e27d87fad38..d9f2fd4117b35502367297523dbc5f2ca0532eda 100644 (file)
--- a/dev-db/mysql/mysql-5.7.23-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.23-r1.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://www.mysql.com/"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 LICENSE="GPL-2"
 SLOT="0/18"
-IUSE="client-libs cracklib debug jemalloc latin1 libressl mecab numa +perl profiling selinux
+IUSE="cjk client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
        +server static static-libs systemtap tcmalloc test yassl"
 
 # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
@@ -81,7 +81,7 @@ COMMON_DEPEND="net-misc/curl
        )
        server? (
                >=app-arch/lz4-0_p131:=
-               mecab? ( app-text/mecab:= )
+               cjk? ( app-text/mecab:= )
                numa? ( sys-process/numactl )
        )
        systemtap? ( >=dev-util/systemtap-1.3:0= )
@@ -372,7 +372,7 @@ multilib_src_configure() {
                mycmakeargs+=(
                        -DWITH_LIBEVENT=system
                        -DWITH_LZ4=system
-                       -DWITH_MECAB=$(usex mecab system OFF)
+                       -DWITH_MECAB=$(usex cjk system OFF)
                        -DWITH_NUMA=$(usex numa ON OFF)
                )