mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sci-mathematics/polymake: drop 4.11
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
This commit is contained in:
Michael Orlitzky
@@ -1,2 +1 @@
|
||||
DIST polymake-4.11-minimal.tar.bz2 7325783 BLAKE2B 87e62741e4e44c5fea7454d5cc8cb205cf13f8ee743c1d72100f937d0677505ce0c5c8f5b37c118f89079ca88f313991eaefb2ea02c49b6c7b45c438c6f9e13b SHA512 94adf3fcec21de50451091a04ca17010f5e71b44e3dcd4e2d52b9f952b94ee0cf3f6df15657b761b0bda20eb47cbdc0cb2481bb440c7243442be34f913292246
|
||||
DIST polymake-4.13-minimal.tar.bz2 7338096 BLAKE2B c4d60ab48cb4fd21e6ea38ccdf85086e92c1ad2b80434180c07da036de9e462439e73f05d271d1c0aa150a8eeda59b20d5314fbf8fd7b17c2eb3f0e0b0384c78 SHA512 cd281a1f293434d96efceeb02e25d23fb334fa0c0ecdf5af10489d12850dca43c05eaa36e86fbd4a0b1fab9e83b03ad694d655a8710ea5ed9f000297a4d86d50
|
||||
|
||||
@@ -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;
|
||||
@@ -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
|
||||
@@ -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'."
|
||||
}
|
||||
Reference in New Issue
Block a user