* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2020-04-26 8:40 Joonas Niilola
0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2020-04-26 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 2ad4661499ae447c67c366828a89afae43b23dfa
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Wed Apr 22 02:18:51 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 08:39:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad46614
sci-mathematics/pari: superceded by new release
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15441
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-mathematics/pari/Manifest | 1 -
.../files/pari-2.11.3-incorrect_bnfisunit.patch | 49 ---------
sci-mathematics/pari/pari-2.11.3.ebuild | 112 ---------------------
3 files changed, 162 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index a01ef39374a..0c8ef471926 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,3 +1,2 @@
DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
-DIST pari-2.11.3.tar.gz 4441199 BLAKE2B 49b001f2dc27d1be7a742c165881f2b21d55cf387a91d880bd3a16cbc5d69172f931caa779c5ccbe79b6855175695b5e88ff99b420b4f2b7404dd5e4a53a135c SHA512 2624cdd0523ec02324f58af65703003c88ab596bcaa30c366a9ea01123b0ae657285b10016abaa06b6783ba34dd4980f560900b836b8df228b9dbe0ca36a5b11
DIST pari-2.11.4.tar.gz 4445000 BLAKE2B e910783186eeb71e74a369681c113b77271abd7f87d7a9f366aea83f36ab984f02e312cd451fad7ee6efb2fa285780e8fa78540bb1fd4b135a62d265176c80e0 SHA512 1312f452244cd1d814a1e43e108378c956669b614845f21199b7039fe6462881168983d4badb8a80bb1bac202cd82d92788a2b4f3c23d16f993cae6e251c4fe1
diff --git a/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch b/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
deleted file mode 100644
index 877cc6ace75..00000000000
--- a/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Karim Belabas <Karim.Belabas@math.u-bordeaux1.fr>
-Date: Mon, 9 Sep 2019 15:20:21 +0000 (+0200)
-Subject: fix #2164
-X-Git-Url: https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=c7a1d35f382e96ddf14694be27a0ca5746880700
-
-fix #2164
----
-
-diff --git a/src/basemath/buch2.c b/src/basemath/buch2.c
-index a853d3c48..e31b2278b 100644
---- a/src/basemath/buch2.c
-+++ b/src/basemath/buch2.c
-@@ -2136,7 +2136,8 @@ bnfisunit(GEN bnf,GEN x)
- for (i = 1; i < RU; i++)
- if (gexpo(gel(emb,i)) > -1) break;
- p1 = imag_i( row_i(logunit,i, 1,RU-1) );
-- p1 = RgV_dotproduct(p1, ex); if (!R1) p1 = gmul2n(p1, -1);
-+ p1 = RgV_dotproduct(p1, ex);
-+ if (i > R1) p1 = gmul2n(p1, -1);
- p1 = gsub(garg(gel(emb,i),prec), p1);
- /* p1 = arg(the missing root of 1) */
-
-diff --git a/src/test/32/nf b/src/test/32/nf
-index 16bf83ce3..e6c41f8b5 100644
---- a/src/test/32/nf
-+++ b/src/test/32/nf
-@@ -502,6 +502,7 @@ Mod(1/2*x - 1/2, x^2 + 23)
- [1, 1/2*x - 1/2]
- Mod(0, x)
- Mod(-6/5, x)
-+[0, 2, Mod(0, 2)]~
- *** at top-level: nfinit([y^3+2,[1,x]])
- *** ^---------------------
- *** nfinit: incorrect type in nfinit_basic (t_VEC).
-diff --git a/src/test/in/nf b/src/test/in/nf
-index 49148123b..94d5165bc 100644
---- a/src/test/in/nf
-+++ b/src/test/in/nf
-@@ -156,6 +156,10 @@ K.zk
- nfinit(x, 3)[2]
- nfinit(1/2*x + 3/5, 3)[2]
-
-+\\ #2164
-+bnf = bnfinit(y^4-y-1);
-+bnfisunit(bnf,-y^3+2*y^2-1)
-+
- \\ ERRORS: keep at end of file
-
- nfinit([y^3+2,[1,x]])
diff --git a/sci-mathematics/pari/pari-2.11.3.ebuild b/sci-mathematics/pari/pari-2.11.3.ebuild
deleted file mode 100644
index 7f3a302bbe4..00000000000
--- a/sci-mathematics/pari/pari-2.11.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp test threads X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="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-strip.patch
- "${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.11.2-Makefile-LDFLAGS.patch
- "${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
- "${FILESDIR}/${PN}"-2.11.3-incorrect_bnfisunit.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"
-}
-
-src_configure() {
- tc-export CC CXX
-
- # Workaraound to "asm operand has impossible constraints" as
- # suggested in bug #499996.
- use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # 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.
- ./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() {
- local mymake=""
- use hppa && \
- mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
- emake ${mymake} 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* )
- default
-
- if use doc; then
- docompress -x "/usr/share/doc/${PF}"
- emake \
- DESTDIR="${D}" \
- EXDIR="${ED}/usr/share/doc/${PF}/examples" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- install-doc
- fi
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2024-07-14 22:39 Michael Orlitzky
0 siblings, 0 replies; 12+ messages in thread
From: Michael Orlitzky @ 2024-07-14 22:39 UTC (permalink / raw
To: gentoo-commits
commit: e37ef289dd3d3cfa361d0f909d71449ea6ec5bd6
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 22:36:23 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 22:39:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37ef289
sci-mathematics/pari: drop 2.15.4-r1
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/pari/Manifest | 1 -
.../pari/files/pari-2.11.2-no-automagic.patch | 68 ----------
.../pari/files/pari-2.9.4-fltk-detection.patch | 22 ----
sci-mathematics/pari/pari-2.15.4-r1.ebuild | 145 ---------------------
4 files changed, 236 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index ec03f2e00668..1c695ff917f7 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1 @@
-DIST pari-2.15.4.tar.gz 5183685 BLAKE2B 2e20b6dc073ce69bc098dd849e6ab43cb38b05d30ff5f72a31272cd24ef01aa515d4e2a4948264ca89169a6980cd9d76f86c7fbb9aad5be604680569950d9c25 SHA512 2b9f0c1fe7198406df8e6ceb3fcdc8bfb75f5c7ebfb963f023a1eebfff0bcc26e3b690941e188d6b9f8dfb6cddf4ce4c00f2cc320ebe47d42ae7596c774ed6cc
DIST pari-2.15.5.tar.gz 5186798 BLAKE2B b253c6d8ad38462e81852d7bb364d06a7cbaae7b085672653da8d9f91f0173cfdef8f537ebc7313b6484f610d43e10fb0547f5d920789b95c8d0027dd52e8312 SHA512 59b2ebed43176f1ee750146053644bffbf673b4b4810134bc39132665941152772afb7a9332b842fc64e5ab8d5747a872c1b8ff327d3bd5eedaa1591691fff13
diff --git a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
deleted file mode 100644
index 80f000c5f43e..000000000000
--- a/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/config/Makefile.SH
-+++ b/config/Makefile.SH
-@@ -74,12 +74,12 @@ case "$which_graphic_lib" in
- ps|svg|none)
- graph=plot$which_graphic_lib;;
- Qt4)
-- PLOTCFLAGS="\$(QTINC)"
-- PLOTLIBS="\$(QTLIB) $QTLIBS"
-+ PLOTCFLAGS="`${PKG_CONFIG} --cflags QtGui`"
-+ PLOTLIBS="`${PKG_CONFIG} --libs QtGui`"
- graph=plotQt4;;
- fltk)
-- PLOTCFLAGS=
-+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
- PLOTLIBS="$FLTK_LIBS"
- postconfig='fltk-config --post '
- graph=plotfltk;;
- win32)
-@@ -267,7 +267,7 @@ RLLIBS = $RLLIBS
- # GMP
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
--QTMOC = $QTMOC
-+QTMOC = "`which moc`"
- QTINC = $QTINC
- QTLIB = $QTLIB
- PLOTCFLAGS = $PLOTCFLAGS
---- a/config/get_config_options
-+++ b/config/get_config_options
-@@ -86,6 +86,7 @@ while test $# -gt 0; do
- --with-ncurses-lib=*|--with-ncurses=*)
- with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-qt|--with-qt=no) without_qt=yes ;;
- --with-qt) with_qt=yes ;;
- --with-qt=*)
- with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -94,6 +95,7 @@ while test $# -gt 0; do
- --with-qt-include=*)
- with_qt_include=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-fltk|--with-fltk=no) without_fltk=yes ;;
- --with-fltk) with_fltk=yes ;;
- --with-fltk=*)
- with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -172,10 +174,12 @@ Optional libraries:
- --with-gmp-lib=DIR specify location of gmp libs
-
- --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
-+ --without-qt do not try to use the Qt lib
- --with-qt-include=DIR specify location of Qt headers
- --with-qt-lib=DIR specify location of Qt libs
-
- --with-fltk use the FLTK graphical library [need fltk-config]
-+ --without-fltk do not try to use the FLTK lib
-
- Miscellaneous
- --with-runtime-perl[=path-to-perl-binary] for gphelp / tex2mail
---- a/config/get_graphic_lib
-+++ b/config/get_graphic_lib
-@@ -7,6 +7,7 @@ FLTK_LIBS QTDIR QTLIB"
-
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt"; then which_graphic_lib=Qt; fi
-+if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$fastread" != yes; then
- cat << EOT
- ==========================================================================
diff --git a/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch b/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
deleted file mode 100644
index 26e146e032a6..000000000000
--- a/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/config/get_fltk b/config/get_fltk
-index 87d0c1d..22f5bd8 100644
---- a/config/get_fltk
-+++ b/config/get_fltk
-@@ -2,13 +2,16 @@ if test -z "$with_fltk"; then
- with_fltk=yes
- fi
-
-+cmd="FLTK_CXXFLAGS=\`fltk-config --cxxflags\`"
-+. log_cmd
-+
- cmd="FLTK_LIBS=\`fltk-config --ldflags\`"
- . log_cmd
-
- exe=$osname-$arch-fltk$$$exe_suff
- cxx=$CXX
- if test -z "$cxx"; then cxx=g++; fi;
--cmd="$cxx $CFLAGS $FLTK_LIBS -o $exe has_fltk.c"
-+cmd="$cxx $CFLAGS $FLTK_CXXFLAGS $FLTK_LIBS -o $exe has_fltk.c"
- . log_cmd
- if test -r "$exe"; then
- echo "Using FLTK library"
diff --git a/sci-mathematics/pari/pari-2.15.4-r1.ebuild b/sci-mathematics/pari/pari-2.15.4-r1.ebuild
deleted file mode 100644
index 07ec717b7ad5..000000000000
--- a/sci-mathematics/pari/pari-2.15.4-r1.ebuild
+++ /dev/null
@@ -1,145 +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"
-
-# Their LICENSE file says "or (at your option) any later version"
-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"
-REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
-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}"
-
-# Both of these should be obsolete in the next version. I've sent the
-# fltk CXXFLAGS bit upstream, and using --graphic=<foo> hopefully works
-# around the automagic parts.
-PATCHES=(
- "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
- "${FILESDIR}/${PN}"-2.11.2-no-automagic.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.
- #
- # There's a lot of automagic involved in the graphics detection. We
- # first pass --graphic=none, which disables some of it. We then pass
- # --graphic=fltk (or --graphic=X11) only if USE=fltk (or USE=X) is
- # set. This is a stronger hint to the build system than --with-fltk
- # would be, and importantly does not rely on the corresponding but
- # nonexistent(!) option option for X11.
- 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)" \
- --graphic=none \
- $(usex X --graphic=X11 "" "" "") \
- $(usex fltk --graphic=fltk "" "" "") \
- $(use_with gmp) \
- $(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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2023-10-31 12:59 Michael Orlitzky
0 siblings, 0 replies; 12+ messages in thread
From: Michael Orlitzky @ 2023-10-31 12:59 UTC (permalink / raw
To: gentoo-commits
commit: d9fcca476e20004701ce379b18ae9cfdfbf220af
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 12:46:47 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:56:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fcca47
sci-mathematics/pari: drop 2.15.3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/pari/Manifest | 1 -
sci-mathematics/pari/files/pari-2.9.4-ppc.patch | 9 --
sci-mathematics/pari/pari-2.15.3.ebuild | 133 ------------------------
3 files changed, 143 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index ca590e9f02fe..c96e983220ff 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1 @@
-DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b
DIST pari-2.15.4.tar.gz 5183685 BLAKE2B 2e20b6dc073ce69bc098dd849e6ab43cb38b05d30ff5f72a31272cd24ef01aa515d4e2a4948264ca89169a6980cd9d76f86c7fbb9aad5be604680569950d9c25 SHA512 2b9f0c1fe7198406df8e6ceb3fcdc8bfb75f5c7ebfb963f023a1eebfff0bcc26e3b690941e188d6b9f8dfb6cddf4ce4c00f2cc320ebe47d42ae7596c774ed6cc
diff --git a/sci-mathematics/pari/files/pari-2.9.4-ppc.patch b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
deleted file mode 100644
index 558f7eb9eda4..000000000000
--- a/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -r -U2 pari-2.9.4.orig/config/arch-osname pari-2.9.4/config/arch-osname
---- pari-2.9.4.orig/config/arch-osname 2011-09-23 03:02:11.000000000 +0700
-+++ pari-2.9.4/config/arch-osname 2018-01-13 16:22:39.623382825 +0700
-@@ -40,4 +40,5 @@
- linux) arch=`uname -m`
- case $arch in
-+ ppc) arch=powerpc;;
- sparc64) arch=sparcv9;;
- parisc*) arch=hppa;;
diff --git a/sci-mathematics/pari/pari-2.15.3.ebuild b/sci-mathematics/pari/pari-2.15.3.ebuild
deleted file mode 100644
index 2c285bc6c7ab..000000000000
--- a/sci-mathematics/pari/pari-2.15.3.ebuild
+++ /dev/null
@@ -1,133 +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.9.4-fltk-detection.patch
- "${FILESDIR}/${PN}"-2.11.2-no-automagic.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
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2023-03-18 19:43 Michael Orlitzky
0 siblings, 0 replies; 12+ messages in thread
From: Michael Orlitzky @ 2023-03-18 19:43 UTC (permalink / raw
To: gentoo-commits
commit: ab98c256a0799d183172beff705dabbf663192c1
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:35:55 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 19:40:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab98c256
sci-mathematics/pari: add 2.15.3, drop 2.15.2-r2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/pari/Manifest | 2 +-
.../pari/files/pari-2.15.2-ellsea-r1.patch | 34 ----------------------
.../pari/files/pari-2.15.2-install-doctex.patch | 25 ----------------
.../{pari-2.15.2-r2.ebuild => pari-2.15.3.ebuild} | 4 +--
4 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 9e878940b366..787883758f30 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1,2 @@
DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-DIST pari-2.15.2.tar.gz 5176694 BLAKE2B b3aa021cb0b786dfde691b150d38c0ee9e9844ff5d2554d7a4f0cd85b27c8077696433b14c0b2128930b7db2191e7db99bdebc200e03607554cc4a9394ea42a4 SHA512 fa9e8713484ab5d659dcf7cf65de0fbaf28334969f443bfaffb8fc19c2305631435fc5635e090cbd8033758ea18200a62c47e8434067af9a86565832e96d489c
+DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b
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
deleted file mode 100644
index b8af421c0e56..000000000000
--- a/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 <Bill.Allombert@math.u-bordeaux.fr>
-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-install-doctex.patch b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
deleted file mode 100644
index d504326b7b43..000000000000
--- a/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0888050e8f3fc8c07e42331651c970d80c8d6a90 Mon Sep 17 00:00:00 2001
-From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
-Date: Wed, 25 Jan 2023 18:42:09 +0100
-Subject: [PATCH] TOP_Make.SH: add target install-docvi, install-doctex [#2444]
-
----
- config/TOP_Make.SH | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/TOP_Make.SH b/config/TOP_Make.SH
-index d2543c91eb..e60fd5f6ee 100644
---- a/config/TOP_Make.SH
-+++ b/config/TOP_Make.SH
-@@ -42,7 +42,7 @@ all::
- @\$(MAKE) gp
- @-cd doc && \$(MAKE) doc
-
--gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
-+gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-doctex install-docdvi install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
- @dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
- if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
- cd \$\$dir && \$(MAKE) \$@
---
-2.30.2
-
diff --git a/sci-mathematics/pari/pari-2.15.2-r2.ebuild b/sci-mathematics/pari/pari-2.15.3.ebuild
similarity index 97%
rename from sci-mathematics/pari/pari-2.15.2-r2.ebuild
rename to sci-mathematics/pari/pari-2.15.3.ebuild
index c25f507e52f3..123f174d15a3 100644
--- a/sci-mathematics/pari/pari-2.15.2-r2.ebuild
+++ b/sci-mathematics/pari/pari-2.15.3.ebuild
@@ -33,10 +33,8 @@ 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
+ "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2023-01-16 16:41 Michael Orlitzky
0 siblings, 0 replies; 12+ messages in thread
From: Michael Orlitzky @ 2023-01-16 16:41 UTC (permalink / raw
To: gentoo-commits
commit: d4b6f83e21e7151ac0471d8c7b62c973928e6d08
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 01:21:24 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 16:40:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b6f83e
sci-mathematics/pari: add 2.15.2
Closes: https://github.com/gentoo/gentoo/pull/29112
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
Signed-off-by: François Bissey <frp.bissey <AT> gmail.com>
sci-mathematics/pari/Manifest | 1 +
.../pari/files/pari-2.15.2-ellsea.patch | 22 ++++
sci-mathematics/pari/pari-2.15.2.ebuild | 127 +++++++++++++++++++++
3 files changed, 150 insertions(+)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index df9fca51a90a..d9cc0ed7c828 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1,3 @@
DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
DIST pari-2.15.1.tar.gz 5175706 BLAKE2B abc04a8bd75f756ad62937941c3b88f910bf57d58e7c4eda20649292ce5ba390688abe463d27cb22af0aee0249967e67a6f929beb9ef328d00d05648af5bf72e SHA512 8f536c1cabff3a082f67febd00240506eef5288c7e85c97d23018e8cdd01109dfb8ebe2fa71dc0e929c55ca00f31349fd145030689c988289201de2ddbcf0a5c
+DIST pari-2.15.2.tar.gz 5176694 BLAKE2B b3aa021cb0b786dfde691b150d38c0ee9e9844ff5d2554d7a4f0cd85b27c8077696433b14c0b2128930b7db2191e7db99bdebc200e03607554cc4a9394ea42a4 SHA512 fa9e8713484ab5d659dcf7cf65de0fbaf28334969f443bfaffb8fc19c2305631435fc5635e090cbd8033758ea18200a62c47e8434067af9a86565832e96d489c
diff --git a/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch
new file mode 100644
index 000000000000..a5c19504ea87
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch
@@ -0,0 +1,22 @@
+# 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.ebuild b/sci-mathematics/pari/pari-2.15.2.ebuild
new file mode 100644
index 000000000000..e677ee6a41a1
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.15.2.ebuild
@@ -0,0 +1,127 @@
+# 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 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-strip.patch
+ "${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.11.2-Makefile-LDFLAGS.patch
+ "${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+ "${FILESDIR}/${PN}"-2.15.2-ellsea.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)
+
+ # need to force optimization here, as it breaks without
+ if is-flag -O0; then
+ replace-flags -O0 -O2
+ elif ! is-flag -O?; then
+ append-flags -O2
+ fi
+
+ # 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.
+ LD="" DLLD="$(tc-getCC)" ./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* )
+ default
+
+ if use doc; then
+ docompress -x "/usr/share/doc/${PF}"
+ emake \
+ DESTDIR="${D}" \
+ EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install-doc
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2020-04-17 7:36 Joonas Niilola
0 siblings, 0 replies; 12+ messages in thread
From: Joonas Niilola @ 2020-04-17 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 15f489e9fbc977dc72d9bdcabc8b19dce3e2aabf
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Wed Apr 8 04:19:36 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 07:35:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f489e9
sci-mathematics/pari: new release + upstream patch
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-mathematics/pari/Manifest | 1 +
.../files/pari-2.11.3-incorrect_bnfisunit.patch | 49 +++++++++
sci-mathematics/pari/pari-2.11.3.ebuild | 112 +++++++++++++++++++++
3 files changed, 162 insertions(+)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c679cd11326..dc1b0ad1731 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1 +1,2 @@
DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
+DIST pari-2.11.3.tar.gz 4441199 BLAKE2B 49b001f2dc27d1be7a742c165881f2b21d55cf387a91d880bd3a16cbc5d69172f931caa779c5ccbe79b6855175695b5e88ff99b420b4f2b7404dd5e4a53a135c SHA512 2624cdd0523ec02324f58af65703003c88ab596bcaa30c366a9ea01123b0ae657285b10016abaa06b6783ba34dd4980f560900b836b8df228b9dbe0ca36a5b11
diff --git a/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch b/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
new file mode 100644
index 00000000000..877cc6ace75
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.3-incorrect_bnfisunit.patch
@@ -0,0 +1,49 @@
+From: Karim Belabas <Karim.Belabas@math.u-bordeaux1.fr>
+Date: Mon, 9 Sep 2019 15:20:21 +0000 (+0200)
+Subject: fix #2164
+X-Git-Url: https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=commitdiff_plain;h=c7a1d35f382e96ddf14694be27a0ca5746880700
+
+fix #2164
+---
+
+diff --git a/src/basemath/buch2.c b/src/basemath/buch2.c
+index a853d3c48..e31b2278b 100644
+--- a/src/basemath/buch2.c
++++ b/src/basemath/buch2.c
+@@ -2136,7 +2136,8 @@ bnfisunit(GEN bnf,GEN x)
+ for (i = 1; i < RU; i++)
+ if (gexpo(gel(emb,i)) > -1) break;
+ p1 = imag_i( row_i(logunit,i, 1,RU-1) );
+- p1 = RgV_dotproduct(p1, ex); if (!R1) p1 = gmul2n(p1, -1);
++ p1 = RgV_dotproduct(p1, ex);
++ if (i > R1) p1 = gmul2n(p1, -1);
+ p1 = gsub(garg(gel(emb,i),prec), p1);
+ /* p1 = arg(the missing root of 1) */
+
+diff --git a/src/test/32/nf b/src/test/32/nf
+index 16bf83ce3..e6c41f8b5 100644
+--- a/src/test/32/nf
++++ b/src/test/32/nf
+@@ -502,6 +502,7 @@ Mod(1/2*x - 1/2, x^2 + 23)
+ [1, 1/2*x - 1/2]
+ Mod(0, x)
+ Mod(-6/5, x)
++[0, 2, Mod(0, 2)]~
+ *** at top-level: nfinit([y^3+2,[1,x]])
+ *** ^---------------------
+ *** nfinit: incorrect type in nfinit_basic (t_VEC).
+diff --git a/src/test/in/nf b/src/test/in/nf
+index 49148123b..94d5165bc 100644
+--- a/src/test/in/nf
++++ b/src/test/in/nf
+@@ -156,6 +156,10 @@ K.zk
+ nfinit(x, 3)[2]
+ nfinit(1/2*x + 3/5, 3)[2]
+
++\\ #2164
++bnf = bnfinit(y^4-y-1);
++bnfisunit(bnf,-y^3+2*y^2-1)
++
+ \\ ERRORS: keep at end of file
+
+ nfinit([y^3+2,[1,x]])
diff --git a/sci-mathematics/pari/pari-2.11.3.ebuild b/sci-mathematics/pari/pari-2.11.3.ebuild
new file mode 100644
index 00000000000..7f3a302bbe4
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.11.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="data doc fltk gmp test threads X"
+RESTRICT="!test? ( test )"
+
+BDEPEND="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-strip.patch
+ "${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.11.2-Makefile-LDFLAGS.patch
+ "${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+ "${FILESDIR}/${PN}"-2.11.3-incorrect_bnfisunit.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"
+}
+
+src_configure() {
+ tc-export CC CXX
+
+ # Workaraound to "asm operand has impossible constraints" as
+ # suggested in bug #499996.
+ use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+ # need to force optimization here, as it breaks without
+ if is-flag -O0; then
+ replace-flags -O0 -O2
+ elif ! is-flag -O?; then
+ append-flags -O2
+ fi
+
+ # 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.
+ ./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() {
+ local mymake=""
+ use hppa && \
+ mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+ emake ${mymake} 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* )
+ default
+
+ if use doc; then
+ docompress -x "/usr/share/doc/${PF}"
+ emake \
+ DESTDIR="${D}" \
+ EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install-doc
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2018-03-18 21:18 Andrey Grozin
0 siblings, 0 replies; 12+ messages in thread
From: Andrey Grozin @ 2018-03-18 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 9661c2a09237d46969ce7d0918efe03771be8795
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 21:17:36 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 21:17:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9661c2a0
sci-mathematics/pari: fix building with USE=fltk
Suggested-by: François Bissey <frp.bissey <AT> gmail.com>
Closes: https://bugs.gentoo.org/646942
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../pari/files/pari-2.9.4-fltk-detection.patch | 22 ++++
sci-mathematics/pari/pari-2.9.4-r1.ebuild | 126 +++++++++++++++++++++
2 files changed, 148 insertions(+)
diff --git a/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch b/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
new file mode 100644
index 00000000000..26e146e032a
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch
@@ -0,0 +1,22 @@
+diff --git a/config/get_fltk b/config/get_fltk
+index 87d0c1d..22f5bd8 100644
+--- a/config/get_fltk
++++ b/config/get_fltk
+@@ -2,13 +2,16 @@ if test -z "$with_fltk"; then
+ with_fltk=yes
+ fi
+
++cmd="FLTK_CXXFLAGS=\`fltk-config --cxxflags\`"
++. log_cmd
++
+ cmd="FLTK_LIBS=\`fltk-config --ldflags\`"
+ . log_cmd
+
+ exe=$osname-$arch-fltk$$$exe_suff
+ cxx=$CXX
+ if test -z "$cxx"; then cxx=g++; fi;
+-cmd="$cxx $CFLAGS $FLTK_LIBS -o $exe has_fltk.c"
++cmd="$cxx $CFLAGS $FLTK_CXXFLAGS $FLTK_LIBS -o $exe has_fltk.c"
+ . log_cmd
+ if test -r "$exe"; then
+ echo "Using FLTK library"
diff --git a/sci-mathematics/pari/pari-2.9.4-r1.ebuild b/sci-mathematics/pari/pari-2.9.4-r1.ebuild
new file mode 100644
index 00000000000..ce071489ded
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.9.4-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="data doc fltk gmp X"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+RDEPEND="
+ 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= )"
+DEPEND="${RDEPEND}
+ doc? ( virtual/latex-base )"
+
+get_compile_dir() {
+ pushd "${S}/config" > /dev/null
+ local fastread=yes
+ source ./get_archos
+ popd > /dev/null
+ echo "O${osname}-${arch}"
+}
+
+PATCHES=( "${FILESDIR}"/${P}-strip.patch
+ "${FILESDIR}"/${P}-ppc.patch
+ "${FILESDIR}"/${P}-no-automagic.patch
+ "${FILESDIR}"/${P}-fltk-detection.patch
+ )
+
+src_prepare() {
+ default
+
+ # disable default building of docs during install
+ sed -i \
+ -e "s:install-doc install-examples:install-examples:" \
+ config/Makefile.SH || die "Failed to fix makefile"
+
+ # propagate ldflags
+ sed -i \
+ -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
+ config/get_dlld || die "failed to fix LDFLAGS"
+ # 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"
+}
+
+src_configure() {
+ tc-export CC
+ export CPLUSPLUS=$(tc-getCXX)
+
+ # need to force optimization here, as it breaks without
+ if is-flag -O0; then
+ replace-flags -O0 -O2
+ elif ! is-flag -O?; then
+ append-flags -O2
+ fi
+
+ # sysdatadir installs a pari.cfg stuff which is informative only
+ ./Configure \
+ --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
+ --mandir="${EPREFIX}"/usr/share/man/man1 \
+ --with-readline="${EPREFIX}"/usr \
+ --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with fltk) \
+ $(use_with gmp) \
+ --without-qt \
+ || die "./Configure failed"
+}
+
+src_compile() {
+ use hppa && \
+ mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+ mycxxmake=LD\=$(tc-getCXX)
+
+ local installdir=$(get_compile_dir)
+ cd "${installdir}" || die "failed to change directory"
+ # upstream set -fno-strict-aliasing.
+ # aliasing is a known issue on amd64, work on x86 by sheer luck
+ emake ${mymake} \
+ CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
+ emake ${mymake} ${mycxxmake} \
+ CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
+
+ if use doc; then
+ pushd "${S}" > /dev/null || die "failed to change directory"
+ VARTEXFONTS="${T}"/fonts emake -j1 docpdf
+ popd > /dev/null || die
+ fi
+}
+
+src_test() {
+ emake dobench
+}
+
+src_install() {
+ emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
+ dodoc MACHINES COMPAT
+ if use doc; then
+ # install gphelp and the pdf documentations manually.
+ # the install-doc target is overkill.
+ dodoc doc/*.pdf
+ dobin doc/gphelp
+ insinto /usr/share/doc/${PF}
+ # gphelp looks for some of the tex sources...
+ doins doc/*.tex doc/translations
+ # Install the examples - for real.
+ emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+ -C $(get_compile_dir) install-examples
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2018-01-13 13:39 Andrey Grozin
0 siblings, 0 replies; 12+ messages in thread
From: Andrey Grozin @ 2018-01-13 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 11c19699f31647ce20bee4ed56608df444278e32
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 13:38:45 2018 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 13:38:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c19699
sci-mathematics/pari: bump to 2.9.4
Closes: https://bugs.gentoo.org/600568
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sci-mathematics/pari/Manifest | 1 +
.../pari/files/pari-2.9.4-no-automagic.patch | 66 +++++++++++
sci-mathematics/pari/files/pari-2.9.4-ppc.patch | 9 ++
sci-mathematics/pari/files/pari-2.9.4-strip.patch | 10 ++
sci-mathematics/pari/pari-2.9.4.ebuild | 126 +++++++++++++++++++++
5 files changed, 212 insertions(+)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index a78f8a17c5f..8a4f45c784c 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -7,4 +7,5 @@ DIST pari-2.5.4-patchset.tar.bz2 11050 BLAKE2B 0ea4727bb03045c7cda9b39cd429db8ea
DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
DIST pari-2.7.1-patchset.tar.bz2 4318 BLAKE2B 881354eec4f89f7b7e0a1d53d5fa169b0ea0de3964baff454f2e7aca1b7bd2e7ffa2f404e4df7a8ff7a662aed3920e10df4a3a1d5d86967579c360869abce557 SHA512 1ff40adcf638230e1aca951b4fdb291cd4d2048ef66215de0ec157b9ec0040e28c115c2684056cf582695e66ee8363aa776a4a50f8654c8dde7bad490a47b304
DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
+DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787
DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
diff --git a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
new file mode 100644
index 00000000000..3612d8f020f
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
@@ -0,0 +1,66 @@
+diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH
+--- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/Makefile.SH 2018-01-13 17:31:02.404210285 +0700
+@@ -80,10 +80,10 @@
+ graph=plotQt;;
+ Qt4)
+- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
+- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
++ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
++ PLOTLIBS="`pkg-config --libs QtGui`"
+ graph=plotQt4;;
+ fltk)
+- PLOTCFLAGS=
+- PLOTLIBS="$FLTK_LIBS"
++ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
++ PLOTLIBS="`fltk-config --ldflags`"
+ postconfig='fltk-config --post '
+ graph=plotfltk;;
+@@ -277,5 +277,5 @@
+ # Graphic library.
+ QTDIR = "$QTDIR"
+-MOC = \$(QTDIR)/bin/moc
++MOC = "`which moc`"
+ PLOTCFLAGS = $PLOTCFLAGS
+ PLOTLIBS = $PLOTLIBS
+diff -r -U2 pari-2.9.4.orig/config/get_Qt pari-2.9.4/config/get_Qt
+--- pari-2.9.4.orig/config/get_Qt 2017-05-12 16:45:12.000000000 +0700
++++ pari-2.9.4/config/get_Qt 2018-01-13 17:35:49.481198212 +0700
+@@ -6,5 +6,5 @@
+ yes)
+ pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
+- QTDIR=`locatedir qt4/bin $pth`
++ QTDIR=`locatedir qt4 $pth`
+ if test -n "$QTDIR"; then
+ QTLIB="-lQtCore -lQtGui"
+diff -r -U2 pari-2.9.4.orig/config/get_config_options pari-2.9.4/config/get_config_options
+--- pari-2.9.4.orig/config/get_config_options 2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/get_config_options 2018-01-13 17:38:39.264191072 +0700
+@@ -87,8 +87,10 @@
+ with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+
++ --without-qt|--with-qt=no) without_qt=yes ;;
+ --with-qt) with_qt=yes ;;
+ --with-qt=*)
+ with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+
++ --without-fltk|--with-fltk=no) without_fltk=yes ;;
+ --with-fltk) with_fltk=yes ;;
+ --with-fltk=*)
+@@ -168,5 +170,7 @@
+
+ --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
++ --without-qt do not try to use the Qt lib
+ --with-fltk use the FLTK graphical library [need fltk-config]
++ --without-fltk do not try to use the FLTK lib
+
+ Miscellaneous
+diff -r -U2 pari-2.9.4.orig/config/get_graphic_lib pari-2.9.4/config/get_graphic_lib
+--- pari-2.9.4.orig/config/get_graphic_lib 2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/get_graphic_lib 2018-01-13 17:42:45.760180706 +0700
+@@ -8,4 +8,5 @@
+ if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
+ if test -n "$with_qt"; then which_graphic_lib=Qt; fi
++if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
+ if test "$fastread" != yes; then
+ cat << EOT
diff --git a/sci-mathematics/pari/files/pari-2.9.4-ppc.patch b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
new file mode 100644
index 00000000000..558f7eb9eda
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
@@ -0,0 +1,9 @@
+diff -r -U2 pari-2.9.4.orig/config/arch-osname pari-2.9.4/config/arch-osname
+--- pari-2.9.4.orig/config/arch-osname 2011-09-23 03:02:11.000000000 +0700
++++ pari-2.9.4/config/arch-osname 2018-01-13 16:22:39.623382825 +0700
+@@ -40,4 +40,5 @@
+ linux) arch=`uname -m`
+ case $arch in
++ ppc) arch=powerpc;;
+ sparc64) arch=sparcv9;;
+ parisc*) arch=hppa;;
diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
new file mode 100644
index 00000000000..f4a8af322c4
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
@@ -0,0 +1,10 @@
+diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH
+--- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/Makefile.SH 2018-01-13 16:18:04.208394407 +0700
+@@ -250,5 +250,5 @@
+ LN = $ln_s
+ CP_F = cp -f
+-STRIP = strip
++STRIP = true
+ STRIPFLAGS =
+
diff --git a/sci-mathematics/pari/pari-2.9.4.ebuild b/sci-mathematics/pari/pari-2.9.4.ebuild
new file mode 100644
index 00000000000..e03aba49e6e
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.9.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="data doc fltk gmp qt4 X"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+RDEPEND="
+ 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= )
+ qt4? ( dev-qt/qtgui:4= )
+ X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+ doc? ( virtual/latex-base )"
+
+get_compile_dir() {
+ pushd "${S}/config" > /dev/null
+ local fastread=yes
+ source ./get_archos
+ popd > /dev/null
+ echo "O${osname}-${arch}"
+}
+
+PATCHES=( "${FILESDIR}"/${P}-strip.patch
+ "${FILESDIR}"/${P}-ppc.patch
+ "${FILESDIR}"/${P}-no-automagic.patch
+ )
+
+src_prepare() {
+ default
+
+ # disable default building of docs during install
+ sed -i \
+ -e "s:install-doc install-examples:install-examples:" \
+ config/Makefile.SH || die "Failed to fix makefile"
+
+ # propagate ldflags
+ sed -i \
+ -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
+ config/get_dlld || die "failed to fix LDFLAGS"
+ # 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"
+}
+
+src_configure() {
+ tc-export CC
+ export CPLUSPLUS=$(tc-getCXX)
+
+ # need to force optimization here, as it breaks without
+ if is-flag -O0; then
+ replace-flags -O0 -O2
+ elif ! is-flag -O?; then
+ append-flags -O2
+ fi
+
+ # sysdatadir installs a pari.cfg stuff which is informative only
+ ./Configure \
+ --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
+ --mandir="${EPREFIX}"/usr/share/man/man1 \
+ --with-readline="${EPREFIX}"/usr \
+ --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with fltk) \
+ $(use_with gmp) \
+ $(use_with qt4 qt) \
+ || die "./Configure failed"
+}
+
+src_compile() {
+ use hppa && \
+ mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+ mycxxmake=LD\=$(tc-getCXX)
+
+ local installdir=$(get_compile_dir)
+ cd "${installdir}" || die "failed to change directory"
+ # upstream set -fno-strict-aliasing.
+ # aliasing is a known issue on amd64, work on x86 by sheer luck
+ emake ${mymake} \
+ CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
+ emake ${mymake} ${mycxxmake} \
+ CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
+
+ if use doc; then
+ pushd "${S}" > /dev/null || die "failed to change directory"
+ VARTEXFONTS="${T}"/fonts emake -j1 docpdf
+ popd > /dev/null || die
+ fi
+}
+
+src_test() {
+ emake dobench
+}
+
+src_install() {
+ emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
+ dodoc MACHINES COMPAT
+ if use doc; then
+ # install gphelp and the pdf documentations manually.
+ # the install-doc target is overkill.
+ dodoc doc/*.pdf
+ dobin doc/gphelp
+ insinto /usr/share/doc/${PF}
+ # gphelp looks for some of the tex sources...
+ doins doc/*.tex doc/translations
+ # Install the examples - for real.
+ emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+ -C $(get_compile_dir) install-examples
+ fi
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2017-12-11 19:46 Michał Górny
0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2017-12-11 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 402214f19fac15d127352556a0699df444331879
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 19:41:16 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 19:46:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402214f1
sci-mathematics/pari: [QA] Move patches to distfiles
Closes: https://bugs.gentoo.org/620628
sci-mathematics/pari/Manifest | 3 +
.../files/pari-2.3.2-ppc-powerpc-arch-fix.patch | 11 -
sci-mathematics/pari/files/pari-2.3.2-strip.patch | 11 -
.../pari/files/pari-2.3.5-doc-make.patch | 46 --
.../pari/files/pari-2.3.5-no-dot-inc.patch | 61 --
.../pari/files/pari-2.5.0-doc-make.patch | 82 ---
sci-mathematics/pari/files/pari-2.5.0-macos.patch | 21 -
sci-mathematics/pari/files/pari-2.5.0-mp.c.patch | 23 -
.../pari/files/pari-2.5.0-no-dot-inc.patch | 61 --
.../pari/files/pari-2.5.1-no-automagic.patch | 100 ---
sci-mathematics/pari/files/pari-2.5.4-polred.patch | 754 ---------------------
.../pari/files/pari-2.5.4-slow_determinant.patch | 100 ---
.../pari/files/pari-2.7.0-doc-make.patch | 89 ---
.../pari/files/pari-2.7.0-no-automagic.patch | 100 ---
.../pari/files/pari-2.7.0-no-dot-inc.patch | 64 --
.../pari/files/pari-2.7.0-slow-discriminant.patch | 54 --
.../pari/files/pari-2.7.1-perl-5.22-doc.patch | 12 -
sci-mathematics/pari/pari-2.3.5.ebuild | 9 +-
sci-mathematics/pari/pari-2.5.4.ebuild | 21 +-
sci-mathematics/pari/pari-2.7.1.ebuild | 17 +-
20 files changed, 28 insertions(+), 1611 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c2317db8fd8..a78f8a17c5f 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,7 +1,10 @@
DIST elldata.tgz 14185595 BLAKE2B eb90a0e392eeeaad81b6b01ba4e8258aaf2a4b4a01950b18a0e91f176629aecc693453d8fe99b49a28f2dfbbb6fae1a06d7d4137cb13ced298e64e5aa4062f53 SHA512 dc13d1cacb98a6c2774936997452bd34ae198da9206fea69bc7cdd28240d0cdd07bb0ec1f14b8e97bea4321a60a6a6144464ab3b629be2e37dd76a73efaf43ef
DIST galdata.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
DIST nftables.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
+DIST pari-2.3.5-patchset.tar.bz2 1773 BLAKE2B 08358dcb7e353eb41a784a6daa9400b74b8f331a54eea8ef159fbbecdbed5d00955a821db20e3a4f7e254160cd600d0255d6648aa0e1b2b7aca9910d5cd17f1d SHA512 f616eac3049fea684413f8f221a1604a5e62ae2804207513fcfff513d8b162a3a4d1063dad059907682404ee30f840182d75e29a44b44cda4f80266b46f75364
DIST pari-2.3.5.tar.gz 2018097 BLAKE2B b5f4f8bc83cd77aceab791263e1a2f0294d0663d354fea454bad8cac3cdbac9c4c8381cc83bc947d518522701c36e94ce1d6862125a9bfd3b17b1a31c9baabc8 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
+DIST pari-2.5.4-patchset.tar.bz2 11050 BLAKE2B 0ea4727bb03045c7cda9b39cd429db8ea1b8d9e2656cf81fb4d401abc57803d8a6b4c538727f6744dd75c6b95530a0cca058cfdb0e85d4b9eaf39e7d43a14929 SHA512 5b70b6e15e651118c5dba339601eee1b8dfe55eb37f30d0b350d73eef33a4119ba366ba48fa171e450e27af2823b96d8006aadf0f994ae76002f98a76adcf6bb
DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
+DIST pari-2.7.1-patchset.tar.bz2 4318 BLAKE2B 881354eec4f89f7b7e0a1d53d5fa169b0ea0de3964baff454f2e7aca1b7bd2e7ffa2f404e4df7a8ff7a662aed3920e10df4a3a1d5d86967579c360869abce557 SHA512 1ff40adcf638230e1aca951b4fdb291cd4d2048ef66215de0ec157b9ec0040e28c115c2684056cf582695e66ee8363aa776a4a50f8654c8dde7bad490a47b304
DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
diff --git a/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch b/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch
deleted file mode 100644
index e3581c9de34..00000000000
--- a/sci-mathematics/pari/files/pari-2.3.2-ppc-powerpc-arch-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur pari-2.3.2/config/arch-osname pari-2.3.2.new/config/arch-osname
---- pari-2.3.2/config/arch-osname 2006-02-15 05:12:59.000000000 -0500
-+++ pari-2.3.2.new/config/arch-osname 2007-11-26 00:17:17.000000000 -0500
-@@ -30,6 +30,7 @@
- osf1) case "$5" in alpha) arch=alpha;; esac;;
- linux) arch=`uname -m`
- case $arch in
-+ ppc) arch=powerpc;;
- sparc64) arch=sparcv9;;
- parisc*) arch=hppa;;
- sparc) case "`cat /proc/cpuinfo`" in
diff --git a/sci-mathematics/pari/files/pari-2.3.2-strip.patch b/sci-mathematics/pari/files/pari-2.3.2-strip.patch
deleted file mode 100644
index 0fee947fd55..00000000000
--- a/sci-mathematics/pari/files/pari-2.3.2-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/Makefile.SH. 2007-10-01 23:45:45.000000000 +0200
-+++ config/Makefile.SH 2007-10-01 23:55:10.000000000 +0200
-@@ -208,7 +208,7 @@
- MV = mv -f
- LN = $ln_s
- CP_F = cp -f
--STRIP = strip
-+STRIP = true
- STRIPFLAGS =
-
- # Change these installation directories to suit your needs.
diff --git a/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch b/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch
deleted file mode 100644
index 67edc8c70f1..00000000000
--- a/sci-mathematics/pari/files/pari-2.3.5-doc-make.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config/DOC_Make.SH.orig 2010-09-21 21:24:56.655520480 +1200
-+++ config/DOC_Make.SH 2010-09-21 21:26:24.683520242 +1200
-@@ -30,23 +30,23 @@
- -rm -f libpari.std
- pdftex libpari
- pdftex libpari
-- make libpari.std; pdftex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- tex libpari
- tex libpari
-- make libpari.std; tex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- pdftex develop
- pdftex develop
-- make develop.std; pdftex develop; rm -f develop.std
-+ \$(MAKE) develop.std; pdftex develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- tex develop
- tex develop
-- make develop.std; tex develop; rm -f develop.std
-+ \$(MAKE) develop.std; tex develop; rm -f develop.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -74,13 +74,13 @@
- -rm -f users.std
- tex users
- tex users
-- make users.std; tex users; rm -f users.std
-+ \$(MAKE) users.std; tex users; rm -f users.std
-
- users.pdf: \$(USERS_TEX)
- -rm -f users.std
- pdftex users
- pdftex users
-- make users.std; pdftex users; rm -f users.std
-+ \$(MAKE) users.std; pdftex users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
deleted file mode 100644
index cd34851a30f..00000000000
--- a/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4f1e00df5ea1e51042146f6277bb1af02f249cc3 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/gen_member | 4 ++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/desc/gen_member b/src/desc/gen_member
-index 2f3cf52..66dea2b 100755
---- a/src/desc/gen_member
-+++ b/src/desc/gen_member
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class='member_functions';
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index 1b507fa..2fb4d3f 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index a02d612..9ca8252 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- PARI::822::read(\%funcs,$_,1)
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch b/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
deleted file mode 100644
index 0882da03e6a..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-doc-make.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- config/DOC_Make.SH.orig 2011-07-28 14:11:34.430896929 +1200
-+++ config/DOC_Make.SH 2011-07-28 14:11:39.832738158 +1200
-@@ -21,7 +21,8 @@
-
- doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
- docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
--docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+#docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf
-
- .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
-
-@@ -37,27 +38,49 @@
- %.dvi: %.tex \$(MACROS)
- tex \$<
-
-+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)
-+ -rm -f *.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+pass2: pass1
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+indexing: pass2
-+ \$(MAKE) libpari.std
-+ \$(MAKE) develop.std
-+ \$(MAKE) users.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex users
-+ -rm -f *.std
-+
- libpari.pdf: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- pdftex libpari
- pdftex libpari
-- make libpari.std; pdftex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- tex libpari
- tex libpari
-- make libpari.std; tex libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- pdftex develop
- pdftex develop
-- make develop.std; pdftex develop; rm -f develop.std
-+ \$(MAKE)make develop.std; pdftex develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- tex develop
- tex develop
-- make develop.std; tex develop; rm -f develop.std
-+ \$(MAKE) develop.std; tex develop; rm -f develop.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -85,13 +108,13 @@
- -rm -f users.std
- tex users
- tex users
-- make users.std; tex users; rm -f users.std
-+ \$(MAKE) users.std; tex users; rm -f users.std
-
- users.pdf: \$(USERS_TEX)
- -rm -f users.std
- pdftex users
- pdftex users
-- make users.std; pdftex users; rm -f users.std
-+ \$(MAKE) users.std; pdftex users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.5.0-macos.patch b/sci-mathematics/pari/files/pari-2.5.0-macos.patch
deleted file mode 100644
index 1b407600937..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-macos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/get_dlld.orig 2011-07-28 14:27:13.341072367 +1200
-+++ config/get_dlld 2011-07-28 14:27:46.225178023 +1200
-@@ -94,7 +94,7 @@
- *) extra=;;
- esac
- case "$osname" in
-- darwin) shared=-dynamiclib;;
-+ darwin) shared="-dynamiclib -install_name \$(PURELIBDIR)/\$(LIBPARI_DYN)";;
- *) shared=-shared;;
- esac
- DLLDFLAGS="$shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS"
---- config/Makefile.SH.orig 2011-07-28 14:29:06.753681364 +1200
-+++ config/Makefile.SH 2011-07-28 14:29:10.589276933 +1200
-@@ -234,6 +234,7 @@
- # DESTDIR is used to install to a false hierachy (to build a Debian package)
- INCLUDEDIR= "\$(DESTDIR)$includedir"
- LIBDIR = "\$(DESTDIR)$libdir"
-+PURELIBDIR= $libdir
- BINDIR = "\$(DESTDIR)$bindir"
- MANDIR = "\$(DESTDIR)$mandir"
- DATADIR = "\$(DESTDIR)$datadir"
diff --git a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch b/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
deleted file mode 100644
index 0bcfffc0817..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-mp.c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/kernel/gmp/mp.c
-===================================================================
---- src/kernel/gmp/mp.c (revision 13151)
-+++ src/kernel/gmp/mp.c (working copy)
-@@ -45,18 +45,8 @@
- /*We need PARI invmod renamed to invmod_pari*/
- #define INVMOD_PARI
-
--static void *gmp_realloc(void *ptr, size_t old_size, size_t new_size) {
-- (void)old_size; return (void *) pari_realloc(ptr,new_size);
--}
--
--static void gmp_free(void *ptr, size_t old_size){
-- (void)old_size; pari_free(ptr);
--}
--
- int pari_kernel_init(void)
- {
-- /* Use pari_malloc instead of malloc */
-- mp_set_memory_functions((void *(*)(size_t)) pari_malloc, gmp_realloc, gmp_free);
- return 0;
- }
-
diff --git a/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
deleted file mode 100644
index e34fa6b352a..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 03df0cdd7228a412d2adfe9ee9c746b3ec69dd6b Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/doc_make | 4 ++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/src/desc/doc_make b/src/desc/doc_make
-index 02dc90d..55296ed 100755
---- a/src/desc/doc_make
-+++ b/src/desc/doc_make
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- PARI::822::read(\%funcs, "pari.desc");
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index 38c2daf..ffb4276 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index 4c9217b..32b3cc9 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch b/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch
deleted file mode 100644
index 8fee1f7eaf7..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-no-automagic.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Nur pari-2.5.1.orig/config/get_config_options pari-2.5.1/config/get_config_options
---- pari-2.5.1.orig/config/get_config_options 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_config_options 2012-08-01 20:57:09.000000000 +0100
-@@ -83,10 +83,12 @@
- --with-ncurses-lib=*|--with-ncurses=*)
- with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-qt|--with-qt=no) without_qt=yes ;;
- --with-qt) with_qt=yes ;;
- --with-qt=*)
- with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-fltk|--with-fltk=no) without_fltk=yes ;;
- --with-fltk) with_fltk=yes ;;
- --with-fltk=*)
- with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -158,7 +160,9 @@
- --with-gmp-lib=DIR specify location of gmp libs
-
- --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
-+ --without-qt do not try to use the Qt lib
- --with-fltk[=DIR] use the FLTK graphical library [prefix for FLTK dir.]
-+ --without-fltk do not try to use the FLTK lib
-
- EOT
- exit 1
-diff -Nur pari-2.5.1.orig/config/get_fltk pari-2.5.1/config/get_fltk
---- pari-2.5.1.orig/config/get_fltk 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_fltk 2012-08-01 22:28:23.000000000 +0100
-@@ -2,6 +2,9 @@
- with_fltk=yes
- fi
- FLTKDIR=
-+if test -z "$without_fltk; then
-+ FLTKDIR="`fltk-config --prefix 2>/dev/null`"
-+fi
- case "$with_fltk" in
- yes)
- pth=$libpth; lib=fltk; . ./locatelib
-diff -Nur pari-2.5.1.orig/config/get_graphic_lib pari-2.5.1/config/get_graphic_lib
---- pari-2.5.1.orig/config/get_graphic_lib 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_graphic_lib 2012-08-01 22:16:57.000000000 +0100
-@@ -11,6 +11,7 @@
- else
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt"; then which_graphic_lib=Qt; fi
-+ if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$which_graphic_lib" != none; then
- case $osname in
- mingw) case $which_graphic_lib in
-@@ -41,7 +42,7 @@
- case $which_graphic_lib in
- auto|fltk)
- . ./get_fltk # FLTKDIR, FLTK_LIBS
-- if test -z "$FLTKDIR"; then
-+ if test -z "`fltk-config --ldflags 2> /dev/null`"; then
- case $which_graphic_lib in fltk) which_graphic_lib=none;; esac
- else
- which_graphic_lib=fltk
-diff -Nur pari-2.5.1.orig/config/get_Qt pari-2.5.1/config/get_Qt
---- pari-2.5.1.orig/config/get_Qt 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/get_Qt 2012-08-01 20:39:28.000000000 +0100
-@@ -5,7 +5,7 @@
- case "$with_qt" in
- yes)
- pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
-- QTDIR=`locatedir qt4/bin $pth`
-+ QTDIR=`locatedir qt4 $pth`
- QTLIB="-lQtCore -lQtGui"
- which_graphic_lib=Qt4
- if test -z "$QTDIR"; then
-diff -Nur pari-2.5.1.orig/config/Makefile.SH pari-2.5.1/config/Makefile.SH
---- pari-2.5.1.orig/config/Makefile.SH 2012-08-01 18:32:03.000000000 +0100
-+++ pari-2.5.1/config/Makefile.SH 2012-08-01 21:08:20.000000000 +0100
-@@ -65,12 +65,12 @@
- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
- graph=plotQt;;
- Qt4)
-- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
-- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
-+ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
-+ PLOTLIBS="`pkg-config --libs QtGui`"
- graph=plotQt4;;
- fltk)
-- PLOTCFLAGS="-I\$(FLTKDIR)/include $X11_INC"
-- PLOTLIBS="-L\$(FLTKDIR)/lib -lfltk $FLTK_LIBS"
-+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
-+ PLOTLIBS="`fltk-config --ldflags`"
- postconfig='-fltk-config --post '
- graph=plotfltk;;
- win32)
-@@ -254,7 +254,7 @@
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
- QTDIR = "$QTDIR"
--MOC = \$(QTDIR)/bin/moc
-+MOC = "`which moc`"
- PLOTCFLAGS = $PLOTCFLAGS
- PLOTLIBS = $PLOTLIBS
- CPLUSPLUS = g++
diff --git a/sci-mathematics/pari/files/pari-2.5.4-polred.patch b/sci-mathematics/pari/files/pari-2.5.4-polred.patch
deleted file mode 100644
index 4287c9d35d6..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.4-polred.patch
+++ /dev/null
@@ -1,754 +0,0 @@
-diff -ru src/src/basemath/base1.c b/src/basemath/base1.c
---- src/src/basemath/base1.c 2013-05-06 16:01:56.000000000 +0200
-+++ b/src/basemath/base1.c 2013-05-06 16:49:09.042406927 +0200
-@@ -1675,40 +1675,42 @@
- ZX_is_better(GEN y, GEN x, GEN *dx)
- {
- GEN d = ZX_disc(y);
-- long cmp = absi_cmp(d, *dx);
-+ int cmp;
-+ if (!*dx) *dx = ZX_disc(x);
-+ cmp = absi_cmp(d, *dx);
- if (cmp < 0) { *dx = d; return 1; }
- if (cmp == 0) return cmp_abs_ZX(y, x) < 0;
- return 0;
- }
-
--static GEN polred_aux(nfbasic_t *T, GEN *pro, long flag);
-+static void polredbest_aux(nfbasic_t *T, GEN *pro, GEN *px, GEN *pdx, GEN *pa);
- /* Seek a simpler, polynomial pol defining the same number field as
- * x (assumed to be monic at this point) */
- static GEN
- nfpolred(nfbasic_t *T, GEN *pro)
- {
-- GEN x = T->x, dx = T->dx, a, z, rev, pow, dpow;
-+ GEN x = T->x, dx, b, rev, pow, dpow;
- long i, n = degpol(x), v = varn(x);
-
- if (n == 1) {
- T->x = deg1pol_shallow(gen_1, gen_m1, v);
- *pro = NULL; return pol_1(v);
- }
-- z = polred_aux(T, pro, nf_ORIG | nf_RED);
-- if (typ(z) != t_VEC || !ZX_is_better(gel(z,1),x,&dx))
-- return NULL; /* no improvement */
--
-- rev = QXQ_reverse(gel(z,2), x);
-- x = gel(z,1); if (DEBUGLEVEL>1) err_printf("xbest = %Ps\n",x);
-+ polredbest_aux(T, pro, &x, &dx, &b);
-+ if (x == T->x) return NULL; /* no improvement */
-+ if (DEBUGLEVEL>1) err_printf("xbest = %Ps\n",x);
-
- /* update T */
-+ rev = QXQ_reverse(b, T->x);
- pow = QXQ_powers(rev, n-1, x);
- pow = Q_remove_denom(pow, &dpow);
-- a = T->bas;
-- for (i=2; i<=n; i++) gel(a,i) = QX_ZXQV_eval(gel(a,i), pow, dpow);
-+ for (i=2; i<=n; i++) gel(T->bas,i) = QX_ZXQV_eval(gel(T->bas,i), pow, dpow);
- (void)Z_issquareall(diviiexact(dx,T->dK), &(T->index));
-- T->basden = get_bas_den(a);
-- T->dx = dx; T->x = x; *pro = NULL; return rev;
-+ T->basden = get_bas_den(T->bas);
-+ T->dx = dx;
-+ T->x = x;
-+ *pro = NULL; /* reset */
-+ return rev;
- }
-
- /* let bas a t_VEC of QX giving a Z-basis of O_K. Return the index of the
-@@ -1776,7 +1778,7 @@
- x = Q_primpart(x);
- RgX_check_ZX(x, "nfinit");
- if (!ZX_is_irred(x)) pari_err(redpoler, "nfinit");
-- if (flag & nf_RED || !gequal1(gel(x,lg(x)-1)))
-+ if (flag & nf_RED || !equali1(gel(x,lg(x)-1)))
- x = ZX_Q_normalize(x, &(T->lead));
- nfmaxord(&S, x, flag, fa);
- index = S.index;
-@@ -1822,26 +1824,32 @@
- nfinitall(GEN x, long flag, long prec)
- {
- const pari_sp av = avma;
-- GEN nf;
-+ GEN nf, lead;
- nfbasic_t T;
-
- nfbasic_init(x, flag, NULL, &T);
- nfbasic_add_disc(&T); /* more expensive after set_LLL_basis */
-- if (T.lead != gen_1 && !(flag & nf_RED))
-+ lead = T.lead;
-+ if (lead != gen_1 && !(flag & nf_RED))
- {
- pari_warn(warner,"non-monic polynomial. Result of the form [nf,c]");
- flag |= nf_RED | nf_ORIG;
- }
- if (flag & nf_RED)
- {
-- GEN ro, rev = nfpolred(&T, &ro);
-+ GEN ro, rev;
-+ /* lie to polred: more efficient to update *after* modreverse, than to
-+ * unscale in the polred subsystem */
-+ T.lead = gen_1;
-+ rev = nfpolred(&T, &ro);
- nf = nfbasic_to_nf(&T, ro, prec);
- if (flag & nf_ORIG)
- {
- if (!rev) rev = pol_x(varn(T.x)); /* no improvement */
-- if (T.lead != gen_1) rev = RgX_Rg_div(rev, T.lead);
-+ if (lead != gen_1) rev = RgX_Rg_div(rev, lead);
- nf = mkvec2(nf, mkpolmod(rev, T.x));
- }
-+ T.lead = lead; /* restore */
- } else {
- GEN ro; set_LLL_basis(&T, &ro, 0.99);
- nf = nfbasic_to_nf(&T, ro, prec);
-@@ -1948,7 +1956,7 @@
- get_polchar(CG_data *d, GEN x)
- { return get_pol(d, RgM_RgC_mul(d->ZKembed,x)); }
-
--/* return a defining polynomial for Q(w_i) */
-+/* return a defining polynomial for Q(w_k) */
- static GEN
- get_polmin_w(CG_data *d, long k)
- {
-@@ -1956,6 +1964,22 @@
- if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
- return g;
- }
-+/* return a defining polynomial for Q(w_k+w_l) */
-+static GEN
-+get_polmin_add2(CG_data *d, long k, long l)
-+{
-+ GEN g = get_pol(d, RgV_add(gel(d->ZKembed,k), gel(d->ZKembed,l)));
-+ if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
-+ return g;
-+}
-+/* return a defining polynomial for Q(w_k-w_l) */
-+static GEN
-+get_polmin_sub2(CG_data *d, long k, long l)
-+{
-+ GEN g = get_pol(d, RgV_sub(gel(d->ZKembed,k), gel(d->ZKembed,l)));
-+ if (g) (void)ZX_gcd_all(g, ZX_deriv(g), &g);
-+ return g;
-+}
-
- /* does x generate the correct field ? */
- static GEN
-@@ -2044,13 +2068,67 @@
- d->v = varn(T->x);
- d->r1= T->r1; return prec;
- }
-+static void
-+update(GEN *pai, GEN *pch, nfbasic_t *T, long orig)
-+{
-+ GEN ch = *pch, ai = *pai;
-+ if (!ch)
-+ { /* accuracy too low, compute algebraically */
-+ ch = ZXQ_charpoly(ai, T->x, varn(T->x));
-+ (void)ZX_gcd_all(ch, ZX_deriv(ch), &ch);
-+ }
-+ if (ZX_canon_neg(ch) && orig) ai = RgX_neg(ai);
-+ if (DEBUGLEVEL>3) err_printf("polred: generator %Ps\n", ch);
-+ if (T->lead != gen_1 && orig) ai = RgX_unscale(ai, ginv(T->lead));
-+ *pch = ch; *pai = ai;
-+}
-+static GEN
-+findmindisc(GEN y, GEN *pa)
-+{
-+ GEN a = *pa, x = gel(y,1), b = gel(a,1), dx = NULL;
-+ long i, l = lg(y);
-+ for (i = 2; i < l; i++)
-+ {
-+ GEN yi = gel(y,i);
-+ if (ZX_is_better(yi,x,&dx)) { x = yi; b = gel(a,i); }
-+ }
-+ *pa = b; return x;
-+}
-+/* filter [y,b] from polred_aux: keep a single polynomial of degree n in y
-+ * [ the best wrt discriminant ordering ], but keep all non-primitive
-+ * polynomials */
-+static void
-+filter(GEN y, GEN b, long n)
-+{
-+ GEN x, a, dx;
-+ long i, k = 1, l = lg(y);
-+ a = x = dx = NULL;
-+ for (i = 1; i < l; i++)
-+ {
-+ GEN yi = gel(y,i), ai = gel(b,i);
-+ if (degpol(yi) == n)
-+ {
-+ if (dx && !ZX_is_better(yi,x,&dx)) continue;
-+ if (!dx) dx = ZX_disc(yi);
-+ x = yi; a = ai; continue;
-+ }
-+ gel(y,k) = yi;
-+ gel(b,k) = ai; k++;
-+ }
-+ if (dx)
-+ {
-+ gel(y,k) = x;
-+ gel(b,k) = a; k++;
-+ }
-+ setlg(y, k);
-+ setlg(b, k);
-+}
-+
- static GEN
--polred_aux(nfbasic_t *T, GEN *pro, long flag)
-+polred_aux(nfbasic_t *T, GEN *pro, long orig)
- {
- GEN b, y, x = T->x;
-- long i, v = varn(x), l = lg(T->bas);
-- const long orig = flag & nf_ORIG;
-- const long nfred = flag & nf_RED;
-+ long maxi, i, j, k, v = varn(x), n = lg(T->bas)-1;
- nffp_t F;
- CG_data d;
-
-@@ -2058,27 +2136,41 @@
- *pro = F.ro;
- d.ZKembed = F.M;
-
-- y = cgetg(l, t_VEC);
-- b = cgetg(l, t_COL);
-+ /* n + 2 sum_{1 <= i <= n} n-i = n + n(n-1) = n*n */
-+ y = cgetg(n*n + 1, t_VEC);
-+ b = cgetg(n*n + 1, t_COL);
-+ /* i = 1 */
- gel(y,1) = deg1pol_shallow(gen_1, gen_m1, v);
- gel(b,1) = gen_1;
-- for (i = 2; i < l; i++)
-+ for (i = k = 2; i <= n; i++)
- {
-- GEN ch, ai = gel(T->bas,i);
-+ GEN ch, ai;
-+ ai = gel(T->bas,i);
- ch = get_polmin_w(&d, i);
-- /* if accuracy too low, compute algebraically */
-- if (!ch)
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
-+ }
-+ k = i;
-+ maxi = minss(n, 3);
-+ for (i = 1; i <= maxi; i++)
-+ for (j = i+1; j <= n; j++)
- {
-- ch = ZXQ_charpoly(ai, x, v);
-- (void)ZX_gcd_all(ch, ZX_deriv(ch), &ch);
-+ GEN ch, ai;
-+ ai = gadd(gel(T->bas,i), gel(T->bas,j));
-+ ch = get_polmin_add2(&d, i, j);
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
-+
-+ ai = gsub(gel(T->bas,i), gel(T->bas,j));
-+ ch = get_polmin_sub2(&d, i, j);
-+ update(&ai, &ch, T, orig);
-+ gel(y,k) = ch;
-+ gel(b,k) = ai; k++;
- }
-- if (ZX_canon_neg(ch) && orig) ai = RgX_neg(ai);
-- if (nfred && degpol(ch) == l-1) return mkvec2(ch, ai);
-- if (DEBUGLEVEL>3) err_printf("polred: generator %Ps\n", ch);
-- if (T->lead != gen_1 && orig) ai = RgX_unscale(ai, ginv(T->lead));
-- gel(y,i) = ch;
-- gel(b,i) = ai;
-- }
-+ setlg(y, k);
-+ setlg(b, k); filter(y, b, n);
- if (!orig) return gen_sort_uniq(y, (void*)cmpii, &gen_cmp_RgX);
- (void)sort_factor_pol(mkmat2(y, b), cmpii);
- settyp(y, t_COL); return mkmat2(b, y);
-@@ -2089,10 +2181,58 @@
- {
- pari_sp av = avma;
- GEN ro;
-- nfbasic_t T; nfbasic_init(x, flag & (nf_PARTIALFACT|nf_RED), fa, &T);
-+ nfbasic_t T; nfbasic_init(x, flag & nf_PARTIALFACT, fa, &T);
- return gerepilecopy(av, polred_aux(&T, &ro, flag & nf_ORIG));
- }
-
-+/* finds "best" polynomial in polred_aux list, defaulting to T->x if none of
-+ * them is primitive. *px is the ZX, characteristic polynomial of *pb, *pdx
-+ * its discriminant.
-+ * Set *pro = polroots(T->x) [ NOT *px ], in case caller needs it. */
-+static void
-+polredbest_aux(nfbasic_t *T, GEN *pro, GEN *px, GEN *pdx, GEN *pb)
-+{
-+ GEN a, v, y, x = T->x, b = pol_x(varn(x)); /* default values */
-+ long i, l, n = degpol(x);
-+ v = polred_aux(T, pro, nf_ORIG);
-+ *pdx = T->dx;
-+ y = gel(v,2);
-+ a = gel(v,1); l = lg(a);
-+ for (i=1; i<l; i++)
-+ {
-+ GEN yi = gel(y,i);
-+ pari_sp av = avma;
-+ if (degpol(yi) == n && ZX_is_better(yi,x,pdx)) { x = yi; b = gel(a,i); }
-+ else avma = av;
-+ }
-+ *px = x;
-+ *pb = b;
-+}
-+GEN
-+polredbest(GEN x, long flag)
-+{
-+ pari_sp av = avma;
-+ GEN dx, ro, b;
-+ long fl;
-+ nfbasic_t T;
-+ switch(flag)
-+ {
-+ default: pari_err(talker, "invalid flag in polredbest()");
-+ case 0: fl = nf_PARTIALFACT; break;
-+ case 1: fl = nf_PARTIALFACT|nf_ORIG; break;
-+ }
-+ nfbasic_init(x, fl, NULL, &T);
-+ polredbest_aux(&T, &ro, &x, &dx, &b);
-+ if (flag)
-+ {
-+ if (x == T.x)
-+ b = pol_x(varn(x)); /* no improvement */
-+ else
-+ b = QXQ_reverse(b, T.x);
-+ x = mkvec2(x, mkpolmod(b,x));
-+ }
-+ return gerepilecopy(av, x);
-+}
- /* FIXME: backward compatibility */
- GEN
- polred0(GEN x, long flag, GEN fa)
-@@ -2273,22 +2413,6 @@
- return bound;
- }
-
--static GEN
--findmindisc(GEN y, GEN *pa)
--{
-- GEN a = *pa, x = gel(y,1), b = gel(a,1), dx;
-- long i, l = lg(y);
--
-- if (l == 2) { *pa = b; return x; }
-- dx = ZX_disc(x);
-- for (i = 2; i < l; i++)
-- {
-- GEN yi = gel(y,i);
-- if (ZX_is_better(yi,x,&dx)) { x = yi; b = gel(a,i); }
-- }
-- *pa = b; return x;
--}
--
- /* z "small" minimal polynomial of Mod(a,x), deg z = deg x */
- static GEN
- store(GEN x, GEN z, GEN a, nfbasic_t *T, long flag, GEN u)
-@@ -2355,7 +2479,7 @@
- GEN y, a, u;
- nfbasic_t T;
-
-- nfbasic_init(x, flag & (nf_PARTIALFACT|nf_RED), NULL, &T);
-+ nfbasic_init(x, flag & nf_PARTIALFACT, NULL, &T);
- x = T.x; vx = varn(x);
-
- if (degpol(x) == 1)
-diff -ru src/src/functions/number_fields/polredabs b/src/functions/number_fields/polredabs
---- src/src/functions/number_fields/polredabs 2013-05-06 16:01:57.000000000 +0200
-+++ b/src/functions/number_fields/polredabs 2013-05-06 16:47:04.542393431 +0200
-@@ -17,8 +17,8 @@
- \misctitle{Warning} This routine uses an exponential-time algorithm to
- enumerate all potential generators, and may be exceedingly slow when the
- number field has many subfields, hence a lot of elements of small $T_2$-norm.
-- E.g. do not try it on the compositum of many quadratic fields; in that case,
-- use \tet{polred} instead.
-+ The function \tet{polredbest} is in general much faster (it runs in
-+ polynomial time), and tends to return polynomials with smaller discriminants.
-
- The binary digits of $\fl$ mean
-
-@@ -38,6 +38,15 @@
- (has at most one large prime factor not in the \kbd{addprimes} table), the
- result is the same.
-
-+ \bprog
-+ ? T = x^16 - 136*x^14 + 6476*x^12 - 141912*x^10 + 1513334*x^8 - 7453176*x^6 + 13950764*x^4 - 5596840*x^2 + 46225
-+ ? T1 = polredabs(T); T2 = polredbest(T);
-+ ? [ norml2(polroots(T1)), norml2(polroots(T2)) ]
-+ %3 = [88.0000000, 120.000000]
-+ ? [ sizedigit(poldisc(T1)), sizedigit(poldisc(T2)) ]
-+ %4 = [75, 67]
-+ @eprog
-+
- Variant: Instead of the above hardcoded numerical flags, one should use an
- or-ed combination of
-
-diff -ruN src/src/functions/number_fields/polredbest b/src/functions/number_fields/polredbest
---- src/src/functions/number_fields/polredbest 1970-01-01 01:00:00.000000000 +0100
-+++ b/src/functions/number_fields/polredbest 2013-01-31 14:49:05.547513332 +0100
-@@ -0,0 +1,21 @@
-+Function: polredbest
-+Section: number_fields
-+C-Name: polredbest
-+Prototype: GD0,L,
-+Help: polredbest(T,{flag=0}): reduction of the polynomial T (gives minimal
-+ polynomials only). If flag=1, gives also elements.
-+Doc: finds a polynomial with reasonably
-+ small coefficients defining the same number field as $T$.
-+ All $T$ accepted by \tet{nfinit} are also allowed here (e.g. non-monic
-+ polynomials, \kbd{nf}, \kbd{bnf}, \kbd{[T,Z\_K\_basis]}). Contrary to
-+ \tet{polredabs}, this routine runs in polynomial time, but it offers no
-+ guarantee as to the minimality of its result.
-+
-+ If $\fl = 1$: outputs a two-component row vector $[P,a]$, where $P$ is the
-+ default output and \kbd{Mod(a, P)} is a root of the original $T$.
-+ \bprog
-+ ? polredbest(x^4 + 8, 1)
-+ %1 = [x^4 + 2, Mod(x^3, x^4 + 2)]
-+ ? charpoly(%[2])
-+ %2 = x^4 + 8
-+ @eprog
-diff -ruN src/src/headers/paridecl.h b/src/headers/paridecl.h
---- src/src/headers/paridecl.h 2012-09-25 23:10:47.000000000 +0200
-+++ b/src/headers/paridecl.h 2013-01-31 14:49:05.557525771 +0100
-@@ -889,6 +889,7 @@
- GEN polredabs0(GEN x, long flag);
- GEN polredabs2(GEN x);
- GEN polredabsall(GEN x, long flun);
-+GEN polredbest(GEN x, long flag);
- GEN smallpolred(GEN x);
- GEN smallpolred2(GEN x);
- GEN tschirnhaus(GEN x);
-diff -ru src/src/test/32/compat b/src/test/32/compat
---- src/src/test/32/compat 2013-05-06 16:01:57.000000000 +0200
-+++ b/src/test/32/compat 2013-05-06 16:47:04.542393431 +0200
-@@ -787,13 +787,9 @@
- ? factoreddiscf(p,fa)
- 136866601
- ? factoredpolred(p,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? factoredpolred2(p,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? factornf(x^3+x^2-2*x-1,t^3+t^2-2*t-1)
-
- [x + mod(-t, t^3 + t^2 - 2*t - 1) 1]
-@@ -904,7 +900,7 @@
- ? gcd(12345678,87654321)
- 9
- ? getheap()
--[208, 45748]
-+[208, 45584]
- ? getrand()
- Vecsmall([1220248512, -582244995, 485580680, -1643185972, -2103930341, -9694
- 07356, 336208700, 1439513079, -1910826353, -2042699820, 222745475, 183991374
-@@ -2014,7 +2010,7 @@
- ? orderell(tcurve,[1,2])
- 6
- ? ordred(x^3-12*x+45*x-1)
--[x - 1, x^3 - 363*x - 2663, x^3 + 33*x - 1]
-+[x - 1, x^3 + 33*x - 1]
- ? padicprec(padicno,127)
- 5
- ? pascal(8)
-@@ -2093,15 +2089,16 @@
- ? polint([0,2,3],[0,4,9],5)
- 25
- ? polred(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
--[x - 1, x^5 - x^4 - 6*x^3 + 6*x^2 + 13*x - 5, x^5 - x^4 + 2*x^3 - 4*x^2 + x
--- 1, x^5 - x^4 + 4*x^3 - 2*x^2 + x - 1, x^5 + 4*x^3 - 4*x^2 + 8*x - 8]
-+[x - 1, x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1]
- ? polred2(x^4-28*x^3-458*x^2+9156*x-25321)
-
- [1 x - 1]
-
--[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-+[1/115*x^2 - 14/115*x - 212/115 x^2 - 2*x - 9]
-+
-+[-1/115*x^2 + 14/115*x + 442/115 x^2 - 2*x - 9]
-
--[2/897*x^3 - 14/299*x^2 - 1171/897*x + 9569/897 x^4 - 32*x^2 + 6]
-+[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-
- [1/4485*x^3 - 7/1495*x^2 - 1034/4485*x + 7924/4485 x^4 - 8*x^2 + 6]
-
-@@ -2454,13 +2451,21 @@
- ? smallinitell([0,0,0,-17,0])
- [0, 0, 0, -17, 0, 0, -34, 0, -289, 816, 0, 314432, 1728]
- ? smallpolred(x^4+576)
--[x - 1, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
-+[x - 1, x^2 - 3*x + 3, x^2 - 2*x + 2, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
- ? smallpolred2(x^4+576)
-
- [1 x - 1]
-
-+[-1/192*x^3 - 1/8*x + 3/2 x^2 - 3*x + 3]
-+
-+[1/24*x^2 + 1 x^2 - 2*x + 2]
-+
-+[-1/24*x^2 + 1 x^2 - 2*x + 2]
-+
- [-1/192*x^3 - 1/8*x + 1/2 x^2 - x + 1]
-
-+[1/192*x^3 + 1/8*x + 1/2 x^2 - x + 1]
-+
- [1/24*x^2 x^2 + 1]
-
- [1/192*x^3 + 1/48*x^2 - 1/8*x x^4 - x^2 + 1]
-@@ -2650,6 +2655,6 @@
- ? getstack()
- 104
- ? getheap()
--[599, 110982]
-+[599, 110954]
- ? print("Total time spent: ",gettime);
--Total time spent: 236
-+Total time spent: 140
-diff -ru src/src/test/32/nfields b/src/test/32/nfields
---- src/src/test/32/nfields 2013-05-06 16:01:57.000000000 +0200
-+++ b/src/test/32/nfields 2013-05-06 16:47:04.542393431 +0200
-@@ -926,45 +926,50 @@
- ? polgalois(x^6-3*x^2-1)
- [12, 1, 1, "A_4(6) = [2^2]3"]
- ? polred(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
--[x - 1, x^5 - x^4 - 6*x^3 + 6*x^2 + 13*x - 5, x^5 - x^4 + 2*x^3 - 4*x^2 + x
--- 1, x^5 - x^4 + 4*x^3 - 2*x^2 + x - 1, x^5 + 4*x^3 - 4*x^2 + 8*x - 8]
-+[x - 1, x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1]
- ? polred(x^4-28*x^3-458*x^2+9156*x-25321,3)
-
- [1 x - 1]
-
--[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-+[1/115*x^2 - 14/115*x - 212/115 x^2 - 2*x - 9]
-+
-+[-1/115*x^2 + 14/115*x + 442/115 x^2 - 2*x - 9]
-
--[2/897*x^3 - 14/299*x^2 - 1171/897*x + 9569/897 x^4 - 32*x^2 + 6]
-+[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-
- [1/4485*x^3 - 7/1495*x^2 - 1034/4485*x + 7924/4485 x^4 - 8*x^2 + 6]
-
- ? polred(x^4+576,1)
--[x - 1, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
-+[x - 1, x^2 - 3*x + 3, x^2 - 2*x + 2, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
- ? polred(x^4+576,3)
-
- [1 x - 1]
-
-+[-1/192*x^3 - 1/8*x + 3/2 x^2 - 3*x + 3]
-+
-+[1/24*x^2 + 1 x^2 - 2*x + 2]
-+
-+[-1/24*x^2 + 1 x^2 - 2*x + 2]
-+
- [-1/192*x^3 - 1/8*x + 1/2 x^2 - x + 1]
-
-+[1/192*x^3 + 1/8*x + 1/2 x^2 - x + 1]
-+
- [1/24*x^2 x^2 + 1]
-
- [1/192*x^3 + 1/48*x^2 - 1/8*x x^4 - x^2 + 1]
-
- ? polred(p2,0,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? polred(p2,1,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? polredabs(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
- x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1
- ? polredabs(x^5-2*x^4-4*x^3-96*x^2-352*x-568,1)
- [x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1, Mod(2*x^4 - x^3 + 3*x^2 - 3*x - 1, x^5 -
- x^4 + 2*x^3 - 4*x^2 + x - 1)]
- ? polredord(x^3-12*x+45*x-1)
--[x - 1, x^3 - 363*x - 2663, x^3 + 33*x - 1]
-+[x - 1, x^3 + 33*x - 1]
- ? polsubcyclo(31,5)
- x^5 + x^4 - 12*x^3 - 21*x^2 + x + 5
- ? setrand(1);poltschirnhaus(x^5-x-1)
-@@ -1028,6 +1033,6 @@
- ? sizebyte(%)
- 152
- ? getheap
--[175, 113027]
-+[175, 112999]
- ? print("Total time spent: ",gettime);
--Total time spent: 116
-+Total time spent: 76
-diff -ru src/src/test/64/compat b/src/test/64/compat
---- src/src/test/64/compat 2013-05-06 16:01:58.000000000 +0200
-+++ b/src/test/64/compat 2013-05-06 16:47:04.542393431 +0200
-@@ -789,13 +789,9 @@
- ? factoreddiscf(p,fa)
- 136866601
- ? factoredpolred(p,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? factoredpolred2(p,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? factornf(x^3+x^2-2*x-1,t^3+t^2-2*t-1)
-
- [x + mod(-t, t^3 + t^2 - 2*t - 1) 1]
-@@ -906,7 +902,7 @@
- ? gcd(12345678,87654321)
- 9
- ? getheap()
--[208, 44472]
-+[208, 44308]
- ? getrand()
- Vecsmall([-696235626332558091, -7363039021536514678, -3123062006620239999, -
- 2510915082749224356, -5278885121447018503, 8033304491650294704, 333461878925
-@@ -2014,7 +2010,7 @@
- ? orderell(tcurve,[1,2])
- 6
- ? ordred(x^3-12*x+45*x-1)
--[x - 1, x^3 - 363*x - 2663, x^3 + 33*x - 1]
-+[x - 1, x^3 + 33*x - 1]
- ? padicprec(padicno,127)
- 5
- ? pascal(8)
-@@ -2093,15 +2089,16 @@
- ? polint([0,2,3],[0,4,9],5)
- 25
- ? polred(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
--[x - 1, x^5 - x^4 - 6*x^3 + 6*x^2 + 13*x - 5, x^5 - x^4 + 2*x^3 - 4*x^2 + x
--- 1, x^5 - x^4 + 4*x^3 - 2*x^2 + x - 1, x^5 + 4*x^3 - 4*x^2 + 8*x - 8]
-+[x - 1, x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1]
- ? polred2(x^4-28*x^3-458*x^2+9156*x-25321)
-
- [1 x - 1]
-
--[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-+[1/115*x^2 - 14/115*x - 212/115 x^2 - 2*x - 9]
-+
-+[-1/115*x^2 + 14/115*x + 442/115 x^2 - 2*x - 9]
-
--[2/897*x^3 - 14/299*x^2 - 1171/897*x + 9569/897 x^4 - 32*x^2 + 6]
-+[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-
- [1/4485*x^3 - 7/1495*x^2 - 1034/4485*x + 7924/4485 x^4 - 8*x^2 + 6]
-
-@@ -2454,13 +2451,21 @@
- ? smallinitell([0,0,0,-17,0])
- [0, 0, 0, -17, 0, 0, -34, 0, -289, 816, 0, 314432, 1728]
- ? smallpolred(x^4+576)
--[x - 1, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
-+[x - 1, x^2 - 3*x + 3, x^2 - 2*x + 2, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
- ? smallpolred2(x^4+576)
-
- [1 x - 1]
-
-+[-1/192*x^3 - 1/8*x + 3/2 x^2 - 3*x + 3]
-+
-+[1/24*x^2 + 1 x^2 - 2*x + 2]
-+
-+[-1/24*x^2 + 1 x^2 - 2*x + 2]
-+
- [-1/192*x^3 - 1/8*x + 1/2 x^2 - x + 1]
-
-+[1/192*x^3 + 1/8*x + 1/2 x^2 - x + 1]
-+
- [1/24*x^2 x^2 + 1]
-
- [1/192*x^3 + 1/48*x^2 - 1/8*x x^4 - x^2 + 1]
-@@ -2649,6 +2654,6 @@
- ? getstack()
- 200
- ? getheap()
--[599, 100048]
-+[599, 100020]
- ? print("Total time spent: ",gettime);
--Total time spent: 152
-+Total time spent: 180
-diff -ru src/src/test/64/nfields b/src/test/64/nfields
---- src/src/test/64/nfields 2013-05-06 16:01:58.000000000 +0200
-+++ b/src/test/64/nfields 2013-05-06 16:47:04.542393431 +0200
-@@ -928,45 +928,50 @@
- ? polgalois(x^6-3*x^2-1)
- [12, 1, 1, "A_4(6) = [2^2]3"]
- ? polred(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
--[x - 1, x^5 - x^4 - 6*x^3 + 6*x^2 + 13*x - 5, x^5 - x^4 + 2*x^3 - 4*x^2 + x
--- 1, x^5 - x^4 + 4*x^3 - 2*x^2 + x - 1, x^5 + 4*x^3 - 4*x^2 + 8*x - 8]
-+[x - 1, x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1]
- ? polred(x^4-28*x^3-458*x^2+9156*x-25321,3)
-
- [1 x - 1]
-
--[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-+[1/115*x^2 - 14/115*x - 212/115 x^2 - 2*x - 9]
-+
-+[-1/115*x^2 + 14/115*x + 442/115 x^2 - 2*x - 9]
-
--[2/897*x^3 - 14/299*x^2 - 1171/897*x + 9569/897 x^4 - 32*x^2 + 6]
-+[1/115*x^2 - 14/115*x - 327/115 x^2 - 10]
-
- [1/4485*x^3 - 7/1495*x^2 - 1034/4485*x + 7924/4485 x^4 - 8*x^2 + 6]
-
- ? polred(x^4+576,1)
--[x - 1, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
-+[x - 1, x^2 - 3*x + 3, x^2 - 2*x + 2, x^2 - x + 1, x^2 + 1, x^4 - x^2 + 1]
- ? polred(x^4+576,3)
-
- [1 x - 1]
-
-+[-1/192*x^3 - 1/8*x + 3/2 x^2 - 3*x + 3]
-+
-+[1/24*x^2 + 1 x^2 - 2*x + 2]
-+
-+[-1/24*x^2 + 1 x^2 - 2*x + 2]
-+
- [-1/192*x^3 - 1/8*x + 1/2 x^2 - x + 1]
-
-+[1/192*x^3 + 1/8*x + 1/2 x^2 - x + 1]
-+
- [1/24*x^2 x^2 + 1]
-
- [1/192*x^3 + 1/48*x^2 - 1/8*x x^4 - x^2 + 1]
-
- ? polred(p2,0,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? polred(p2,1,fa)
--[x - 1, x^5 - 2*x^4 - 62*x^3 + 85*x^2 + 818*x + 1, x^5 - 2*x^4 - 53*x^3 - 46
--*x^2 + 508*x + 913, x^5 - 2*x^4 - 13*x^3 + 37*x^2 - 21*x - 1, x^5 - x^4 - 52
--*x^3 - 197*x^2 - 273*x - 127]
-+[x - 1, x^5 - 80*x^3 - 223*x^2 + 800*x + 2671]
- ? polredabs(x^5-2*x^4-4*x^3-96*x^2-352*x-568)
- x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1
- ? polredabs(x^5-2*x^4-4*x^3-96*x^2-352*x-568,1)
- [x^5 - x^4 + 2*x^3 - 4*x^2 + x - 1, Mod(2*x^4 - x^3 + 3*x^2 - 3*x - 1, x^5 -
- x^4 + 2*x^3 - 4*x^2 + x - 1)]
- ? polredord(x^3-12*x+45*x-1)
--[x - 1, x^3 - 363*x - 2663, x^3 + 33*x - 1]
-+[x - 1, x^3 + 33*x - 1]
- ? polsubcyclo(31,5)
- x^5 + x^4 - 12*x^3 - 21*x^2 + x + 5
- ? setrand(1);poltschirnhaus(x^5-x-1)
-@@ -1030,6 +1035,6 @@
- ? sizebyte(%)
- 288
- ? getheap
--[175, 102929]
-+[175, 102901]
- ? print("Total time spent: ",gettime);
--Total time spent: 84
-+Total time spent: 110
diff --git a/sci-mathematics/pari/files/pari-2.5.4-slow_determinant.patch b/sci-mathematics/pari/files/pari-2.5.4-slow_determinant.patch
deleted file mode 100644
index 14833da6270..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.4-slow_determinant.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ru src/src/basemath/alglin1.c b/src/basemath/alglin1.c
---- src/src/basemath/alglin1.c 2012-09-25 23:10:46.000000000 +0200
-+++ b/src/basemath/alglin1.c 2013-01-03 13:56:55.487513420 +0100
-@@ -2969,6 +2969,21 @@
- return NULL; /* not reached */
- }
-
-+/* A a 2x2 matrix
-+ returns the determinant of A computed by the simple formula
-+*/
-+static GEN
-+det2x2(GEN A)
-+{
-+ pari_sp av = avma;
-+ GEN a = gcoeff(A, 1, 1),
-+ b = gcoeff(A, 1, 2),
-+ c = gcoeff(A, 2, 1),
-+ d = gcoeff(A, 2, 2);
-+ return gerepileupto(av, gsub(gmul(a, d), gmul(b, c)));
-+}
-+
-+
- static GEN
- det_simple_gauss(GEN a, GEN data, pivot_fun pivot)
- {
-@@ -3021,6 +3036,7 @@
- if (typ(a)!=t_MAT) pari_err(mattype1,"det2");
- if (!nbco) return gen_1;
- if (nbco != lg(a[1])-1) pari_err(mattype1,"det2");
-+ if (nbco == 2) return det2x2 (a);
- pivot = get_pivot_fun(a, &data);
- return det_simple_gauss(a, data, pivot);
- }
-@@ -3158,11 +3174,7 @@
- {
- case 0: return gen_1;
- case 1: return gcopy(gcoeff(M,1,1));
-- case 2: {
-- GEN a = gcoeff(M,1,1), b = gcoeff(M,1,2);
-- GEN c = gcoeff(M,2,1), d = gcoeff(M,2,2);
-- return gerepileupto(av, gsub(gmul(a,d), gmul(b,c)));
-- }
-+ case 2: return det2x2(M);
- }
- if (max > ((n+2)>>1)) max = (n+2)>>1;
- for (j = 1; j <= n; j++)
-@@ -3193,9 +3205,10 @@
- }
- if (best_row)
- {
-+ double d = lbest-1;
- GEN s = NULL;
- long k;
-- bound /= (lbest-1);
-+ bound /= d*d*d;
- for (k = 1; k < lbest; k++)
- {
- GEN c = coeff_det(M, best_row, best[k], max, bound);
-@@ -3205,9 +3218,10 @@
- }
- if (best_col)
- {
-+ double d = lbest-1;
- GEN s = NULL;
- long k;
-- bound /= (lbest-1);
-+ bound /= d*d*d;
- for (k = 1; k < lbest; k++)
- {
- GEN c = coeff_det(M, best[k], best_col, max, bound);
-@@ -3230,15 +3244,24 @@
- if (!n) return gen_1;
- if (n != lg(a[1])-1) pari_err(mattype1,"det");
- if (n == 1) return gcopy(gcoeff(a,1,1));
-- if (RgM_is_FpM(a, &p) && p)
-+ if (RgM_is_FpM(a, &p))
- {
-- pari_sp av = avma;
-- return gerepilecopy(av, Fp_to_mod(FpM_det(RgM_to_FpM(a, p), p), p));
-+ pari_sp av;
-+ if (!p)
-+ { /* ZM */
-+ return det_simple_gauss(a, NULL, &gauss_get_pivot_NZ);
-+ }
-+ else
-+ { /* FpM */
-+ av = avma;
-+ return gerepilecopy(av, Fp_to_mod(FpM_det(RgM_to_FpM(a, p), p), p));
-+ }
- }
-+ if (n == 2) return det2x2 (a);
- pivot = get_pivot_fun(a, &data);
- if (pivot != gauss_get_pivot_NZ) return det_simple_gauss(a, data, pivot);
-- B = (double)n; B = B*B; B = B*B;
-- return det_develop(a, 7, B);
-+ B = (double)n;
-+ return det_develop(a, 7, B*B*B);
- }
-
-
diff --git a/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch b/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch
deleted file mode 100644
index 4292688d97a..00000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-doc-make.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur pari-2.7.0/config/DOC_Make.SH pari-2.7.0_a/config/DOC_Make.SH
---- pari-2.7.0/config/DOC_Make.SH 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/DOC_Make.SH 2014-05-05 13:20:09.119923587 +1200
-@@ -23,7 +23,8 @@
-
- doc all: develop.dvi libpari.dvi parallel.dvi users.dvi refcard.ps tutorial.dvi
- docps: develop.ps libpari.ps parallel.ps refcard.ps tutorial.ps users.ps INSTALL.ps
--docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+#docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
-+docpdf: \$(PARI_TEX) \$(MACROS) pass1 pass2 indexing refcard.pdf INSTALL.pdf
-
- .SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
-
-@@ -39,38 +40,60 @@
- %.dvi: %.tex \$(MACROS)
- \$(TEX) \$<
-
-+pass1: \$(PARI_TEX) \$(USERS_TEX) develop.tex tutorial.tex \$(MACROS)
-+ -rm -f *.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+pass2: pass1
-+ pdftex libpari
-+ pdftex develop
-+ pdftex tutorial
-+ pdftex users
-+
-+indexing: pass2
-+ \$(MAKE) libpari.std
-+ \$(MAKE) develop.std
-+ \$(MAKE) users.std
-+ pdftex libpari
-+ pdftex develop
-+ pdftex users
-+ -rm -f *.std
-+
- libpari.pdf: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- \$(PDFTEX) libpari
- \$(PDFTEX) libpari
-- make libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
- libpari.dvi: \$(PARI_TEX) \$(MACROS)
- -rm -f libpari.std
- \$(TEX) libpari
- \$(TEX) libpari
-- make libpari.std; \$(TEX) libpari; rm -f libpari.std
-+ \$(MAKE) libpari.std; \$(TEX) libpari; rm -f libpari.std
-
- develop.pdf: develop.tex \$(MACROS)
- -rm -f develop.std
- \$(PDFTEX) develop
- \$(PDFTEX) develop
-- make develop.std; \$(PDFTEX) develop; rm -f develop.std
-+ \$(MAKE) develop.std; \$(PDFTEX) develop; rm -f develop.std
- develop.dvi: develop.tex \$(MACROS)
- -rm -f develop.std
- \$(TEX) develop
- \$(TEX) develop
-- make develop.std; \$(TEX) develop; rm -f develop.std
-+ \$(MAKE) develop.std; \$(TEX) develop; rm -f develop.std
-
- parallel.pdf: parallel.tex \$(MACROS)
- -rm -f parallel.std
- \$(PDFTEX) parallel
- \$(PDFTEX) parallel
-- make parallel.std; \$(PDFTEX) parallel; rm -f parallel.std
-+ \$(MAKE) parallel.std; \$(PDFTEX) parallel; rm -f parallel.std
- parallel.dvi: parallel.tex \$(MACROS)
- -rm -f parallel.std
- \$(TEX) parallel
- \$(TEX) parallel
-- make parallel.std; \$(TEX) parallel; rm -f parallel.std
-+ \$(MAKE) parallel.std; \$(TEX) parallel; rm -f parallel.std
-
- tutorial.pdf: tutorial.tex \$(MACROS)
- -rm -f tutorial.std
-@@ -104,7 +127,7 @@
- -rm -f users.std
- \$(PDFTEX) users
- \$(PDFTEX) users
-- make users.std; \$(PDFTEX) users; rm -f users.std
-+ \$(MAKE) users.std; \$(PDFTEX) users; rm -f users.std
-
- gpman: gp.1
- nroff -man gp.1 | unix2dos -ascii > gp.man
diff --git a/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch b/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch
deleted file mode 100644
index 2d77f19f9f5..00000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-no-automagic.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -Naur pari-2.7.0/config/Makefile.SH pari-2.7.0_a/config/Makefile.SH
---- pari-2.7.0/config/Makefile.SH 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/Makefile.SH 2014-05-05 12:00:21.095724368 +1200
-@@ -75,12 +75,12 @@
- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
- graph=plotQt;;
- Qt4)
-- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
-- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
-+ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
-+ PLOTLIBS="`pkg-config --libs QtGui`"
- graph=plotQt4;;
- fltk)
-- PLOTCFLAGS="-I\$(FLTKDIR)/include $X11_INC"
-- PLOTLIBS="$FLTK_LIBS"
-+ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
-+ PLOTLIBS="`fltk-config --ldflags`"
- postconfig='fltk-config --post '
- graph=plotfltk;;
- win32)
-@@ -269,7 +269,7 @@
- GMPINCLUDE = $GMPINCLUDE
- # Graphic library.
- QTDIR = "$QTDIR"
--MOC = \$(QTDIR)/bin/moc
-+MOC = "`which moc`"
- PLOTCFLAGS = $PLOTCFLAGS
- PLOTLIBS = $PLOTLIBS
- CPLUSPLUS = g++
-diff -Naur pari-2.7.0/config/get_Qt pari-2.7.0_a/config/get_Qt
---- pari-2.7.0/config/get_Qt 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_Qt 2014-05-05 11:56:42.453465262 +1200
-@@ -5,7 +5,7 @@
- case "$with_qt" in
- yes)
- pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
-- QTDIR=`locatedir qt4/bin $pth`
-+ QTDIR=`locatedir qt4 $pth`
- if test -n "$QTDIR"; then
- QTLIB="-lQtCore -lQtGui"
- which_graphic_lib=Qt4
-diff -Naur pari-2.7.0/config/get_config_options pari-2.7.0_a/config/get_config_options
---- pari-2.7.0/config/get_config_options 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_config_options 2014-05-05 11:49:14.577963840 +1200
-@@ -85,10 +85,12 @@
- --with-ncurses-lib=*|--with-ncurses=*)
- with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-qt|--with-qt=no) without_qt=yes ;;
- --with-qt) with_qt=yes ;;
- --with-qt=*)
- with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-
-+ --without-fltk|--with-fltk=no) without_fltk=yes ;;
- --with-fltk) with_fltk=yes ;;
- --with-fltk=*)
- with_fltk=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
-@@ -164,7 +166,9 @@
- --with-gmp-lib=DIR specify location of gmp libs
-
- --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.]
-+ --without-qt do not try to use the Qt lib
- --with-fltk[=DIR] use the FLTK graphical library [prefix for FLTK dir.]
-+ --without-fltk do not try to use the FLTK lib
-
- Environment variables affecting the build:
- CC C compiler
-diff -Naur pari-2.7.0/config/get_fltk pari-2.7.0_a/config/get_fltk
---- pari-2.7.0/config/get_fltk 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_fltk 2014-05-05 11:49:14.578963841 +1200
-@@ -2,6 +2,9 @@
- with_fltk=yes
- fi
- FLTKDIR=
-+if test -z "$without_fltk; then
-+ FLTKDIR="`fltk-config --prefix 2>/dev/null`"
-+fi
- case "$with_fltk" in
- yes)
- pth=$libpth; lib=fltk; . ./locatelib
-diff -Naur pari-2.7.0/config/get_graphic_lib pari-2.7.0_a/config/get_graphic_lib
---- pari-2.7.0/config/get_graphic_lib 2014-03-20 21:59:28.000000000 +1300
-+++ pari-2.7.0_a/config/get_graphic_lib 2014-05-05 11:54:45.469333702 +1200
-@@ -7,6 +7,7 @@
-
- if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
- if test -n "$with_qt"; then which_graphic_lib=Qt; fi
-+if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
- if test "$fastread" != yes; then
- cat << EOT
- ==========================================================================
-@@ -38,7 +39,7 @@
- case $osname in
- darwin) ;; # fltk brings in CoreFoundation, incompatible with pari_daemon
- *). ./get_fltk # FLTKDIR, FLTK_LIBS ;;
-- if test -z "$FLTKDIR"; then
-+ if test -z "`fltk-config --ldflags 2> /dev/null`"; then
- case $which_graphic_lib in fltk) which_graphic_lib=none;; esac
- else
- which_graphic_lib=fltk
diff --git a/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
deleted file mode 100644
index 9d868ef6b6a..00000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2864fe5b852e443d98af92d8929e359525ccb1a2 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Sun, 11 Jun 2017 10:31:03 +1200
-Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
-
-Previous scripts assumed CWD was in @INC and that "PARI::822" was in
-wherever CWD was.
-
-This fixes both of those, and the latter, because its not obvious
-from the build system where one should assume CWD to be.
-
-Instead, the absolute path of the directory of these scripts is
-inserted into @INC
----
- src/desc/doc_make | 5 +++++
- src/desc/gen_proto | 4 ++++
- src/desc/merge_822 | 4 ++++
- 3 files changed, 13 insertions(+)
-
-diff --git a/src/desc/doc_make b/src/desc/doc_make
-index 91b894e..ffbbb78 100755
---- a/src/desc/doc_make
-+++ b/src/desc/doc_make
-@@ -1,6 +1,11 @@
- #!/usr/bin/perl
- use warnings FATAL => 'all';
- use strict;
-+
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- my (%funcs, %Fun_by_sec);
-diff --git a/src/desc/gen_proto b/src/desc/gen_proto
-index ee55449..5ca0305 100755
---- a/src/desc/gen_proto
-+++ b/src/desc/gen_proto
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- $class=$ARGV[0];
-diff --git a/src/desc/merge_822 b/src/desc/merge_822
-index 4c9217b..32b3cc9 100755
---- a/src/desc/merge_822
-+++ b/src/desc/merge_822
-@@ -1,4 +1,8 @@
- #!/usr/bin/perl -w
-+use File::Spec;
-+use File::Basename qw( dirname );
-+use lib dirname(File::Spec->rel2abs(__FILE__));
-+
- use PARI::822;
-
- open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
---
-2.13.1
-
diff --git a/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch b/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch
deleted file mode 100644
index 814dc4b2ab9..00000000000
--- a/sci-mathematics/pari/files/pari-2.7.0-slow-discriminant.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru src/src/basemath/alglin1.c b/src/basemath/alglin1.c
---- src/src/basemath/alglin1.c 2014-01-29 18:00:27.000000000 +0100
-+++ b/src/basemath/alglin1.c 2014-02-09 01:54:37.676725196 +0100
-@@ -247,6 +247,7 @@
- a = RgM_shallowcopy(a);
- for (i=1; i<nbco; i++)
- {
-+ int garbage = 0; /* Only gerepile() once per loop iteration */
- for(k=i; k<=nbco; k++)
- {
- gcoeff(a,k,i) = ff->red(E,gcoeff(a,k,i));
-@@ -271,7 +272,7 @@
- for (j=i+1; j<=nbco; j++)
- {
- gcoeff(a,j,k) = ff->add(E, gcoeff(a,j,k), ff->mul(E,m,gcoeff(a,j,i)));
-- if (low_stack(lim, stack_lim(av,1)))
-+ if (low_stack(lim, stack_lim(av,1)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,4, &a,&x,&q,&m);
-@@ -3721,6 +3722,7 @@
- a = RgM_shallowcopy(a);
- for (i=1; i<nbco; i++)
- {
-+ int garbage = 0; /* Only gerepile() once per loop iteration */
- k = pivot(a, data, i, NULL);
- if (k > nbco) return gerepilecopy(av, gcoeff(a,i,i));
- if (k != i)
-@@ -3740,7 +3742,7 @@
- for (j=i+1; j<=nbco; j++)
- {
- gcoeff(a,j,k) = gsub(gcoeff(a,j,k), gmul(m,gcoeff(a,j,i)));
-- if (low_stack(lim, stack_lim(av,3)))
-+ if (low_stack(lim, stack_lim(av,3)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,2, &a,&x);
-@@ -3791,6 +3793,7 @@
- {
- GEN ci, ck, m;
- int diveuc = (gequal1(pprec)==0);
-+ int garbage = 0; /* Only gerepile() once per loop iteration */
-
- p = gcoeff(a,i,i);
- if (gequal0(p))
-@@ -3827,7 +3830,7 @@
- GEN p1 = gsub(gmul(p,gel(ck,j)), gmul(m,gel(ci,j)));
- if (diveuc) p1 = mydiv(p1,pprec);
- gel(ck,j) = gerepileupto(av2, p1);
-- if (low_stack(lim,stack_lim(av,2)))
-+ if (low_stack(lim,stack_lim(av,2)) && (garbage++ == 0))
- {
- if(DEBUGMEM>1) pari_warn(warnmem,"det. col = %ld",i);
- gerepileall(av,2, &a,&pprec);
diff --git a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
deleted file mode 100644
index c4bbadcb2e0..00000000000
--- a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U2 -r pari-2.7.1.orig/src/desc/doc_make pari-2.7.1/src/desc/doc_make
---- pari-2.7.1.orig/src/desc/doc_make 2014-05-11 00:59:29.000000000 +0700
-+++ pari-2.7.1/src/desc/doc_make 2015-11-15 00:51:11.494845695 +0600
-@@ -39,6 +39,6 @@
- $v =~ s/(\w\w+)/\\var{$1}/g;
- $v =~ s/\^([a-z])/\\hbox{\\kbd{\\pow}}$1/g;
-- $v =~ s/\\var{flag}/\\fl/g;
-- $v =~ s/\\var{(\d+)}/{$1}/g;
-+ $v =~ s/\\var\{flag}/\\fl/g;
-+ $v =~ s/\\var\{(\d+)}/{$1}/g;
-
- $v = "\$($v)\$";
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index a0f484b4677..d996d235469 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -9,6 +9,7 @@ HOMEPAGE="http://pari.math.u-bordeaux.fr/"
SRC_COM="http://pari.math.u-bordeaux.fr/pub/${PN}"
SRC_URI="${SRC_COM}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
data? ( ${SRC_COM}/packages/elldata.tgz
${SRC_COM}/packages/galdata.tgz
${SRC_COM}/packages/seadata.tgz
@@ -40,10 +41,10 @@ src_prepare() {
if use data; then
mv "${WORKDIR}"/data "${S}" || die "failed to move data"
fi
- epatch "${FILESDIR}/"${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}/"${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- epatch "${FILESDIR}/"${PN}-2.3.5-doc-make.patch
- epatch "${FILESDIR}/"${PN}-2.3.5-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.5-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.5-no-dot-inc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.5.4.ebuild b/sci-mathematics/pari/pari-2.5.4.ebuild
index 2c261d95efc..78f5d5418c9 100644
--- a/sci-mathematics/pari/pari-2.5.4.ebuild
+++ b/sci-mathematics/pari/pari-2.5.4.ebuild
@@ -7,7 +7,8 @@ inherit eutils flag-o-matic toolchain-funcs multilib
DESCRIPTION="Computer-aided number theory C library and tools"
HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -34,22 +35,22 @@ get_compile_dir() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
# fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-doc-make.patch
# sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-macos.patch
# Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-no-dot-inc.patch
# fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.1-no-automagic.patch
# sage-on-gentoo trac 13902: Slowdown for PARI integer determinant
- epatch "${FILESDIR}"/${PN}-2.5.4-slow_determinant.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-slow_determinant.patch
# sage-on-gentoo trac 13054: polred bug / pari bug 1395
- epatch "${FILESDIR}"/${PN}-2.5.4-polred.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-polred.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
index 1bf04634442..8a691309959 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.7.1.ebuild
@@ -7,7 +7,8 @@ inherit eutils flag-o-matic toolchain-funcs multilib
DESCRIPTION="Computer-aided number theory C library and tools"
HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="GPL-2"
SLOT="0/4"
@@ -34,18 +35,18 @@ get_compile_dir() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
# fix parallel make
- epatch "${FILESDIR}"/${PN}-2.7.0-doc-make.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-doc-make.patch
# fix automagic
- epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-automagic.patch
# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
- epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-slow-discriminant.patch
# Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-dot-inc.patch
# fix building docs with perl-5.22
- epatch "${FILESDIR}"/${PN}-2.7.1-perl-5.22-doc.patch
+ epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.1-perl-5.22-doc.patch
# disable default building of docs during install
sed -i \
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2017-12-11 19:46 Michał Górny
0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2017-12-11 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 2b4de8113370e08dd863e5fe1cc9553055f1b306
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 19:35:33 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 19:46:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4de811
sci-mathematics/pari: Prune old
sci-mathematics/pari/Manifest | 5 -
sci-mathematics/pari/files/50pari-gentoo.el | 10 --
sci-mathematics/pari/files/pari-2.5.1-1302.patch | 33 ------
sci-mathematics/pari/files/pari-2.5.1-1304.patch | 39 ------
sci-mathematics/pari/files/pari-2.5.1-gcc47.patch | 18 ---
sci-mathematics/pari/pari-2.5.0-r3.ebuild | 136 ---------------------
sci-mathematics/pari/pari-2.5.1-r1.ebuild | 138 ----------------------
sci-mathematics/pari/pari-2.5.1.ebuild | 138 ----------------------
sci-mathematics/pari/pari-2.5.2.ebuild | 134 ---------------------
sci-mathematics/pari/pari-2.5.3.ebuild | 134 ---------------------
sci-mathematics/pari/pari-2.7.0.ebuild | 134 ---------------------
11 files changed, 919 deletions(-)
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c43b709a4c7..c2317db8fd8 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -2,11 +2,6 @@ DIST elldata.tgz 14185595 BLAKE2B eb90a0e392eeeaad81b6b01ba4e8258aaf2a4b4a01950b
DIST galdata.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
DIST nftables.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
DIST pari-2.3.5.tar.gz 2018097 BLAKE2B b5f4f8bc83cd77aceab791263e1a2f0294d0663d354fea454bad8cac3cdbac9c4c8381cc83bc947d518522701c36e94ce1d6862125a9bfd3b17b1a31c9baabc8 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
-DIST pari-2.5.0.tar.gz 2714449 BLAKE2B 2c3bdc52c9c5332670656910a425847633a39831d372f69966542564a0bc5b35d767b84df68a357285e06357ebe110fb55134d1e34675f7e9b27c78cfc0945d4 SHA512 701abdf4d65bcaeac9bdd314b1fc24a59de9ee1874b9abba5761cb88bb871c18d108a99cf1cbf9a357ac192196c043592e0e5d1645689d5a6f85afbfa7a9096f
-DIST pari-2.5.1.tar.gz 2718726 BLAKE2B 28149a9af879fed26dd5d7effee8a821a293518743fb5c1ef2ca97e903cf1ab24afbeb4116b2bf833c05aebddacd026a584b8b2c60fef5b036af44d666f22f60 SHA512 dd304bd02402602c1f114a7f4d1e54af0fce8707b196fd9da617c028ba3426418813aeaf818fecaa9f76572b1d36847463a3aa7f60848cdec607ec70131dc263
-DIST pari-2.5.2.tar.gz 2719367 BLAKE2B a48109c1c5ec85306eef4b6bff8c7c05bfe0479f1f9e4e57e2b914286117c2768be869109e7701d74f29fee80fcff9e0f05d6863fde6cf881e7ecc00b7539ba0 SHA512 2d0332e5604a6bd41c8328c4cffc42302dd85db077a950e19769a0cc7b8c3e17b7c4c5c1514ecb2f75757015baa7e7df76f6174e997fbaa90874c5e6cf5e7fce
-DIST pari-2.5.3.tar.gz 2720543 BLAKE2B a52473c817c9625f30e6c3ee08942f8e69d4cba0ef6d50972c20ac0995dc00d605d19d90793b88d59e5d47ac87d0ef68d4dbc6b77c3887677cd7b290e0b41bbb SHA512 8606f1f1b59a8e9e8b5bdbaacd03f980da99616568c180eb37f6f530efad396343e3146f6c7adfc5dac6e43a1d35c898531ecf61dd6d62c26cafcd2554f8c43b
DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
-DIST pari-2.7.0.tar.gz 3142306 BLAKE2B eb4a62af1eaa502d38e04116a34e2c9b186ef075cfa647c242ec5384de8d1c12acdb1ad55397a2c3af19b93b95115a60a8a6e8ae2b2bd6d197d68a1907df79e8 SHA512 312ed6032e5b1b431d04cccb593e5ca6ca323361736669be0ed345cbb6cf22114c670984ae74120aacb4ac1af822a1fdf76aed7ba59a1cd4f94e26150562ad84
DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
diff --git a/sci-mathematics/pari/files/50pari-gentoo.el b/sci-mathematics/pari/files/50pari-gentoo.el
deleted file mode 100644
index 2f5b4da9084..00000000000
--- a/sci-mathematics/pari/files/50pari-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;; site-init for sci-mathematics/pari
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'gp-mode "pari" nil t)
-(autoload 'gp-script-mode "pari" nil t)
-(autoload 'gp "pari" nil t)
-(autoload 'gpman "pari" nil t)
-(add-to-list 'auto-mode-alist '("\\.gp$" . gp-script-mode))
diff --git a/sci-mathematics/pari/files/pari-2.5.1-1302.patch b/sci-mathematics/pari/files/pari-2.5.1-1302.patch
deleted file mode 100644
index 245e587d275..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-1302.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 917b505c86a70dda2191d380861af05becc03858
-Author: Karim Belabas <Karim.Belabas@math.u-bordeaux1.fr>
-Date: Mon Mar 12 23:54:11 2012 +0100
-
- ispower(x < 0,, &n): n could have the wrong sign [#1302]
-
-diff --git a/src/basemath/arith1.c b/src/basemath/arith1.c
-index ded946b..5502ba5 100644
---- a/src/basemath/arith1.c
-+++ b/src/basemath/arith1.c
-@@ -1109,6 +1109,7 @@ Z_isanypower(GEN x, GEN *pty)
- *pty = gerepileuptoint(av, y);
- return k;
- }
-+ if (pty) togglesign_safe(pty);
- }
- if (pty) *pty = gerepilecopy(av, *pty); else avma = av;
- return k;
-diff --git a/src/test/32/ispower b/src/test/32/ispower
-index bf4b6f0..84d8de7 100644
---- a/src/test/32/ispower
-+++ b/src/test/32/ispower
-@@ -1118,7 +1118,7 @@
- [2, 999]
- [6, 10]
- [3, -4]
--[3, 2]
--[3, 21218]
-+[3, -2]
-+[3, -21218]
- [3, -1/4]
--Total time spent: 3236
-+Total time spent: 3012
diff --git a/sci-mathematics/pari/files/pari-2.5.1-1304.patch b/sci-mathematics/pari/files/pari-2.5.1-1304.patch
deleted file mode 100644
index 3da2e8558da..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-1304.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ff707a3f2ba2d5c555434ba50547453833a7570f
-Author: Karim Belabas <Karim.Belabas@math.u-bordeaux1.fr>
-Date: Sun Mar 18 23:54:02 2012 +0100
-
- 71- issquarefree(0) => error [#1304]
-
-diff --git a/src/basemath/ifactor1.c b/src/basemath/ifactor1.c
-index 046491f..8f9fbaa 100644
---- a/src/basemath/ifactor1.c
-+++ b/src/basemath/ifactor1.c
-@@ -3493,7 +3493,11 @@ moebius(GEN n)
- GEN
- gissquarefree(GEN x) { return map_proto_lG(issquarefree,x); }
- long
--Z_issquarefree(GEN n) { return moebius(n)? 1: 0; }
-+Z_issquarefree(GEN n)
-+{
-+ if (!signe(n)) return 0;
-+ return moebius(n)? 1: 0;
-+}
- long
- issquarefree(GEN x)
- {
-diff --git a/src/test/32/arith b/src/test/32/arith
-new file mode 100644
-index 0000000..3c5981a
---- /dev/null
-+++ b/src/test/32/arith
-@@ -0,0 +1,2 @@
-+0
-+Total time spent: 8
-diff --git a/src/test/in/arith b/src/test/in/arith
-new file mode 100644
-index 0000000..fb92bed
---- /dev/null
-+++ b/src/test/in/arith
-@@ -0,0 +1,2 @@
-+\\#1304
-+issquarefree(0)
diff --git a/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch b/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
deleted file mode 100644
index e7b27159fa0..00000000000
--- a/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: pari-2.5.1/src/basemath/bibli2.c
-===================================================================
---- pari-2.5.1.orig/src/basemath/bibli2.c 2012-01-26 17:26:13.000000000 +0100
-+++ pari-2.5.1/src/basemath/bibli2.c 2012-06-04 10:08:41.000000000 +0200
-@@ -1394,12 +1394,12 @@
- int (*CMP)(void*,GEN,GEN);
- int (*cmp)(GEN,GEN) = (flag & cmp_LEX)? &lexcmp: &gcmp;
- void *E;
-+ struct veccmp_s v;
-
- if (flag < 0 || flag > (cmp_REV|cmp_LEX|cmp_IND|cmp_UNIQ))
- pari_err(flagerr,"vecsort");
- if (k) {
- long i, j, l, lk, tx, lx;
-- struct veccmp_s v;
- GEN y;
-
- /* cf init_sort */
diff --git a/sci-mathematics/pari/pari-2.5.0-r3.ebuild b/sci-mathematics/pari/pari-2.5.0-r3.ebuild
deleted file mode 100644
index 57421935e63..00000000000
--- a/sci-mathematics/pari/pari-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc data fltk gmp X"
-
-RDEPEND="sys-libs/readline
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- X? ( x11-libs/libX11 )
- doc? ( X? ( x11-misc/xdg-utils ) )
- data? ( sci-mathematics/pari-data )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}"-2.3.2-strip.patch
- epatch "${FILESDIR}/${PN}"-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}/${PN}"-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- local myconfig
- if use gmp ; then
- myconfig="--with-gmp=${EPREFIX}/usr"
- else
- myconfig="--with-gmp=no"
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $myconfig \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
-
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.1-r1.ebuild b/sci-mathematics/pari/pari-2.5.1-r1.ebuild
deleted file mode 100644
index 7202ed087de..00000000000
--- a/sci-mathematics/pari/pari-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # from debian, fies bug #423617
- epatch "${FILESDIR}"/${PN}-2.5.1-gcc47.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
- # upstream fixes
- epatch "${FILESDIR}"/${PN}-2.5.1-1302.patch
- epatch "${FILESDIR}"/${PN}-2.5.1-1304.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.1.ebuild b/sci-mathematics/pari/pari-2.5.1.ebuild
deleted file mode 100644
index fb1efebef0c..00000000000
--- a/sci-mathematics/pari/pari-2.5.1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc data fltk gmp X"
-
-RDEPEND="sys-libs/readline
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- X? ( x11-libs/libX11 )
- doc? ( X? ( x11-misc/xdg-utils ) )
- data? ( sci-mathematics/pari-data )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}"-2.3.2-strip.patch
- epatch "${FILESDIR}/${PN}"-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}/${PN}"-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # from debian, fies bug #423617
- epatch "${FILESDIR}/${PN}"-2.5.1-gcc47.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- sed -i "s:/usr:${EPREFIX}/usr:g" config/get_X11 \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm -f doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- local myconfig
- if use gmp ; then
- myconfig="--with-gmp=${EPREFIX}/usr"
- else
- myconfig="--with-gmp=no"
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $myconfig \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
-
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.2.ebuild b/sci-mathematics/pari/pari-2.5.2.ebuild
deleted file mode 100644
index 3bc68a6ccdc..00000000000
--- a/sci-mathematics/pari/pari-2.5.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
- config/get_{Qt,X11,include_path,libpth} \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.5.3.ebuild b/sci-mathematics/pari/pari-2.5.3.ebuild
deleted file mode 100644
index 8f42ea7f9a8..00000000000
--- a/sci-mathematics/pari/pari-2.5.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="A software package for computer-aided number theory"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="sys-libs/readline
- data? ( sci-mathematics/pari-data )
- doc? ( X? ( x11-misc/xdg-utils ) )
- fltk? ( x11-libs/fltk:1 )
- gmp? ( dev-libs/gmp )
- qt4? ( dev-qt/qtgui:4 )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.5.0-doc-make.patch
- # sage error handling patch
- epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
- # OS X: add -install_name to the linker option
- epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
- config/get_{Qt,X11,include_path,libpth} \
- || die "Failed to fix get_X11"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- default
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
- fi
-}
diff --git a/sci-mathematics/pari/pari-2.7.0.ebuild b/sci-mathematics/pari/pari-2.7.0.ebuild
deleted file mode 100644
index 5553fa2865b..00000000000
--- a/sci-mathematics/pari/pari-2.7.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="
- 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= )
- qt4? ( dev-qt/qtgui:4= )
- X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
- doc? ( virtual/latex-base )"
-
-get_compile_dir() {
- pushd "${S}/config" > /dev/null
- local fastread=yes
- source ./get_archos
- popd > /dev/null
- echo "O${osname}-${arch}"
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3.2-strip.patch
- epatch "${FILESDIR}"/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
- # fix parallel make
- epatch "${FILESDIR}"/${PN}-2.7.0-doc-make.patch
- # fix automagic
- epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
- # sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
- epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
- # Fix Perl 5.26
- epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
-
- # disable default building of docs during install
- sed -i \
- -e "s:install-doc install-examples:install-examples:" \
- config/Makefile.SH || die "Failed to fix makefile"
-
- # propagate ldflags
- sed -i \
- -e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
- config/get_dlld || die "failed to fix LDFLAGS"
- # 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"
-
- # usersch3.tex is generated
- rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
- tc-export CC
- export CPLUSPLUS=$(tc-getCXX)
-
- # need to force optimization here, as it breaks without
- if is-flag -O0; then
- replace-flags -O0 -O2
- elif ! is-flag -O?; then
- append-flags -O2
- fi
-
- # sysdatadir installs a pari.cfg stuff which is informative only
- ./Configure \
- --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/${PN} \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --with-readline="${EPREFIX}"/usr \
- --with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with fltk) \
- $(use_with gmp) \
- $(use_with qt4 qt) \
- || die "./Configure failed"
-}
-
-src_compile() {
- use hppa && \
- mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
- mycxxmake=LD\=$(tc-getCXX)
-
- local installdir=$(get_compile_dir)
- cd "${installdir}" || die "failed to change directory"
- # upstream set -fno-strict-aliasing.
- # aliasing is a known issue on amd64, work on x86 by sheer luck
- emake ${mymake} \
- CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
- emake ${mymake} ${mycxxmake} \
- CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
- if use doc; then
- cd "${S}" || die "failed to change directory"
- # To prevent sandbox violations by metafont
- VARTEXFONTS="${T}"/fonts emake docpdf
- fi
-}
-
-src_test() {
- emake dobench
-}
-
-src_install() {
- emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
- dodoc MACHINES COMPAT
- if use doc; then
- # install gphelp and the pdf documentations manually.
- # the install-doc target is overkill.
- dodoc doc/*.pdf
- dobin doc/gphelp
- insinto /usr/share/doc/${PF}
- # gphelp looks for some of the tex sources...
- doins doc/*.tex doc/translations
- # Install the examples - for real.
- emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
- -C $(get_compile_dir) install-examples
- fi
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2017-06-11 14:30 Kent Fredric
0 siblings, 0 replies; 12+ messages in thread
From: Kent Fredric @ 2017-06-11 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 820fcd22ef2a0a5d8eefb18e86ab21ba76d96e3f
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 23:48:16 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 14:29:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820fcd22
sci-mathematics/pari: Fix for '.' in @INC on perl 5.26 re bug #615016
Perl 5.26 removes implied cwd from library loading paths, and
subsequently Pari's compile fails due to reliance on this implication.
These patches rectify that by constructing a library path the same
as the scripts directory, and inserting that into `@INC`
Of course, we still need the oldest pari because dev-perl/Math-Pari
needs the old version.
And of course, the files in question have minor changes over the
handful of versions, necessitating 3 *mostly* identical but slightly
different patches for the relevant versions.
I haven't filed this issue upstream, as their bug reporting stuff
looked dizzyingly confusing.
Bug: https://bugs.gentoo.org/615016
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../pari/files/pari-2.3.5-no-dot-inc.patch | 61 +++++++++++++++++++++
.../pari/files/pari-2.5.0-no-dot-inc.patch | 61 +++++++++++++++++++++
.../pari/files/pari-2.7.0-no-dot-inc.patch | 64 ++++++++++++++++++++++
sci-mathematics/pari/pari-2.3.5.ebuild | 3 +-
sci-mathematics/pari/pari-2.5.0-r3.ebuild | 4 +-
sci-mathematics/pari/pari-2.5.1-r1.ebuild | 4 +-
sci-mathematics/pari/pari-2.5.1.ebuild | 4 +-
sci-mathematics/pari/pari-2.5.2.ebuild | 4 +-
sci-mathematics/pari/pari-2.5.3.ebuild | 4 +-
sci-mathematics/pari/pari-2.5.4.ebuild | 4 +-
sci-mathematics/pari/pari-2.7.0.ebuild | 4 +-
sci-mathematics/pari/pari-2.7.1.ebuild | 4 +-
12 files changed, 212 insertions(+), 9 deletions(-)
diff --git a/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
new file mode 100644
index 00000000000..cd34851a30f
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.3.5-no-dot-inc.patch
@@ -0,0 +1,61 @@
+From 4f1e00df5ea1e51042146f6277bb1af02f249cc3 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 10:31:03 +1200
+Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
+
+Previous scripts assumed CWD was in @INC and that "PARI::822" was in
+wherever CWD was.
+
+This fixes both of those, and the latter, because its not obvious
+from the build system where one should assume CWD to be.
+
+Instead, the absolute path of the directory of these scripts is
+inserted into @INC
+---
+ src/desc/gen_member | 4 ++++
+ src/desc/gen_proto | 4 ++++
+ src/desc/merge_822 | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/src/desc/gen_member b/src/desc/gen_member
+index 2f3cf52..66dea2b 100755
+--- a/src/desc/gen_member
++++ b/src/desc/gen_member
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ $class='member_functions';
+diff --git a/src/desc/gen_proto b/src/desc/gen_proto
+index 1b507fa..2fb4d3f 100755
+--- a/src/desc/gen_proto
++++ b/src/desc/gen_proto
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ $class=$ARGV[0];
+diff --git a/src/desc/merge_822 b/src/desc/merge_822
+index a02d612..9ca8252 100755
+--- a/src/desc/merge_822
++++ b/src/desc/merge_822
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ PARI::822::read(\%funcs,$_,1)
+--
+2.13.1
+
diff --git a/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
new file mode 100644
index 00000000000..e34fa6b352a
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.5.0-no-dot-inc.patch
@@ -0,0 +1,61 @@
+From 03df0cdd7228a412d2adfe9ee9c746b3ec69dd6b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 10:31:03 +1200
+Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
+
+Previous scripts assumed CWD was in @INC and that "PARI::822" was in
+wherever CWD was.
+
+This fixes both of those, and the latter, because its not obvious
+from the build system where one should assume CWD to be.
+
+Instead, the absolute path of the directory of these scripts is
+inserted into @INC
+---
+ src/desc/doc_make | 4 ++++
+ src/desc/gen_proto | 4 ++++
+ src/desc/merge_822 | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/src/desc/doc_make b/src/desc/doc_make
+index 02dc90d..55296ed 100755
+--- a/src/desc/doc_make
++++ b/src/desc/doc_make
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ PARI::822::read(\%funcs, "pari.desc");
+diff --git a/src/desc/gen_proto b/src/desc/gen_proto
+index 38c2daf..ffb4276 100755
+--- a/src/desc/gen_proto
++++ b/src/desc/gen_proto
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ $class=$ARGV[0];
+diff --git a/src/desc/merge_822 b/src/desc/merge_822
+index 4c9217b..32b3cc9 100755
+--- a/src/desc/merge_822
++++ b/src/desc/merge_822
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
+--
+2.13.1
+
diff --git a/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch b/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
new file mode 100644
index 00000000000..9d868ef6b6a
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.7.0-no-dot-inc.patch
@@ -0,0 +1,64 @@
+From 2864fe5b852e443d98af92d8929e359525ccb1a2 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 11 Jun 2017 10:31:03 +1200
+Subject: [PATCH] Fix for 5.26 removal of '.' in @INC
+
+Previous scripts assumed CWD was in @INC and that "PARI::822" was in
+wherever CWD was.
+
+This fixes both of those, and the latter, because its not obvious
+from the build system where one should assume CWD to be.
+
+Instead, the absolute path of the directory of these scripts is
+inserted into @INC
+---
+ src/desc/doc_make | 5 +++++
+ src/desc/gen_proto | 4 ++++
+ src/desc/merge_822 | 4 ++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/src/desc/doc_make b/src/desc/doc_make
+index 91b894e..ffbbb78 100755
+--- a/src/desc/doc_make
++++ b/src/desc/doc_make
+@@ -1,6 +1,11 @@
+ #!/usr/bin/perl
+ use warnings FATAL => 'all';
+ use strict;
++
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ my (%funcs, %Fun_by_sec);
+diff --git a/src/desc/gen_proto b/src/desc/gen_proto
+index ee55449..5ca0305 100755
+--- a/src/desc/gen_proto
++++ b/src/desc/gen_proto
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ $class=$ARGV[0];
+diff --git a/src/desc/merge_822 b/src/desc/merge_822
+index 4c9217b..32b3cc9 100755
+--- a/src/desc/merge_822
++++ b/src/desc/merge_822
+@@ -1,4 +1,8 @@
+ #!/usr/bin/perl -w
++use File::Spec;
++use File::Basename qw( dirname );
++use lib dirname(File::Spec->rel2abs(__FILE__));
++
+ use PARI::822;
+
+ open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
+--
+2.13.1
+
diff --git a/sci-mathematics/pari/pari-2.3.5.ebuild b/sci-mathematics/pari/pari-2.3.5.ebuild
index 2d3e754e7b1..a0f484b4677 100644
--- a/sci-mathematics/pari/pari-2.3.5.ebuild
+++ b/sci-mathematics/pari/pari-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=3
@@ -43,6 +43,7 @@ src_prepare() {
epatch "${FILESDIR}/"${PN}-2.3.2-strip.patch
epatch "${FILESDIR}/"${PN}-2.3.2-ppc-powerpc-arch-fix.patch
epatch "${FILESDIR}/"${PN}-2.3.5-doc-make.patch
+ epatch "${FILESDIR}/"${PN}-2.3.5-no-dot-inc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.5.0-r3.ebuild b/sci-mathematics/pari/pari-2.5.0-r3.ebuild
index 7fcce2db95f..57421935e63 100644
--- a/sci-mathematics/pari/pari-2.5.0-r3.ebuild
+++ b/sci-mathematics/pari/pari-2.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -40,6 +40,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.5.1-r1.ebuild b/sci-mathematics/pari/pari-2.5.1-r1.ebuild
index af29f9f8b64..7202ed087de 100644
--- a/sci-mathematics/pari/pari-2.5.1-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -41,6 +41,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# from debian, fies bug #423617
epatch "${FILESDIR}"/${PN}-2.5.1-gcc47.patch
# fix automagic
diff --git a/sci-mathematics/pari/pari-2.5.1.ebuild b/sci-mathematics/pari/pari-2.5.1.ebuild
index edaad215734..fb1efebef0c 100644
--- a/sci-mathematics/pari/pari-2.5.1.ebuild
+++ b/sci-mathematics/pari/pari-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -40,6 +40,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# from debian, fies bug #423617
epatch "${FILESDIR}/${PN}"-2.5.1-gcc47.patch
diff --git a/sci-mathematics/pari/pari-2.5.2.ebuild b/sci-mathematics/pari/pari-2.5.2.ebuild
index 97003885b77..3bc68a6ccdc 100644
--- a/sci-mathematics/pari/pari-2.5.2.ebuild
+++ b/sci-mathematics/pari/pari-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -41,6 +41,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# fix automagic
epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
diff --git a/sci-mathematics/pari/pari-2.5.3.ebuild b/sci-mathematics/pari/pari-2.5.3.ebuild
index c09a829e211..8f42ea7f9a8 100644
--- a/sci-mathematics/pari/pari-2.5.3.ebuild
+++ b/sci-mathematics/pari/pari-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -41,6 +41,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# fix automagic
epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
diff --git a/sci-mathematics/pari/pari-2.5.4.ebuild b/sci-mathematics/pari/pari-2.5.4.ebuild
index 07cd3c31251..2c261d95efc 100644
--- a/sci-mathematics/pari/pari-2.5.4.ebuild
+++ b/sci-mathematics/pari/pari-2.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -42,6 +42,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.5.0-mp.c.patch
# OS X: add -install_name to the linker option
epatch "${FILESDIR}"/${PN}-2.5.0-macos.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.5.0-no-dot-inc.patch
# fix automagic
epatch "${FILESDIR}"/${PN}-2.5.1-no-automagic.patch
# sage-on-gentoo trac 13902: Slowdown for PARI integer determinant
diff --git a/sci-mathematics/pari/pari-2.7.0.ebuild b/sci-mathematics/pari/pari-2.7.0.ebuild
index 39551d6c234..5553fa2865b 100644
--- a/sci-mathematics/pari/pari-2.7.0.ebuild
+++ b/sci-mathematics/pari/pari-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -42,6 +42,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
# disable default building of docs during install
sed -i \
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
index f34ec5d3143..1bf04634442 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -42,6 +42,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+ # Fix Perl 5.26
+ epatch "${FILESDIR}/"${PN}-2.7.0-no-dot-inc.patch
# fix building docs with perl-5.22
epatch "${FILESDIR}"/${PN}-2.7.1-perl-5.22-doc.patch
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
@ 2015-11-14 16:12 Andrey Grozin
0 siblings, 0 replies; 12+ messages in thread
From: Andrey Grozin @ 2015-11-14 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 833535d7dedaedcd9715cce29303f08a5c75fa85
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 16:04:48 2015 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 16:06:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833535d7
sci-mathematics/pari: fix building docs with perl-5.22
Thanks to Andreas Proteus <proteuss <AT> sdf.lonestar.org>
Package-Manager: portage-2.2.24
sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch | 12 ++++++++++++
sci-mathematics/pari/pari-2.7.1.ebuild | 2 ++
2 files changed, 14 insertions(+)
diff --git a/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
new file mode 100644
index 0000000..c4bbadc
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.7.1-perl-5.22-doc.patch
@@ -0,0 +1,12 @@
+diff -U2 -r pari-2.7.1.orig/src/desc/doc_make pari-2.7.1/src/desc/doc_make
+--- pari-2.7.1.orig/src/desc/doc_make 2014-05-11 00:59:29.000000000 +0700
++++ pari-2.7.1/src/desc/doc_make 2015-11-15 00:51:11.494845695 +0600
+@@ -39,6 +39,6 @@
+ $v =~ s/(\w\w+)/\\var{$1}/g;
+ $v =~ s/\^([a-z])/\\hbox{\\kbd{\\pow}}$1/g;
+- $v =~ s/\\var{flag}/\\fl/g;
+- $v =~ s/\\var{(\d+)}/{$1}/g;
++ $v =~ s/\\var\{flag}/\\fl/g;
++ $v =~ s/\\var\{(\d+)}/{$1}/g;
+
+ $v = "\$($v)\$";
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
index 1af3fe0..ffaa8f8 100644
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ b/sci-mathematics/pari/pari-2.7.1.ebuild
@@ -43,6 +43,8 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.7.0-no-automagic.patch
# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
epatch "${FILESDIR}"/${PN}-2.7.0-slow-discriminant.patch
+ # fix building docs with perl-5.22
+ epatch "${FILESDIR}"/${PN}-2.7.1-perl-5.22-doc.patch
# disable default building of docs during install
sed -i \
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-07-14 22:39 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-26 8:40 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-07-14 22:39 Michael Orlitzky
2023-10-31 12:59 Michael Orlitzky
2023-03-18 19:43 Michael Orlitzky
2023-01-16 16:41 Michael Orlitzky
2020-04-17 7:36 Joonas Niilola
2018-03-18 21:18 Andrey Grozin
2018-01-13 13:39 Andrey Grozin
2017-12-11 19:46 Michał Górny
2017-12-11 19:46 Michał Górny
2017-06-11 14:30 Kent Fredric
2015-11-14 16:12 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox