commit: 2e36f9b20495c5c6c7df618c82b1aba9901f3479
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 16:29:50 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 16:29:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e36f9b2
dev-db/mariadb-connector-c: Drop client-libs USE requirement on live
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index e6c4b2e6896..2985ce7c2c6 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
VCS_INHERIT=""
if [[ "${PV}" == 9999 ]] ; then
@@ -43,9 +43,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
)
"
-RDEPEND="${DEPEND}
- !>=dev-db/mariadb-10.2.0[client-libs(+)]
- "
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
@@ -63,7 +61,7 @@ multilib_src_configure() {
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-DWITH_CURL=$(usex curl ON OFF)
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos
DYNAMIC OFF)
- -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+ -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"