gentoo auto-resync : 01:05:2024 - 00:00:04

5 files changed, 30 insertions, 3 deletions

diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 7474cde00141..f54b66f21d8e 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,3 +1,4 @@
+AUX cmocka-config_h.patch 763 BLAKE2B 9f84366da43a9d353b0116361cf44302c2c9c1c2223bf19f4f9f9014f2af621332907dca5cdb85a9f277d8ee7fceb92021133f94fa4e98bfe620b384f08d001c SHA512 b38e7ea4cae0e678ce775cfb211afd5416dba219bec8735edc7decc1dbacf99a77f8abbbded444eb4252b778d8c07754a203f504b68f88578828ca5455bc9e0c
 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
@@ -13,8 +14,8 @@ DIST ldb-2.9.0.tar.gz 1757213 BLAKE2B 6d24ced193a64e723da65f26a055b97e5c5645b0ce
 EBUILD ldb-2.4.4.ebuild 3062 BLAKE2B 1a8abbc3daaf7a811039a51df74bcd77694ef2667928b5c0e10f97415a4fe63135a2906efdc8271fb02c5f523b9b6db26115456ede481adb518a443e57fb2563 SHA512 119081ff7523d62c7219fc719ee93f0b7ffbbfceecb10f1cbdc57552449e1df3146c702c08cde2e8ec053248d1f5b562e8ee28b09eae343c05ad98f87b88f78d
 EBUILD ldb-2.5.2.ebuild 3069 BLAKE2B 1f82ac443260c0893ed29e5a166e9b1f529ba78bb2a79e7ee27063cbb6c2e54d412a475b46ec19af7c24a5f797d290d327cbd94ffbd61e876dacaa0586b34050 SHA512 3679ed7914b32d25e151fab8cd9005778b93336dd095250fb37a80ed7e02b1790d8ef7a912e442cca8c01126d2febab0a7d06e9cbbb906a7894252ad229fda33
 EBUILD ldb-2.5.3.ebuild 3305 BLAKE2B a3375495cd0b66857a98d78fbc9432237c6943c91e636a618f7a0e5d1baac7032b4283ee87d237e6a6710761f2bc06cf854f78aa9615d52db0b7028bbaa8e06c SHA512 1afeb66c24d00f65a68225341c6ce292539591db10bc02500764880debc0b141425e9ce5d926f368aec3a0ce68d1824d064d26711a0bf313cbf8ac3eda4d769b
-EBUILD ldb-2.6.2.ebuild 4775 BLAKE2B 5f636277864004e4ecc7031e009e9b7bb7830a4d62e01570fd077c6a41e266d917e2c21041242487509c528ddb216f797af64661b83cf18f132e682b0def5e18 SHA512 6bff04aeee22f4a6340462675c0e2c554b079023abbfbbe5f4b1ea4b552a3aaf78802b21215726e89e42355ec49a462aa6a058686d1d7d243a282735348cf566
-EBUILD ldb-2.7.2.ebuild 4768 BLAKE2B 8c4f71b869a0628367082bf43cbc5ed98735294c07210d6580f4c19e14fccde404ce366319bdbda4c7e80977ac184086117909fd5b5943e45725e5c8d6dd3178 SHA512 796df5565dedb7236c1e34d5c47d26390f36f7eb767ef27519d5f2ac1f0aa08d0b3c141b62c826226601b214c48be415d8b2b253885809812849eba570ccbc3d
-EBUILD ldb-2.8.0.ebuild 4775 BLAKE2B 10ab6360b8264be6f3021c2a6ef729e613aaf61e1746fb35e5ffe37516937adf727be75a523c36b8246d05f38d74dc5c3581aee64ead0d25e1d2ad0172168f0d SHA512 054004e541c4642e35f20f355cbf56506179640431e608a4fbeab09f4686a3876cdbacfb890263d6d8d9f1b852d9cdb46646a224ecb2ad1f24212b66de031055
+EBUILD ldb-2.6.2.ebuild 4812 BLAKE2B 6bf55d6cee7e159430672a96181cc0775feedf97b93cb96fdfb2787aa73321fff6fdcefba721155bf7febefa3e02806a5dd4b5d0a8489861de6785b9345ff04d SHA512 7311e57f151d46b99238cc35059d0c4587e1742d5728da627b4bf07e809590f03cd5fa0817cff3c1524b35b7a406e40fe66f7dd41860395fdddfd179171cd6de
+EBUILD ldb-2.7.2.ebuild 4805 BLAKE2B 1593b9535f229d81269946bd8dd3810d39ec5ac697ff69b3a87d7e2edcbd0c40cd4174f4fe0645fcacdbee36ab35678004c0a5bdfe25876eeb87cbbe70b1250a SHA512 415e3ec6d32b1ab02d6b491d4d59ecf700d0cc7bfadb8d32ee132157f943d4c79b2300861207af0606b529881e11eb639f73c12ff9e2c1339cd1bdbd89b8c775
+EBUILD ldb-2.8.0.ebuild 4812 BLAKE2B 0571caa6149113c0dd5a3c32bb5c2ec3605e96358d5fe9d16af9528dc1598f59d721bed54a88da3ca362886a38ffd23bc913fd47da2ab15863f2626d1cde3d2b SHA512 ba2a79402d4ed437b3aceb580bad5fc4f964f9f1f12d56c2947cd6458c0297ee9a904de2b40cca440e65787ac0443c7cdd9965a02dd7bd1fdbab5dbe4ef501c4
 EBUILD ldb-2.9.0.ebuild 4776 BLAKE2B b73c3ae7ff90a1e8fe3afe252d2c95d69f25cc7fb1cdf3e2a58a7a18f0f2e65a64c52f26275eecbf8ba53037a7328fd1a84d3a5c9b41775163a58db9dd265ac5 SHA512 3210ca98621d1497c2e9317afe1b2c083485ab4fd6490f29f9f60e93f3f381d1713e898bedfd4651256b1d93c943c6b01c83480174711d2d9bdce419af10071b
 MISC metadata.xml 446 BLAKE2B 4ee524096a438d9cbf73faea3207715f6570b763715578b74289732677c1a159955783b3d81beb775612f15f1a58f10fe9ee68406bb22484faddabb302680620 SHA512 beffe8e4143ba8a595dabfe3e9c0ed7e1093b4e92dded1a6d7dd27e2bde7928d26e95ba048e421ab17d506ede92675764732388aa8edb454cd7753a0e0094c49
diff --git a/sys-libs/ldb/files/cmocka-config_h.patch b/sys-libs/ldb/files/cmocka-config_h.patch
new file mode 100644
index 000000000000..124928450cd6
--- /dev/null
+++ b/sys-libs/ldb/files/cmocka-config_h.patch
@@ -0,0 +1,23 @@
+--- ./third_party/cmocka/cmocka.h.orig	2024-03-26 10:23:03.378410042 +0100
++++ ./third_party/cmocka/cmocka.h	2024-03-26 10:24:51.526922405 +0100
+@@ -14,6 +14,11 @@
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #ifndef CMOCKA_H_
+ #define CMOCKA_H_
+ 
+@@ -111,7 +114,7 @@
+     ((LargestIntegralType)(value))
+ 
+ /* Smallest integral type capable of holding a pointer. */
+-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
++#if !defined(HAVE_UINTPTR_T) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(__DEFINED_uintptr_t)
+ # if defined(_WIN32)
+     /* WIN32 is an ILP32 platform */
+     typedef unsigned int uintptr_t;
diff --git a/sys-libs/ldb/ldb-2.6.2.ebuild b/sys-libs/ldb/ldb-2.6.2.ebuild
index 192c588a358d..dd88cd473194 100644
--- a/sys-libs/ldb/ldb-2.6.2.ebuild
+++ b/sys-libs/ldb/ldb-2.6.2.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/cmocka-config_h.patch
 )
 
 pkg_setup() {
diff --git a/sys-libs/ldb/ldb-2.7.2.ebuild b/sys-libs/ldb/ldb-2.7.2.ebuild
index 104e3ff13045..7efbfffe0bcc 100644
--- a/sys-libs/ldb/ldb-2.7.2.ebuild
+++ b/sys-libs/ldb/ldb-2.7.2.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/cmocka-config_h.patch
 )
 
 pkg_setup() {
diff --git a/sys-libs/ldb/ldb-2.8.0.ebuild b/sys-libs/ldb/ldb-2.8.0.ebuild
index 695c2e00e998..9a9ef754e6f3 100644
--- a/sys-libs/ldb/ldb-2.8.0.ebuild
+++ b/sys-libs/ldb/ldb-2.8.0.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/cmocka-config_h.patch
 )
 
 pkg_setup() {