| 1 |
commit: 5195b2ae5d4c7edf3fea92e2b7f441f0160860b6 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 15 19:05:28 2019 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 15 19:05:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5195b2ae |
| 7 |
|
| 8 |
dev-db/mariadb-connector-c: Begin to drop the mysqlcompat USE flag |
| 9 |
|
| 10 |
This library is functionally incompatible and should never have introduced |
| 11 |
this in the first place. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=666750 |
| 14 |
Bug: https://bugs.gentoo.org/668560 |
| 15 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 16 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 17 |
|
| 18 |
.../mariadb-connector-c-3.0.9.ebuild | 21 ++------------------- |
| 19 |
.../mariadb-connector-c-9999.ebuild | 17 +---------------- |
| 20 |
2 files changed, 3 insertions(+), 35 deletions(-) |
| 21 |
|
| 22 |
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 |
| 23 |
index c957edaec2d..854813a44d9 100644 |
| 24 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild |
| 25 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild |
| 26 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/" |
| 27 |
LICENSE="LGPL-2.1" |
| 28 |
|
| 29 |
SLOT="0/3" |
| 30 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
| 31 |
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test" |
| 32 |
|
| 33 |
DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 34 |
virtual/libiconv:=[${MULTILIB_USEDEP}] |
| 35 |
@@ -43,16 +43,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 36 |
) |
| 37 |
) |
| 38 |
" |
| 39 |
-RDEPEND="${DEPEND} |
| 40 |
- mysqlcompat? ( |
| 41 |
- !dev-db/mysql[client-libs(+)] |
| 42 |
- !dev-db/mysql-cluster[client-libs(+)] |
| 43 |
- !dev-db/mariadb[client-libs(+)] |
| 44 |
- !dev-db/mariadb-galera[client-libs(+)] |
| 45 |
- !dev-db/percona-server[client-libs(+)] |
| 46 |
- !dev-db/mysql-connector-c ) |
| 47 |
- !>=dev-db/mariadb-10.2.0[client-libs(+)] |
| 48 |
- " |
| 49 |
+RDEPEND="${DEPEND}" |
| 50 |
PATCHES=( |
| 51 |
"${FILESDIR}"/gentoo-layout-3.0.patch |
| 52 |
"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch |
| 53 |
@@ -86,18 +77,10 @@ multilib_src_compile() { |
| 54 |
|
| 55 |
multilib_src_install() { |
| 56 |
cmake-utils_src_install |
| 57 |
- if use mysqlcompat ; then |
| 58 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
| 59 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
| 60 |
- fi |
| 61 |
} |
| 62 |
|
| 63 |
multilib_src_install_all() { |
| 64 |
if ! use static-libs ; then |
| 65 |
find "${D}" -name "*.a" -delete || die |
| 66 |
fi |
| 67 |
- if use mysqlcompat ; then |
| 68 |
- dosym mariadb_config /usr/bin/mysql_config |
| 69 |
- dosym mariadb /usr/include/mysql |
| 70 |
- fi |
| 71 |
} |
| 72 |
|
| 73 |
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 74 |
index c957edaec2d..e6c4b2e6896 100644 |
| 75 |
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 76 |
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild |
| 77 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/" |
| 78 |
LICENSE="LGPL-2.1" |
| 79 |
|
| 80 |
SLOT="0/3" |
| 81 |
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" |
| 82 |
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test" |
| 83 |
|
| 84 |
DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 85 |
virtual/libiconv:=[${MULTILIB_USEDEP}] |
| 86 |
@@ -44,13 +44,6 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] |
| 87 |
) |
| 88 |
" |
| 89 |
RDEPEND="${DEPEND} |
| 90 |
- mysqlcompat? ( |
| 91 |
- !dev-db/mysql[client-libs(+)] |
| 92 |
- !dev-db/mysql-cluster[client-libs(+)] |
| 93 |
- !dev-db/mariadb[client-libs(+)] |
| 94 |
- !dev-db/mariadb-galera[client-libs(+)] |
| 95 |
- !dev-db/percona-server[client-libs(+)] |
| 96 |
- !dev-db/mysql-connector-c ) |
| 97 |
!>=dev-db/mariadb-10.2.0[client-libs(+)] |
| 98 |
" |
| 99 |
PATCHES=( |
| 100 |
@@ -86,18 +79,10 @@ multilib_src_compile() { |
| 101 |
|
| 102 |
multilib_src_install() { |
| 103 |
cmake-utils_src_install |
| 104 |
- if use mysqlcompat ; then |
| 105 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 |
| 106 |
- dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so |
| 107 |
- fi |
| 108 |
} |
| 109 |
|
| 110 |
multilib_src_install_all() { |
| 111 |
if ! use static-libs ; then |
| 112 |
find "${D}" -name "*.a" -delete || die |
| 113 |
fi |
| 114 |
- if use mysqlcompat ; then |
| 115 |
- dosym mariadb_config /usr/bin/mysql_config |
| 116 |
- dosym mariadb /usr/include/mysql |
| 117 |
- fi |
| 118 |
} |
Archives