From: Brian Evans <grknight@gentoo.org>
Date: Thu, 1 Mar 2018 16:01:17 +0000 (-0500)
Subject: dev-db/myodbc: Fix dependencies that do not work with 5.3.10
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c1208f74321fb98369588e328ec27952f6518c09;p=gentoo.git

dev-db/myodbc: Fix dependencies that do not work with 5.3.10

Closes: https://bugs.gentoo.org/649188
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/dev-db/myodbc/myodbc-5.3.10.ebuild b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
similarity index 97%
rename from dev-db/myodbc/myodbc-5.3.10.ebuild
rename to dev-db/myodbc/myodbc-5.3.10-r1.ebuild
index 9fd6b225fc61..63881efa73e2 100644
--- a/dev-db/myodbc/myodbc-5.3.10.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
@@ -21,13 +21,15 @@ SLOT="${MAJOR}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-# Does not build with mysql-connector-c
+# Does not build with libmariadb
 RDEPEND="
 	dev-db/unixODBC[${MULTILIB_USEDEP}]
 	~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
 	abi_x86_32? (
 		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
 	)
+	!>=dev-db/mariadb-10.2.0[client-libs(+)]
+	!dev-db/mariadb-connector-c[mysqlcompat(-)]
 "
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}