10 files changed, 19 insertions, 21 deletions
diff --git a/dev-gap/Manifest.gz b/dev-gap/Manifest.gz
index dc9c89d70305..6f8dbd9fdc0e 100644
--- a/dev-gap/Manifest.gz
+++ b/dev-gap/Manifest.gz
diff --git a/dev-gap/congruence/Manifest b/dev-gap/congruence/Manifest
index 3882d130a4c7..a2b688a9ca00 100644
--- a/dev-gap/congruence/Manifest
+++ b/dev-gap/congruence/Manifest
@@ -1,3 +1,3 @@
-DIST congruence-1.2.5.tar.gz 320796 BLAKE2B 3ec55c8c3bed85d3875a91bcb1449463ccf9ef34ef4b4c8e14a6920bf29a1b43ccc97ec2cef1243f147be84d7d0c40f4eefc60ecded6d13730e0ade41c02a178 SHA512 369fe5382b94762bfc4741b55f0c45eeada71aeff83c58c428bdf9ecfe8f95f430d066ca1d2bf5b644a0c9fe59f9132af089bd7241e2cab8260534eb72c08113
-EBUILD congruence-1.2.5.ebuild 342 BLAKE2B e6f21d2fd33894a9a0aba7e2807a40da7ead26f459cd6ab6630a650537cf060a150883d64e732e76744d07b4d639e2ccd17bfe0bf1b0b3f58a6ca882841c8b55 SHA512 c1148cde56c68125a762d105423e9c0bb0f4ae6ebb9e924b5a11ece146c623386820f5660001a7eeb7a93c9f654350b8fcce8e5f57215bb5d88592051bbe937c
+DIST congruence-1.2.6.tar.gz 331095 BLAKE2B f0e1d272ccf3c32d4da985254060e03b62419bcb1e427e0e1f01cfd8999123419756560c6c551d049cbf4e4fa906167989a0f37486c15e11158b81d345d82747 SHA512 e075158c0f5c3dbde6140ef5541470f3fb77810ac674c965cef07c8c8d1068d8c0cfc1beb8071727151a1901ebdf78c886b1d3e943f2d6aef241f2a644e8f55b
+EBUILD congruence-1.2.6.ebuild 342 BLAKE2B e6f21d2fd33894a9a0aba7e2807a40da7ead26f459cd6ab6630a650537cf060a150883d64e732e76744d07b4d639e2ccd17bfe0bf1b0b3f58a6ca882841c8b55 SHA512 c1148cde56c68125a762d105423e9c0bb0f4ae6ebb9e924b5a11ece146c623386820f5660001a7eeb7a93c9f654350b8fcce8e5f57215bb5d88592051bbe937c
 MISC metadata.xml 1137 BLAKE2B d5e95742366ee42049a1a72172c39d7c6e48c149458d04ae63a11d931daee23b33b0b8e691881574e10b8673317798edadad334d72bca26e977bc0998b3a87c5 SHA512 044a0ef3c323793c441985a714f72702f865b76bcf5937f9778b5e9fc6c18ed7c00b9860c4b0919078c38c8600b55639789b718c15131473d25a216b0b4d4a70
diff --git a/dev-gap/congruence/congruence-1.2.5.ebuild b/dev-gap/congruence/congruence-1.2.6.ebuild
index d1dd8494ca93..d1dd8494ca93 100644
--- a/dev-gap/congruence/congruence-1.2.5.ebuild
+++ b/dev-gap/congruence/congruence-1.2.6.ebuild
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.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
 
diff --git a/dev-gap/liepring/Manifest b/dev-gap/liepring/Manifest
index c178595a6a0b..ddb5bd18ba5c 100644
--- a/dev-gap/liepring/Manifest
+++ b/dev-gap/liepring/Manifest
@@ -1,3 +1,3 @@
-DIST liepring-2.8.tar.gz 2641042 BLAKE2B fe6cf1df60eb0a2e9002da45cbb46a86461d949682951ee1197ceef223fdad9d3a7e7d5d2aa2a3100374773796aa30bb138b740bf438dc45882fcb727216701b SHA512 c22dbb403fc89df041690bb877a685e25f29ce7739fa77efd26c932e619e4a139d11fdff0b5e4d2e39ba5e44821f6e32197663f26f4c70509e0bce7d25d05893
-EBUILD liepring-2.8.ebuild 407 BLAKE2B 36845416eaa9d3a6bc25cae07bf653c87bb3a6d116058246344cabcc9fdbf9c348ea5bab83cf26fa89855225f64fac4f92488f2cc9f6d48425334ae9aefc14a5 SHA512 fd61c86c5f19073306f6e8f4cc36293dcdc69a742eeec3f42a45bb2cdcba3164bdb2cf0c01481eb3b0c58c29ab3b63536766f88783cad13015081c30fe9ac0fe
+DIST liepring-2.9.1.tar.gz 2642049 BLAKE2B a99ddd683952bb4770835256b0d2f7f117cd74a550b87aba37f0247c43ed7a303a01609e9d7a00b59a9cbe72f36b153b6f04f8f862663593548366ff38e6abe3 SHA512 7e3e2efad61bc8c5ab101a6bbd87340b9c0f7ad88aee9410876aaa5ff851ee6769ec0473b21945fb2de0eec7453a1bebb421b39bba3db9d0c7049e80db7ad813
+EBUILD liepring-2.9.1.ebuild 388 BLAKE2B 6e6942b91120c3102b13f3815b27aea930ab1e8b06a5752e0cf47af6b6bf1c23fe66d3f6a9fd7222b7466650c2151ea1d0ef9793c8ffe7052c23ced3aef860b7 SHA512 745eb15f1b96db541a1429e94f728a37d7aa00fb49d685b716e7095071bcfc8220a8468fe0d918d1c493164df5b6d295be78120d73c94ed3025fb3627cce511b
 MISC metadata.xml 703 BLAKE2B 75b9020363fdcb82ee2d6110224744c00404996f04f86234418ce4d2c142bf7bc22e6c53519f2675f8a1d5ab7149b6a4c774bffcac8e76e9b45f2748098ce703 SHA512 c1fa828b98f61328756b7bb6f98b42925fed139f4132c087537cf5c137452cf63b4a6f2b7b66af89bc5158f5fd40bbc4188f85ead2a2f8bf06cf62f8ffa7ba54
