gentoo auto-resync : 03:02:2023 - 15:10:30

5 files changed, 175 insertions, 6 deletions

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 90c61d74a77f..02a8be1c1fda 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,7 +5,9 @@ AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f
 DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
 DIST ldb-2.6.1.tar.gz 1740497 BLAKE2B 3e831e4689297f3415928507c4c498cba937df104f1e94792a66691a2c0fefa641989badc1d89b0030d164eff5fdb0b3c75646f12961808e37c54d741f745a76 SHA512 7b920c5ec1252446584caeedf9ec18aeb5c1b689c2ecc8ae65c0d5b64bf0bca0cbaa887c07fca90b36b16904e3a08534fc513fec6bac288e80f94d2980c36211
-EBUILD ldb-2.4.4.ebuild 3060 BLAKE2B 657e00307bbb27330b30917f7f95686661fe46c7ea4ada40fe6fa7d8a41c3fe065111af53b43ca65d14ae3cc12cd0eace142aca17e82327dee36cc2b92449900 SHA512 57686f40bb8503b33252f8c861d4d0e2ec4a1023fe30ceeb5bbd84f5b36e6ec6091d003bf82e2dc2385e8ad8d8d8019f7aebe4f53e68ef848a0d090d790e3f12
-EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B 9b2c7f966fa8ff7d5400129ccb5f9b587782c577e0535e83bd1c89be84e4e2af8c8b728211e0f490d3e818d33b87aada2cad39f1f46ce858ba69426e7ff68051 SHA512 66199f97bae68b2867ae6b8f3e62f8fabf461ee070eb1826ad8fed7e15e8ecfb314ca82eacaf1e3185dadc966a6a71f863ade6d48567ffcfc6af5ee091a1ced4
-EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B e1ed9561e1d8b33c7766c4d91b25b1fd34bd71b4ac292902895264e41a80d6bb3d922baec802aec64a88422d4fadf1a4657c0b55f096de6e359586a1983bbc18 SHA512 46583dbf9c1efa8081ffa5af6217fcb028af83ca312c907523cf02e2e9397a85acdb43c9348a6f53c3e750d89a9fe0f179cc75e159e0b8c4d56119ddd8c9e5d3
+DIST ldb-2.7.0.tar.gz 1736995 BLAKE2B e06b8934a8b8703e861ed8d89f4ee5151d0529b76d08e4d7b24f08860a95669e1749edb3bd90649dbe9104101d03625604d613d25968d9d1d253b3921f5ca575 SHA512 5b730595e8a5830889eb0c0374a695ff228a14bcfffbed494b01d9642b626a7b82a5d73f182435d95cd9d52b3744cb3a5c190d6242eda8843a1c24203c56d57e
+EBUILD ldb-2.4.4.ebuild 3060 BLAKE2B 2b550dd8180377100888dc6268f9391b111ab81ff674fb683b78ee862b1ff4db222e034436d3e8f4d66a6bb602911ddb9369e9e9d26add4e666dc0878cfcc598 SHA512 8e32a04d8b3b9af962ce5e599cb3e642392a689cd49f615cf307f3047224fdbb64e70ab5831e9b0b5e5df6aebb303154e07fcf771749608695c9edd7985fe4a6
+EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B 873594862038fdcc1adeb4a1c4639617be53a4867a4e2eecc97abd44e9c6cec5f483201061846e7598655dcc15e623cb2359a6272a84b2342ba5da8dbdae9872 SHA512 c6ff75bffe65695f653f2d443cc042cad6e23a2786d222fb75b60228c82e4452824f16d3dae62ea257f841c8189117b1a1c279286a51c2d3d5ed1b8402b4cc29
+EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B bea9509288cc2fb92531767eca821020bf357d50602fe4f09d2d5ef7d19483fbc045c65870cd0b2805b8b4a846b4ddd03fc34017b866076e97b015917fa631a1 SHA512 beb843b79d14a544ead57efc728ee99c52189dbdc1d0daac85aa6bfb4b36625ac1fe27d111054ede947e9407d052dced26b3f07fd8dc58725b105e390aa93b44
+EBUILD ldb-2.7.0.ebuild 4544 BLAKE2B 9540b6beb14502300689bb6286820f1cdbfe8e14003b6c5f43868eaf2ed2f92825c127eb3eb5459508bece28c5b8fa15b83703665fa3dc25531a7046f2aff6a7 SHA512 41e4dcfa7cdaf65660b9e9755f72e27194736cdd470b56885f926d457677d07d038b7edd958758de2f04bc467b21fe5821021d2602f45a7825c82085dbc0f860
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.4.4.ebuild b/sys-libs/ldb/ldb-2.4.4.ebuild
index 7d945da07f99..e05995195978 100644
--- a/sys-libs/ldb/ldb-2.4.4.ebuild
+++ b/sys-libs/ldb/ldb-2.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.5.2.ebuild b/sys-libs/ldb/ldb-2.5.2.ebuild
index ae9f1d7d82cd..01d3f31d7c2d 100644
--- a/sys-libs/ldb/ldb-2.5.2.ebuild
+++ b/sys-libs/ldb/ldb-2.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.6.1.ebuild b/sys-libs/ldb/ldb-2.6.1.ebuild
index a56119ab7796..318abf8bb390 100644
--- a/sys-libs/ldb/ldb-2.6.1.ebuild
+++ b/sys-libs/ldb/ldb-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
 inherit python-single-r1 waf-utils multilib-minimal
 
diff --git a/sys-libs/ldb/ldb-2.7.0.ebuild b/sys-libs/ldb/ldb-2.7.0.ebuild
new file mode 100644
index 000000000000..63a61531e296
--- /dev/null
+++ b/sys-libs/ldb/ldb-2.7.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="LDAP-like embedded database"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc ldap +lmdb python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( lmdb python )"
+
+RESTRICT="!test? ( test )"
+
+TALLOC_VERSION="2.4.0"
+TDB_VERSION="1.4.8"
+TEVENT_VERSION="0.14.0"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap:= )
+	lmdb? ( >=dev-db/lmdb-0.9.16:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	virtual/libcrypt
+	test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] )
+"
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+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.4.2-skip-32bit-time_t-tests.patch
+	"${FILESDIR}"/${PN}-2.5.2-skip-waf-tevent-check.patch
+)
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+	export PYTHONHASHSEED=1
+
+	# waf requires a python interpreter
+	python-single-r1_pkg_setup
+}
+
+check_samba_dep_versions() {
+	actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die)
+	if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then
+		eerror "Source talloc version: ${TALLOC_VERSION}"
+		eerror "Ebuild talloc version: ${actual_talloc_version}"
+		die "Ebuild needs to fix TALLOC_VERSION!"
+	fi
+
+	actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die)
+	if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then
+		eerror "Source tdb version: ${TDB_VERSION}"
+		eerror "Ebuild tdb version: ${actual_tdb_version}"
+		die "Ebuild needs to fix TDB_VERSION!"
+	fi
+
+	actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die)
+	if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then
+		eerror "Source tevent version: ${TEVENT_VERSION}"
+		eerror "Ebuild tevent version: ${actual_tevent_version}"
+		die "Ebuild needs to fix TEVENT_VERSION!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	check_samba_dep_versions
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# When specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+
+	# We "use" bundled cmocka when we're not running tests as we're
+	# not using it anyway. Means we avoid making users install it for
+	# no reason. bug #802531
+	if ! use test; then
+		bundled_libs="cmocka,${bundled_libs}"
+	fi
+
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		$(usex lmdb '' --without-ldb-lmdb)
+		--disable-rpath
+		--disable-rpath-install
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+	)
+
+	if ! use python || ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	fi
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:${PATH}:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/.
+	fi
+
+	# bug #726454
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}