gentoo resync : 20.03.2022

5 files changed, 42 insertions, 4 deletions

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 88c1159960a4..ed07b9deeb8a 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,5 +1,6 @@
 AUX ldb-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch 701 BLAKE2B dd2398f9e1fa39bfc3de89928dd3b935fd6ee9db4bc2c4e381ba5672098ae9209b2d6e475fa2549a9cef2e3ce5e9a789557413fbdb1bbd68842cca89ce1e8094 SHA512 35ba295d94ab5ce767f39c4cd5eb48d57a6e4993977013ee6ae0d640f74b5437a4dff6f1d14dc44dbcdc25d4e51e5084b0e3216353b2af383d8f544993228170
 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
 DIST ldb-2.3.1.tar.gz 1718379 BLAKE2B e2aa196e6e09846be2a631d81bf0b94c0cd80984ac124757888889717efdf78caf5501c4278ace33dcc2a6fb92a4a2f224b20ea9f3bf3fa5c7333f9994dcbdc1 SHA512 d87f3839481c3ac3f5ce5e2b5bb766451fe39681bff9c53747d45e2cdcef9f1eb91c0a7d6a9c202c4d01097600d66ca431a175f4fc28a126ad987b9783cb87bc
 DIST ldb-2.3.2.tar.gz 1718583 BLAKE2B 48b9fb77e414af0f9fffe0cda9cf49971d79ed8b66213b01b73f53a61969e03f9e6426a04a33ff70da906c814470d8fa356902a68aa1169d969cc597e8c234d7 SHA512 be324e8f20db50529634548451dbc5f95f26a701e124bfb40ae2b0a5069de78b7c5c1a66222097209ea24ef6077373d996e67c00257a5a05198f1b81bf0ed53e
 DIST ldb-2.4.0.tar.gz 1689484 BLAKE2B 904d74900011ce3f63ad1c24fe88b1a090e835c68829ddfda5e8af2c0ab3674d7a8cd9a62b95c1f38f26578d0704556d3562e46e21a54cbb44a15b9d83676521 SHA512 6c500b723c081488bc0717b6a5b0e8966c5d8a751232f8856281a6fe4d358ae6b5878c8400a82fa666379066105fbb9259b2967313e73efabef0e1386095e2ee
@@ -9,7 +10,7 @@ DIST ldb-2.5.0.tar.gz 1722847 BLAKE2B 880a5a516b0b423854f8a3f9c54da89e4640f8462c
 EBUILD ldb-2.3.1.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe
 EBUILD ldb-2.3.2.ebuild 2938 BLAKE2B 1b1bad3a97da1dc608fa25144d10b03328fc3c7a3666cd4554c2d9234b854655978b6c22ad7cdccd8dad98c649c5300b8c38361f95e04ae84b1c00947da6bcc2 SHA512 477ce1e42cde597201ee814a665c270bd5ac40808532f8c5ae4cab4bfbd583f594d648ebdc75443867c7a04738e782d5f72e89ceaebaaf10055f5e9c3c793bfe
 EBUILD ldb-2.4.0-r1.ebuild 2945 BLAKE2B b316c4132a2a821775acb807a336c531482f9e798bbac0035c577f528ea3ecb0b9d7e13a484746a23ce8cf274ac996816270b4340cc0eb2e951b119f7a5c79ed SHA512 57d1069bfbd0bc2d55e9407b753bf98fa00deeb8b3747b4f24bb19c965d6b6028d0ee605082d64c32b2c23c866f7cf3820518e42c146c612c53d163794c9dac9
-EBUILD ldb-2.4.1.ebuild 2942 BLAKE2B 34479d7ba8ba2012db9915cf654da865eb9ef9d51114d248021abdef1d6e94f49a31194f666b595133d65cf734f6307f14ab3ff3d134cc50cf03ac787a7d8ccc SHA512 108b61fe919ab58ac30eaa190183a0c724597f945e581da48a19d212f98c48fa5a3928c0b4a8d7dc7aff03c3f61ec681c5dc6edd01669ffc143d5b4149036ebf
-EBUILD ldb-2.4.2.ebuild 2946 BLAKE2B 21c7e8e42299f6aed846d63925c3bce581b456b0639c9ab4540d9f55908c47b130b0b255f81c212e4fb31142c578610b6a78f32dbd49919297fd4ecac6dfb2ea SHA512 c99046e4eeefcf723e5b201acb099a433722bb49016f0bc98afc5c9ea554790f6a6416f18d9e427504e96dfe15f64c232e9813480036733d1823c7cc14be2aab
-EBUILD ldb-2.5.0.ebuild 2946 BLAKE2B 762dc4ab89e22a2978d4a0f85ec4533b7bb2d69d69d214793c74fdaa944c114fff3c3fccdf221a90bbb912a78991f90c2f09b6e44889b0ac719900ddbdb61d23 SHA512 0946eb86cb5948e2650fbf55918f550fe87a4ed67a2a2202dcd20a4da09d11febfe2dc6b1da5f8cf68e6e47d007f8de33ea6c518b6396a2c9c183c945515e215
+EBUILD ldb-2.4.1.ebuild 2939 BLAKE2B b6b089e5f985c823e145dce7419f69b4681bde1494f5a9ac0e1a5a3bb08242522de40ddea10f4368eb509060754a3c88d9a81a4c4d7a5eee3d49283118db3247 SHA512 0fc55f0157b2f7c1ea6eb4aa61a8be60cc7dc96ec9079d41e1da984d99591c9b69d8cf4e7d7717a7e8956aa054988fe3151a349d5562e87e1aa711f30354f3f6
+EBUILD ldb-2.4.2.ebuild 3003 BLAKE2B f39f0b69ee5286990cb2616dc61f1ee97b8e6d5af20e42d1653f72e460a82b5759f02c4ecd4a92395859286cd026efaa67b601160608368efbda8608ef39e524 SHA512 58544addd6f525566090c97e4704b1de356a1f30df95b8adc3be8ce84efb6071c2c0df11f59c14ed4d60e0ccfbeb7e5eed2afc17ca3d0a6e7fdc764b31df922a
+EBUILD ldb-2.5.0.ebuild 3003 BLAKE2B dc8bcf7f4225a87f446ce6b17658d69ad13624a642e95296ff992ec65161ccf02ffdeb5c97d5783eae21d80a79248bea536298fbc584d1280914a111cbbac6b1 SHA512 d37009c316e8b88902802a0b38647ab0e91b8322235390a5a66b2ad487f63407e678b329210d452e7a2b68e91cb7d7b8973910cf0c21e944f9d8006d4eace23f
 MISC metadata.xml 526 BLAKE2B 004dbbf0286ced4bcd404eb3caf091f973e67e00b9230d2399f07dcb31d93a423045b353c1813958da151cded2f52996608de1b4294e3cb90cb8da0ac8877f9f SHA512 9f8008b5b57e5f73e79df68d828f1644edb0a154fa97504c3088301aa60e6ba3ac83a2e06d55d14c06cded89196dd635598f1d767ca93398cbf9610af3b49038
diff --git a/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch b/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch
new file mode 100644
index 000000000000..70f34c5f1a58
--- /dev/null
+++ b/sys-libs/ldb/files/ldb-2.4.2-skip-32bit-time_t-tests.patch
@@ -0,0 +1,35 @@
+From 38f5e8e09a7ae641b3669068b10c6bd966e46632 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent@gmail.com>
+Date: Thu, 4 Nov 2021 22:46:15 +0100
+Subject: [PATCH] Skip failing tests (on 32-bit architectures)
+
+See https://bugzilla.samba.org/show_bug.cgi?id=14558#c17
+---
+ tests/python/api.py | 4 ++++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/python/api.py b/tests/python/api.py
+index 8d154aa..e1de40c 100755
+--- a/tests/python/api.py
++++ b/tests/python/api.py
+@@ -44,6 +44,8 @@ class NoContextTests(TestCase):
+         self.assertEqual("19700101000000.0Z", ldb.timestring(0))
+         self.assertEqual("20071119191012.0Z", ldb.timestring(1195499412))
+ 
++        self.skipTest('Test failing on 32-bit')
++
+         self.assertEqual("00000101000000.0Z", ldb.timestring(-62167219200))
+         self.assertEqual("99991231235959.0Z", ldb.timestring(253402300799))
+ 
+@@ -62,6 +64,8 @@ class NoContextTests(TestCase):
+         self.assertEqual(0, ldb.string_to_time("19700101000000.0Z"))
+         self.assertEqual(1195499412, ldb.string_to_time("20071119191012.0Z"))
+ 
++        self.skipTest('Test failing on 32-bit')
++
+         self.assertEqual(-62167219200, ldb.string_to_time("00000101000000.0Z"))
+         self.assertEqual(253402300799, ldb.string_to_time("99991231235959.0Z"))
+ 
+-- 
+2.30.2
+
diff --git a/sys-libs/ldb/ldb-2.4.1.ebuild b/sys-libs/ldb/ldb-2.4.1.ebuild
index 24d85c4f51a5..8af580927576 100644
--- a/sys-libs/ldb/ldb-2.4.1.ebuild
+++ b/sys-libs/ldb/ldb-2.4.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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+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}
diff --git a/sys-libs/ldb/ldb-2.4.2.ebuild b/sys-libs/ldb/ldb-2.4.2.ebuild
index cd109691c887..a8af63199f6d 100644
--- a/sys-libs/ldb/ldb-2.4.2.ebuild
+++ b/sys-libs/ldb/ldb-2.4.2.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.4.2-skip-32bit-time_t-tests.patch
 )
 
 pkg_setup() {
diff --git a/sys-libs/ldb/ldb-2.5.0.ebuild b/sys-libs/ldb/ldb-2.5.0.ebuild
index c435347c1a38..dd87ed506eac 100644
--- a/sys-libs/ldb/ldb-2.5.0.ebuild
+++ b/sys-libs/ldb/ldb-2.5.0.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.4.2-skip-32bit-time_t-tests.patch
 )
 
 pkg_setup() {