gentoo auto-resync : 25:11:2024 - 03:02:44

4 files changed, 56 insertions, 2 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7735e5e70b1e..9311fda3a4c5 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest
index 72d1c035e64b..b1347a5f826a 100644
--- a/sci-mathematics/gap/Manifest
+++ b/sci-mathematics/gap/Manifest
@@ -1,7 +1,8 @@
 AUX gap-4.13.1-hash-fixes.patch 8703 BLAKE2B 84ef5cce4ef7d71229972f60886472591a3fb1c8afb132e803e82bdcbc2a8e46a10910d99d43a3b04c7120a7c44b7b8ab04ecae4bab62035ccc1327e76c0d46e SHA512 5921dbb29361aafc7aa6a14b752d7c1736a7a4b0db01c56a4a4aa8719277d8a6a6e14116f3edd9e6764fbb449e9579f334311837d0c726e97a00bbca97f2117a
+AUX gap-4.13.1-more-hash-fixes.patch 1785 BLAKE2B 5125b4f6bdfcedde2976d588d0dbbdb3af82f91ca381300e34c59c07463acd28656299ed621f10fcf7403a5be9c0354d905ee9eb851d378b4b369b480930811d SHA512 49a033ae082a00bb22284917f886c1536dd64c1b07d9c4251e2baa89876075955b44a437ae46b44673ed85672d63960519add54b99b0a69d6e14506b5f10315c
 DIST gap-4.13.1-core.tar.gz 38673913 BLAKE2B a63cbd2211430bfbf1bc9bb489a68a2ee7182858ccb326dfe5e6d3a7b8fb6a8c34b56a539c8b9cf3a22a1cc3a4ffe22d365b0e5229ba2c2b6d0ce6bacf0e645b SHA512 e3b74558c05e5963ea87aa77baba0edc068634072ff97b8ea0880289e53213eed82b01784db2675263d6f47547bfef259b80353ed2843ce90a77a0252c551919
 DIST gap-4.14.0-beta1-core.tar.gz 38686095 BLAKE2B dec27a1d04cc9a75e3d896e8e08c07ff2f1e7e27cbb2a5a302a840fd9ed878abc91c8efa5b172118adf96949491badc809e86c43bbdca0bb6a78ce47b6ae53e5 SHA512 e56d768a2a84a3ba82cfcfb4c3d9f39f862410cf32f04c1a173376c7e2ca5beb55ab7a7519388ca5e3b2f8118d604033a0c405d1bfa26bb974a7ac8c02f574ea
-EBUILD gap-4.13.1-r1.ebuild 4008 BLAKE2B a56bc5655cf450ab304fc653354c9914861269f9bec8acb933f9cb392bba5c626156745658a89e19329e2485df2bac7cffbfd03f8bbbbb4b563186dfc34c1251 SHA512 f1dcc671f350e4962ac7869650d01c037d5dc530731f84289dd323ce31068f16edc450d4375f413f83c668403c4b4ddb3d7d753ed8f983db44425195888ad24a
+EBUILD gap-4.13.1-r2.ebuild 4057 BLAKE2B 58dcc68fe49fc016b67d3d36d83bbb158da3c27be42852eaedeae2170558a30fe1f117ff2a9223e2392dc699a25657704f8fc7d1422080f8ff20674b605cbe39 SHA512 53d1d1cd355d267f525efb18c8cbe171784dd692571431769d244c57402e51db95f49347fdcbcf3f0161d28b0f590c36c9888a4c3fb54a803f1e0f876edf2f1a
 EBUILD gap-4.13.1.ebuild 3952 BLAKE2B 7799ab87b5facb7cbe4934c53108a85b96725add2e61dbe0cea6fa4f5d4ef013f3d2d496da86e0d2fda2b13f1e6601fd2755d5a0671306b7d80fe14c6d599389 SHA512 53a7f462e3f7c4601a96a95a199cddc0800b187100ada6a3046aa3f502bb65f881dfc524b07676817e83ab51923c90c16ae6b7fc74f6d06a57e18cdbb5d4b0b6
 EBUILD gap-4.14.0_beta1.ebuild 3940 BLAKE2B d5b2df6c00fdfdd97a10bba50640fad285031f58d0c6306f1acb4451407304b241ceae9caf156ef6c92ed6003237608deeeee17083d139feb0db439d098520f9 SHA512 7eb3d741c955e927e7b2bc5abda6df5d2e779fd82a3317c5a574e350e1bb30bbc73a9e4ed496f12aea854f07e086b67158f41d1b1e638ed814e8e626bacbfd4f
 MISC metadata.xml 1582 BLAKE2B 9151244f139b0d675e327731c336c41d5d69c25856286c182944d57255fbb6d7b1f023195b3a01c829ff6f3ea1d5e6eb6edbcc796a30120deacde82b90b5f39c SHA512 f4490e9b13cee6604f14df39ea048d7578e080a8faa97b0bb22191a7dce56904416870ed64c289f91526087009f7488e8baed4e531c78f50a5b917e9e1684ce2
diff --git a/sci-mathematics/gap/files/gap-4.13.1-more-hash-fixes.patch b/sci-mathematics/gap/files/gap-4.13.1-more-hash-fixes.patch
new file mode 100644
index 000000000000..5a464a0fda49
--- /dev/null
+++ b/sci-mathematics/gap/files/gap-4.13.1-more-hash-fixes.patch
@@ -0,0 +1,50 @@
+From 19484a75098d43e75e3facfdd05dccefc358e43f Mon Sep 17 00:00:00 2001
+From: Max Horn <max@quendi.de>
+Date: Fri, 11 Oct 2024 14:54:29 +0200
+Subject: [PATCH] Fix hashing for integer plists (#5807)
+
+---
+ lib/dicthf.gi                            |  2 +-
+ tst/testbugfix/2024-10-11-orbit-hash.tst | 20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+ create mode 100644 tst/testbugfix/2024-10-11-orbit-hash.tst
+
+diff --git a/lib/dicthf.gi b/lib/dicthf.gi
+index e4349ac940..119d5329f6 100644
+--- a/lib/dicthf.gi
++++ b/lib/dicthf.gi
+@@ -164,7 +164,7 @@ function(m, v)
+     if not IsPlistRep(x) then
+       x := AsPlist(x);
+     fi;
+-    return HashKeyWholeBag(x, 1);
++    return HashKeyBag(x, 1, 0, Length(x) * GAPInfo.BytesPerVariable);
+   end;
+ 
+   # alternative code w/o HashKeyBag
+diff --git a/tst/testbugfix/2024-10-11-orbit-hash.tst b/tst/testbugfix/2024-10-11-orbit-hash.tst
+new file mode 100644
+index 0000000000..3735537e6f
+--- /dev/null
++++ b/tst/testbugfix/2024-10-11-orbit-hash.tst
+@@ -0,0 +1,20 @@
++# Fix a bug reported by Leonard Soicher caused by a bug in
++# the hash function for lists of small positive integers.
++gap> n:=280;;
++gap> G:=OnePrimitiveGroup(NrMovedPoints,n,Size,604800*2);
++J_2.2
++gap> blocks := [ [ 1, 2, 3, 28, 108, 119, 155, 198, 216, 226 ],
++>  [ 1, 2, 3, 118, 119, 140, 193, 213, 218, 226 ] ];;
++gap> Append(blocks[2],[1..1000]); for i in [1..1000] do Remove(blocks[2]); od;
++gap> Append(blocks[2],[1..1000]); for i in [1..1000] do Remove(blocks[2]); od;
++gap> ForAll(blocks,IsSet);
++true
++gap> orb1:=Orbit(G,blocks[1],OnSets);;
++gap> Length(orb1);
++12096
++gap> orb2:=Orbit(G,blocks[2],OnSets);;
++gap> Length(orb2);
++1008
++gap> orbs:=Orbits(G,blocks,OnSets);;
++gap> List(orbs,Length); # this code gave wrong results
++[ 12096, 1008 ]
diff --git a/sci-mathematics/gap/gap-4.13.1-r1.ebuild b/sci-mathematics/gap/gap-4.13.1-r2.ebuild
index 45cb0c98749e..49b0fd13f52a 100644
--- a/sci-mathematics/gap/gap-4.13.1-r1.ebuild
+++ b/sci-mathematics/gap/gap-4.13.1-r2.ebuild
@@ -65,7 +65,10 @@ RDEPEND="${DEPEND}"
 # packages, use package.provided.
 PDEPEND="${REQUIRED_PKGS} !minimal? ( ${AUTOLOADED_PKGS} )"
 
-PATCHES=( "${FILESDIR}/gap-4.13.1-hash-fixes.patch" )
+PATCHES=(
+	"${FILESDIR}/gap-4.13.1-hash-fixes.patch"
+	"${FILESDIR}/gap-4.13.1-more-hash-fixes.patch"
+)
 
 pkg_setup() {
 	if use valgrind; then