diff --git a/dev-gap/liepring/liepring-2.8.ebuild b/dev-gap/liepring/liepring-2.9.1.ebuild
index 52c73d9b46cb..ca182a6b376b 100644
--- a/dev-gap/liepring/liepring-2.8.ebuild
+++ b/dev-gap/liepring/liepring-2.9.1.ebuild
@@ -6,14 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Database and algorithms for Lie p-rings"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-gap/liering
-	dev-gap/singular"
+RDEPEND="dev-gap/liering"
 
 GAP_PKG_HTML_DOCDIR="htm"
 gap-pkg_enable_tests
diff --git a/dev-gap/singular/Manifest b/dev-gap/singular/Manifest
index 97fa8358f840..6cbfde6524da 100644
--- a/dev-gap/singular/Manifest
+++ b/dev-gap/singular/Manifest
@@ -1,3 +1,3 @@
-DIST singular-2023.02.09.tar.gz 402387 BLAKE2B 7f8c592a23ae8372f4b03cd0bf0503b9a5387b7547154845372e97ff8d23ac347def41dceaa5a69051156f8def8bd71e1738834270a72ed69b3adfe62dc52d42 SHA512 b21f1aa608b25e0b36878b93ac37790056428c96ac958c91b04214508ead9676883eeb6ea3a18a67b50a8af13113449a34cc6dd95e8bd6f87e22d382e9cb4d21
-EBUILD singular-2023.02.09.ebuild 439 BLAKE2B 98e54cc96c75f93f0c2026b96aee1f9b1eb488f0568803ad2f32c00149ba16120bbdc588f3a56d7fda78d7072272eafc52fd2da1daec3a45668a35706a9621b3 SHA512 e082a3d8866e2cdf297bb1e4ecc294820eb95e7e14cd1381fd89ceba6a049d7a9732d9ce74bfcfb834a2332cdfc30aa4e5ec6f87fa900eb4e8d618d5032c0d5d
+DIST singular-2024.06.03.tar.gz 419161 BLAKE2B 133399e5ce039f4b677aee205c4dd5e79ac79ad90df89bafd475934b3a08a805a45d6192dbd4b8f525e457c8367ddbffd2420c5abbd1b4ffb50ffe9f3b3a6e2e SHA512 76b0b3692dd432194079c28c136aaa3aac5919cf8e3f57f1d6abff0b1ceaf1789c813065e328a6e0efbabb8a9d7d4b12a1aeccb2b9ad22e870247a63d1a7e55f
+EBUILD singular-2024.06.03.ebuild 438 BLAKE2B 52692ac12199f038055ab16336663d4929b14bd1b7a24580262b31fa23265f9af70d232ed54dc842a15db6810af9e1a7f2a9e5988f2a2aae8486b04dbc72f704 SHA512 2c36f4db3a8e69071e479fdf756192707fe3be053e91c366b8bf77c3758c8e03e97c8c19a03e2637b0bad85b0c4f55771c5d93e5b01f14d4a4a5a26748dcc8e6
 MISC metadata.xml 703 BLAKE2B bcb01a1e674940c416ad9402c60663b40ca9fb9850faf7844d5afd5843781ed80f49ef75289aadf55682ddfbed77870178ddd2bde368171f102bd14110bc51ad SHA512 971ed9de50e7dd8f6adc69e45a2f25c4b1fc163e9af5a3b78d52b18c2ddf4f24903db8e01bf94b079f4281b150cfd84ae83c52d12226531bce011abe322ccfc8
diff --git a/dev-gap/singular/singular-2023.02.09.ebuild b/dev-gap/singular/singular-2024.06.03.ebuild
index c5c850ec035f..4e1ed1e18323 100644
--- a/dev-gap/singular/singular-2023.02.09.ebuild
+++ b/dev-gap/singular/singular-2024.06.03.ebuild
@@ -6,10 +6,9 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP interface to sci-mathematics/singular"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
 LICENSE="GPL-2+"
+SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="sci-mathematics/singular"