From 51af5f0eb4cddbe6aa7953717873691d77aae9ff Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jul 2019 23:40:16 +0100 Subject: gentoo resync : 11.07.2019 --- dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild') 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 e6c4b2e68967..2985ce7c2c63 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" -- cgit v1.2.3