public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2019-12-28 13:58 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2019-12-28 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     e3fd7bb8cfe64cd5b92cbf5d758ffb8aeddf8f8e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 13:22:33 2019 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 13:57:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fd7bb8

sci-mathematics/pari: new version 2.11.2.

This new version was imported from the sage-on-gentoo overlay where
François Bissey has been maintaining it for use with SageMath. I've
made a few changes:

  * Moved the virtual/latex-base dependency into BDEPEND, because
    those tools are run on the build host to create the documentation.

  * Used the existing patches (with different names) where possible.

  * Edited pari-2.10-no-automagic.patch to not mess with PLOTLIBS
    when USE=fltk is set. My build was failing because this patch
    resulted in -lstdc++ being stripped from the linker flags.

  * Dropped empty variable "${mymake}" in a few places.

  * Enabled the full test suite, which passes for me if I lie to pari
    about the number of columns my terminal has (???).

  * Installed some extra documentation by setting DOCS and calling
    the default implementation of src_install.

  * Used "usex" instead of an "if" statement for a ./Configure flag.

  * Changed "export CPLUSPLUS=$(tc-getCXX)" to "tc-export CXX". The
    CPLUSPLUS variable doesn't appear anywhere in the source, so I
    doubt this was doing anything. It may not even be necessary to
    export CC/CXX any longer.

  * Added RESTRICT="!test? ( test )" now that we run the test suite.

  * Added myself and François as maintainers.

Closes: https://bugs.gentoo.org/703156
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/pari/Manifest                      |   1 +
 .../pari/files/pari-2.11.2-Makefile-LDFLAGS.patch  |  13 +++
 .../files/pari-2.11.2-Makefile-docinstall.patch    |  25 +++++
 .../pari/files/pari-2.11.2-no-automagic.patch      |  74 ++++++++++++++
 sci-mathematics/pari/metadata.xml                  |  16 +++
 sci-mathematics/pari/pari-2.11.2.ebuild            | 111 +++++++++++++++++++++
 6 files changed, 240 insertions(+)

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 01bd0f5957d..66779145ec1 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.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787

diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
new file mode 100644
index 00000000000..6d6e6726ddf
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
@@ -0,0 +1,13 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 27c6d5b..43debb1 100644
+--- a/config/Makefile.SH
++++ b/config/Makefile.SH
+@@ -185,7 +185,7 @@ LD         = $LD \$(LD_FLAVOR)
+ LDFLAGS    = $LDFLAGS
+ DLLD_FLAVOR  = \$(LD_FLAVOR)
+ DLLD       = $DLLD \$(DLLD_FLAVOR)
+-DLLDFLAGS  = $DLLDFLAGS
++DLLDFLAGS  = $DLLDFLAGS \$(LDFLAGS)
+ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
+ RUNTEST    = $RUNTEST
+ 

diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
new file mode 100644
index 00000000000..5f03d77d9e7
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
@@ -0,0 +1,25 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 27c6d5b..43debb1 100644
+--- a/config/Makefile.SH
++++ b/config/Makefile.SH
+@@ -366,9 +366,9 @@ clean: cleanall
+ .headers: $HEADERS
+ 	@touch \$@
+ 
+-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-examples install-cfg
++install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-cfg
+ 
+-install: install-doc install-nodata install-data
++install: install-nodata install-data
+ 
+ install-include:
+ 	-mkdir -p \$(INCLUDEDIR)/pari
+@@ -425,7 +425,7 @@ install-cfg::
+ 	   \$(INSTALL_DATA) $desc/PARI/822.pm \$(DATADIR)/PARI;\
+ 	   \$(INSTALL_DATA) $desc/\$(DESC) \$(DATADIR); fi
+ 
+-install-doc: install-docdvi install-doctex
++install-doc: install-docpdf install-doctex install-examples
+ 
+ install-doctex:
+ 	-mkdir -p \$(BINDIR) \$(DOCDIR)

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
new file mode 100644
index 00000000000..d4044cc426d
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch
@@ -0,0 +1,74 @@
+diff --git a/config/Makefile.SH b/config/Makefile.SH
+index 6cf5e59ee..7487941f9 100644
+--- 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
+diff --git a/config/get_config_options b/config/get_config_options
+index 4078d2720..5c12bd491 100644
+--- 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
+diff --git a/config/get_graphic_lib b/config/get_graphic_lib
+index 4591f2aad..4808aab90 100644
+--- 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/metadata.xml b/sci-mathematics/pari/metadata.xml
index f4c3bc4e338..d5bd7510bbd 100644
--- a/sci-mathematics/pari/metadata.xml
+++ b/sci-mathematics/pari/metadata.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <!--
+      mjo: François maintained this package in the sage-on-gentoo overlay
+      long before I moved it into ::gentoo. You don't need an ACK from me
+      to merge his changes.
+  -->
+  <maintainer type="person">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>

