From d69399c7befdd98cda62d6a1788ae2aa7f104c5e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Jan 2025 06:41:06 +0000 Subject: gentoo auto-resync : 07:01:2025 - 06:41:06 --- dev-gap/guava/Manifest | 3 +- dev-gap/guava/files/guava-3.19-C23.patch | 25 ++++++++++++++++ dev-gap/guava/guava-3.19-r1.ebuild | 47 ------------------------------ dev-gap/guava/guava-3.19-r2.ebuild | 50 ++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 48 deletions(-) create mode 100644 dev-gap/guava/files/guava-3.19-C23.patch delete mode 100644 dev-gap/guava/guava-3.19-r1.ebuild create mode 100644 dev-gap/guava/guava-3.19-r2.ebuild (limited to 'dev-gap/guava') 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 +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-r1.ebuild deleted file mode 100644 index 9084820391cc..000000000000 --- a/dev-gap/guava/guava-3.19-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gap-pkg flag-o-matic toolchain-funcs - -DESCRIPTION="GAP package for computing with error-correcting codes" -SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -DEPEND="sci-mathematics/gap" - -PATCHES=( "${FILESDIR}/${PN}-3.15-makefile.patch" ) - -GAP_PKG_EXTRA_INSTALL=( tbl ) -gap-pkg_enable_tests - -src_prepare() { - # remove temporary files in src/leon - rm src/leon/src/stamp-h1 || die - default -} - -src_configure() { - # "false" conflicts with c23 bool type - append-cflags -std=c17 - - # This will run the top-level fake ./configure... - gap-pkg_src_configure - - # Now run the real one in src/leon - cd src/leon || die - econf -} - -src_compile() { - # COMPILE, COMPOPT, LINKOPT are needed to compile the code in src/leon. - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - COMPILE="$(tc-getCC)" \ - COMPOPT="${CFLAGS} -c" \ - LINKOPT="${LDFLAGS}" -} diff --git a/dev-gap/guava/guava-3.19-r2.ebuild b/dev-gap/guava/guava-3.19-r2.ebuild new file mode 100644 index 000000000000..9320927bd826 --- /dev/null +++ b/dev-gap/guava/guava-3.19-r2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gap-pkg flag-o-matic toolchain-funcs + +DESCRIPTION="GAP package for computing with error-correcting codes" +SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +DEPEND="sci-mathematics/gap" + +PATCHES=( + "${FILESDIR}/${PN}-3.15-makefile.patch" + "${FILESDIR}/${PN}-3.19-C23.patch" +) + +GAP_PKG_EXTRA_INSTALL=( tbl ) +gap-pkg_enable_tests + +src_prepare() { + # remove temporary files in src/leon + rm src/leon/src/stamp-h1 || die + default +} + +src_configure() { + # "false" conflicts with c23 bool type + append-cflags -std=c17 + + # This will run the top-level fake ./configure... + gap-pkg_src_configure + + # Now run the real one in src/leon + cd src/leon || die + econf +} + +src_compile() { + # COMPILE, COMPOPT, LINKOPT are needed to compile the code in src/leon. + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + COMPILE="$(tc-getCC)" \ + COMPOPT="${CFLAGS} -c" \ + LINKOPT="${LDFLAGS}" +} -- cgit v1.2.3