commit: 5195b2ae5d4c7edf3fea92e2b7f441f0160860b6 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Fri Mar 15 19:05:28 2019 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Fri Mar 15 19:05:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5195b2ae
dev-db/mariadb-connector-c: Begin to drop the mysqlcompat USE flag This library is functionally incompatible and should never have introduced this in the first place. Bug: https://bugs.gentoo.org/show_bug.cgi?id=666750 Bug: https://bugs.gentoo.org/668560 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> .../mariadb-connector-c-3.0.9.ebuild | 21 ++------------------- .../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 c957edaec2d..854813a44d9 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 c957edaec2d..e6c4b2e6896 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 }
