gentoo auto-resync : 30:09:2022 - 09:24:13

23 files changed, 172 insertions, 794 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 37a3f7a87121..5b609c6b09c9 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index c520ed6d2e24..738d889b2d22 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -2,24 +2,16 @@ AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e
 AUX ldb-1.5.2-optional_packages.patch 1441 BLAKE2B 0b9413cd9690aae2b2eb26f097d2509c0bbe0fc59f81bab22add57ffe0c603a8fb0c9be038d06693dcbb1d3817d4ad97a5931120b18bd9783efaac599fe0ccbc SHA512 2f313c3377385279ca3da6db21d926df0559d971e1fd42f8cce57b4001078c3817f472b85088a1f3b0e5ddcdfbbfd943199485d6e4a00412f62c883c6ea04afd
 AUX ldb-2.4.2-skip-32bit-time_t-tests.patch 1308 BLAKE2B 1ff687160b92c5395c7838ade8af32ba77637a2b18153d146b9e1496f96ec9c411cc5e5f9721a8dea1730118e6574a091ee7fd1edca1830cc54c5d4fddb007ab SHA512 27a35123cb9a1f6e39b88c91de8241ecfc0f0ed125a235ba26b95767dc3121d176b267ba97b1579e5b68cfb9e3879f40326f0163a31e311f01a1b2eb7751caf4
 AUX ldb-2.5.2-skip-waf-tevent-check.patch 606 BLAKE2B 9cfe1afd1adfca20e1fcdead2f2a60f52a64f181b85c227be6cf9c9373a64528afbe4e9db1970e8316d5bddf76ba9395a75b194f27bcf25eb4d2e7695c5530eb SHA512 19028447cbde09a425f1a07fe2d9a2a6f16cada1785e6e9684a8b573db5705b6694a29cd6f5480047360920562fcc654fc10faad39e73c565f7d475558cb57c8
-DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e
 DIST ldb-2.3.3.tar.gz 1719542 BLAKE2B 2a5cfe3ddac2054d167c2857e0cd92e0f88d2c196f9285c029b2a525d781025a956a296bd6d793b65f848188cf7adf70f99542999061a85be473b3fc3b2856f1 SHA512 ffb50208fe971afd544a431b79905ec8fce67d78d20c3fcfb8345a56f3b278fb664bc48079d7239a8ca5b70aae8b32076b6007cb63e080cd536e9fe458efeccd
 DIST ldb-2.3.4.tar.gz 1721000 BLAKE2B be54c0bffdc910029b5e324578ed2f1e0350dfd19202749cb0c05dff20f3786d0cb612f18ef6f9534c7e34e94c0a283adb3dd935ca3c3252aba0290faca590ef SHA512 e0128a0e36411424fbb092ce24f503f530d0bc75dc98f31e0f457df34c3c2c01c23456d55722eca9965ff89f4dec5cde36c1dabbfaf3ddee536ff4d1dedb1c1d
-DIST ldb-2.4.1.tar.gz 1719769 BLAKE2B 868d3dcc51bd8272d99f2335ed1af2e37506b6a175254f1aca37f758488ba0997e37419a7d8c81def77698128307df97de26d4807ac78c34088f7a623f8d9e68 SHA512 14ab5397d28c369142b2ccf55a2ab4e678a3fe6e018541cfce46241f8226400bc169360bbef254fae4410a6e15024ae986f02298d3d324e3d3a8b88801bf76d7
 DIST ldb-2.4.2.tar.gz 1720169 BLAKE2B d144218bf62dde57560df8b8a641e9f58bee001fdfa7b1527d9eb9a1a55e428662db81912173cbcdb9f993c0b316faab7d758a4878beeff1daadd487e9aa44a9 SHA512 77705ad284eed9105c9aba0459d2e48cd66ca19b657a55f7513e10281dd2e96540d24d1c8df53adc84109a918900687dc75b635cda05c4e788424ed71b5ff989
-DIST ldb-2.4.3.tar.gz 1729139 BLAKE2B 90dbb41ec6db19c562f275cdbf8fe273763633ca6a86d5a2f2428fc2063f5f88fcae23543f588f4df16ae5315e597145eecce3d87b616f8a27c0df91ab8bf81c SHA512 681433c5bbd1cc1fcddc35403c538f1511a83a7555b9113ac9247c6a22718ad6d7b21a86def50e6b5df91c9c8e04f2c45ffd264cd0ad1a715dc4b85681569622
 DIST ldb-2.4.4.tar.gz 1726595 BLAKE2B c01440e7032dbd3f7b735cb8d2078d7e1dbb56370bd1defe5f170eff006d3979daa654698e6e046c0583288dacd2cda9a5cde249fd6382db52c4aadb83f55e34 SHA512 2e4c762525eee9db40083b21e2a23f9cdfad5d2969cc628b3ea5414f9ec1be2c12d0aa65137cd8d8a5395c0414166ba14fc3dd57d53c533596762d80b9c561f4
-DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462ccc54a7b147c70c3a9eb073dc9e914d1906ab914a9ddd9b9aa0e7d177ef3ecb4c0b506f5417db931b017849 SHA512 f16a235f1409e06266c51735ac645cf2708d31dd731ee7b95d6778498b115f4252b0a528952e620767d1616a4e1e7c5f2cdc69f3fa32d79288cf14da2f52a010
-DIST ldb-2.5.1.tar.gz 1736209 BLAKE2B f06df9878ca664a456859464895e91c21da55c340e6dc94dc1bae22002e1c93ce9c7c87e3435b362e01e7d3d407d4968a529445d465a3d37ecf95f969866b40b SHA512 679ad695d4467a38e6cb87ba2b7d61049a42c59792b39f0a40256456ac673849adf58dc0759a89be982b80bb4a0834d34b51779424f7b997a53ea95f02f410ad
 DIST ldb-2.5.2.tar.gz 1730347 BLAKE2B a0d3a9ae02f79c27b396314b804195ecd37b8bcd843fb94f9813a69fb15773db94ed2210f4102e395333562c2dccebabde1c2dcc0c2fceac97dfa31b2ad97e3d SHA512 02ae1246f99d9b6d6b33c5030488aa46c6abb535b4da4b13799a62b49d32c490b7c088ef41c0bc5a1b2f7263c680faceb8033827834cb6f66916adcdb5be421c
-EBUILD ldb-2.3.2-r1.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
+DIST ldb-2.6.1.tar.gz 1740497 BLAKE2B 3e831e4689297f3415928507c4c498cba937df104f1e94792a66691a2c0fefa641989badc1d89b0030d164eff5fdb0b3c75646f12961808e37c54d741f745a76 SHA512 7b920c5ec1252446584caeedf9ec18aeb5c1b689c2ecc8ae65c0d5b64bf0bca0cbaa887c07fca90b36b16904e3a08534fc513fec6bac288e80f94d2980c36211
 EBUILD ldb-2.3.3.ebuild 2942 BLAKE2B d2495240018b7ecece8c88092c30ea64f411ea0f073f0ff2404ca6184fe931ada8342ea3beffd710fb0d3c137174cc01fba37d73d7884ad11edba84855f2ae08 SHA512 8711a2758689c818b66af5548af9881cf217839d5ea951cbcdbc83531ec602a9b39e1d2b12e8452e60691f09ef4e9db0d0d639e7d4a45d16cc7e75db583c714b
 EBUILD ldb-2.3.4.ebuild 3010 BLAKE2B 632921f7638af2e4b226b67daf4a8129aa939261e1f2dd9000b86be4027a2e415b532b26b1a6356c5da0d2e89eb54617e218e7aba768fab8815d2829660cf29f SHA512 23a97f3a216f9059da3e0181d5c30bd2409675ac0d18a099d6e3b1a8dacba1e9733ef33d0b7aafadd201621783adf4df8ccb6eb5206b61604c11ca6942d2cb43
-EBUILD ldb-2.4.1-r1.ebuild 2943 BLAKE2B e96f5909024e90dd48096bd1a80d123460cd86c6a1743372992cdab7ed758f0759f889f558ce999cd493b625a231f8185852e18cf678f086bc221a61f895e887 SHA512 60ffaadddc5007e6c3aa8cbad369b20e5691b26ed163e747196cc7c1fb40ee74477ea00e022cfd94ff69eb9c911aaa51945d793913aa3056321b8026bd38bb66
 EBUILD ldb-2.4.2-r1.ebuild 3000 BLAKE2B b792c10c41f0f6aa6e05ee45fc59bfb88c7bdec2a3e6c191a374b387e9b4d169b9179fcf698e8d0856b4335dff27741e1d6873a013f298faf3e73889a7210671 SHA512 a9b6fe64a246d67c6193a2d14377a479a4dca9c851b9c183984c217dcfb32a0a5e15bf32ba5f373eb6aa2c4d106c2403f11c39123685ddd001c93072b6cb3e7b
-EBUILD ldb-2.4.3.ebuild 3007 BLAKE2B 543d57e1e3e50a57fdde0a15003fbd04990b16300df7e38b0be8021549f57e2bbfc30417a81b8519ca47d236cfbf3be3bf10d8dbeeff2b5d06e575ab9acff22b SHA512 71027d7877c6af0db3b859aa3271aefb3e9bb0134d732393e5c7d6a2b14da9a55d255fac0e04de271caf269a9d627f4203a932ed13d74137558d1c7adfcccc51
 EBUILD ldb-2.4.4.ebuild 3067 BLAKE2B 367048331bd26f4920b2b4d6d514bfc11a4ece835eb6939ff397c47998a7d8b9f552b2297209df23dc0712ae755043c4596405af15dee84cbf090bf3d38e2ac7 SHA512 13dc06b1f368da58fdc3b920fe94d051babc57b836a08dc97edddc0b15b4e9456b41486ba54107a8201fd653c465562440758e60c82e7cc931ab4ce07ed53396
-EBUILD ldb-2.5.0-r1.ebuild 3007 BLAKE2B 0abb5aa964f1b945d2bddd1154421bf35d24e9fb78dde2b0ae34b4495326142dbda601c1aa2579bdfb81face8bf6072f0dafb676524d2aa3c1f2e9947c7a9cf7 SHA512 ff46752cb5c33374665b52eef69398821f7c463deaa1a5c8c05115b94fb97cc56c805df49826f09ded208adf91a50799fa9f43e878f36291676ff7e2c9f917a7
-EBUILD ldb-2.5.1.ebuild 3007 BLAKE2B 170849834a556b081cbc072f591d766eaf65d930165d3cee11cc01de81eb8325b15cdc8e4e2abd083e630f6c956bf70140982172c360d0f49c1a818d8551cfa1 SHA512 62f423a99c35d367122e6edae52aa76a387d569c824bd2cbf4b4c22221be655926b3db3e7b5d0230b7ba34c376c9a274feacc78855e00ded0580f4e1ac605a93
 EBUILD ldb-2.5.2.ebuild 3074 BLAKE2B ca2228344bada5c0f6a2625f246adc4d276ce0bd361c66ecfa2c4efc1ff26999058abf1b372aa94443ac144ce1dc068a57d2d501dab2998c7d2b860121ee43da SHA512 6481ffaff1571d1f68db2d5d8f1d4c49fb533ff7ab0781b980226ebf2aeb31521af4caf8588fc4cb926df69d8c8f85e50af67032b1ef98f5ef0670de20e0626b
