From: Brian Evans <grknight@gentoo.org>
Date: Mon, 21 Jan 2019 19:57:29 +0000 (-0500)
Subject: dev-db/mariadb: Add option to avoid collision
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dcdd05bca276d4369bd0f1935daba3c48c7bcda;p=gentoo.git

dev-db/mariadb: Add option to avoid collision

Closes: https://bugs.gentoo.org/675964
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight@gentoo.org>
---

diff --git a/dev-db/mariadb/mariadb-10.2.20.ebuild b/dev-db/mariadb/mariadb-10.2.20.ebuild
index 6a7484aab060..d5c662d9c0de 100644
--- a/dev-db/mariadb/mariadb-10.2.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -361,6 +361,7 @@ src_configure(){
 		-DCLIENT_PLUGIN_DIALOG=OFF
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=OFF
 		-DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC
+		-DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=OFF
 	)
 	if use test ; then
 		mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mariadb/mysql-test )