From 236302aac694377916670b7769f941e3f1dd0bbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 26 Jan 2023 19:56:43 +0000 Subject: gentoo auto-resync : 26:01:2023 - 19:56:42 --- sci-mathematics/Manifest.gz | Bin 18388 -> 18387 bytes sci-mathematics/pari/Manifest | 4 +- .../pari/files/pari-2.15.2-ellsea-r1.patch | 34 ++++++ .../pari/files/pari-2.15.2-ellsea.patch | 22 ---- sci-mathematics/pari/pari-2.15.2-r1.ebuild | 135 --------------------- sci-mathematics/pari/pari-2.15.2-r2.ebuild | 135 +++++++++++++++++++++ 6 files changed, 171 insertions(+), 159 deletions(-) create mode 100644 sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch delete mode 100644 sci-mathematics/pari/files/pari-2.15.2-ellsea.patch delete mode 100644 sci-mathematics/pari/pari-2.15.2-r1.ebuild create mode 100644 sci-mathematics/pari/pari-2.15.2-r2.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 8a866c65f803..c8f0b27471d4 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest index f1c7bd81df15..2c45c25d5aa4 100644 --- a/sci-mathematics/pari/Manifest +++ b/sci-mathematics/pari/Manifest @@ -1,7 +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.15.2-ellsea.patch 1078 BLAKE2B 25d72bbfbd14498e1e3c104c5e0379e54ec7a9da2fbc2664983997618751cfec608fa8e982d939bb432edeb1e9c953ddee03d0ce0310a185568ec8ee7d1fd3a5 SHA512 0d23e5bc789ed5886181fdc31ff5c34d4c5961c8d7f6185126a4dbf1f6dc1c4eb727673290a702cb68a33030c6512ad70ec37f8991e7bc2c17dacfb587a41ab7 +AUX pari-2.15.2-ellsea-r1.patch 1316 BLAKE2B 70bbe766490a263e957fd783cb85f3955317aa2fa0d0222fb415bd7cac145d8e31ed3013b519a7354912b14cba93426ef14f33461ecf906930621129b2881a27 SHA512 4ab9f1377ea381f678c25687083ca8632602336e19907938765944a9f275ebaee7b5cca18ee56ddb045e5d74bf2377d8352779b548ca81b5bd6e8af7fabef1bc AUX pari-2.15.2-install-doctex.patch 1249 BLAKE2B 85172256638ecff209f42882230a3e9fe6633718d44373621880bfb41979c703c7dc21168414db4724957da8d4ec0857f090311d5c901842e584d70e4bacb697 SHA512 f2c41595205a65775d030be411a21ca34e35a703088db7a3959580e91fb1333764e5dafbc9cb698ef7c91702dd77dd4de801eead48af8e9111dff8fdf2bb7d85 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 @@ -9,5 +9,5 @@ AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9 DIST pari-2.15.2.tar.gz 5176694 BLAKE2B b3aa021cb0b786dfde691b150d38c0ee9e9844ff5d2554d7a4f0cd85b27c8077696433b14c0b2128930b7db2191e7db99bdebc200e03607554cc4a9394ea42a4 SHA512 fa9e8713484ab5d659dcf7cf65de0fbaf28334969f443bfaffb8fc19c2305631435fc5635e090cbd8033758ea18200a62c47e8434067af9a86565832e96d489c EBUILD pari-2.13.4-r1.ebuild 3669 BLAKE2B 50694a82d37f3d7315e61f804029a6271afc2193a28378e8321cef7d4cedac8f04b4e972547427f58712e3b003eea7371df7a2f21f990eb81e8ec667bca62e06 SHA512 d58c360d15d93cc4131a3f54438e34522ccdb1b42b5298551f73f86e619f8b6219e6472c97e44bb3a3bb22c9bd0b5bc174a85a38e15f3415e89fcda53293debf -EBUILD pari-2.15.2-r1.ebuild 4096 BLAKE2B 72af23fb75882b05fd270ba2cced745fa990c904d37ca37bcf2ae251b945dc382c778cf626ea97c6e5b220f8400b9b79eb4451d74c876625982d870f489790f9 SHA512 846b8d46587d37d957461382ec47825fcc3bed1c794dc21e0de01a1beefdee51e18ba9a6c7db90213fd94357f4ce7b206a00ea30301b8918f9886ee6bb62acdb +EBUILD pari-2.15.2-r2.ebuild 4099 BLAKE2B 11a2bd28e1aea2167fdaab4ddc572cbf33d390d44c0fde30485ce97ad028a33fa033c48f8dd033aa200af013f2536a301587e94e1c606116d8367d86bf94ba6f SHA512 1dffbfb332bdb908fc471fed0a4caa5ae1507e7fa9f2fdd972fd6645b1ea7394a96d9d692364b47ecae7fc165d50f101599880df1538e669b2ff65a3d24f3dd6 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee diff --git a/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch new file mode 100644 index 000000000000..b8af421c0e56 --- /dev/null +++ b/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch @@ -0,0 +1,34 @@ +A fix for upstream bug 2441 and gentoo bug 892035, with the changes to +CHANGES and the test suite stripped out (they don't apply cleanly). + +From 6f556664bea5dae9d7101533be65f10b9d6332e2 Mon Sep 17 00:00:00 2001 +From: Bill Allombert +Date: Fri, 20 Jan 2023 11:13:46 +0100 +Subject: [PATCH 1/1] ellcard(ellinit([1,1]*ffgen([41,16])))-> impossible + inverse [#2441] + +find_isogenous_from_Atkin: check that the kernel divides the division polynomial +--- + CHANGES | 1 + + src/basemath/ellsea.c | 3 ++- + src/test/32/ellff | 3 ++- + src/test/in/ellff | 3 +++ + 4 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c +index a6871fa6a7..05f148eadd 100644 +--- a/src/basemath/ellsea.c ++++ b/src/basemath/ellsea.c +@@ -852,7 +852,8 @@ find_isogenous_from_Atkin(GEN a4, GEN a6, ulong ell, struct meqn *MEQN, GEN g, G + GEN a4t, a6t, h; + a4a6t(&a4t, &a6t, ell, E4t, E6t, T, p); + h = find_kernel(a4, a6, ell, a4t, a6t, pp1, T, p, pp, e); +- if (h) return gerepilecopy(ltop, mkvec3(a4t, a6t, h)); ++ if (h && signe(Fq_elldivpolmod(a4, a6, ell, h, T, pp))==0) ++ return gerepilecopy(ltop, mkvec3(a4t, a6t, h)); + } + } + pari_err_BUG("find_isogenous_from_Atkin, kernel not found"); +-- +2.30.2 + diff --git a/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch deleted file mode 100644 index a5c19504ea87..000000000000 --- a/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch +++ /dev/null @@ -1,22 +0,0 @@ -# upstream bug https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441 -# will be fixed in 2.15.3 -diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c -index a6871fa6a7..f1e725ea55 100644 ---- a/src/basemath/ellsea.c -+++ b/src/basemath/ellsea.c -@@ -1303,6 +1303,7 @@ find_trace_Elkies_power(GEN a4, GEN a6, ulong ell, long *pt_k, struct meqn *MEQN - lambda = tr ? find_eigen_value_oneroot(a4, a6, ell, tr, kpoly, T, p): - find_eigen_value_power(a4, a6, ell, 1, 1, kpoly, T, p); - if (DEBUGLEVEL>1) err_printf(" [%ld ms]", timer_delay(ti)); -+ if (lambda==ell) return NULL; - if (smallfact && smallfact%(long)ell!=0) - { - ulong pell = pellk%ell; -@@ -1317,6 +1318,7 @@ find_trace_Elkies_power(GEN a4, GEN a6, ulong ell, long *pt_k, struct meqn *MEQN - if (!tmp) { k = cnt-1; break; } - if (DEBUGLEVEL) err_printf(", %Ps", powuu(ell, cnt)); - lambda = find_eigen_value_power(a4, a6, ell, cnt, lambda, gel(tmp,3), T, p); -+ if (lambda == upowuu(ell, cnt)) { k = cnt-1; break; } - Eba4 = Eca4; - Eba6 = Eca6; - Eca4 = gel(tmp,1); diff --git a/sci-mathematics/pari/pari-2.15.2-r1.ebuild b/sci-mathematics/pari/pari-2.15.2-r1.ebuild deleted file mode 100644 index 8a767ad7f37d..000000000000 --- a/sci-mathematics/pari/pari-2.15.2-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Computer-aided number theory C library and tools" -HOMEPAGE="https://pari.math.u-bordeaux.fr/" -SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz" - -LICENSE="GPL-2" - -# The subslot is the value of $soname_num obtained from -# upstream's config/version script. -SLOT="0/8" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="data doc examples fltk gmp test threads X" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - doc? ( virtual/latex-base ) -" -DEPEND=" - sys-libs/readline:0= - data? ( sci-mathematics/pari-data ) - doc? ( X? ( x11-misc/xdg-utils ) ) - fltk? ( x11-libs/fltk:1= ) - gmp? ( dev-libs/gmp:0= ) - X? ( x11-libs/libX11:0= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}"-2.9.4-ppc.patch - "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch - "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch - "${FILESDIR}/${PN}"-2.15.2-ellsea.patch - "${FILESDIR}/${PN}"-2.15.2-install-doctex.patch -) - -src_prepare() { - default - - # move doc dir to a gentoo doc dir and replace acroread by xdg-open - sed -i \ - -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \ - -e 's:"acroread":"xdg-open":' \ - doc/gphelp.in || die "Failed to fix doc dir" - - # These tests fail when LaTeX is not installed (which we don't - # require without USE=doc), most likely due to output formatting - # issues but I haven't deleted my LaTeX installation to check. - # There's no real upstream support for enabling/disabling the LaTeX - # docs, so this is probably the correctest way to skip these tests. - if ! use doc; then - rm src/test/{in,32}/help || die - fi -} - -src_configure() { - tc-export CC CXX PKG_CONFIG - - # Workaraound to "asm operand has impossible constraints" as - # suggested in bug #499996. - use x86 && append-cflags $(test-flags-CC -fno-stack-check) - - # sysdatadir installs a pari.cfg stuff which is informative only. - # It is supposed to be for "architecture-dependent" data. It needs - # to be easily discoverable for downstream packages such as gp2c. - # We set LD="" and DLLD="$CC" so that the "shared library linker" - # always gets set to the value of the compiler used. Pari's build - # system does not cope very well with a naked linker, it is - # expecting a compiler driver. See bugs 722090 and 871117. - # DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would - # be in a less-weird build system. - LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \ - --prefix="${EPREFIX}"/usr \ - --datadir="${EPREFIX}/usr/share/${PN}" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --sysdatadir="${EPREFIX}"/usr/share/pari \ - --mandir="${EPREFIX}"/usr/share/man/man1 \ - --with-readline="${EPREFIX}"/usr \ - --with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \ - --with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with fltk) \ - $(use_with gmp) \ - --without-qt \ - $(usex threads "--mt=pthread" "" "" "") \ - || die "./Configure failed" -} - -src_compile() { - emake gp - - if use doc; then - # To prevent sandbox violations by metafont - VARTEXFONTS="${T}/fonts" emake docpdf - fi -} - -src_test() { - # Welcome to the jungle, where the tests fail if you make your - # terminal bigger. - emake COLUMNS=80 test-all -} - -src_install() { - DOCS=( AUTHORS CHANGES* COMPAT NEW README* ) - - # Install examples to a junk location by default because "make - # install-nodata" includes the examples with it. Only if the user - # has USE=examples set do we provide the correct directory. - local exdir="${T}" - if use examples; then - docompress -x "/usr/share/doc/${PF}/examples" - exdir="${ED}/usr/share/doc/${PF}/examples" - fi - - # Use "true" in place of "strip" to sabotage the unconditional - # binary stripping. - emake DESTDIR="${D}" \ - EXDIR="${exdir}" \ - STRIP="true" \ - install-nodata install-data - einstalldocs - - if use doc; then - docompress -x "/usr/share/doc/${PF}" - emake \ - DESTDIR="${D}" \ - DOCDIR="${ED}/usr/share/doc/${PF}" \ - install-docpdf install-doctex - fi -} diff --git a/sci-mathematics/pari/pari-2.15.2-r2.ebuild b/sci-mathematics/pari/pari-2.15.2-r2.ebuild new file mode 100644 index 000000000000..c25f507e52f3 --- /dev/null +++ b/sci-mathematics/pari/pari-2.15.2-r2.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Computer-aided number theory C library and tools" +HOMEPAGE="https://pari.math.u-bordeaux.fr/" +SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz" + +LICENSE="GPL-2" + +# The subslot is the value of $soname_num obtained from +# upstream's config/version script. +SLOT="0/8" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="data doc examples fltk gmp test threads X" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + doc? ( virtual/latex-base ) +" +DEPEND=" + sys-libs/readline:0= + data? ( sci-mathematics/pari-data ) + doc? ( X? ( x11-misc/xdg-utils ) ) + fltk? ( x11-libs/fltk:1= ) + gmp? ( dev-libs/gmp:0= ) + X? ( x11-libs/libX11:0= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}"-2.9.4-ppc.patch + "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch + "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch + "${FILESDIR}/${PN}"-2.15.2-ellsea-r1.patch + "${FILESDIR}/${PN}"-2.15.2-install-doctex.patch +) + +src_prepare() { + default + + # move doc dir to a gentoo doc dir and replace acroread by xdg-open + sed -i \ + -e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \ + -e 's:"acroread":"xdg-open":' \ + doc/gphelp.in || die "Failed to fix doc dir" + + # These tests fail when LaTeX is not installed (which we don't + # require without USE=doc), most likely due to output formatting + # issues but I haven't deleted my LaTeX installation to check. + # There's no real upstream support for enabling/disabling the LaTeX + # docs, so this is probably the correctest way to skip these tests. + if ! use doc; then + rm src/test/{in,32}/help || die + fi +} + +src_configure() { + tc-export CC CXX PKG_CONFIG + + # Workaraound to "asm operand has impossible constraints" as + # suggested in bug #499996. + use x86 && append-cflags $(test-flags-CC -fno-stack-check) + + # sysdatadir installs a pari.cfg stuff which is informative only. + # It is supposed to be for "architecture-dependent" data. It needs + # to be easily discoverable for downstream packages such as gp2c. + # We set LD="" and DLLD="$CC" so that the "shared library linker" + # always gets set to the value of the compiler used. Pari's build + # system does not cope very well with a naked linker, it is + # expecting a compiler driver. See bugs 722090 and 871117. + # DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would + # be in a less-weird build system. + LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \ + --prefix="${EPREFIX}"/usr \ + --datadir="${EPREFIX}/usr/share/${PN}" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --sysdatadir="${EPREFIX}"/usr/share/pari \ + --mandir="${EPREFIX}"/usr/share/man/man1 \ + --with-readline="${EPREFIX}"/usr \ + --with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \ + --with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \ + $(use_with fltk) \ + $(use_with gmp) \ + --without-qt \ + $(usex threads "--mt=pthread" "" "" "") \ + || die "./Configure failed" +} + +src_compile() { + emake gp + + if use doc; then + # To prevent sandbox violations by metafont + VARTEXFONTS="${T}/fonts" emake docpdf + fi +} + +src_test() { + # Welcome to the jungle, where the tests fail if you make your + # terminal bigger. + emake COLUMNS=80 test-all +} + +src_install() { + DOCS=( AUTHORS CHANGES* COMPAT NEW README* ) + + # Install examples to a junk location by default because "make + # install-nodata" includes the examples with it. Only if the user + # has USE=examples set do we provide the correct directory. + local exdir="${T}" + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + exdir="${ED}/usr/share/doc/${PF}/examples" + fi + + # Use "true" in place of "strip" to sabotage the unconditional + # binary stripping. + emake DESTDIR="${D}" \ + EXDIR="${exdir}" \ + STRIP="true" \ + install-nodata install-data + einstalldocs + + if use doc; then + docompress -x "/usr/share/doc/${PF}" + emake \ + DESTDIR="${D}" \ + DOCDIR="${ED}/usr/share/doc/${PF}" \ + install-docpdf install-doctex + fi +} -- cgit v1.2.3