diff --git a/sci-mathematics/pari/pari-2.11.2.ebuild b/sci-mathematics/pari/pari-2.11.2.ebuild
new file mode 100644
index 00000000000..4d53f82467f
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.11.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 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="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/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
+	)
+
+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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2020-02-27 21:30 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2020-02-27 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     266f4febeddcf7bd2ae04f3e2cc8b53ea1ca64e2
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 21:03:34 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 21:03:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266f4feb

sci-mathematics/pari: drop old unstable v2.9.4.

We lost the ~arm keyword somewhere in the upgrade. I filed a keyword
request to see if pari still works on arm.

Bug: https://bugs.gentoo.org/710994
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/pari/Manifest                      |   1 -
 .../pari/files/pari-2.9.4-no-automagic.patch       |  66 -----------
 sci-mathematics/pari/pari-2.9.4-r1.ebuild          | 126 ---------------------
 3 files changed, 193 deletions(-)

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 66779145ec1..c679cd11326 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1 @@
 DIST pari-2.11.2.tar.gz 4433038 BLAKE2B 89fd8c14d6ee8c8640432bec75e10b79897f0180212dcb1b04b654478a3258fc13a7f982bcb400e28997934a21667c0c3cb08fdb2e843a80a24c6499feafb639 SHA512 22f5a6ecad6d9b8b337c2655f538a196a0460f6fe98256d0f49557ce7b843f6b27ad364f45a9472aaafee9506386c886f1f0d62697078e501ec465151d4d10a1
-DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787

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
deleted file mode 100644
index 3612d8f020f..00000000000
--- a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/pari-2.9.4-r1.ebuild b/sci-mathematics/pari/pari-2.9.4-r1.ebuild
deleted file mode 100644
index 84317023bfd..00000000000
--- a/sci-mathematics/pari/pari-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 ~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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2021-05-13 11:46 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2021-05-13 11:46 UTC (permalink / raw
  To: gentoo-commits

commit:     361658b03516ebe9ccfddfe37c22e5d812f1ea8a
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 11:44:30 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu May 13 11:45:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361658b0

sci-mathematics/pari: new revision with backported rnfdisc patch.

The SageMath test suite will soon require this backported patch to
when using pari-2.13.1. It fixes an incorrect result and doesn't hurt
anything, so we add it preemptively.

Sage-bug: https://trac.sagemath.org/ticket/30801
Pari-bug: https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2284
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../pari/files/pari-2.13.1-rnfdisc.patch           | 35 ++++++++++++++++++++++
 .../{pari-2.13.1.ebuild => pari-2.13.1-r1.ebuild}  |  1 +
 2 files changed, 36 insertions(+)

diff --git a/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
new file mode 100644
index 00000000000..39d325911e8
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.13.1-rnfdisc.patch
@@ -0,0 +1,35 @@
+From 3edb98db78dd49bb8b4137b46781a7cd570c2556 Mon Sep 17 00:00:00 2001
+From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
+Date: Sun, 28 Mar 2021 13:27:24 +0200
+Subject: [PATCH] rnfdisc_factored: remove spurious Q_primpart [#2284]
+
+diff --git a/src/basemath/base2.c b/src/basemath/base2.c
+index b2b63ada5..531f5c558 100644
+--- a/src/basemath/base2.c
++++ b/src/basemath/base2.c
+@@ -3582,7 +3582,7 @@ rnfdisc_factored(GEN nf, GEN pol, GEN *pd)
+ 
+   nf = checknf(nf);
+   pol = rnfdisc_get_T(nf, pol, &lim);
+-  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, Q_primpart(pol)));
++  disc = nf_to_scalar_or_basis(nf, nfX_disc(nf, pol));
+   pol = nfX_to_monic(nf, pol, NULL);
+   fa = idealfactor_partial(nf, disc, lim);
+   P = gel(fa,1); l = lg(P);
+diff --git a/src/test/32/rnf b/src/test/32/rnf
+index 6bd4585..d24e1ce 100644 (file)
+--- a/src/test/32/rnf
++++ b/src/test/32/rnf
+@@ -832,9 +832,9 @@ error("inconsistent dimensions in idealtwoelt.")
+ 0
+ 0
+ 1
+-[[7361, 3786, 318, 5823; 0, 1, 0, 0; 0, 0, 1, 0; 0, 0, 0, 1], [-3, 6, -2, 0]
+-~]
+-[2, -1]
++[[433, 322, 318, 1318/17; 0, 1, 0, 12/17; 0, 0, 1, 5/17; 0, 0, 0, 1/17], [25
++/17, -12/17, 12/17, 16/17]~]
++[1, -1]
+   ***   at top-level: rnfdedekind(nf,P,pr2,1)
+   ***                 ^-----------------------
+   *** rnfdedekind: sorry, Dedekind in the difficult case is not yet implemented.

