Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/libmysqlclient/
Date: Mon, 15 Oct 2018 01:18:01
Message-Id: 1539566262.523e5380a19889cae2621beaaaf21d9862faf22d.grknight@gentoo
1 commit: 523e5380a19889cae2621beaaaf21d9862faf22d
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 15 01:17:42 2018 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 15 01:17:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523e5380
7
8 virtual/libmysqlclient: Drop mariadb USE
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 virtual/libmysqlclient/libmysqlclient-18-r1.ebuild | 6 ++----
14 virtual/libmysqlclient/metadata.xml | 3 ---
15 2 files changed, 2 insertions(+), 7 deletions(-)
16
17 diff --git a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
18 index aa6b211f418..8eb093fb8b0 100644
19 --- a/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
20 +++ b/virtual/libmysqlclient/libmysqlclient-18-r1.ebuild
21 @@ -8,8 +8,6 @@ inherit multilib-build
22 DESCRIPTION="Virtual for MySQL client libraries"
23 SLOT="0/18"
24 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
25 -IUSE="mariadb static-libs"
26 +IUSE="static-libs"
27
28 -RDEPEND="
29 -mariadb? ( dev-db/mariadb-connector-c[mysqlcompat,static-libs?,${MULTILIB_USEDEP}] )
30 -!mariadb? ( dev-db/mysql-connector-c:${SLOT}[static-libs?,${MULTILIB_USEDEP}] )"
31 +RDEPEND="dev-db/mysql-connector-c:${SLOT}[static-libs?,${MULTILIB_USEDEP}]"
32
33 diff --git a/virtual/libmysqlclient/metadata.xml b/virtual/libmysqlclient/metadata.xml
34 index b69daca91ae..6bad6e2ed2d 100644
35 --- a/virtual/libmysqlclient/metadata.xml
36 +++ b/virtual/libmysqlclient/metadata.xml
37 @@ -5,9 +5,6 @@
38 <email>mysql-bugs@g.o</email>
39 <name>MySQL</name>
40 </maintainer>
41 - <use>
42 - <flag name="mariadb">Prefer dev-db/mariadb-connector-c to prevent blocks on other packages</flag>
43 - </use>
44 <longdescription>
45 Originally, this package was meant to have providers be switched easily.
46 However, the dependency resolution and rebuilding does not work through a virtual.