diff options
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild | 21 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 17 |
2 files changed, 3 insertions, 35 deletions
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild index c957edaec2de..854813a44d91 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/" LICENSE="LGPL-2.1" SLOT="0/3" -IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" +IUSE="+curl gnutls kerberos libressl +ssl static-libs test" DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/libiconv:=[${MULTILIB_USEDEP}] @@ -43,16 +43,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] ) ) " -RDEPEND="${DEPEND} - mysqlcompat? ( - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - !dev-db/mysql-connector-c ) - !>=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 @@ -86,18 +77,10 @@ multilib_src_compile() { multilib_src_install() { cmake-utils_src_install - if use mysqlcompat ; then - dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 - dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so - fi } multilib_src_install_all() { if ! use static-libs ; then find "${D}" -name "*.a" -delete || die fi - if use mysqlcompat ; then - dosym mariadb_config /usr/bin/mysql_config - dosym mariadb /usr/include/mysql - fi } 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 c957edaec2de..e6c4b2e68967 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/" LICENSE="LGPL-2.1" SLOT="0/3" -IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" +IUSE="+curl gnutls kerberos libressl +ssl static-libs test" DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] virtual/libiconv:=[${MULTILIB_USEDEP}] @@ -44,13 +44,6 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND} - mysqlcompat? ( - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)] " PATCHES=( @@ -86,18 +79,10 @@ multilib_src_compile() { multilib_src_install() { cmake-utils_src_install - if use mysqlcompat ; then - dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 - dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so - fi } multilib_src_install_all() { if ! use static-libs ; then find "${D}" -name "*.a" -delete || die fi - if use mysqlcompat ; then - dosym mariadb_config /usr/bin/mysql_config - dosym mariadb /usr/include/mysql - fi } |