From 6a7029e0f7370d4d5dfe9e31cc2719a870482392 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Jun 2024 00:09:17 +0100 Subject: gentoo auto-resync : 15:06:2024 - 00:09:17 --- dev-gap/guava/Manifest | 6 ++-- dev-gap/guava/files/guava-3.15-makefile.patch | 5 +++ dev-gap/guava/guava-3.18.ebuild | 48 --------------------------- dev-gap/guava/guava-3.19.ebuild | 44 ++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 51 deletions(-) delete mode 100644 dev-gap/guava/guava-3.18.ebuild create mode 100644 dev-gap/guava/guava-3.19.ebuild (limited to 'dev-gap/guava') diff --git a/dev-gap/guava/Manifest b/dev-gap/guava/Manifest index 05f78601f7a2..3fd58566e30a 100644 --- a/dev-gap/guava/Manifest +++ b/dev-gap/guava/Manifest @@ -1,4 +1,4 @@ -AUX guava-3.15-makefile.patch 736 BLAKE2B 5d2e4a307350bbe097a89745f7026f8c1438234b8c871f6b396c42a722e4b7b255f1dd5aa82b05597b6376235a411d273f6564096fb7e3cb91322dbc79c9433d SHA512 a88f7fed40c70859c226994361b71ea0e99657e63aa5ee212e1bfb66ce418262ec8f95e50414f5f90e47b61aae1a1d316bc29a782107b268ebfd5af348f74f2f -DIST guava-3.18.tar.gz 2635260 BLAKE2B f2b81d6418204564afeede7901f9d9a54e93a165913ffd6152a641590452455d07607e511ecde220a0d9f44182d793ce25bde51c5103324033f9b0470b2bb234 SHA512 350240ffff584877fa3981e4acdda94419bdeb982de26a308af056dd3130b38eeccaf6157afef7ffbdab359b0fddf5a213ccb6d27d2f4e8955ae45e0607d6b97 -EBUILD guava-3.18.ebuild 1079 BLAKE2B 863925d5548e5b7ab0fad28a6df3015d51ab2a52f9f2d9ff259ff4e0453a25a54a8aeb4d779a5111b57467bb5fd7d9033d2248446a1a3f5284ae1fecec2bccfa SHA512 0d714fd674f08e5f0a8c0040b7fe3cfb408d4456eea0ecbe52e81ace70fcc413a897bdc0750c32b47aea4105e0b4e45b90521948f6cbe1cdda9e5f903a9b93c8 +AUX guava-3.15-makefile.patch 1005 BLAKE2B e43ae9491ba75a180e539f0291dfa420589b9674e1baa3c9c4cd7a406862900a68b308c9a3ab9987f762065314c437cca8d40913e831c4591bb6d2ce68312ce3 SHA512 1b4abc1f9c76882d3b538cd4dafa8bf74f3f35d0444dbbac6fa997494bf1cb87c6f8a6cd0e8dcab19744ece731dde940ada7787bba3b718cf0bd633c4cbaefae +DIST guava-3.19.tar.gz 2712685 BLAKE2B be6a351ab74a86e3a1da04ac96a1e44a4722952dc39ead35403a7f83a523e576e74ad9407a792334183de4a8d2276a28b3a539e75f2130c9b3449ad1f4e3852a SHA512 2bc501bc267ef8f35ed5b73f56edd484d99d735cc4a4f5db3610243938eb1ea0481e5f69b627887493cd1d8c39732ccabb0b61fcaa09f0a6d98bd7e363989824 +EBUILD guava-3.19.ebuild 969 BLAKE2B 577ce008cc93ac97bd6abf293018225932c0096a921496bdf10464e85a0789b8afac0e54f7e206d577ec099de33c718aecbbc88a8393f405e5b0d613e8d63c0d SHA512 d38797bfe8c6f8232797af45bf1cc65881a3dc4f0f572a02e1fbf7df8a1dd308623d1f139ab41cf3952cd79b71e49117feddef00429a761f18327b1ad339452d MISC metadata.xml 700 BLAKE2B deb667761cc1a33ac94450018e71060ad2fb89cf433e0294ea4288d7c9aec985834c388529659a446afe1547f7e13c58edfdfdd901fc5594ace6189445448c5b SHA512 960c2af8aec86ee8d4d7a2f9c44cb1b1e0581b6aeb78965d91501db0eaf7295b35eff33173365aaaf4274d9ac72bc798540496a2a67f3cc1df1d387b8e30625b 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.18.ebuild deleted file mode 100644 index 396abe423ca9..000000000000 --- a/dev-gap/guava/guava-3.18.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic 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 )" -KEYWORDS="~amd64" - -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() { - # 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 - - # 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.ebuild b/dev-gap/guava/guava-3.19.ebuild new file mode 100644 index 000000000000..7cef6eaa6e7b --- /dev/null +++ b/dev-gap/guava/guava-3.19.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gap-pkg 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" + +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() { + # 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