[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/, dev-libs/apr-util/files/

[Thomas Deutschmann]

commit:     b5c797685526e3f4f99ae9a4384ec2a0bc385702
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 10:28:31 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 10:29:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c79768

dev-libs/apr-util: improve mysql-8 compatibility

Don't call my_init() which was removed in mysql-8.0.2+.

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...{apr-util-1.6.1-r4.ebuild => apr-util-1.6.1-r5.ebuild} |  5 +++--
 dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch | 15 +++++++++++++++
 ...-1.6.1-my_boold.patch => apr-util-1.6.1-my_bool.patch} |  0
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild 
b/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
similarity index 96%
rename from dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
rename to dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
index e73f88b5cf6..a30d4b805b2 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
        ldap? ( =net-nds/openldap-2* )
        mysql? ( || (
                dev-db/mariadb-connector-c
-               dev-db/mysql-connector-c
+               >=dev-db/mysql-connector-c-8
        ) )
        nss? ( dev-libs/nss )
        odbc? ( dev-db/unixODBC )
@@ -50,7 +50,8 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
        "${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
        "${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
-       "${FILESDIR}"/${PN}-1.6.1-my_boold.patch
+       "${FILESDIR}"/${PN}-1.6.1-my_bool.patch
+       "${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch 
b/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch
new file mode 100644
index 00000000000..741ca65ca32
--- /dev/null
+++ b/dev-libs/apr-util/files/apr-util-1.6.1-drop-my_init.patch
@@ -0,0 +1,15 @@
+Was finally removed in >=mysql-8.0.2
+
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1262,9 +1262,6 @@ static apr_status_t thread_end(void *data)
+ 
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
+-#if MYSQL_VERSION_ID < 100000
+-    my_init();
+-#endif
+     mysql_thread_init();
+ 
+     /* FIXME: this is a guess; find out what it really does */
+ 

diff --git a/dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch 
b/dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch
similarity index 100%
rename from dev-libs/apr-util/files/apr-util-1.6.1-my_boold.patch
rename to dev-libs/apr-util/files/apr-util-1.6.1-my_bool.patch