diff --git a/sci-mathematics/pari/pari-2.13.1.ebuild b/sci-mathematics/pari/pari-2.13.1-r1.ebuild
similarity index 99%
rename from sci-mathematics/pari/pari-2.13.1.ebuild
rename to sci-mathematics/pari/pari-2.13.1-r1.ebuild
index bc5709ab338..12230c7f452 100644
--- a/sci-mathematics/pari/pari-2.13.1.ebuild
+++ b/sci-mathematics/pari/pari-2.13.1-r1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
 	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
 	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
+	"${FILESDIR}/${P}"-rnfdisc.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2023-01-26  2:02 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2023-01-26  2:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d3afc36b635d53e62067c6bc5c2a14fe76d27613
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 01:38:54 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 01:48:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3afc36b

sci-mathematics/pari: new ~arch revision, cleanup old.

The new pari-2.15.2-r1...

 * Separates out a new flag, USE=examples;

 * Replaces an old "permanent" patch with a new temporary one (already
   committed upstream) needed to install the documentation properly;

 * Drops an an old hack for -O0 because I can no longer reproduce the
   issue that motivated it.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/pari/Manifest                      |   1 -
 .../pari/files/pari-2.15.2-install-doctex.patch    |  25 ++++
 sci-mathematics/pari/pari-2.15.1.ebuild            | 126 ---------------------
 .../{pari-2.15.2.ebuild => pari-2.15.2-r1.ebuild}  |  28 +++--
 4 files changed, 41 insertions(+), 139 deletions(-)

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index d9cc0ed7c828..9e878940b366 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,3 +1,2 @@
 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-install-doctex.patch b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
new file mode 100644
index 000000000000..d504326b7b43
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
@@ -0,0 +1,25 @@
+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.1.ebuild b/sci-mathematics/pari/pari-2.15.1.ebuild
deleted file mode 100644
index 212fed3f24df..000000000000
--- a/sci-mathematics/pari/pari-2.15.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 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
-)
-
-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
-}

diff --git a/sci-mathematics/pari/pari-2.15.2.ebuild b/sci-mathematics/pari/pari-2.15.2-r1.ebuild
similarity index 86%
rename from sci-mathematics/pari/pari-2.15.2.ebuild
rename to sci-mathematics/pari/pari-2.15.2-r1.ebuild
index 058eac35d8b0..8a767ad7f37d 100644
--- a/sci-mathematics/pari/pari-2.15.2.ebuild
+++ b/sci-mathematics/pari/pari-2.15.2-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 # 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"
+IUSE="data doc examples fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -35,8 +35,8 @@ 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.11.2-Makefile-docinstall.patch
 	"${FILESDIR}/${PN}"-2.15.2-ellsea.patch
