[gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/, sys-libs/ldb/files/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     af6790d9b83c1bf18bd6adaa32b6a2b68b1a524f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 19:35:06 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 18:12:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6790d9

sys-libs/ldb: fix tevent detection

Closes: https://bugs.gentoo.org/590026

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch | 12 ++++++++++++
 sys-libs/ldb/ldb-2.3.4.ebuild                            |  1 +
 sys-libs/ldb/ldb-2.4.4.ebuild                            |  1 +
 sys-libs/ldb/ldb-2.5.2.ebuild                            |  1 +
 4 files changed, 15 insertions(+)

diff --git a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
new file mode 100644
index 000000000000..4578435064b0
--- /dev/null
+++ b/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
@@ -0,0 +1,12 @@
+--- ldb-1.3.6/lib/tevent/wscript
++++ ldb-1.3.6/lib/tevent/wscript
+@@ -34,8 +34,7 @@
+         if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION,
+                                      onlyif='talloc', implied_deps='replace talloc'):
+             conf.define('USING_SYSTEM_TEVENT', 1)
+-            if not conf.env.disable_python and \
+-                conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION):
++            if not conf.env.disable_python:
+                 conf.define('USING_SYSTEM_PYTEVENT', 1)
+ 
+     if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'):

diff --git a/sys-libs/ldb/ldb-2.3.4.ebuild b/sys-libs/ldb/ldb-2.3.4.ebuild
index 85ca63eb5be2..0730a2c090be 100644
--- a/sys-libs/ldb/ldb-2.3.4.ebuild
+++ b/sys-libs/ldb/ldb-2.3.4.ebuild
@@ -53,6 +53,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {

diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild
index 54d9456e59cd..05b4d0c727a9 100644
--- a/sys-libs/ldb/ldb-2.4.4.ebuild
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {

diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index bfd7de97a612..c723951c9d16 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-optional_packages.patch
 	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
 	"${FILESDIR}"/${PN}-2.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
 )
 
 pkg_setup() {