gentoo auto-resync : 09:10:2024 - 04:26:32

3 files changed, 2 insertions, 177 deletions

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 8251ecacf218..17c901fe93e0 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -7,11 +7,9 @@ AUX ldb-2.9.0-optional_packages.patch 1568 BLAKE2B 723a36ca839e085dd264c9a00895f
 DIST ldb-2.7.2.tar.gz 1737849 BLAKE2B 0aa70d8a4827448e41874db97130f18d17683c800b8f03f9940b4852e24fd6092052f6e70aae845c587939b9be16c80d7a920f6b874a746f923c4513b73d2afc SHA512 beb2cd83a8f128713e0b43ec6e80d0f87ab0883c6c8f0cefbbf5bf49e29dfa327b245b78467d1906917cb5f3f11e01cb76cc6bcca58a47c5deac4f05c2e9dfbd
 DIST ldb-2.8.0.tar.gz 1747616 BLAKE2B 19fd4cc0893ca36e7aa65eb605b050e3faeb7add6c00a2dfd8415334c58b7dc644ffaad41c24fe358b39292aaa581e3231e6b8161b03c073e903cdae16050ac5 SHA512 b6f289af3137e02a8e3ee0588bc300d1756b8980558e0b3a3a9eee4449100ccd42ed873187dbdb334e7e7834a8bff8478cd4f20588d4ca834d9ea14c0ee2c2f9
 DIST ldb-2.8.1.tar.gz 1745790 BLAKE2B 7b0fb70b510da85e9b1e67e9485ed9caf7635d4709e855f46243746f3a65cb9ccc1958f151868261b4aeb4efc6e6aa0054e19cf8f43b8bbebd7d41630af29cc7 SHA512 37e53cee1361303398cb0366760f08f2f306ed08c98354f5eb9ab2330d67b866ed0af07b252c204f77bbb260fe911337f3585015305b9d5e0ab2fcea6761b164
-DIST ldb-2.9.0.tar.gz 1757213 BLAKE2B 6d24ced193a64e723da65f26a055b97e5c5645b0ce17263073db997e9310509c788e7739136b70d099d171d1d0cbbe43bb43ea50746d876d74a1be06fa2fc36f SHA512 b5cfbbcb2c35d6830bf1a7c85e1d4363728ae474504441add54c4c8569316b26aedbf6fb9f561ec4f187eb5a847ac76af07396e38d00e6f7632b63e02d7b64a1
 DIST ldb-2.9.1.tar.gz 1752372 BLAKE2B dcff2bf54a31c787504eb206453f46f3ab5b7e106a9b0978ee3f2f3d5ef267d60cb0c21864bb78c31f71b815051757bd4becf6379ea26d32e151489e09835569 SHA512 a7384d5b88b1b2edc1ac40f38f74b8b2eb403610d158c579a862007801586a4ad1ba11019737ecad8a83e8f2d1ae7ae16ec7e92c58f60feb2d6fed84c4212265
 EBUILD ldb-2.7.2.ebuild 4799 BLAKE2B da7675c89eea652d2cc04d10071ec5aa7b4b262386b69bc65a281cff0dbf684887e20482846d5eb3cf1f99216a48b9496da2d98b396620fa90cc733395fb28e9 SHA512 8ec94287a95b5d4cccde368fc824f311914a64f5cda5548045373e6c01491e3ca1c90fa98240ca73274e79f5cb9e48e759882cccbd3f68d1934b70c6138be2e6
 EBUILD ldb-2.8.0.ebuild 4800 BLAKE2B 7643935dc7e272c6a4a54d603258fed4ab5b7d836fe4914c6d9a438ed4466c17a204bfd5c550f62f2a3dde31cc794019ad37e21a026848541cea60fb7774d18d SHA512 811ec6c2610d32442689c0711e6a76a1d1ad95f6a20553fd8b119d95b977a3c1b859248235ba241edeed067cb7f94664bbd629e6b8d1d510e63f93bb29fef9c6
-EBUILD ldb-2.8.1.ebuild 4806 BLAKE2B df6c86d5128495cc3a8948da9ff4eabe3d092001da9f86f3332ca148fdd5db11630aa6d1e236f72d16e7abecd576c2a73835bece3e52d5d8bf06203d085a7746 SHA512 1d9115dec2e67554a49b5921942a461a6c66c024322ac6f4e28c2a366cb3b1a284d051356a903d607571932d124f1ee980794bed57dc86811372adfed721208f
-EBUILD ldb-2.9.0.ebuild 4770 BLAKE2B 76dd5945bb42e5f3c92c7b709ba594ea168efc9b5a244cd06b27743dcde330df98e7f456874e0735ac2b9256787ab68db48badeadc4b855307b229bce449fe98 SHA512 5037421477b1d46f58bd259a45846607f192f650f47a3e60340c8e61215eff2d839fb70e94ddb9264371c68681a54302612f5e96b66435ac23a7205b68b6acec
+EBUILD ldb-2.8.1.ebuild 4803 BLAKE2B e61912fc36b4fc115bd847fa31331ec4c902fea23f11d950ca206ba28af9087375af8db403e4cfd251ee1aef66d4fd701365dca3a17d7e4243e4ca720e875330 SHA512 8e9bcaf7677fd606edffee261b6c9d0dc9ed0f54c4e06c0884749d989100fa99cdee28fc98180363ab0d0bc179fe3071f992aa47b58d7af2f7677c876caa6112
 EBUILD ldb-2.9.1.ebuild 4770 BLAKE2B 2e2d38b6aa04ddc5c5707a2b3b1da41833e374fdcffd9f86c9c83431f81f224f98eddd4647962a7a1c738c9bfe449e942c08b526821419006e1f30a9c01cc606 SHA512 5575dc7faf9846cf07d549e77f5187cc8f83ceb5e30086c0b0bbc0056a8f91f5e7d74d4f088bc2536b2fb9d93665e79a5a50b917bac5bbe171ea11f9fe872bbf
 MISC metadata.xml 446 BLAKE2B 4ee524096a438d9cbf73faea3207715f6570b763715578b74289732677c1a159955783b3d81beb775612f15f1a58f10fe9ee68406bb22484faddabb302680620 SHA512 beffe8e4143ba8a595dabfe3e9c0ed7e1093b4e92dded1a6d7dd27e2bde7928d26e95ba048e421ab17d506ede92675764732388aa8edb454cd7753a0e0094c49
diff --git a/sys-libs/ldb/ldb-2.8.1.ebuild b/sys-libs/ldb/ldb-2.8.1.ebuild
index dadb2bc1bb2f..194eed5b0e83 100644
--- a/sys-libs/ldb/ldb-2.8.1.ebuild
+++ b/sys-libs/ldb/ldb-2.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="doc ldap +lmdb python test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-libs/ldb/ldb-2.9.0.ebuild b/sys-libs/ldb/ldb-2.9.0.ebuild
deleted file mode 100644
index 06d1b7fd2e03..000000000000
--- a/sys-libs/ldb/ldb-2.9.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( lmdb )"
-
-RESTRICT="!test? ( test )"
-
-TALLOC_VERSION="2.4.2"
-TDB_VERSION="1.4.10"
-TEVENT_VERSION="0.16.1"
-
-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-text/doxygen )
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.0-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
-
-	if use test && ! use python ; then
-		# We want to be able to run tests w/o Python as it makes
-		# automated testing much easier (as USE=python isn't default-enabled).
-		truncate -s0 tests/python/{repack,index,api,crash}.py || die
-	fi
-
-	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
-}