+	"${FILESDIR}/${PN}"-2.15.2-install-doctex.patch
 )
 
 src_prepare() {
@@ -65,13 +65,6 @@ src_configure() {
 	# 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.
@@ -115,17 +108,28 @@ src_test() {
 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}" STRIP="true" install
+	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}" \
-			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
 			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-doc
+			install-docpdf install-doctex
 	fi
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2023-01-26 16:30 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2023-01-26 16:30 UTC (permalink / raw
  To: gentoo-commits

commit:     772b64c72de3ecc8e94d893d50494bca07016974
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 13:35:51 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 16:28:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772b64c7

sci-mathematics/pari: patch update for upstream bug 2441.

Closes: https://bugs.gentoo.org/892035
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 .../pari/files/pari-2.15.2-ellsea-r1.patch         | 34 ++++++++++++++++++++++
 .../pari/files/pari-2.15.2-ellsea.patch            | 22 --------------
 ...pari-2.15.2-r1.ebuild => pari-2.15.2-r2.ebuild} |  2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch
new file mode 100644
index 000000000000..b8af421c0e56
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.15.2-ellsea-r1.patch
@@ -0,0 +1,34 @@
+A fix for upstream bug 2441 and gentoo bug 892035, with the changes to
+CHANGES and the test suite stripped out (they don't apply cleanly).
+
+From 6f556664bea5dae9d7101533be65f10b9d6332e2 Mon Sep 17 00:00:00 2001
+From: Bill Allombert <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-ellsea.patch b/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch
deleted file mode 100644
index a5c19504ea87..000000000000
--- a/sci-mathematics/pari/files/pari-2.15.2-ellsea.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# upstream bug https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2441
-# will be fixed in 2.15.3
-diff --git a/src/basemath/ellsea.c b/src/basemath/ellsea.c
-index a6871fa6a7..f1e725ea55 100644
---- a/src/basemath/ellsea.c
-+++ b/src/basemath/ellsea.c
-@@ -1303,6 +1303,7 @@ find_trace_Elkies_power(GEN a4, GEN a6, ulong ell, long *pt_k, struct meqn *MEQN
-   lambda = tr ? find_eigen_value_oneroot(a4, a6, ell, tr, kpoly, T, p):
-                 find_eigen_value_power(a4, a6, ell, 1, 1, kpoly, T, p);
-   if (DEBUGLEVEL>1) err_printf(" [%ld ms]", timer_delay(ti));
-+  if (lambda==ell) return NULL;
-   if (smallfact && smallfact%(long)ell!=0)
-   {
-     ulong pell = pellk%ell;
-@@ -1317,6 +1318,7 @@ find_trace_Elkies_power(GEN a4, GEN a6, ulong ell, long *pt_k, struct meqn *MEQN
-     if (!tmp) { k = cnt-1; break; }
-     if (DEBUGLEVEL) err_printf(", %Ps", powuu(ell, cnt));
-     lambda = find_eigen_value_power(a4, a6, ell, cnt, lambda, gel(tmp,3), T, p);
-+    if (lambda == upowuu(ell, cnt)) { k = cnt-1; break; }
-     Eba4 = Eca4;
-     Eba6 = Eca6;
-     Eca4 = gel(tmp,1);

diff --git a/sci-mathematics/pari/pari-2.15.2-r1.ebuild b/sci-mathematics/pari/pari-2.15.2-r2.ebuild
similarity index 98%
rename from sci-mathematics/pari/pari-2.15.2-r1.ebuild
rename to sci-mathematics/pari/pari-2.15.2-r2.ebuild
index 8a767ad7f37d..c25f507e52f3 100644
--- a/sci-mathematics/pari/pari-2.15.2-r1.ebuild
+++ b/sci-mathematics/pari/pari-2.15.2-r2.ebuild
@@ -35,7 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
 	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
 	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.15.2-ellsea.patch
+	"${FILESDIR}/${PN}"-2.15.2-ellsea-r1.patch
 	"${FILESDIR}/${PN}"-2.15.2-install-doctex.patch
 )
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/
@ 2023-06-05 12:33 Michael Orlitzky
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2023-06-05 12:33 UTC (permalink / raw
  To: gentoo-commits

commit:     24b01797050f1b95bd296188a5c68313f1501698
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 12:10:21 2023 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 12:26:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b01797

sci-mathematics/pari: drop 2.13.4-r1

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 sci-mathematics/pari/Manifest                      |   1 -
 .../pari/files/pari-2.11.2-Makefile-LDFLAGS.patch  |  13 ---
 .../files/pari-2.11.2-Makefile-docinstall.patch    |  25 ----
 sci-mathematics/pari/files/pari-2.9.4-strip.patch  |  10 --
 sci-mathematics/pari/pari-2.13.4-r1.ebuild         | 126 ---------------------
 5 files changed, 175 deletions(-)

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 787883758f30..1fbe614ae199 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,2 +1 @@
-DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
 DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b

diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
deleted file mode 100644
index 6d6e6726ddf7..000000000000
--- a/sci-mathematics/pari/files/pari-2.11.2-Makefile-LDFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/Makefile.SH b/config/Makefile.SH
-index 27c6d5b..43debb1 100644
---- a/config/Makefile.SH
-+++ b/config/Makefile.SH
-@@ -185,7 +185,7 @@ LD         = $LD \$(LD_FLAVOR)
- LDFLAGS    = $LDFLAGS
- DLLD_FLAVOR  = \$(LD_FLAVOR)
- DLLD       = $DLLD \$(DLLD_FLAVOR)
--DLLDFLAGS  = $DLLDFLAGS
-+DLLDFLAGS  = $DLLDFLAGS \$(LDFLAGS)
- EXTRADLLDFLAGS = $EXTRADLLDFLAGS
- RUNTEST    = $RUNTEST
- 

diff --git a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch b/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
deleted file mode 100644
index 5f03d77d9e7c..000000000000
--- a/sci-mathematics/pari/files/pari-2.11.2-Makefile-docinstall.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/config/Makefile.SH b/config/Makefile.SH
-index 27c6d5b..43debb1 100644
---- a/config/Makefile.SH
-+++ b/config/Makefile.SH
-@@ -366,9 +366,9 @@ clean: cleanall
- .headers: $HEADERS
- 	@touch \$@
- 
--install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-examples install-cfg
-+install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-cfg
- 
--install: install-doc install-nodata install-data
-+install: install-nodata install-data
- 
- install-include:
- 	-mkdir -p \$(INCLUDEDIR)/pari
-@@ -425,7 +425,7 @@ install-cfg::
- 	   \$(INSTALL_DATA) $desc/PARI/822.pm \$(DATADIR)/PARI;\
- 	   \$(INSTALL_DATA) $desc/\$(DESC) \$(DATADIR); fi
- 
--install-doc: install-docdvi install-doctex
-+install-doc: install-docpdf install-doctex install-examples
- 
- install-doctex:
- 	-mkdir -p \$(BINDIR) \$(DOCDIR)

diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
deleted file mode 100644
index f4a8af322c45..000000000000
--- a/sci-mathematics/pari/files/pari-2.9.4-strip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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.13.4-r1.ebuild b/sci-mathematics/pari/pari-2.13.4-r1.ebuild
deleted file mode 100644
index e3881514c6ec..000000000000
--- a/sci-mathematics/pari/pari-2.13.4-r1.ebuild
+++ /dev/null
@@ -1,126 +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/7"
-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
-)
-
-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 to "" so that it is set to the value of the compiler used
-	# which is how a normal end user is expected to configure it. pari's build
-	# system do not cope very well with a naked linker, it is expecting a
-	# compiler driver. See https://bugs.gentoo.org/722090
-	LD="" ./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] 6+ messages in thread
end of thread, other threads:[~2023-06-05 12:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-13 11:46 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/files/, sci-mathematics/pari/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2023-06-05 12:33 Michael Orlitzky
2023-01-26 16:30 Michael Orlitzky
2023-01-26  2:02 Michael Orlitzky
2020-02-27 21:30 Michael Orlitzky
2019-12-28 13:58 Michael Orlitzky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox