diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-15 12:27:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-15 12:27:33 +0100 |
commit | 868fd5dc8aab84930cfaa5252b8be06b35552765 (patch) | |
tree | 0c0cebf818c30c6f871f00ce1e7599775a7e561c /sci-mathematics | |
parent | f7adcd4ee556b2c3a420239c13fb74113d791f6a (diff) |
gentoo auto-resync : 15:07:2024 - 12:27:33
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/Manifest.gz | bin | 19345 -> 19336 bytes | |||
-rw-r--r-- | sci-mathematics/gap/Manifest | 4 | ||||
-rw-r--r-- | sci-mathematics/gap/gap-4.13.0.ebuild | 137 | ||||
-rw-r--r-- | sci-mathematics/gap/gap-4.13.1.ebuild | 2 | ||||
-rw-r--r-- | sci-mathematics/nauty/Manifest | 3 | ||||
-rw-r--r-- | sci-mathematics/nauty/nauty-2.8.8-r1.ebuild | 6 | ||||
-rw-r--r-- | sci-mathematics/nauty/nauty-2.8.8.ebuild | 79 | ||||
-rw-r--r-- | sci-mathematics/pari/Manifest | 6 | ||||
-rw-r--r-- | sci-mathematics/pari/files/pari-2.11.2-no-automagic.patch | 68 | ||||
-rw-r--r-- | sci-mathematics/pari/files/pari-2.9.4-fltk-detection.patch | 22 | ||||
-rw-r--r-- | sci-mathematics/pari/pari-2.15.4-r1.ebuild | 145 | ||||
-rw-r--r-- | sci-mathematics/pari/pari-2.15.5.ebuild | 2 |
12 files changed, 8 insertions, 466 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz Binary files differindex 88ec12cba762..c1c0784fc1ea 100644 --- a/sci-mathematics/Manifest.gz +++ b/sci-mathematics/Manifest.gz diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest index 13f84fb08d9f..15a9475dbe27 100644 --- a/sci-mathematics/gap/Manifest +++ b/sci-mathematics/gap/Manifest @@ -1,5 +1,3 @@ -DIST gap-4.13.0-core.tar.gz 38666910 BLAKE2B 42e6ccd4c7474efec6f9faab7bbc67c264df7f3a3b62945faa53150a00d6944aa8a2cc5e5c9f99440541211d5279bdaed458ce8351375f8e14f0380f612e8c89 SHA512 d7326dc49f1c646853e66a48b83c8053bb80625289fbaa54b12b8f88c016d41cbf78d67333def0c3ac36d93f602811d2cb4ee5d56c37aa7efd13ce8ce6808f3c DIST gap-4.13.1-core.tar.gz 38673913 BLAKE2B a63cbd2211430bfbf1bc9bb489a68a2ee7182858ccb326dfe5e6d3a7b8fb6a8c34b56a539c8b9cf3a22a1cc3a4ffe22d365b0e5229ba2c2b6d0ce6bacf0e645b SHA512 e3b74558c05e5963ea87aa77baba0edc068634072ff97b8ea0880289e53213eed82b01784db2675263d6f47547bfef259b80353ed2843ce90a77a0252c551919 -EBUILD gap-4.13.0.ebuild 3944 BLAKE2B a6c26178337fc7c9454bf2f567491c420d3471b42763b98e33ca9093dce01fd32a1a33e6215701776976f9485938b99f448f06e4dfbba2cafa721360c272eb6d SHA512 18a786f24b34a16cfef3bccf0a5c4854980cb2f1e152b344bec0fae12430cfe032b9ad05deaaeaf2e53ba4a35a172c9c54f3ea0643a2d7a500fd81024b25ad9b -EBUILD gap-4.13.1.ebuild 3946 BLAKE2B 1234633f63557fafecba5b9cb34fc251fd38b0be9eb296c99a958c5626444f1bab4cb9bdb4e1dec71c9b74d9c92c7d4296c36cb61b621627c5133f169499d831 SHA512 19b15e01e0bd30d7d64165c9980b93a3e29372370d92c2234f46445a19898bf9840af457e48c4cd4e5098bd6f36099e9676d21f71721acc583bf673ac7ad1544 +EBUILD gap-4.13.1.ebuild 3945 BLAKE2B 675ec1034d0dc064accf558a9b293c2071f611e3de5ad6d00199daf9359036d616c4e34dab4404ab51952c78ebb7dc10ef25d0b18cefeeebf55c83cd19b8f533 SHA512 8ebe89f824502916d1a0f15446fcd9d272b224ba8fca5371b22e4a43ca425ff7bb367ea1b76cabfa63d8f5b8f1b2195df11b1466cd2a9fdc8ad08d8b4dd6a8fd MISC metadata.xml 1582 BLAKE2B 9151244f139b0d675e327731c336c41d5d69c25856286c182944d57255fbb6d7b1f023195b3a01c829ff6f3ea1d5e6eb6edbcc796a30120deacde82b90b5f39c SHA512 f4490e9b13cee6604f14df39ea048d7578e080a8faa97b0bb22191a7dce56904416870ed64c289f91526087009f7488e8baed4e531c78f50a5b917e9e1684ce2 diff --git a/sci-mathematics/gap/gap-4.13.0.ebuild b/sci-mathematics/gap/gap-4.13.0.ebuild deleted file mode 100644 index 9e533710c911..000000000000 --- a/sci-mathematics/gap/gap-4.13.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit estack - -DESCRIPTION="System for computational discrete algebra. Core functionality." -HOMEPAGE="https://www.gap-system.org/" -SRC_URI="https://github.com/gap-system/gap/releases/download/v${PV/_/-}/${P/_/-}-core.tar.gz" - -LICENSE="GPL-2+" -SLOT="0/9" # soname -KEYWORDS="amd64" -IUSE="cpu_flags_x86_popcnt debug memcheck minimal readline test valgrind" -REQUIRED_USE="?? ( memcheck valgrind )" -RESTRICT="!test? ( test )" - -# The minimum set of packages needed for basic GAP operation. You can -# actually start gap without these by passing "--bare" to it on the CLI, -# but don't expect anything to work. -REQUIRED_PKGS=" - dev-gap/gapdoc - dev-gap/primgrp - dev-gap/smallgrp - dev-gap/transgrp" - -# The packages aren't really required, but GAP tries to load them -# automatically, and will complain to the user if they fail to load. -# The list of automatically-loaded packages is a user preference, called -# AutoloadPackages, and the upstream default can be found in -# lib/package.gi within the GAP source tree. Passing "-A" to GAP on the -# CLI (or setting that user preference) will suppress the autoload -# behavior and allow GAP to start without these, which is why we allow -# the user to skip them with USE=minimal if he knows what he is doing. -AUTOLOADED_PKGS=" - dev-gap/autpgrp - dev-gap/alnuth - dev-gap/crisp - dev-gap/ctbllib - dev-gap/factint - dev-gap/fga - dev-gap/irredsol - dev-gap/laguna - dev-gap/polenta - dev-gap/polycyclic - dev-gap/resclasses - dev-gap/sophus - dev-gap/tomlib" - -# The test suite will fail without the "required" subset. -BDEPEND="test? ( ${REQUIRED_PKGS} )" - -DEPEND="dev-libs/gmp:= - sys-libs/zlib - valgrind? ( dev-debug/valgrind ) - readline? ( sys-libs/readline:= )" - -RDEPEND="${DEPEND}" - -# If you _really_ want to install GAP without the set of required -# packages, use package.provided. -PDEPEND="${REQUIRED_PKGS} !minimal? ( ${AUTOLOADED_PKGS} )" - -S="${WORKDIR}/${P/_/-}" - -pkg_setup() { - if use valgrind; then - elog "If you enable the use of valgrind during building" - elog "be sure that you have enabled the proper flags" - elog "in gcc to support it:" - elog "https://wiki.gentoo.org/wiki/Debugging#Valgrind" - fi -} - -src_prepare() { - # Remove these to be extra sure we don't use bundled libraries. - rm -r extern || die - rm -r hpcgap/extern || die - - # The Makefile just tells you to run ./configure, which then - # produces a GNUmakefile. - rm Makefile || die - - default -} - -src_configure() { - # We unset $ABI because GAP uses it internally for something else. - # --without-gmp and --without-zlib both trigger an AC_MSG_ERROR - local myeconfargs=( - ABI="" - --with-gmp - --with-zlib - $(use_enable cpu_flags_x86_popcnt popcnt) - $(use_enable memcheck memory-checking) - $(use_enable valgrind) - $(use_with readline) - $(use_enable debug) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # Without this, the default is a quiet build. - emake V=1 -} - -src_test() { - # We need to specify additional root paths because otherwise the - # recently-built GAP doesn't know where to look for the "required" - # packages (which must already be installed). The two paths we - # append to $S are where those packages wind up. - local gaproots="${S}/;" - gaproots+="${EPREFIX}/usr/$(get_libdir)/gap/;" - gaproots+="${EPREFIX}/usr/share/gap/" - - # GAPARGS is a Makefile variable that exists for this purpose. We - # use "-A" to hide the warnings about missing autoloaded-but-not- - # required packages. The tee/pipefail works around a glitch in - # dev-gap/browse that can clobber your terminal. - eshopts_push -o pipefail - emake GAPARGS="-A -l '${gaproots}'" check | tee test-suite.log \ - || die "test suite failed, see test-suite.log" - eshopts_pop -} - -src_install() { - default - - # Manually install Makefile.gappkg - insinto usr/share/gap/etc - doins etc/Makefile.gappkg - - # la files removal - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sci-mathematics/gap/gap-4.13.1.ebuild b/sci-mathematics/gap/gap-4.13.1.ebuild index 9bc9e6442c42..7927d5feec2a 100644 --- a/sci-mathematics/gap/gap-4.13.1.ebuild +++ b/sci-mathematics/gap/gap-4.13.1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="GPL-2+" SLOT="0/9" # soname -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="cpu_flags_x86_popcnt debug memcheck minimal readline test valgrind" REQUIRED_USE="?? ( memcheck valgrind )" diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest index 010d0cd72d61..1ad9a2eaf2c3 100644 --- a/sci-mathematics/nauty/Manifest +++ b/sci-mathematics/nauty/Manifest @@ -2,6 +2,5 @@ AUX nauty-2.8.8-autoconf-2.72.patch 1714 BLAKE2B 5ed587d4f8f5f30b1d07e318ffd8364 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2 DIST nauty2_8_8.tar.gz 2302360 BLAKE2B 4a37b345b239de11948d180f306e984dfec4aa26eb2720d0f0f09acd120a60b4f678375baa10d3f64f3e2f501c35cbfa58e10fc44252eb7b952a1592727a3b7f SHA512 c0495256b92b0742e7f0a3ad8b43f400e7b4bc4b58dff560e7d0a868f392b0462424566b8ebba5ec08499551eab091b6a8e2c0ddba4953ab7592906034812c18 DIST nauty_2.8.8+ds-1.debian.tar.xz 65176 BLAKE2B 3615819098169caf1648271c0725e146c87ab794776c02f5bd77b7092a2c1d9b93d663ef4a9cf027fda956d40f24bb99a909f89a4564b99429b67f781d39cfc2 SHA512 f81aa3c4a142c4efa5ce97c241f95cba9916d49f02c2b3dfbd76227f2db20ec5e2a3ebe371c5748681fc3492df9ff9bca2456d76e1c70e435aa5baf1522391d5 -EBUILD nauty-2.8.8-r1.ebuild 1996 BLAKE2B 6bb3ffca7159e075771ad6b7df4a41232559722a25795c18ee61ae16e9d2a8f0e736afa7f0e27982e4fbcac492c3e8750fade975874ab409a0516cf8d47cdbd7 SHA512 fc0609e09cb8d7c52f64e0e0decd2292f4ca02d0dd6e4f34c25878111e682a4e84876f81a0088f400eeafc0ca9b6fc1f96231c689cef3e80f31c3b192995a38b -EBUILD nauty-2.8.8.ebuild 1955 BLAKE2B 44fdce9e00cc86fa9f2b31fbf3119ddcc29366dcd7d6e3c54b261dc185d780b3f3ca0d6ad8906e1bc260a385109b7738f990b413b9ef41513674dde6ecb1bf60 SHA512 f8c27dc70c207669eb8b9efb7caa38d7d7144e54e3fe192a8bc416469c2d904c4e22c81a808fb8400cacd1188f004467086c80b495a24e95486dbb64cd44711d +EBUILD nauty-2.8.8-r1.ebuild 1995 BLAKE2B b42fc2a4a7bbadd7c65881e97f307c4d058507f2288969ece6eadb0e5ab8d9be784c1a9c086cbf84659ea8e1e3b6001bde1438cd5b459d2f667399b501f0b5ff SHA512 00aa1d4d4ca7ce88f443d940616a30f94721cea4187134ebfe5f9222e0c3393a233f97154085daf99d636ed0280d7a84d51a98f9e2a83fcd0f093201a9038751 MISC metadata.xml 554 BLAKE2B a6fbface4e867c9299680da9d2fefce4194771220489b4d9a81d295bbf1a8048fe1bf23e3c3225501a18b23af8a7daea3533f8a7c250afc7f9a4bbbf60fc8efd SHA512 c7b67c8516b9bad6cd9f60a54b3b3a4974a72e81071f53cd6562a5bea2e2b8ae990119e4391615dd3b2e30282bf70924c4f2f4b5ccd3dcf1cb7399e7de189387 diff --git a/sci-mathematics/nauty/nauty-2.8.8-r1.ebuild b/sci-mathematics/nauty/nauty-2.8.8-r1.ebuild index af2ba2a10de8..da25e0fbbb54 100644 --- a/sci-mathematics/nauty/nauty-2.8.8-r1.ebuild +++ b/sci-mathematics/nauty/nauty-2.8.8-r1.ebuild @@ -15,9 +15,11 @@ SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz https://src.fedoraproject.org/rpms/nauty/raw/rawhide/f/nauty-includes.patch" +S="${WORKDIR}/${PN}${MY_PV}" + LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="amd64 ~arm ~riscv ~x86" IUSE="cpu_flags_x86_popcnt examples" BDEPEND="sys-apps/help2man" @@ -26,8 +28,6 @@ DEPEND="dev-libs/gmp:0 sci-mathematics/cliquer" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}${MY_PV}" - DOCS=( schreier.txt formats.txt changes24-28.txt ) PATCHES=( diff --git a/sci-mathematics/nauty/nauty-2.8.8.ebuild b/sci-mathematics/nauty/nauty-2.8.8.ebuild deleted file mode 100644 index 6651ae996063..000000000000 --- a/sci-mathematics/nauty/nauty-2.8.8.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_PV=${PV//./_} -DEBIAN_PATCH_VERSION=1 - -DESCRIPTION="Computing automorphism groups of graphs and digraphs" -HOMEPAGE="https://pallini.di.uniroma1.it/" - -SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz - https://src.fedoraproject.org/rpms/nauty/raw/rawhide/f/nauty-includes.patch" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~riscv ~x86" -IUSE="cpu_flags_x86_popcnt examples" - -BDEPEND="sys-apps/help2man" -DEPEND="dev-libs/gmp:0 - sys-libs/zlib - sci-mathematics/cliquer" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}${MY_PV}" - -DOCS=( schreier.txt formats.txt changes24-28.txt ) - -PATCHES=( - "${WORKDIR}/debian/patches/upstream-fix-gt_numorbits.patch" - "${WORKDIR}/debian/patches/upstream-zlib-dimacs2g.patch" - "${WORKDIR}/debian/patches/upstream-C2help2man.patch" - "${WORKDIR}/debian/patches/upstream-autotoolization.patch" - "${DISTDIR}/nauty-includes.patch" - "${WORKDIR}/debian/patches/unbundle-cliquer.patch" - "${WORKDIR}/debian/patches/format.patch" - "${WORKDIR}/debian/patches/uninitialized.patch" - "${WORKDIR}/debian/patches/fall-off.patch" - "${WORKDIR}/debian/patches/noreturn.patch" -) - -src_prepare() { - default - rm makefile || die - - # The debian patch looks for <cliquer.h>, but the autotools-form of - # cliquer installs that header as <cliquer/cliquer.h>. - sed -e 's~<cliquer\.h>~<cliquer/cliquer\.h>~' -i nautycliquer.h || die - - eautoreconf -} - -src_configure() { - econf --disable-static \ - --enable-tls \ - --enable-generic \ - $(use_enable cpu_flags_x86_popcnt popcnt) -} - -src_test() { - # It arrives non-executable in v2.8.8. - chmod +x runalltests || die - default -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc nautyex*.c - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest index b5400bc4cfeb..f126aa8f816b 100644 --- a/sci-mathematics/pari/Manifest +++ b/sci-mathematics/pari/Manifest @@ -1,7 +1,3 @@ -AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c -AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29 -DIST pari-2.15.4.tar.gz 5183685 BLAKE2B 2e20b6dc073ce69bc098dd849e6ab43cb38b05d30ff5f72a31272cd24ef01aa515d4e2a4948264ca89169a6980cd9d76f86c7fbb9aad5be604680569950d9c25 SHA512 2b9f0c1fe7198406df8e6ceb3fcdc8bfb75f5c7ebfb963f023a1eebfff0bcc26e3b690941e188d6b9f8dfb6cddf4ce4c00f2cc320ebe47d42ae7596c774ed6cc DIST pari-2.15.5.tar.gz 5186798 BLAKE2B b253c6d8ad38462e81852d7bb364d06a7cbaae7b085672653da8d9f91f0173cfdef8f537ebc7313b6484f610d43e10fb0547f5d920789b95c8d0027dd52e8312 SHA512 59b2ebed43176f1ee750146053644bffbf673b4b4810134bc39132665941152772afb7a9332b842fc64e5ab8d5747a872c1b8ff327d3bd5eedaa1591691fff13 -EBUILD pari-2.15.4-r1.ebuild 4724 BLAKE2B cdd4bd4805b870700e7f190bf220f21c5f55ab7627c141122aa97dc92f12ea605abfab9d417e873fafc6a6d38cd8e57f734c9626de48d10e1d78a4d4a7dcebbb SHA512 d8a740394bca755e34445fcf4ead7841e5d3a47edd67dcb86f2cb134c705e847fdd7c89105c66029a3ccf254c669c1e150995267a976bc2d9f920197fb5b0f4b -EBUILD pari-2.15.5.ebuild 4446 BLAKE2B 6884828e06727b54f811c8c226324018ecbfbe4846d8d0c1a2229ecac946d1dcd2fcd2e28f808578c90e4dc9b1336957c750c5a22c66c6a51ca2ab58b34a75b0 SHA512 f17c6c2ddd4b01b0575615d2a636d39de860e74f54b18b266a604819a71186f5b8ec2445c5054824bf6f41c36a656bd60f494aa208a5eaa2edef890a1acda36a +EBUILD pari-2.15.5.ebuild 4444 BLAKE2B f9058dbbaca0293176e475b74a35015903365b6581a5a12fe959d05263949f2267c91621f9fc553458a89ec578017422a6ebdd50174d692476f01782157dcddc SHA512 22939bb6b6db6275df572cfe65b2e182b4addad9bd718d5b89b7ffd17f6374949cd3b24f31c5c3db17b8799b081986a2b6513a40167e4c1d8e0f70daebee6b42 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee 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 -} diff --git a/sci-mathematics/pari/pari-2.15.5.ebuild b/sci-mathematics/pari/pari-2.15.5.ebuild index 6c8fe6f9b29e..73e003b95f44 100644 --- a/sci-mathematics/pari/pari-2.15.5.ebuild +++ b/sci-mathematics/pari/pari-2.15.5.ebuild @@ -15,7 +15,7 @@ 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" +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 )" |