From: Brian Evans <grknight@gentoo.org>
Date: Mon, 15 Oct 2018 01:17:42 +0000 (-0400)
Subject: virtual/libmysqlclient: Drop mariadb USE
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=523e5380a19889cae2621beaaaf21d9862faf22d;p=gentoo.git

virtual/libmysqlclient: Drop mariadb USE

Signed-off-by: Brian Evans <grknight@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
---

diff --git a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
index aa6b211f418b..8eb093fb8b05 100644
--- a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
+++ b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
@@ -8,8 +8,6 @@ inherit multilib-build
 DESCRIPTION="Virtual for MySQL client libraries"
 SLOT="0/18"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="mariadb static-libs"
+IUSE="static-libs"
 
-RDEPEND="
-mariadb? ( dev-db/mariadb-connector-c[mysqlcompat,static-libs?,${MULTILIB_USEDEP}] )
-!mariadb? ( dev-db/mysql-connector-c:${SLOT}[static-libs?,${MULTILIB_USEDEP}] )"
+RDEPEND="dev-db/mysql-connector-c:${SLOT}[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/virtual/libmysqlclient/metadata.xml b/virtual/libmysqlclient/metadata.xml
index b69daca91ae7..6bad6e2ed2d1 100644
--- a/virtual/libmysqlclient/metadata.xml
+++ b/virtual/libmysqlclient/metadata.xml
@@ -5,9 +5,6 @@
     <email>mysql-bugs@gentoo.org</email>
     <name>MySQL</name>
   </maintainer>
-  <use>
-    <flag name="mariadb">Prefer dev-db/mariadb-connector-c to prevent blocks on other packages</flag>
-  </use>
   <longdescription>
     Originally, this package was meant to have providers be switched easily.
     However, the dependency resolution and rebuilding does not work through a virtual.