diff options
Diffstat (limited to 'sci-mathematics/polymake')
6 files changed, 19 insertions, 205 deletions
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest index 2cee9bf54818..51898473f235 100644 --- a/sci-mathematics/polymake/Manifest +++ b/sci-mathematics/polymake/Manifest @@ -1,7 +1,4 @@ -AUX polymake-4.11-barycentric-subdiv.patch 807 BLAKE2B e2e632146e6d96e5966444283a0226caf26dfd7dab482a35289e2b6f9acaa791db015787b4b91f5c2f3abc47323227377dd296dfc21b777315979e58d2e36af8 SHA512 f5332d3a558a0b3dc1b0cc0846131210857d2a6ad11647fd64cd5366c04c349752d06e30da3f93568ff5d2f04f8419b8c9ef6e71460e997c295cb6959a8964e1 -AUX polymake-4.11-singular-sat.patch 2212 BLAKE2B 659d07040141617f7ac6cb8572c44bf4d9ba332f1f4ddb5434987ea900009ef2b3ebefa27ead63a60c6048b58c3a853c797d82af1f3c8793f2c506f09dfd43f0 SHA512 fc46ec6753ddf14d389b9e03421a909bf572e4e7d6acf3dec7319d3bf704ba7710ba1c4719bf6b9153599f523e36cf83ac8b8218141f72a43343c94373fc5b57 -DIST polymake-4.11-minimal.tar.bz2 7325783 BLAKE2B 87e62741e4e44c5fea7454d5cc8cb205cf13f8ee743c1d72100f937d0677505ce0c5c8f5b37c118f89079ca88f313991eaefb2ea02c49b6c7b45c438c6f9e13b SHA512 94adf3fcec21de50451091a04ca17010f5e71b44e3dcd4e2d52b9f952b94ee0cf3f6df15657b761b0bda20eb47cbdc0cb2481bb440c7243442be34f913292246 +AUX polymake-4.13-cstdint.patch 416 BLAKE2B 10da829044398c11a979d2178fea9c35b83684b7675875835168f3b7a1ea27251e006953ba2c036fdf54032304195eb81f9c3bda879d873481954d5a41c690a0 SHA512 89ccb8bab9ebd81dab41c4267e99ae8d9c10f8dcf404418f006d68429a5194e8ab5252466e8044d7124f7a687334c6eb64c260be9381e26bda8a9c65494de4d7 DIST polymake-4.13-minimal.tar.bz2 7338096 BLAKE2B c4d60ab48cb4fd21e6ea38ccdf85086e92c1ad2b80434180c07da036de9e462439e73f05d271d1c0aa150a8eeda59b20d5314fbf8fd7b17c2eb3f0e0b0384c78 SHA512 cd281a1f293434d96efceeb02e25d23fb334fa0c0ecdf5af10489d12850dca43c05eaa36e86fbd4a0b1fab9e83b03ad694d655a8710ea5ed9f000297a4d86d50 -EBUILD polymake-4.11.ebuild 3921 BLAKE2B 6fb8ae61e88443c185c577fcb3888e5cc4d77c22d827c2f495a4c5b61f1af1165ee14b18fbedd920ce40b1fa4b13f407214519ef55328721a56f50b890e8d551 SHA512 38e33377dcb6e100bf918409a4f926b2597fa49fc4c6f1c6a04babad8c251d2e7eb9aac924f998e351908b72dbd7094b1aafb24b6d1e443ef2357daa69b5398f -EBUILD polymake-4.13.ebuild 3827 BLAKE2B 177c9c6bb2ccfa739086921314e84657493fb42e7851b1479246b445ac14bd5e3c0b31a7a27e5902e46c8f0cf0799d4cbb773d45638d4e597387fc096a5aa0cd SHA512 47f6a14d7abad026c0bb6e15c8120b76e8e7ce4acb7249e3ba69d4bbdc40a65f61135a8b2a65f4d80826b0c3aa47a7d4c3a421a433c0bac77781b77a13bf735d +EBUILD polymake-4.13.ebuild 3872 BLAKE2B b6bd68325627136c59359853a97912744753cb8b42e72c74755b2c61690769a8954b0755e1041f001d6b2ec67bb6a34a14b1fee95d7d6451c39af762a2bb01c5 SHA512 3de45cc21b719a147c9808a9992ff9290302d76e9920cf8e44f0fba3e79a3de9e0ae90439a071c320c3d72332e0ca3f5d574a9137a13abb2b0e5275d2c60ca3f MISC metadata.xml 1765 BLAKE2B 4e13dfb267c8100df81d8be89e7915ba850f55fea4256882264b13a0307c60cd8346ff46bf972018b334bf2d0dc387761244c1e0c3b8c7a1f4613a2a87458538 SHA512 7fd8af42bccc7710bd7c4159759b42ace43f638365a83defee96568e6ab4d6c186f49e71cbf68291fcd3b8b30fd7f883e8096c001c6bbf233d6f7336fa266f7c diff --git a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch deleted file mode 100644 index 2f58b0f76299..000000000000 --- a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit d55dc6bd7f2da9245884f86706cb96e2d11fa83a -Author: Benjamin Lorenz <lorenz@math.tu-berlin.de> -Date: Tue Nov 7 16:49:33 2023 +0100 - - barycentric_subdivision: dont call back on empty strings - - thanks jamesjer - - @Jenkins: merge - -diff --git a/apps/topaz/src/barycentric_subdivision.cc b/apps/topaz/src/barycentric_subdivision.cc -index 753afb4040..e2d4130bc3 100644 ---- a/apps/topaz/src/barycentric_subdivision.cc -+++ b/apps/topaz/src/barycentric_subdivision.cc -@@ -139,7 +139,7 @@ bs_data2Object(const bool realize, - else - desc << k << "th "; - desc << "barycentric subdivision of " << description; -- if (description.back() != '\n') -+ if (description.empty() || description.back() != '\n') - desc << endl; - p_out.set_description() << desc.str(); - return p_out; diff --git a/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch b/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch deleted file mode 100644 index 739e503ac246..000000000000 --- a/sci-mathematics/polymake/files/polymake-4.11-singular-sat.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 4ce0549f510d246c8f69c85c509fc2d13d882442 -Author: Benjamin Lorenz <lorenz@math.tu-berlin.de> -Date: Thu Nov 9 11:15:06 2023 +0100 - - singular: support new return types for saturation command - - This was changed from (ideal, exponent) to just the ideal in singular 4-3-2p5. - To allow older versions we keep using sat but support both return types - instead of switching to the new sat_with_exp. - -diff --git a/bundled/singular/apps/ideal/src/singularIdeal.cc b/bundled/singular/apps/ideal/src/singularIdeal.cc -index 4cbc00a6f4..bdade5c29d 100644 ---- a/bundled/singular/apps/ideal/src/singularIdeal.cc -+++ b/bundled/singular/apps/ideal/src/singularIdeal.cc -@@ -236,22 +236,24 @@ public: - arg.next->data=(void *)idCopy(J); - // call primdecSY - BOOLEAN res=iiMake_proc(sathdl, nullptr ,&arg); -- if(!res && (iiRETURNEXPR.Typ() == LIST_CMD)){ -- lists L = (lists)iiRETURNEXPR.Data(); -- SingularIdeal_wrap* result; -- if(L->m[0].Typ() == IDEAL_CMD){ -- result = new SingularIdeal_impl((::ideal) (L->m[0].Data()),singRing); -- } else { -- throw std::runtime_error("Something went wrong for the primary decomposition"); -+ if(!res) { -+ ::ideal iddata = nullptr; -+ if (iiRETURNEXPR.Typ() == LIST_CMD) { -+ lists L = (lists)iiRETURNEXPR.Data(); -+ if(L->m[0].Typ() == IDEAL_CMD) -+ iddata = (::ideal) L->m[0].Data(); -+ } else if (iiRETURNEXPR.Typ() == IDEAL_CMD) { -+ iddata = (::ideal) iiRETURNEXPR.Data(); -+ } -+ if (iddata != nullptr) { -+ SingularIdeal_wrap* result = new SingularIdeal_impl(iddata, singRing); -+ iiRETURNEXPR.CleanUp(); -+ iiRETURNEXPR.Init(); -+ return result; - } -- iiRETURNEXPR.CleanUp(); -- iiRETURNEXPR.Init(); -- return result; -- } else { -- iiRETURNEXPR.Init(); -- throw std::runtime_error("Something went wrong for the saturation"); - } -- -+ iiRETURNEXPR.Init(); -+ throw std::runtime_error("saturation: unable to parse ideal from return value"); - } - - Array<SingularIdeal_wrap*> primary_decomposition() const diff --git a/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch b/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch new file mode 100644 index 000000000000..a5734cdbf9ad --- /dev/null +++ b/sci-mathematics/polymake/files/polymake-4.13-cstdint.patch @@ -0,0 +1,13 @@ +diff --git a/lib/core/include/internal/comparators.h b/lib/core/include/internal/comparators.h +index 57e3f14..3486f80 100644 +--- a/lib/core/include/internal/comparators.h ++++ b/lib/core/include/internal/comparators.h +@@ -17,6 +17,8 @@ + + #pragma once + ++#include <cstdint> ++ + #include "polymake/internal/comparators_ops.h" + #include "polymake/internal/matrix_rows_cols.h" + #include "polymake/TransformedContainer.h" diff --git a/sci-mathematics/polymake/polymake-4.11.ebuild b/sci-mathematics/polymake/polymake-4.11.ebuild deleted file mode 100644 index afcd2acf56a5..000000000000 --- a/sci-mathematics/polymake/polymake-4.11.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic ninja-utils toolchain-funcs - -DESCRIPTION="Tool for polyhedral geometry and combinatorics" -SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2" -HOMEPAGE="https://polymake.org/" - -# polymake itself is GPL-2, but even the minimal tarball bundles a lot -# of other code. I've included everything that turns up with a -# -# find ./ -name 'LICENSE' -o -name 'COPYING' -# -# in the list below. If any of these bother you, you may want to take a -# closer look at how (or even if) the corresponding code is being used. -LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2" -SLOT="0" -KEYWORDS="amd64 ~riscv ~amd64-linux" -IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular" - -REQUIRED_USE="^^ ( bliss nauty )" - -# The "configure" script isn't autotools; it basically exists just to -# exec some other perl script but using the familiar name. -BDEPEND="dev-lang/perl - ${NINJA_DEPEND}" - -DEPEND=" - libpolymake? ( dev-lang/perl ) - dev-libs/boost:= - dev-libs/gmp:= - dev-libs/libxml2:2= - dev-libs/libxslt:= - dev-libs/mpfr:= - sys-libs/readline:= - bliss? ( sci-libs/bliss:=[gmp] ) - cdd? ( sci-libs/cddlib:= ) - flint? ( sci-mathematics/flint:= ) - lrs? ( >=sci-libs/lrslib-051:=[gmp] ) - nauty? ( sci-mathematics/nauty:= ) - normaliz? ( >=sci-mathematics/normaliz-3.8:= ) - ppl? ( dev-libs/ppl:= ) - singular? ( sci-mathematics/singular:= )" - -RDEPEND="${DEPEND} - dev-lang/perl - dev-perl/JSON - dev-perl/Term-ReadLine-Gnu - dev-perl/TermReadKey - dev-perl/XML-SAX - dev-perl/XML-Writer" - -PATCHES=( - "${FILESDIR}/${P}-singular-sat.patch" - "${FILESDIR}/${P}-barycentric-subdiv.patch" -) - -src_configure() { - # Without this, the build system tries to use "the highest possible" - # optimization level and will override what's in your CXXFLAGS. - export CXXOPT="" - - tc-export CC CXX - - # We need to define BLISS_USE_GMP if bliss was built with gmp support. - # Therefore we require gmp support on bliss, so that the package - # manager can prevent rebuilds with changed gmp flag. Yes, this should - # be append-cppflags; but the build system doesn't respect CPPFLAGS. - use bliss && append-cxxflags -DBLISS_USE_GMP - - # This isn't an autotools ./configure script, so a lot of things - # don't work the way you'd expect. We disable openmp unconditionally - # because it's only supposedly only used for building the bundled - # libnormaliz (we unbundle it) and for something called to_simplex - # that I can't find anywhere in the polymake source. - ./configure --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \ - $(usev !libpolymake "--without-callable") \ - --without-java \ - --without-javaview \ - --without-native \ - --without-scip \ - --without-soplex \ - --without-openmp \ - $(use_with bliss bliss "${EPREFIX}/usr") \ - $(use_with cdd cdd "${EPREFIX}/usr") \ - $(use_with flint flint "${EPREFIX}/usr") \ - $(use_with lrs lrs "${EPREFIX}/usr") \ - $(use_with nauty nauty "${EPREFIX}/usr") \ - $(use_with normaliz libnormaliz "${EPREFIX}/usr") \ - $(use_with ppl ppl "${EPREFIX}/usr") \ - $(use_with singular singular "${EPREFIX}/usr") \ - || die -} - -# There is a backwards-compatible Makefile that would call ninja for us -# in src_compile/src_install, but it doesn't handle MAKEOPTS correctly. -src_compile() { - eninja -C build/Opt -} - -src_install() { - # DESTDIR needs to find its way into the real install script, - # support/install.pl. - export DESTDIR="${D}" - eninja -C build/Opt install -} - -src_test() { - perl/polymake --script run_testcases --emacs-style \ - || die "test suite failed" -} - -pkg_postinst() { - elog "Additional features for polymake are available through external" - elog "software such as sci-mathematics/4ti2 and sci-mathematics/topcom." - elog "After installing new external software run 'polymake --reconfigure'." -} diff --git a/sci-mathematics/polymake/polymake-4.13.ebuild b/sci-mathematics/polymake/polymake-4.13.ebuild index a58117a18828..e7f06938aa0e 100644 --- a/sci-mathematics/polymake/polymake-4.13.ebuild +++ b/sci-mathematics/polymake/polymake-4.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SRC_URI="https://polymake.org/lib/exe/fetch.php/download/${P}-minimal.tar.bz2" # closer look at how (or even if) the corresponding code is being used. LICENSE="BSD GPL-2 GPL-2+ MIT WTFPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~amd64-linux" +KEYWORDS="amd64 ~riscv ~amd64-linux" IUSE="bliss +cdd +flint +normaliz libpolymake lrs nauty ppl singular" REQUIRED_USE="^^ ( bliss nauty )" @@ -53,6 +53,8 @@ RDEPEND="${DEPEND} dev-perl/XML-SAX dev-perl/XML-Writer" +PATCHES=( "${FILESDIR}/${P}-cstdint.patch" ) + src_configure() { # Without this, the build system tries to use "the highest possible" # optimization level and will override what's in your CXXFLAGS. |