[gentoo-commits] repo/gentoo:master commit in: dev-gap/guava/files/, dev-gap/guava/

[Michael Orlitzky]

commit:     22c1bcba1066bc0b57788524fc8fcbc428c7f6ed
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 02:56:03 2025 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 19:33:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c1bcba

dev-gap/guava: add 3.20, drop 3.19-r2

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 dev-gap/guava/Manifest                             |  2 +-
 dev-gap/guava/files/guava-3.19-C23.patch           | 25 ----------------------
 .../{guava-3.19-r2.ebuild => guava-3.20.ebuild}    |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/dev-gap/guava/Manifest b/dev-gap/guava/Manifest
index e91ad6124d3c..7ba26d2d808c 100644
--- a/dev-gap/guava/Manifest
+++ b/dev-gap/guava/Manifest
@@ -1 +1 @@
-DIST guava-3.19.tar.gz 2712685 BLAKE2B 
be6a351ab74a86e3a1da04ac96a1e44a4722952dc39ead35403a7f83a523e576e74ad9407a792334183de4a8d2276a28b3a539e75f2130c9b3449ad1f4e3852a
 SHA512 
2bc501bc267ef8f35ed5b73f56edd484d99d735cc4a4f5db3610243938eb1ea0481e5f69b627887493cd1d8c39732ccabb0b61fcaa09f0a6d98bd7e363989824
+DIST guava-3.20.tar.gz 2708906 BLAKE2B 
e3ede18e65e0bc98853eeec4f79c3b71d4de05c9441fde583b1768e0f717a17c0efacfec30175a19a5683eae4091702669e128f30ceb512abf49287d26fafa13
 SHA512 
e6584f28e3a8035667f4712ec771bfdfa78be5dea4b665f0ab24a0a2801cdc3c5efac21f9322e9273765f7c7b985c4df08dfbe2c02cee42e70094d96d0ab8b7e

diff --git a/dev-gap/guava/files/guava-3.19-C23.patch 
b/dev-gap/guava/files/guava-3.19-C23.patch
deleted file mode 100644
index e9e6520d70aa..000000000000
--- a/dev-gap/guava/files/guava-3.19-C23.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3dc3b1a2e1f5935fa105531ad9f4cf604aeefcb1 Mon Sep 17 00:00:00 2001
-From: Joe Fields <field...@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-r2.ebuild 
b/dev-gap/guava/guava-3.20.ebuild
similarity index 96%
rename from dev-gap/guava/guava-3.19-r2.ebuild
rename to dev-gap/guava/guava-3.20.ebuild
index 9320927bd826..130975ba1724 100644
--- a/dev-gap/guava/guava-3.19-r2.ebuild
+++ b/dev-gap/guava/guava-3.20.ebuild
@@ -15,7 +15,6 @@ DEPEND="sci-mathematics/gap"
 
 PATCHES=(
        "${FILESDIR}/${PN}-3.15-makefile.patch"
-       "${FILESDIR}/${PN}-3.19-C23.patch"
 )
 
 GAP_PKG_EXTRA_INSTALL=( tbl )