From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/
Date: Sun, 14 Jul 2024 22:39:34 +0000 (UTC) [thread overview]
Message-ID: <1720996754.e37ef289dd3d3cfa361d0f909d71449ea6ec5bd6.mjo@gentoo> (raw)
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
-}
next reply other threads:[~2024-07-14 22:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-14 22:39 Michael Orlitzky [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-31 12:59 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/, sci-mathematics/pari/files/ Michael Orlitzky
2023-03-18 19:43 Michael Orlitzky
2023-01-16 16:41 Michael Orlitzky
2020-04-26 8:40 Joonas Niilola
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1720996754.e37ef289dd3d3cfa361d0f909d71449ea6ec5bd6.mjo@gentoo \
--to=mjo@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox