From: Brian Evans <grknight@gentoo.org>
Date: Fri, 18 May 2018 13:14:41 +0000 (-0400)
Subject: dev-db/mariadb-galera: Revbump to fix collision with mariadb-connector-c
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3cc282abcc4e3cc91020ae4246fe2fa9335a1b46;p=gentoo.git

dev-db/mariadb-galera: Revbump to fix collision with mariadb-connector-c

Closes: https://bugs.gentoo.org/655980
Package-Manager: Portage-2.3.36, Repoman-2.3.9
---

diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.35.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
similarity index 99%
rename from dev-db/mariadb-galera/mariadb-galera-10.0.35.ebuild
rename to dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
index 837885821034..b0a8b98c8e94 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.35.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.35-r1.ebuild
@@ -238,7 +238,10 @@ src_prepare() {
 		done
 	fi
 
-	# Don't build Mroonga
+	# Collides with mariadb-connector-c bug 655980
+	disable_plugin auth_dialog
+
+	# Don't build Mroonga or example
 	disable_engine mroonga
 	disable_engine example