* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/polymake/, sci-mathematics/polymake/files/
@ 2023-11-14 2:25 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2023-11-14 2:25 UTC (permalink / raw
To: gentoo-commits
commit: d5cad95f6c02a29cf004130f715d994b66a4b07a
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 02:23:11 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 02:24:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5cad95f
sci-mathematics/polymake: re-enable the test suite
After adding another patch, the test suite once again passes for me (it
hasn't for a few versions, but it did a long time ago). Let's enable it
and get some feedback.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/polymake-4.11-barycentric-subdiv.patch | 23 ++++++++++++++++++++++
sci-mathematics/polymake/polymake-4.11.ebuild | 10 ++++------
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch
new file mode 100644
index 000000000000..2f58b0f76299
--- /dev/null
+++ b/sci-mathematics/polymake/files/polymake-4.11-barycentric-subdiv.patch
@@ -0,0 +1,23 @@
+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/polymake-4.11.ebuild b/sci-mathematics/polymake/polymake-4.11.ebuild
index 56790dcb5cc9..5feccaae668e 100644
--- a/sci-mathematics/polymake/polymake-4.11.ebuild
+++ b/sci-mathematics/polymake/polymake-4.11.ebuild
@@ -53,12 +53,10 @@ RDEPEND="${DEPEND}
dev-perl/XML-SAX
dev-perl/XML-Writer"
-# Tests observed failing after upgrade to polymake-4.5. No idea if they
-# worked prior to that. Someone who actually understands polymake will
-# have to get these working (at least briefly) before we re-enable them.
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}/${P}-singular-sat.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-singular-sat.patch"
+ "${FILESDIR}/${P}-barycentric-subdiv.patch"
+)
src_configure() {
# Without this, the build system tries to use "the highest possible"
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/polymake/, sci-mathematics/polymake/files/
@ 2016-09-30 11:46 Thomas Kahle
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Kahle @ 2016-09-30 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 08a32db74f9bc81c59802b2cd776c60ef515014c
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 11:41:00 2016 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 11:45:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a32db7
sci-mathematics/polymake: Remove old
Package-Manager: portage-2.3.0
sci-mathematics/polymake/Manifest | 2 -
.../polymake/files/polymake_gcc49.patch | 68 ----------------------
sci-mathematics/polymake/polymake-2.13.ebuild | 64 --------------------
sci-mathematics/polymake/polymake-2.14.ebuild | 59 -------------------
4 files changed, 193 deletions(-)
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 1528d82..0ff9bf5 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,4 +1,2 @@
-DIST polymake-2.13-1.tar.bz2 16539798 SHA256 d010edc206b22356333493e90bd24f807c7341730232276d47dbf1b62eb53aba SHA512 90fd0c7eacbb673734e08860a753f75dae06347ce8affcb5d50c55a51975b85260db841393979c0143be5a71a26b6737f9513509d75a5950b40654c54d0be3ea WHIRLPOOL cef5c95930c7633acb0652e6ce3cd6c85b469af912ad1adb695e58a018e4cedbdac9f63caaeb12f3da0a8f7fb2b71e853b782f308a1594cfc89d2c9697e6c170
DIST polymake-2.14-minimal.tar.bz2 1996581 SHA256 c43b525c6f329ae2d8eb6d0e2af63f7846c4e5d408627665a28d0f421bbbcf9b SHA512 8989a8d2eb42c03e46569eca24334083154ff5107d7cd7d9dc481790b1553acd38025bd48ca016407e5c08b4b08f8062e19a1d4828ef535f83292510bdf5cd07 WHIRLPOOL 3f1521c60eafcff60b8ab2a443ff051835ee1c667eefcd59b33227e7a84293ccaefad4bc05eea4b8c541dea513b85b4e8538b6b572d762f2e1167b733029ec54
-DIST polymake-2.14.tar.bz2 38747874 SHA256 c181277b5cd45ac00f5667647e4eb5fa13c20547623fd6e63ce2522c058883c2 SHA512 f66eac2e821060719a16a6979fa0cc20edf9598d425ba2fff5bddfc053fd582b05a5579e1c2521fd382733a4808955aa49cb946234a183aba3ef75eed8c02b22 WHIRLPOOL 26b21d28d6b9a76b7a3164b6d5e45a00ed8a604b3f973a22db1472dce714dec5f8ad5d2ee7133321e2cd0f48d6380343b8e6d93db9e79b6726ef1e9954c04405
DIST polymake-3.0r2.tar.bz2 37695790 SHA256 e7c0f8e3a45ea288d2fb4ae781a1dcea913ef9c275fed401632cdb11a672d6dc SHA512 b4c22b2c6da8ef597dc05a44a30c7a55fd924a96854cde3f725095465972eabe1e24508f8e5d544f3131c82c973117b15983c38a0242fc7f1d4a4a8ecddb1d46 WHIRLPOOL 5a236ac32de0dd19e7f0f5b8b1b42f2b72fa2392ee098718383a8dfd0f1d1db3946d5f4f75bd9e4c075033deebcd87ddbb28ce70733d6371fa4624b8b6a4edd1
diff --git a/sci-mathematics/polymake/files/polymake_gcc49.patch b/sci-mathematics/polymake/files/polymake_gcc49.patch
deleted file mode 100644
index bc2cac5..00000000
--- a/sci-mathematics/polymake/files/polymake_gcc49.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit 9fdecb57cb728170d0b87637c67947acf0cd27a4
-Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
-Date: Sat May 17 23:05:41 2014 +0200
-
- fix ppl configure.pl test for gcc 4.9
-
-diff --git a/bundled/ppl/configure.pl b/bundled/ppl/configure.pl
-index 128af1f..a147ea1 100644
---- a/bundled/ppl/configure.pl
-+++ b/bundled/ppl/configure.pl
-@@ -43,6 +43,7 @@ sub proceed {
-
- } else {
- my $error=Polymake::Configure::build_test_program(<<"---", Libs => "-lppl -lgmp");
-+#include <cstddef>
- #include "ppl.hh"
- #include <iostream>
- int main() {
-
-commit 6651dd4b284085ffb7385d6cbca1785b6242003b
-Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
-Date: Wed May 7 15:53:12 2014 +0200
-
- another gcc 4.9 cstddef header fix
-
-diff --git a/bundled/bliss/apps/graph/src/GraphIso.cc b/bundled/bliss/apps/graph/src/GraphIso.cc
-index 4000dd5..14e0e8f 100644
---- a/bundled/bliss/apps/graph/src/GraphIso.cc
-+++ b/bundled/bliss/apps/graph/src/GraphIso.cc
-@@ -15,6 +15,7 @@
- */
-
- #include <cstring>
-+#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
- #include <bliss/graph.hh>
- #include "polymake/graph/GraphIso.h"
-
-
-commit 716639b858f476d6a2fd8fe51da67d6cb347ec7c
-Author: Benjamin Lorenz <lorenz@math.tu-berlin.de>
-Date: Tue May 6 14:58:33 2014 +0200
-
- cstddef include fix for gcc 4.9 (see http://gcc.gnu.org/gcc-4.9/porting_to.html)
-
-diff --git a/bundled/libnormaliz/apps/polytope/src/normaliz.cc b/bundled/libnormaliz/apps/polytope/src/normaliz.cc
-index e6f2208..81e9783 100644
---- a/bundled/libnormaliz/apps/polytope/src/normaliz.cc
-+++ b/bundled/libnormaliz/apps/polytope/src/normaliz.cc
-@@ -14,6 +14,7 @@
- --------------------------------------------------------------------------------
- */
-
-+#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
- #include <gmpxx.h>
-
- #include "polymake/client.h"
-diff --git a/bundled/ppl/apps/polytope/include/ppl_interface_impl.h b/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
-index fda2f39..1040c9e 100644
---- a/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
-+++ b/bundled/ppl/apps/polytope/include/ppl_interface_impl.h
-@@ -17,6 +17,7 @@
- #ifndef POLYMAKE_POLYTOPE_PPL_INTERFACE_IMPL_H
- #define POLYMAKE_POLYTOPE_PPL_INTERFACE_IMPL_H
-
-+#include <cstddef> // needed for gcc 4.9, see http://gcc.gnu.org/gcc-4.9/porting_to.html
- #include <gmpxx.h> //for mpz/mpq-handling
- #include "polymake/polytope/ppl_interface.h"
- #include "polymake/common/lattice_tools.h"
diff --git a/sci-mathematics/polymake/polymake-2.13.ebuild b/sci-mathematics/polymake/polymake-2.13.ebuild
deleted file mode 100644
index 0d5111c..00000000
--- a/sci-mathematics/polymake/polymake-2.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-MY_PV=${PV}-1
-
-DESCRIPTION="research tool for polyhedral geometry and combinatorics"
-SRC_URI="http://polymake.org/lib/exe/fetch.php/download/${PN}-${MY_PV}.tar.bz2"
-HOMEPAGE="http://polymake.org"
-
-IUSE="libpolymake"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-libs/gmp:0=
- dev-libs/boost:=
- dev-libs/libxml2:2
- dev-perl/XML-LibXML
- dev-libs/libxslt
- dev-perl/XML-LibXSLT
- dev-perl/XML-Writer
- dev-perl/Term-ReadLine-Gnu"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- # Don't strip
- sed -i '/system "strip $to"/d' support/install.pl || die
- epatch "${FILESDIR}/${PN}_gcc49.patch"
-
- einfo "During compile this package uses up to"
- einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if"
- einfo "you run into trouble."
-}
-
-src_configure () {
- export CXXOPT=$(get-flag -O)
- # Configure does not accept --host, therefore econf cannot be used
- ./configure --prefix="${EPREFIX}/usr" \
- --without-java \
- $(use_with libpolymake callable) \
- --without-prereq \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
- "${myconf}" || die
-}
-
-src_install(){
- emake -j1 DESTDIR="${D}" install
- dosym libpolymake.so "${EPREFIX}/usr/$(get_libdir)/libpolymake.so.0"
-}
-
-pkg_postinst(){
- elog "Docs can be found on http://www.polymake.org/doku.php/documentation"
- elog " "
- elog "Support for jreality is missing, sorry (see bug #346073)."
-}
diff --git a/sci-mathematics/polymake/polymake-2.14.ebuild b/sci-mathematics/polymake/polymake-2.14.ebuild
deleted file mode 100644
index e6e9fa5..00000000
--- a/sci-mathematics/polymake/polymake-2.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="research tool for polyhedral geometry and combinatorics"
-SRC_URI="http://polymake.org/lib/exe/fetch.php/download/${P}.tar.bz2"
-HOMEPAGE="http://polymake.org"
-
-IUSE="libpolymake"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="dev-libs/gmp:0=
- dev-libs/boost:=
- dev-libs/libxml2:2
- dev-perl/XML-LibXML
- dev-libs/libxslt
- dev-perl/XML-LibXSLT
- dev-perl/XML-Writer
- dev-perl/Term-ReadLine-Gnu"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Don't strip
- sed -i '/system "strip $to"/d' support/install.pl || die
-
- einfo "During compile this package uses up to"
- einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if"
- einfo "you run into trouble."
-}
-
-src_configure () {
- export CXXOPT=$(get-flag -O)
- # Configure does not accept --host, therefore econf cannot be used
- ./configure --prefix="${EPREFIX}/usr" \
- --without-java \
- $(use_with libpolymake callable) \
- --without-prereq \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
- "${myconf}" || die
-}
-
-src_install(){
- emake -j1 DESTDIR="${D}" install
- dosym libpolymake.so "${EPREFIX}/usr/$(get_libdir)/libpolymake.so.0"
-}
-
-pkg_postinst(){
- elog "Docs can be found on http://www.polymake.org/doku.php/documentation"
- elog " "
- elog "Support for jreality is missing, sorry (see bug #346073)."
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-14 2:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-14 2:25 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/polymake/, sci-mathematics/polymake/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2016-09-30 11:46 Thomas Kahle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox