6 files changed, 35 insertions, 6 deletions
diff --git a/dev-gap/Manifest.gz b/dev-gap/Manifest.gz
index b0f8f822f6d9..5a76775f5350 100644
--- a/dev-gap/Manifest.gz
+++ b/dev-gap/Manifest.gz
diff --git a/dev-gap/cvec/Manifest b/dev-gap/cvec/Manifest
index 0c01e3aaf353..ab0d84aae53a 100644
--- a/dev-gap/cvec/Manifest
+++ b/dev-gap/cvec/Manifest
@@ -1,3 +1,3 @@
-DIST cvec-2.8.2.tar.gz 647016 BLAKE2B 0289cd8f889ec11e781bb82a9efc27aa4c23c6f0c68686bf95a8bf6a815934fbd9f43155a223f375f0aa545a1a70b6bd683ae0cb9c44d76ce8a6610a07ed47de SHA512 f339c5bd239032235a2aadbeb5c99da4b29bd21ab97df6f72113c90da697ab9b98e03b0256b00acd57264bade9d316f0669c45590839996abda29dee3c1d547f
-EBUILD cvec-2.8.2.ebuild 543 BLAKE2B 22f4c8427ecc1dc58e9547faf263eef1a53ac4b9d37896406fdfe4b2a0c4a3b857f6d48eb923be9a1d40cbc8616c5967703786fee88df989364549cbf4bd2a39 SHA512 3652fcfaaaac08ff03699f08bdd5da8fd0dacb77fde57aa4d9cc51391f58b99da7e7d0d9bf46e811832b01e361077641cfd02b59bdd6e00dd18becd6aeec0dce
+DIST cvec-2.8.3.tar.gz 646360 BLAKE2B 2dafda78df946190cf350461591f1497cd2b6f5dad547055eafe2927abb24ea494d818287788579d7a82bf999bec3027bec8cadc7983aa943ae62aa47be4e826 SHA512 a6ba1e3794920b9196639ac07feee9afc9bdb5d244bf5566ace620ce7038ccc20f65ea4d19ff3959040537f5c18fe85dad98c95047944c4838c94e5084555777
+EBUILD cvec-2.8.3.ebuild 543 BLAKE2B 2b1ab93184f6d07c19330f57f619886f9b87b15111334119f3726db18798bfd0b6692694d6792a0a74368444d5f15a3a11cbf9af31a242deb9067d985840a90b SHA512 38839cb7ceb8aaba19b7c711e6a7d2edb16c022288d60bc9b76267fd51d318f77be92dd01b6452322999518e2c7f7efd06b39fb2df57168187c2679c4c0ed81b
 MISC metadata.xml 1004 BLAKE2B bb121635c7db599cd02aa2a2c9b176903efac13e51b58125928f5d12f1fc39932ef3bdfaabed5fed153d1903aed0da8361b358adde1ac04e5d7e1a9985a51e14 SHA512 e396b57450834902ec9e8aea079e333c98032344759ef46fc4b00858031559e4019d37f18ca7be09448d1406d636fa85911c2c6000d6da919e930c3998c221a3
diff --git a/dev-gap/cvec/cvec-2.8.2.ebuild b/dev-gap/cvec/cvec-2.8.3.ebuild
index cf6de1e9e8aa..65663d70371a 100644
--- a/dev-gap/cvec/cvec-2.8.2.ebuild
+++ b/dev-gap/cvec/cvec-2.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-gap/guava/Manifest b/dev-gap/guava/Manifest
index a98862c2bca0..cfbcb9984016 100644
--- a/dev-gap/guava/Manifest
+++ b/dev-gap/guava/Manifest
@@ -1,4 +1,5 @@
 AUX guava-3.15-makefile.patch 1005 BLAKE2B e43ae9491ba75a180e539f0291dfa420589b9674e1baa3c9c4cd7a406862900a68b308c9a3ab9987f762065314c437cca8d40913e831c4591bb6d2ce68312ce3 SHA512 1b4abc1f9c76882d3b538cd4dafa8bf74f3f35d0444dbbac6fa997494bf1cb87c6f8a6cd0e8dcab19744ece731dde940ada7787bba3b718cf0bd633c4cbaefae
+AUX guava-3.19-C23.patch 735 BLAKE2B 1694babc3c4b666749fb47f85e838ae190c5a59024a66e7519b6087f92a925845be48483464cd2cc8748dcd7fd05754a5bd8a4dfb0bb7b82d3f279e84d150983 SHA512 18bb2ab7e7dbaa5e2598fff8f454a550bc941172573cdb5dd13189d7149272e2354d188673d6907686db61e732699c368f72164a8e0dca95f0698d00ea915d38
 DIST guava-3.19.tar.gz 2712685 BLAKE2B be6a351ab74a86e3a1da04ac96a1e44a4722952dc39ead35403a7f83a523e576e74ad9407a792334183de4a8d2276a28b3a539e75f2130c9b3449ad1f4e3852a SHA512 2bc501bc267ef8f35ed5b73f56edd484d99d735cc4a4f5db3610243938eb1ea0481e5f69b627887493cd1d8c39732ccabb0b61fcaa09f0a6d98bd7e363989824
-EBUILD guava-3.19-r1.ebuild 1054 BLAKE2B 52ce698e6e92793b10ee13566deb1153f62ea4dde2932177d3f2cfc8cda8a805248e8c7765b5b425cf921fd7d76110add112df653cc0b4be8e5940d1eff0fb6f SHA512 202146413a4a536171c122a73ab3e9f28937a6a086cb82ddb712c0da940c0a49c8065ea45b6ebf235a59f40de44c089541231476ca1db8a8233c7a4704ce054c
+EBUILD guava-3.19-r2.ebuild 1091 BLAKE2B 28e33c0db0268aa1ea92ed824c39a252371d8c8630b9b24a31c62e3dc7fdd4edad555cf012465f8c536bfa56a8756d40cd5d4920e074a9b3abe597225a5960d0 SHA512 207bb2be635306015148f7385f322a1fc6acd3f422a3036e76d7fcdf4a6dac7f46e9bc4c9a84e6158e76e0c39f61ad082d897857ba1479422e8e19750630123f
 MISC metadata.xml 700 BLAKE2B deb667761cc1a33ac94450018e71060ad2fb89cf433e0294ea4288d7c9aec985834c388529659a446afe1547f7e13c58edfdfdd901fc5594ace6189445448c5b SHA512 960c2af8aec86ee8d4d7a2f9c44cb1b1e0581b6aeb78965d91501db0eaf7295b35eff33173365aaaf4274d9ac72bc798540496a2a67f3cc1df1d387b8e30625b
diff --git a/dev-gap/guava/files/guava-3.19-C23.patch b/dev-gap/guava/files/guava-3.19-C23.patch
new file mode 100644
index 000000000000..e9e6520d70aa
--- /dev/null
+++ b/dev-gap/guava/files/guava-3.19-C23.patch
@@ -0,0 +1,25 @@
+From 3dc3b1a2e1f5935fa105531ad9f4cf604aeefcb1 Mon Sep 17 00:00:00 2001
+From: Joe Fields <fieldsj1@southernct.edu>
+Date: Sat, 4 Jan 2025 15:45:01 -0500
+Subject: [PATCH] Put def of bool type in #ifdef for C23 compatability
+
+---
+ src/ctjhai/types.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/ctjhai/types.h b/src/ctjhai/types.h
+index d805dae..c295752 100644
+--- a/src/ctjhai/types.h
++++ b/src/ctjhai/types.h
+@@ -24,7 +24,10 @@ typedef struct {
+ 	unsigned int **m;
+ } MATRIX;
+ 
+-typedef enum { false = 0, true = 1 } bool;
++#if __STDC_VERSION__ <= 201710L
++    typedef enum { false = 0, true = 1 } bool;
++#endif
++
+ typedef enum { C_0MOD2 = 1, C_1MOD2, C_3MOD4, C_0MOD4, C_0MOD3 } mod_t;
+ 
+ typedef struct {
diff --git a/dev-gap/guava/guava-3.19-r1.ebuild b/dev-gap/guava/guava-3.19-r2.ebuild
index 9084820391cc..9320927bd826 100644
--- a/dev-gap/guava/guava-3.19-r1.ebuild
+++ b/dev-gap/guava/guava-3.19-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,10 @@ KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap"
 
-PATCHES=( "${FILESDIR}/${PN}-3.15-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15-makefile.patch"
+	"${FILESDIR}/${PN}-3.19-C23.patch"
+)
 
 GAP_PKG_EXTRA_INSTALL=( tbl )
 gap-pkg_enable_tests