[gentoo-commits] repo/gentoo:master commit in: eclass/

[Brian Evans]

commit:     f9e06572ce465a8c0125b9297d4689763d80edb5
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 13:42:55 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 13:44:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e06572

mysql-multilib.eclass: Adjust REQUIRED_USE for GLEP73

 eclass/mysql-multilib.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 570deadd259..c994e51d7a0 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -227,9 +227,9 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; 
then
        # 5.5.33 and 10.0.5 add TokuDB. Authors strongly recommend jemalloc or 
perfomance suffers
        mysql_version_is_at_least "10.0.5" && IUSE="${IUSE} odbc xml"
        if [[ ${HAS_TOOLS_PATCH} ]] ; then
-               REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc )"
+               REQUIRED_USE="${REQUIRED_USE} !server? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc !tcmalloc )"
        else
-               REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc )"
+               REQUIRED_USE="${REQUIRED_USE} minimal? ( !oqgraph !sphinx ) 
tokudb? ( jemalloc !tcmalloc )"
        fi
        # MariaDB 10.1 introduces InnoDB/XtraDB compression with external 
libraries
        # Choices are bzip2, lz4, lzma, lzo.  bzip2 and lzma enabled by default 
as they are system libraries