commit: da786d08880a47b369c9042d922520311c57aa88
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 23:38:24 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 01:30:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da786d08
dev-gap/guava: add 3.19, drop 3.18
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
dev-gap/guava/Manifest | 2 +-
dev-gap/guava/files/guava-3.15-makefile.patch | 5 +++++
dev-gap/guava/{guava-3.18.ebuild => guava-3.19.ebuild} | 8 ++------
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dev-gap/guava/Manifest b/dev-gap/guava/Manifest
index c1032e3e73ef..e91ad6124d3c 100644
--- a/dev-gap/guava/Manifest
+++ b/dev-gap/guava/Manifest
@@ -1 +1 @@
-DIST guava-3.18.tar.gz 2635260 BLAKE2B
f2b81d6418204564afeede7901f9d9a54e93a165913ffd6152a641590452455d07607e511ecde220a0d9f44182d793ce25bde51c5103324033f9b0470b2bb234
SHA512
350240ffff584877fa3981e4acdda94419bdeb982de26a308af056dd3130b38eeccaf6157afef7ffbdab359b0fddf5a213ccb6d27d2f4e8955ae45e0607d6b97
+DIST guava-3.19.tar.gz 2712685 BLAKE2B
be6a351ab74a86e3a1da04ac96a1e44a4722952dc39ead35403a7f83a523e576e74ad9407a792334183de4a8d2276a28b3a539e75f2130c9b3449ad1f4e3852a
SHA512
2bc501bc267ef8f35ed5b73f56edd484d99d735cc4a4f5db3610243938eb1ea0481e5f69b627887493cd1d8c39732ccabb0b61fcaa09f0a6d98bd7e363989824
diff --git a/dev-gap/guava/files/guava-3.15-makefile.patch
b/dev-gap/guava/files/guava-3.15-makefile.patch
index 9d82fdfa81f2..0441d48ea1bc 100644
--- a/dev-gap/guava/files/guava-3.15-makefile.patch
+++ b/dev-gap/guava/files/guava-3.15-makefile.patch
@@ -1,3 +1,8 @@
+The autoreconf is not needed at all; upstream ships a ./configure
+script. The ./configure _is_ needed at some point, but our ebuilds do
+it in src_configure. And since "desauto" is part of the default
+top-level "make" target, we have to patch out the extra invocation.
+
diff --git a/Makefile.in b/Makefile.in
index 573f2bd..aa565f4 100644
--- a/Makefile.in
diff --git a/dev-gap/guava/guava-3.18.ebuild b/dev-gap/guava/guava-3.19.ebuild
similarity index 86%
rename from dev-gap/guava/guava-3.18.ebuild
rename to dev-gap/guava/guava-3.19.ebuild
index 396abe423ca9..7cef6eaa6e7b 100644
--- a/dev-gap/guava/guava-3.18.ebuild
+++ b/dev-gap/guava/guava-3.19.ebuild
@@ -3,13 +3,12 @@
EAPI=8
-inherit flag-o-matic gap-pkg toolchain-funcs
+inherit gap-pkg toolchain-funcs
DESCRIPTION="GAP package for computing with error-correcting codes"
-SLOT="0"
SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz";
-
LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
KEYWORDS="~amd64"
DEPEND="sci-mathematics/gap"
@@ -26,9 +25,6 @@ src_prepare() {
}
src_configure() {
- # https://github.com/gap-packages/guava/issues/90
- append-cflags -Wno-error=strict-prototypes
-
# This will run the top-level fake ./configure...
gap-pkg_src_configure