+EBUILD ldb-2.6.1.ebuild 4544 BLAKE2B d22cfccbd5938706d0c4103d8fdfcaca1b815c72e8ce5281b5558720516ba9559dab1780ccb71c9aa6cb8162d7849c9d9b0eda3ef241974529fa7c664fcb44b8 SHA512 3e43cd3373baeb6370196da88614c3551b596d79f1824685ff58e888a5aa6e4731025d374c7ae3bad89f93dc59c695e8e61d91d0794fbb1c33f85e27b0e1c6d5
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/ldb-2.3.2-r1.ebuild b/sys-libs/ldb/ldb-2.3.2-r1.ebuild
deleted file mode 100644
index 49ea629050ba..000000000000
--- a/sys-libs/ldb/ldb-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.2[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${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
-"
-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
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || 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
-
-	use python && python_optimize #726454
-}
-
-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
-}
diff --git a/sys-libs/ldb/ldb-2.4.1-r1.ebuild b/sys-libs/ldb/ldb-2.4.1-r1.ebuild
deleted file mode 100644
index eae274809755..000000000000
--- a/sys-libs/ldb/ldb-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${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
-"
-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
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || 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
-
-	use python && python_optimize #726454
-}
-
-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
-}
diff --git a/sys-libs/ldb/ldb-2.4.3.ebuild b/sys-libs/ldb/ldb-2.4.3.ebuild
deleted file mode 100644
index 54d9456e59cd..000000000000
--- a/sys-libs/ldb/ldb-2.4.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${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
-"
-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
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || 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
-
-	use python && python_optimize #726454
-}
-
-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
-}
diff --git a/sys-libs/ldb/ldb-2.5.0-r1.ebuild b/sys-libs/ldb/ldb-2.5.0-r1.ebuild
deleted file mode 100644
index 4b4ed4c7fa5b..000000000000
--- a/sys-libs/ldb/ldb-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc ldap +lmdb python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( python )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.5[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${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
-"
-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
-)
-
-pkg_setup() {
-	# Package fails to build with distcc
-	export DISTCC_DISABLE=1
-
-	# waf requires a python interpreter
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(usex ldap '' --disable-ldap)
-		$(usex lmdb '' --without-ldb-lmdb)
-		--disable-rpath
-		--disable-rpath-install --bundled-libraries=NONE
-		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
-		--builtin-libraries=NONE
-	)
-	if ! multilib_is_native_abi; then
-		myconf+=( --disable-python )
-	else
-		use python || 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
-
-	use python && python_optimize #726454
-}
-
-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
-}
diff --git a/sys-libs/ldb/ldb-2.5.1.ebuild b/sys-libs/ldb/ldb-2.6.1.ebuild
index bfd7de97a612..78ec93f70bf1 100644
--- a/sys-libs/ldb/ldb-2.5.1.ebuild
+++ b/sys-libs/ldb/ldb-2.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
@@ -13,21 +13,24 @@ SRC_URI="https://samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+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? ( python )"
+	test? ( lmdb python )"
 
 RESTRICT="!test? ( test )"
 
+TALLOC_VERSION="2.3.4"
+TDB_VERSION="1.4.7"
+TEVENT_VERSION="0.13.0"
+
 RDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.11.0[${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? (
@@ -37,8 +40,10 @@ RDEPEND="
 		sys-libs/tevent[python,${PYTHON_SINGLE_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	virtual/libcrypt
+	test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] )
 "
 BDEPEND="${PYTHON_DEPS}
 	dev-libs/libxslt
@@ -54,35 +59,75 @@ 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 --bundled-libraries=NONE
+		--disable-rpath-install
 		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--bundled-libraries="${bundled_libs}"
 		--builtin-libraries=NONE
 	)
-	if ! multilib_is_native_abi; then
+
+	if ! use python || ! multilib_is_native_abi; then
 		myconf+=( --disable-python )
-	else
-		use python || myconf+=( --disable-python )
 	fi
+
 	waf-utils_src_configure "${myconf[@]}"
 }
 
@@ -94,8 +139,8 @@ multilib_src_compile() {
 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 \
+		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
 }
@@ -109,7 +154,8 @@ multilib_src_install() {
 		dodoc -r apidocs/html/.
 	fi
 
-	use python && python_optimize #726454
+	# bug #726454
+	use python && python_optimize
 }
 
 pkg_postinst() {
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 2cc2779c6f86..bdc6fd861dd6 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,9 +1,3 @@
-DIST nss_wrapper-1.1.10.tar.gz 89593 BLAKE2B 9f478f87acbe9a842edf443ddfc45642621cee22dd03342cfb7dcc03fd4b188950a43527d3b332b03714729f7f57cf072b77ffb38574b98124dfdbb4b03f227d SHA512 7c2f0eccdb3535643015aea8b4bdb87b421c3575c3124b62c8f17c9d3db54d92ba012524674c41c16f02a1b6ebe4177724f04eefdc04760ca49b32d3f77910c5
-DIST nss_wrapper-1.1.11.tar.gz 93431 BLAKE2B abf7d67b38646d4708dc08146ea018a700bc38dfd73efc3dec5ee855b8eb7af13ddec9799adf2cfb17ee03985aa033907abff3f73ac93afe182d63012c1a70b2 SHA512 8a0dfa6ccf865640f86168f0dc2915675b5815cacc36bdacbfc1163ec4b38a28be5a160d1c9e6d3785890bc5e12e32b8c070dcabb52c6dd6235ebeed51d51857
 DIST nss_wrapper-1.1.12.tar.gz 176038 BLAKE2B 16c8b81dc9a56b074d61ddb3c7ac6108ce4a2494081341b4a734d21017236c864652db06d9e7a9f3584c286b24a46be184156b1c1c9be04a37e7906f75dc4adf SHA512 ff2efc70b29b30a2761952637c3794e73da2c8ae9273222b146e62312acd2b3bdecfca54722ca86c9a2fd700162717782b2b8f8072e76c17657e44c602911a2b
-DIST nss_wrapper-1.1.6.tar.gz 57893 BLAKE2B 4952b1af2b2b0487104b650b98694e5d39aed9edb44992d22e10ea38a2c4009f076aafa36f43775a021eca5b1f2708c9f42fa711d6715c43b077a9a3341570e8 SHA512 213d611abc072cb8d098b0782f661b4cdf1dcfd04fb564fb05034f023197aeed15a684478c660c00fb72f9438a192914e7b6878e505e4380435534bef52e0328
-EBUILD nss_wrapper-1.1.10.ebuild 394 BLAKE2B be2d618adfb5e60fcb996ab5e84921029a0e44db432efe52ade6f17da7439a7eb532159f05077185ec36e43d009a68dc4dfcf8c69df387e02ed9c4d33185a7b4 SHA512 d46a97ea7f44cfd282e04c8ccc2ede1b52ee98b73807c0ed3f240945c8cf9ebf7cfb29f91e47f66e9ef7eb5b859fec6767e8dbbe314b4a80c82751bded1cd863
-EBUILD nss_wrapper-1.1.11.ebuild 401 BLAKE2B 505ab13bbcf79b7ffad28fee4430e1bfded51510d4e5768bfb455354a6f57f2da691c44399e0d1a40c9f7361892f5b0606fa9273da059f23082705054df138dc SHA512 203254432a3b1d937491b9d1e9d036e5394645bf5bcf03a8f51c2a1b6167f6bedd31914455fa3905c86c754589db11e81b39aeff534c67eba80e9d62b892e30b
 EBUILD nss_wrapper-1.1.12.ebuild 576 BLAKE2B f29d65d3daa431b2968a38fe6b68c9f8d69f042819257a7c0cb60d6de59b579e09ce1761f8244ae44715640f7aaf91f92d82db6443568a71e23b53c8471248e0 SHA512 335147c9579e2bc5714c18587d2d796a47d4cb86fd4c9547a3db0a4f1bf77adfe297b7690b4a5bed072d89971d1e4f9e022c98e352933f5f4c45f782bfa19569
-EBUILD nss_wrapper-1.1.6.ebuild 387 BLAKE2B c7a4e54867d2ffb5aa7e5117d22258203b9fa33bdc1796cc6c562f81a91a403ec9331b3276066cb6260701781aae652c308e46ecdc6dafe4887bca3ab71cf7e8 SHA512 19184243d8c42e086bb5e3bd4275093067adf65b06244306aaa6b4c22bee2728f28853b9d8cc581b895dde55ce527a5271f5a6b7854c8f85b35da2fcccaac263
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
deleted file mode 100644
index 77383673bdb9..000000000000
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.10.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for the user, group and hosts NSS API"
-HOMEPAGE="https://cwrap.org/nss_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.11.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.11.ebuild
deleted file mode 100644
index 063173df362d..000000000000
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.11.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for the user, group and hosts NSS API"
-HOMEPAGE="https://cwrap.org/nss_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
deleted file mode 100644
index 79508012e270..000000000000
--- a/sys-libs/nss_wrapper/nss_wrapper-1.1.6.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper for the user, group and hosts NSS API"
-HOMEPAGE="https://cwrap.org/nss_wrapper.html"
-SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
diff --git a/sys-libs/pam_wrapper/Manifest b/sys-libs/pam_wrapper/Manifest
index 1877c0901dad..788bf4a8647f 100644
--- a/sys-libs/pam_wrapper/Manifest
+++ b/sys-libs/pam_wrapper/Manifest
@@ -1,5 +1,3 @@
-DIST pam_wrapper-1.1.3.tar.gz 118034 BLAKE2B 3c05e74959f3c6dfd35575cc5f9187f4a328bfd7ce002e327fc135c82a4ff1513add87678360992d2010c124f7fd95e4bdb3c0a4d63418d9711069cbc200e417 SHA512 3b7cbd25ae7dd73f4a0c64a7762cdeb38cc7ba6e8b4e18e79aceffea09241d520aa884de88e4105b5957b2b18ec682be6568a6bfccf82b9354a3510cd2cd98eb
 DIST pam_wrapper-1.1.4.tar.gz 170882 BLAKE2B fa0a789f6fd6f809c7ef80e354e886b5f1f0b4212060dc0e388a44701e4a1f49635b8f47344156ad65cd273660e3b0a806480c37875a830e2f5d8e56c4ec0818 SHA512 3b68dc6d7815707d74d1340facd9c2de4dff3934402ac2c2632371b39c41a75744434744ed7308e157be03a03a941405638cadb6f34995de56fb1f5f45d37de2
-EBUILD pam_wrapper-1.1.3-r3.ebuild 1529 BLAKE2B 33290646764019b6548bf6140f22573b120c65193f8d4b24e89839953851d8d4ab002c3193b92c67a78bc76bfb699401931d539c1f02683a89336e7af6e6e3ad SHA512 a28af0235d8877c19e62ab22b41afcd0e97edc488526179e284db13f6e61efe18865dc0d7529b87a75587775cf4d981f7954911795e8fda1da4ae533bc9bc4e3
 EBUILD pam_wrapper-1.1.4-r1.ebuild 1596 BLAKE2B e889af4c75e7ae0244113b92a2ccdf2965dd93f31aaeace64423694108fa82209d3d2ac26104e398da1e87f05405807602a5e7a8e3435fbf9a80007135734caf SHA512 1ee51574d98ffca54c4c4b3def49d6d1a47c53b2805ad1c2beec52a207b2df7e91f422eea3c17b20f7ff0392d29710c5c70a5ff9ae61427764cec24c962c7663
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild
deleted file mode 100644
index 85898afabe55..000000000000
--- a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake-multilib python-r1
-
-DESCRIPTION="A tool to test PAM applications and PAM modules"
-HOMEPAGE="https://cwrap.org/pam_wrapper.html"
-SRC_URI="
-	https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sys-libs/pam:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
-"
-
-multilib_src_configure() {
-	configure_for_python() {
-		local mycmakeargs=(
-			-DUNIT_TESTING=OFF
-		)
-
-		cmake_src_configure
-	}
-
-	if multilib_is_native_abi ; then
-		# Build the Pythons for each version (but only for the native ABI)
-		# bug #737468
-		python_foreach_impl configure_for_python
-	fi
-
-	# Do the regular build now
-	local mycmakeargs=(
-		-DUNIT_TESTING=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_compile
-	fi
-
-	# Compile the "proper" version without Python last
-	cmake_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		python_foreach_impl cmake_src_install
-	fi
-
-	# Install the "proper" version without Python last
-	cmake_src_install
-}
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 1778f05f67d1..6abe0ab78663 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -3,5 +3,5 @@ DIST talloc-2.3.3.tar.gz 650493 BLAKE2B 4312d8bbd54da2cb8917946e46bb77dae1c6fdfe
 DIST talloc-2.3.4.tar.gz 674196 BLAKE2B 1fac0a45a4ba16c7741e6d810e1a1e56352c04f266b99de62770177c1218a8c8253be2d5d1793aae67ce61e6a1159cbcd4888a49702822e6817b86eb7a1fea31 SHA512 c46488deda99753fd79566d42cae88899b71196513a127813be2cb855e7f36b77132f0552297ee4153ba4d8f177cea3bb0dc93340caabf321c026657744684d9
 EBUILD talloc-2.3.2.ebuild 3371 BLAKE2B 3aba9d4a7982d0b2a7bddc1cd94b07fb6a2b652e2d23b704c43c901eb0e8123b78a6e5db2d41f83024cdc2234dff8b8e6c2bd6e2a356679660ed914ed5a182c8 SHA512 8a767d540f1aa7e4b5b33b45a5077f725cbe9eda7509f38ee7c0d97ac73b3093df30b31b77564e1898dbb643f3eb42951d1d5bd7f9cda0dafd8963786ce15930
 EBUILD talloc-2.3.3.ebuild 3373 BLAKE2B 865c39b59cd1f3f4882bee93d52bb86ab67314a7f848e91575cb299583bf6fdc73baf6c87df9449d254665d6cb8d405b802b79cf5ab95b72ca3a4d36512d4c71 SHA512 3613df0ff221020451aa1f733fedfd6b396a9918977fce7b559a395a7c1c84aeb18a959eb0c4ccfaf84041f8b782641287b001ff65b243a925e9cca85472ac5a
-EBUILD talloc-2.3.4.ebuild 3412 BLAKE2B 174cc8e035efa4e29db9530a00004837c2e71648b73ad477c41a8a427d15cab8b443bbbbdd1d65a841b91eda7aa3b05a386b5bc08b9701396e7996a3b56d8ddc SHA512 953eeb05cc17235bdcee3c4893113d65d36d0f8316ceb79d5626795a1b1cc7d0bca9fb6855582bd584f2889d7deebfdfc081ab7d0601060f2f1d3fadd46477d5
+EBUILD talloc-2.3.4.ebuild 3409 BLAKE2B 9fdd8ec751cdb1d232b4fccf9fd13c693b67378203969b94b5d632ecf3674960b626d7643d609bf7118f913b9a5b25d0fa14fe21198bbf4a185799a16ede0cde SHA512 759087d81dab5cf4499e32c8f2dfdf9ba1f7547e165d52052b1008a7d482b7d6a30d5a48c19712bbbd78df72ba56ce1da4234a86775137297f4f520dcd365349
 MISC metadata.xml 326 BLAKE2B 4788d8b536b43840fc3a6d6ef36d860589ebb1137cd07d11ce75c54869b8b65027f9332901c1882ce8fd97f446d90973cec03332b4e693283162f3c731b7627e SHA512 e700e6f5810ad2d6618f52ff3607a2dc3254751dc8172744512c956f001045accfa28d8aa79be67935c02aead13c2c22c54aa4e221f487ba3cb25ebe9273d57f
diff --git a/sys-libs/talloc/talloc-2.3.4.ebuild b/sys-libs/talloc/talloc-2.3.4.ebuild
index df07de9d8b23..284000cb00fc 100644
--- a/sys-libs/talloc/talloc-2.3.4.ebuild
+++ b/sys-libs/talloc/talloc-2.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3+ LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="compat +python"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index 697f4c8000f8..4698628af3e5 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -1,7 +1,5 @@
 DIST tdb-1.4.5.tar.gz 729650 BLAKE2B 5d8a226cf251268d70f68759fb792628559fa3b10e7843d1a53914ea24f0ceca61fe0c3f348d704ebc8df4c56fe2365690b585b1c96cf53d63ecae1960aca58a SHA512 373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56
-DIST tdb-1.4.6.tar.gz 736747 BLAKE2B 53b989955993e970f3ca0874ade4d7404e180fedaac94d409753b209ea9dfa5136f2cdce4eb6d67a44b208731466eb0557c4dfcd9db20ea5806c5da1a3917e50 SHA512 8af549867fdf2e0daf073c26933ae0d475ea64efaca23d3d7b0eb20839376e817f4c0a0ba2504f60f9e27a2b35d3b6ae7c329d88a5c2c0408e98ad9dfde84712
 DIST tdb-1.4.7.tar.gz 741714 BLAKE2B ec2f991bbaa61d46f16b7a68a4e47a2f690cda261dd0e9fd9708e51ad64eefeb54ac8b1102cde6935916f840d3c89d7a2903f58175cceb78ea4ef889e82ddbc6 SHA512 2b5b20c299b60545943f106d854b6e0d4a559e16f08a7ed62fe57ee962bebc888c2e663bd5fef907aace05b316826fe8fbbf3f323b6d3427531e59ffe47d48e4
 EBUILD tdb-1.4.5.ebuild 1406 BLAKE2B 56a4ece339321f667bff0b6b9bd4c28aad7faf6acd3403cd407078694a55075c53e351ac2188024d7433dad5fd2a3ca4771ac90768844406104506d4e06008ee SHA512 d74105542ac51aa62ba933d313eef429a0fecf78cc1995c5b7d54e33e2ec46068e2f4ddd9409ab5496915870724f59fde6f7f6425e06061cf3d80b894a89c6e5
-EBUILD tdb-1.4.6.ebuild 1451 BLAKE2B b367b02365f7e2381130fae1e8d8bfb581ef5f3d7f297f64183c21836e076c32b1d318c963239d7b46251cfca64631caeef09befa727339d09042544119dfc45 SHA512 50f476fda8a145124a050b0197b0cf5550ec5998f9a46c2dce5543cf9c4e5ec3aa004d08ce87467efad882a35c2d09442acd16d8a03879ffa3b6df553b738715
-EBUILD tdb-1.4.7.ebuild 1521 BLAKE2B 1967af92fb38639f4497d33bc11790f93f4e44548c1357d5f79a4e448b97ecf56cdd407e33224075b82d04d00d7acb28600a73af743882d5b2b09a28ade0ab05 SHA512 ae200e77febef995c6ed6db04e275d7008b2144c71394ef95d737ea4c80fa694a48c869ffedf3a9b41218f1b272b408c20a827e83a7486cdf8696d0e218aa56a
+EBUILD tdb-1.4.7.ebuild 1519 BLAKE2B 48c6490417e57727d3173a90e553133f91ac48160c0a535d9924f9122d06f19e8f043f8a896716fb13362fa020ec64f8e10ad3d6711bb35f62de2f3a57017fae SHA512 7148b312ddde13767dd098422d1ee6cc67e8b63aa19916ef36aefe51ea2427096170ea93bd70a04c7491a6cdddab8ae2b27466c7a0177a6558cbce0540a0292a
 MISC metadata.xml 245 BLAKE2B 015a6303c153dcdb4a4b6ec58ea97e6798d3316c6d211559022bd2a26d481356e481ba2ade200171bb182264ce9c132727cf8ce077fba38fabcef92c3431b6ba SHA512 5d1b6ef089165b3325df35b31d33f7c994bbc302399bb47abf3138885f0dd7b04176114de8ffea6ee1ae26a53fc83be9016426714e547fd6405c454b918e39da
diff --git a/sys-libs/tdb/tdb-1.4.6.ebuild b/sys-libs/tdb/tdb-1.4.6.ebuild
deleted file mode 100644
index 26757dd181d4..000000000000
--- a/sys-libs/tdb/tdb-1.4.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Simple database API"
-HOMEPAGE="https://tdb.samba.org/"
-SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/libcrypt"
-BDEPEND="${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
-	default
-	python_fix_shebang .
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local extra_opts=()
-	if ! multilib_is_native_abi || ! use python ; then
-		extra_opts+=( --disable-python )
-	fi
-
-	waf-utils_src_configure "${extra_opts[@]}"
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_test() {
-	# the default src_test runs 'make test' and 'make check', letting
-	# the tests fail occasionally (reason: unknown)
-	emake check
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	use python && python_optimize
-}
diff --git a/sys-libs/tdb/tdb-1.4.7.ebuild b/sys-libs/tdb/tdb-1.4.7.ebuild
index 5a2043ce9f40..04a59d09dc48 100644
--- a/sys-libs/tdb/tdb-1.4.7.ebuild
+++ b/sys-libs/tdb/tdb-1.4.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://samba.org/ftp/tdb/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index a879f175b5ea..7cdd28c12ffc 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,10 +1,10 @@
 AUX tevent-0.11.0-missing-include.patch 310 BLAKE2B b6c54840d64cec798968e58ee7665a984a948bd0fe4842224229c0650a4a0cd798bda2ac30bb842fabf3e7a0d433ca39ae1209da88eb31f0074361f01daccfce SHA512 53941507bc7852f5b1f5133f10d64927d8ec3a5886f51701f191502bd08bcf16fec1950a7ae6446c67981e8d1dd2e5260d95acb6d44572486f28ec8379dd5fc6
 DIST tevent-0.10.2.tar.gz 800731 BLAKE2B 5ea6b83378b04dbe1666432db0dbd4c0df2e6b0bf5ebcc8ec4ec9bdeb834efec75c87b2019dc78c691aba6c4f6467394101febd6010f106046a1fb8848e27405 SHA512 1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
 DIST tevent-0.11.0.tar.gz 866327 BLAKE2B 9e6e958597e21c0d228346aa102987f89bb6630a5661cef21b908735469a59e7b4f46bc4473e9c25fe636913a1eebc1f26234448c09739ad812cd3ce97bf5048 SHA512 740346b19bf290ff31b0c1b36e232021b8ad107c3ce27e0e8b1ec1a77485214b07a9b7837ba57f3650a50e4c04f530674e486b5fa4d118a1778259be63b49790
-DIST tevent-0.12.0.tar.gz 877767 BLAKE2B cbfb823f9a8ce8a9a88964c9daa15643c077163c03a792468836e5bbc7e7500c745e1fc1203063ed01f899cf598794764c6d465afc3ed31cd711f420ebc6ce55 SHA512 ae955b64a683bc6aaba66592ca5d205eb48f62a70bd2674b5b3a0e3b0f4de30c93f400bf183d3bef5993845a3281716584b24cf8a93c849ba4fa7d1fcfb9cc99
 DIST tevent-0.12.1.tar.gz 879683 BLAKE2B 51521aa26dc3ac38dcf69cdb77a7ad33fede88947e3a91cc5917fae9746951643a70615db24449437e133b575ca41d961ed63c23a0b4f1a01edf090952672032 SHA512 ab70262702d70ce00e8b3aef41930c674b04c147fdbf0006e57cfa057d82f6049ba6da4b2c2b7b53aa191dd4f0f3d55e72b0666ae8f5b6948eeb9fde1988c938
+DIST tevent-0.13.0.tar.gz 880601 BLAKE2B 4e2a2c055bac28cecae1a95b7ddab349ed780f44427e74709eca497d6242bc4f46a91878d3d253c1af4819887ce7df522fe41f88f6059ec5f6c706c7e071ee35 SHA512 7aa05c09e3c708769e31cda88b319cee3629c88c51bda559193a85d4ab32204a8b4ba11f142861dbca06b578bf54953f2aca1ad847e99995a4fc40bf08618a93
 EBUILD tevent-0.10.2.ebuild 1591 BLAKE2B 63043bf0d721a46e303bc72f1166470068f57582ea529f8cdcf0dae3228b681c0649d20dab279f0e3a46c85c9ba755ba95bdf3944abd951899715f1c46a504ae SHA512 768d207948ac5a27d1ca62b108e3ee4d91f849b2f887596b469e5338e9e00050d34d518b8adc4e1283f1db9f88e519813dc7aced6df94449b784965fe72c5992
 EBUILD tevent-0.11.0.ebuild 1672 BLAKE2B 876840924440fc319c04b0ff51d9cc50fedeaefea973d3117da5ea039e817f61a42f8f4fd1b986594b026ee485927375047c16bf53be0098f1b6133b43ecd7f3 SHA512 f01a7ccb816617fbdd4ea46ee7d99a40b02dadca8759c9c36985cdadce309adec81a1ae47b8cc019a58e661983ecaa179805941e637bc04262401e68fc15040b
-EBUILD tevent-0.12.0.ebuild 1650 BLAKE2B e97a67eb78b6ab05e6acf102b037c517abcaed134eb2d94101f0c5b32047ff26f282d998cec379176ab1b7269692c59afd24fb1516e176729e7d317a4eb3fd54 SHA512 460fd4d48232642732f1401dfd78a04517378f5809f596a4a5f34d3e8b5f28bfb833dd299a7522602b884c19accaa6a8e4a5ffb0a67eac1b2a44e34a49735f20
 EBUILD tevent-0.12.1.ebuild 1657 BLAKE2B aa598e63b28bca73cefa1f7bf714aecdf7112d8564d4db1744a9e94d7de6182c6138615615c2c194367e69b3e5295ce54be6c11d81fabfb4ba27559b306a5567 SHA512 a41d02eccb1f6d4fdd0c3e79f4b7b97574ca3d6ac0cb78c6e57e01e70b4054cec9289212a38322b79a44f74bd36402dcccf203d02aefb746693174063d275228
+EBUILD tevent-0.13.0.ebuild 2460 BLAKE2B 89de60b58ef750de474dd8613cd4704c8daa49cbd3c32c28fd7871bdb2a12b5b97902f43395902def90118a0a4ea5fecbf95ae6fdabf070c3ca3e62520cdeecb SHA512 63904502d0faa08a93f2116e08d97b7941387a350d3f4ffe6a6587613afe74d349ffd56ecbc77239f51bac668a6a9e98e0c3e4f1a1d27f0730f77178df658185
 MISC metadata.xml 239 BLAKE2B 7127a2a67e79dc98a78fcaca706fd348389c7f08465112215855afe5978d2932ecbee93944efb1df528fbb6d09e884b277cb1d55a8b3926487b6ca07f9330b8a SHA512 4ea42efe4d083d013b85796ca25a132678bcefe6e3687fd6dd371814fd307118fbc8da8c15ce7f4d956e5f824cd0202f49d3469406c88008e84ff9f4d360f424
diff --git a/sys-libs/tevent/tevent-0.12.0.ebuild b/sys-libs/tevent/tevent-0.12.0.ebuild
deleted file mode 100644
index b56018d2eb11..000000000000
--- a/sys-libs/tevent/tevent-0.12.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit waf-utils multilib-minimal python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="https://tevent.samba.org/"
-SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
-	python? (
-		${PYTHON_DEPS}
-		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/cmocka-1.1.3
-	elibc_glibc? (
-		net-libs/libtirpc[${MULTILIB_USEDEP}]
-		|| (
-			net-libs/rpcsvc-proto
-			<sys-libs/glibc-2.26[rpc(+)]
-		)
-	)
-"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	export PYTHONHASHSEED=1
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(multilib_native_usex python '' '--disable-python')
-}
-
-multilib_src_compile() {
-	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
-	unset MAKEOPTS
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	multilib_is_native_abi && use python && python_domodule tevent.py
-}
-
-multilib_src_install_all() {
-	insinto /usr/include
-	doins tevent_internal.h
-}
diff --git a/sys-libs/tevent/tevent-0.13.0.ebuild b/sys-libs/tevent/tevent-0.13.0.ebuild
new file mode 100644
index 000000000000..e3914a179a2f
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.13.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="python test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test !test? ( test )"
+
+TALLOC_VERSION="2.3.4"
+
+RDEPEND="
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}]
+	python? (
+		${PYTHON_DEPS}
+		>=sys-libs/talloc-${TALLOC_VERSION}[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? (
+		net-libs/libtirpc[${MULTILIB_USEDEP}]
+		net-libs/rpcsvc-proto
+	)
+	test? ( >=dev-util/cmocka-1.1.3 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export PYTHONHASHSEED=1
+}
+
+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
+}
+
+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
+
+	waf-utils_src_configure \
+		--bundled-libraries="${bundled_libs}" \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	# Need to avoid parallel building, this looks like the
+	# best way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/sys-libs/uid_wrapper/Manifest b/sys-libs/uid_wrapper/Manifest
index 81e0a8b04c3b..66001a8beee4 100644
--- a/sys-libs/uid_wrapper/Manifest
+++ b/sys-libs/uid_wrapper/Manifest
@@ -1,5 +1,3 @@
-DIST uid_wrapper-1.2.8.tar.gz 47864 BLAKE2B d165954b4418ee23c7564d809a3c2189fc43c91822c8e4a73bdf6ea8e1621156bf0a29097b07a4d8b31ea1d10af35c3be367c4ca8f1e13db1b430f297b47b6ea SHA512 536f353f35e84ffd350a3cd5a96ff30e7b1fd4ba455dbe34fd232ed1a14b061351110c7e0cb4376a27cbde1eda789ef93e635ffa2e9948cadc41c2f1fdcfc3b5
 DIST uid_wrapper-1.2.9.tar.gz 48150 BLAKE2B bfd52c5a5e6a6a4322cff9fbf9bb2ceee3f5eb004d1174cf1d548bf08eade02453c0b551e006ea30aaa0b147748c6592184a597f9c615da2ed5355fe96222a20 SHA512 561dd8d5b139020f47a908e6baca9197d46f6192c280c23f85fad80fcac3fffb2823200777b0f353f79949cfb45b7dcc21b9a585a4bc21b26632b0e0df11d825
-EBUILD uid_wrapper-1.2.8.ebuild 436 BLAKE2B 01b09d35cffad441ccd6d5ae9ba3045a26a0c23e7eeecfc2b748923f3c34b70ffd83071177881caef3fdfd0799521c85d11b7133c62f7e21e7fcd8834dfd8d47 SHA512 b292320eea3ad964710ceeace6001cd0ee7d2fff70bcab04869f2a861cb0374a09d201ba5acb7e93a67e8ecc7087320ee66766479bbb81b75e985267a944dbe4
 EBUILD uid_wrapper-1.2.9.ebuild 618 BLAKE2B c9e348ebb10ff93825ec09e38ac760e0c97385740a178d351134e912b000cad7b9ec8b9ff7352be031fcf197c294128ef10ef4420eb0011c889e2a918c7b20ae SHA512 927375a6abdf6362a47a72dd3c1b0c2e7659a0de52638356e2549956edf6f6dc6e0221e8c03c569146a031e0b3fe596fb1a6a1cac437bcec44ffca36bcf287ae
 MISC metadata.xml 250 BLAKE2B e398673dd1a3522ccddb89a82a53fc2578d8e0777ec46f889d01d618609a22958d91699beef513c7912799e0e8ff985200f7c67bba941235da25c24cd4b48f09 SHA512 16834c3cbecd0dd5a9c8c311d2b8ebc63d8cd72c5891498f4f0048988993c104aadd4e24e632bf54071c11f810716432e89e4afab029555875f9f52794daa6e9
diff --git a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild b/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
deleted file mode 100644
index 155d193d2a9a..000000000000
--- a/sys-libs/uid_wrapper/uid_wrapper-1.2.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Wrapper to fake privilege separation"
-HOMEPAGE="https://cwrap.org/uid_wrapper.html"
-SRC_URI="https://www.samba.org/ftp/pub/cwrap/${P}.tar.gz
-	https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"