gentoo resync : 22.05.2021

3 files changed, 38 insertions, 1 deletions

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 9c56c524b671..d47faa21c173 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,6 +1,7 @@
 AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96bd5417c31005512ee8f256283921fb64ec4a9ec27fb7e721648b117d3be1000816d1e9bc5ae5adc5df63afe1b0490db020c6 SHA512 de3283be39cff0bba916b314eb9e112324626513f30b5c0e0340617535d8e66ee93fdd9613839633bf7e85244caff6fa1379cc5d0c0a7f9484d028a650eb8845
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
 AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
+AUX pari-2.13.1-rnfdisc.patch 1335 BLAKE2B 25c16204f996b210d345d1ca903d2256b07f8575ea5363cc5646508e84c77785f9a05b6c751a49bd15cf6915128d5e1f533d468ff0d2c544bd8b7d8cad37ac2f SHA512 70ec83d1dd028458d3f2d15b4159f53136ed50c84275d38121ad04bb38ef144c235e460aca8927152791e57a8e1fd9ebe5e233c624d953213fe83c00bbb09b24
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
@@ -9,5 +10,5 @@ DIST pari-2.13.0.tar.gz 4758091 BLAKE2B 21a008fbca9af60c7298daf2db5c596cf881fbf4
 DIST pari-2.13.1.tar.gz 4760932 BLAKE2B 50c8be1d07f303665013623f07109ef42a6d82ea88e4795c90be8ae4c714f78c2f009df40c457cc1c45f1591e5b8550965a35e3c9c272b8cd17508d774ef182e SHA512 57d0811c66d58ce6abf4d34d3f2ee98efaa22aa5f65941b8bd3d2ceaf5ba57447a8fe334b9587387b31298c85f19ec356a9db05d11dc6d956f921e7fc7d1596e
 EBUILD pari-2.11.4.ebuild 3327 BLAKE2B 8117499dc50d8146bd3988fbaf4c18ccf719cd482372687bc58eaadec09011ec29b1324d58df2669d0fbc6dcbf3985e3dedf8bb20ad6793bfbc496913d467d6d SHA512 39034792b1b133599cba2eb89d7c459a6eb39da7db0f3ee0793b0941f5be9c992e5b4a1a0a58ad0e272fdf00b5b7e24ade75f7d2e7a2b2691d565eceefeff05a
 EBUILD pari-2.13.0.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
-EBUILD pari-2.13.1.ebuild 3424 BLAKE2B 5d6bd25923c72ee36a037ca56f26fe71491ad3d2d1d98a3249291fc7ad50efdae7d9b170dd66691345f6e2c5080dc945fef06ed14174a89f3376e31faeca281e SHA512 ef976b96b5ad8600d96d9892ca24e449b1be11542ad531734fadec759b00188ac4afd9114fec76aace0f40e129e71e75acdc839b402cd31dd6bc93b6005898a9
+EBUILD pari-2.13.1-r1.ebuild 3458 BLAKE2B f2ad5f104a0818490238dfc4453a8995c0b7e768dfb9c51bdb3906f7f62affc80970cdd3afc83b88d6e678a7c32fb9aa7a6c2262b3cca7b03e37be2b2379aab3 SHA512 c8e6c33ee12431f982af943e32392b23846c5199dcea42f3f18a44a8d9ccd3ba62a78c27baa280ed7cebf6acab8f27f69f849de5a1faf7db99994fcd1c82d81b
 MISC metadata.xml 1764 BLAKE2B 8c5ad974148c99e21c30630ef1866a3ca7d34c87c214973c4025977130393a055de729bba4fda75d5e2ee288f439b1fc71e44bd3b68d09255f2ed3c81909f6fe SHA512 752c757e7b38995d44af25595da8626e773cb6083a0f9aafe7f3b6af1203b7da743b04b51bbc3f023e5e09c0620fe64fec1d44da7d84c88c4ef4619cbe347565
diff --git a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
new file mode 100644
index 000000000000..39d325911e88
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
@@ -0,0 +1,35 @@
+From 3edb98db78dd49bb8b4137b46781a7cd570c2556 Mon Sep 17 00:00:00 2001
+From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
+Date: Sun, 28 Mar 2021 13:27:24 +0200
+Subject: [PATCH] rnfdisc_factored: remove spurious Q_primpart [#2284]
+
+diff --git a/src/basemath/base2.c b/src/basemath/base2.c
+index b2b63ada5..531f5c558 100644
+--- a/src/basemath/base2.c
++++ b/src/basemath/base2.c
+@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd)
+ 
+   nf = checknf(nf);
+   pol = rnfdisc_get_T(nf, pol, &lim);
+-  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol)));
++  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol));
+   pol = nfX_to_monic(nf, pol, NULL);
+   fa = idealfactor_partial(nf, disc, lim);
+   P = gel(fa,1); l = lg(P);
+diff --git a/src/test/32/rnf b/src/test/32/rnf
+index 6bd4585..d24e1ce 100644 (file)
+--- a/src/test/32/rnf
++++ b/src/test/32/rnf
+@@ -832,9 +832,9 @@ error("inconsistent dimensions in idealtwoelt.")
+ 0
+ 0
+ 1
+-[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0]
+-~]
+-[2, -1]
++[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25
++/17, -12/17, 12/17, 16/17]~]
++[1, -1]
+   ***   at top-level: rnfdedekind(nf,P,pr2,1)
+   ***                 ^-----------------------
+   *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented.
diff --git a/sci-mathematics/pari/pari-2.13.1.ebuild b/sci-mathematics/pari/pari-2.13.1-r1.ebuild
index bc5709ab3388..12230c7f452d 100644
--- a/sci-mathematics/pari/pari-2.13.1.ebuild
+++ b/sci-mathematics/pari/pari-2.13.1-r1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
 	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
 	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+	"${FILESDIR}/${P}"-rnfdisc.patch
 )
 
 src_prepare() {