[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2024-04-02 Thread Michael Orlitzky 
commit: 7876a356f737310c0cdda056fb77ebcbab866f3d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Apr  2 15:08:51 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Apr  2 15:09:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7876a356

sci-mathematics/singular: backport strict-aliasing/lto fix

Bug: https://bugs.gentoo.org/927675
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../singular/files/singular-4.3.2_p16-lto.patch| 18 ++
 sci-mathematics/singular/singular-4.3.2_p16.ebuild | 11 ++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch 
b/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
new file mode 100644
index ..a880f4ef5b12
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.2_p16-lto.patch
@@ -0,0 +1,18 @@
+From 83a4e40c59dd99ff3131cbdb57b24b456aa04b93 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann 
+Date: Tue, 2 Apr 2024 15:09:51 +0200
+Subject: [PATCH] countedref + https://github.com/Singular/Singular/issues/1212
+
+diff --git a/Singular/countedref.cc b/Singular/countedref.cc
+index d3b783ade7..f83d7fab62 100644
+--- a/Singular/countedref.cc
 b/Singular/countedref.cc
+@@ -108,7 +108,7 @@ class CountedRefData:
+   BOOLEAN put(leftv res) { return broken() || m_data.put(res);  }
+ 
+   /// Extract (shallow) copy of stored data
+-  LeftvShallow operator*() const { return (broken()? LeftvShallow(): (const 
LeftvShallow&)m_data); }
++  LeftvShallow operator*() { return (broken()? LeftvShallow(): 
LeftvShallow(m_data)); }
+ 
+   /// Determine active ring when ring dependency changes
+   BOOLEAN rering() {

diff --git a/sci-mathematics/singular/singular-4.3.2_p16.ebuild 
b/sci-mathematics/singular/singular-4.3.2_p16.ebuild
index 1b8fee9d38a1..94a83c7da0c8 100644
--- a/sci-mathematics/singular/singular-4.3.2_p16.ebuild
+++ b/sci-mathematics/singular/singular-4.3.2_p16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic
+inherit autotools elisp-common
 
 MY_PN=Singular
 MY_PV=$(ver_rs 3 '')
@@ -42,6 +42,7 @@ SITEFILE=60${PN}-gentoo.el
 
 PATCHES=(
"${FILESDIR}/${P}-test-underlinking.patch"
+   "${FILESDIR}/${P}-lto.patch"
 )
 
 src_prepare() {
@@ -50,14 +51,6 @@ src_prepare() {
 }
 
 src_configure() {
-   # -Werror=strict-aliasing
-   # https://bugs.gentoo.org/927675
-   # https://github.com/Singular/Singular/issues/1212
-   #
-   # Do not trust with LTO either.
-   append-flags -fno-strict-aliasing
-   filter-lto
-
local myconf=(
--disable-debug
--disable-doc

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2022-12-23 Thread Michael Orlitzky 
commit: 2fbdf6de119de19623465e6388140587811c6e26
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Dec 23 23:23:34 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Dec 23 23:26:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbdf6de

sci-mathematics/singular: drop 4.2.0_p1

Bug: https://bugs.gentoo.org/869362
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/singular/Manifest  |   1 -
 .../files/singular-4.0.3-gfan_linking.patch|  13 ---
 .../files/singular-4.1.3-doc_install.patch |  62 
 .../singular/files/singular-4.2.0-no-static.patch  |  69 --
 .../singular/files/singular-4.2.1-htmldoc.patch|  43 -
 sci-mathematics/singular/singular-4.2.0_p1.ebuild  | 104 -
 6 files changed, 292 deletions(-)

diff --git a/sci-mathematics/singular/Manifest 
b/sci-mathematics/singular/Manifest
index ad18fbcd80a4..fbe95c6c9bd5 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,3 +1,2 @@
-DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 
444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127
 SHA512 
2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.3.1p1.tar.gz 15090370 BLAKE2B 
d4e40378b3892b98b1f78c3928c8a40484336ea25ea4dcd4b3a1e5f651281d2cdb06d92c9cc64427ce76e91c5bf4eaa1c3b643df174a24c188823ae808817ad9
 SHA512 
d27d8e042ea085e49aed6a0697056c36e78e62ea0b9d17751cdf4c556cf4f6efce3b34b411c77aef97c6d90675bea11c97651eb7009634cb8a9b630ec820a06e
 DIST singular-4.3.1p2.tar.gz 15088650 BLAKE2B 
17d73518653f6348297c955214aa8d30b3ce7cdf342f1bbb6fb49b746ddc563b1f46906df92f45abd601c834c77139f7aaccadf14bf706010017564d56948ca2
 SHA512 
ff2282b2fcd1a5b8809297036d524838403a2b66ae87ceb566ed6ff0571843d3c4aa0f7a4abbaab8541630f4e0130b6171ea0a7b8a5296b3b10f6c5cd5088828

diff --git a/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch 
b/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
deleted file mode 100644
index f228d980ffcf..
--- a/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
-index 2039af0..a1b7dce 100644
 a/gfanlib/Makefile.am
-+++ b/gfanlib/Makefile.am
-@@ -20,6 +20,8 @@ libgfan_la_SOURCES = $(SOURCES)
- libgfan_includedir =$(includedir)/gfanlib
- libgfan_include_HEADERS = config.h gfanlib_mixedvolume.h 
gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h 
_config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  
gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h 
gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h 
gfanlib_zfan.h
- 
-+libgfan_la_LIBADD = $(CDDGMPLDFLAGS)
-+
- DISTCLEANFILES =  config.h
- 
- moduledir = $(libexecdir)/singular/MOD

diff --git a/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch 
b/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
deleted file mode 100644
index 10e831bea701..
--- a/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index c21b6ba..ea61758 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -14,10 +14,11 @@ dist-hook:
- 
- install-data-local:
-   if test -e $(srcdir)/doc/doc.tbz2; then\
--(cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; 
tar jxf -));\
-  mkdir $(DESTDIR)$(datadir)/info;\
-- mkdir $(DESTDIR)$(datadir)/doc;\
-- mv  $(DESTDIR)$(datadir)/singular/singular.hlp  
$(DESTDIR)$(datadir)/info/.;\
-+ mkdir -p $(DESTDIR)$(docdir);\
-+(cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx 
--no-same-owner -f -));\
-+ mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
-+ @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
-   fi
- 
- uninstall-local:
-diff --git a/configure.ac b/configure.ac
-index 2d53a55..d43b5fe 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -248,6 +248,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
- AC_SUBST(DATA_DIR, "$config_datadir")
- 
-+AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
-+AX_NORMALIZE_PATH([config_docdir],['/'])
-+AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
-+AC_SUBST(DOC_DIR, "$config_docdir")
-+
- SING_SHOW_FLAGS([Compiler/linker flags: ])
- 
- 
-diff --git a/resources/configure.ac b/resources/configure.ac
-index cf6720f..ac5f2d0 100644
 a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQU

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2022-05-27 Thread Michael Orlitzky 
commit: 9a8b90b9ade6af143558eaa0b5769177703a8028
Author: François Bissey  gmail  com>
AuthorDate: Thu May 19 23:25:25 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri May 27 11:57:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8b90b9

sci-mathematics/singular: clean singular 4.3.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/singular/Manifest  |   1 -
 .../singular/files/singular-4.3.0-includes.patch   |  29 --
 .../singular/files/singular-4.3.0-slibtool.patch   |  33 --
 sci-mathematics/singular/singular-4.3.0.ebuild | 115 -
 4 files changed, 178 deletions(-)

diff --git a/sci-mathematics/singular/Manifest 
b/sci-mathematics/singular/Manifest
index 3128bf56af08..d5014a7d783e 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,5 +2,4 @@ DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 
444553f87d7ca8d6a62e4519c9857a6892
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 
4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8
 SHA512 
b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 
2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766
 SHA512 
48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 
9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead
 SHA512 
1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
-DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 
9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f
 SHA512 
b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
 DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 
0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062
 SHA512 
af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69

diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch 
b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
deleted file mode 100644
index 07df5c0cc068..
--- a/sci-mathematics/singular/files/singular-4.3.0-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann 
-Date: Wed, 19 Jan 2022 15:02:14 +0100
-Subject: [PATCH] fix: missing includes
-

- kernel/oswrapper/feread.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
-index ccdd272285..5491007478 100644
 a/kernel/oswrapper/feread.cc
-+++ b/kernel/oswrapper/feread.cc
-@@ -7,6 +7,7 @@
- 
- #include "kernel/mod2.h"
- #include 
-+#include 
- 
- // 
- // system settings:
-@@ -21,6 +22,7 @@
- #include "misc/options.h"
- 
- #include "kernel/oswrapper/feread.h"
-+#include "reporter/reporter.h"
- 
- #if defined(HAVE_DYN_RL)
- #include 

diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch 
b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
deleted file mode 100644
index 72d88979e870..
--- a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index ba7d911..346602f 100644
 a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
- 
- case $host_os in
-   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
-+  *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version 
-flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
- esac
- 
- dnl INCLUDES=""
-diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
-index 23f216e..119c4ef 100644
 a/libpolys/polys/Makefile.am
-+++ b/libpolys/polys/Makefile.am
-@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep 
${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
- 
--P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic 
-avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup 
-flat_namespace

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2021-12-25 Thread Michael Orlitzky 
commit: 27e26ae3fe700403a596d0096248f2e8015822cd
Author: François Bissey  gmail  com>
AuthorDate: Sun Dec 12 23:19:37 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Dec 25 19:06:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e26ae3

sci-mathematics/singular: Update to singular 4.2.1p2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: François René Pierre Bissey  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/singular/Manifest  |   1 +
 .../singular/files/singular-4.2.1-htmldoc.patch|  43 
 sci-mathematics/singular/singular-4.2.1_p2.ebuild  | 117 +
 3 files changed, 161 insertions(+)

diff --git a/sci-mathematics/singular/Manifest 
b/sci-mathematics/singular/Manifest
index 1a947fd65804..7d1224ad896e 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,3 +1,4 @@
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 
444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127
 SHA512 
2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 
4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8
 SHA512 
b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 
2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766
 SHA512 
48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
+DIST singular-4.2.1p2.tar.gz 15026730 BLAKE2B 
91d13a367fe9e182aba865debb2cf8a14735ed26b5ce573061172b1fcf1e188c6ebc76794e0219fd2b2ef39c10117def047630737583ebed987a152d7fc1fb2a
 SHA512 
b031f8a1f65739617e052a30ec8d2f809d3961c3cff606651570b0e47c0b8814322883bfa5d5fdda8a1263c527de39287b1666ef7a548369febad46676a7f04e

diff --git a/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch 
b/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch
new file mode 100644
index ..7eedee90dcf2
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.1-htmldoc.patch
@@ -0,0 +1,43 @@
+diff --git a/configure.ac b/configure.ac
+index 6b75a34..5e932b8 100644
+--- a/configure.ac
 b/configure.ac
+@@ -228,6 +228,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ AC_SUBST(DATA_DIR, "$config_datadir")
+ 
++AX_RECURSIVE_EVAL([[$]docdir], [config_docdir])
++AX_NORMALIZE_PATH([config_docdir],['/'])
++AC_DEFINE_UNQUOTED([DOC_DIR],"$config_docdir",[docdir])
++AC_SUBST(DOC_DIR, "$config_docdir")
++
+ SING_SHOW_FLAGS([Compiler/linker flags: ])
+ 
+ 
+diff --git a/resources/configure.ac b/resources/configure.ac
+index bde2baa..9f9c966 100644
+--- a/resources/configure.ac
 b/resources/configure.ac
+@@ -72,5 +72,9 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
+ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ 
++AX_RECURSIVE_EVAL([[$]htmldir], [config_htmldir])
++AX_NORMALIZE_PATH([config_htmldir],['/'])
++AC_DEFINE_UNQUOTED([HTML_DIR],"$config_datadir",[htmldir])
++
+ AC_CONFIG_FILES([singular_resources.pc Makefile])
+ AC_OUTPUT
+diff --git a/resources/feResource.cc b/resources/feResource.cc
+index 0eaa6fa..3309386 100644
+--- a/resources/feResource.cc
 b/resources/feResource.cc
+@@ -78,7 +78,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+   {"DefaultDir",'d',feResDir,   "SINGULAR_DEFAULT_DIR",  
SINGULAR_DEFAULT_DIR,  (char *)""},
+   {"InfoFile",  'i',feResFile,  "SINGULAR_INFO_FILE",   
"%D/info/singular.info", (char *)""},
+   {"IdxFile",   'x',feResFile,  "SINGULAR_IDX_FILE",
"%D/singular/singular.idx",  (char *)""},
+-  {"HtmlDir",   'h',feResDir,   "SINGULAR_HTML_DIR",
"%D/singular/html",  (char *)""},
++  {"HtmlDir",   'h',feResDir,   "SINGULAR_HTML_DIR",HTML_DIR, 
 (char *)""},
+   {"ManualUrl", 'u',feResUrl,   "SINGULAR_URL", 
"https://www.singular.uni-kl.de/Manual/";,(char *)""},
+   {"ExDir", 'm',feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",
  (char *)""},
+   {"Path",  'p',feResPath,  NULL,   "%b;%P;$PATH",
 (char *)""},

diff --git a/sci-mathematics/singular/singular-4.2.1_p2.ebuild 
b/sci-mathematics/singular/singular-4.2.1_p2.ebuild
new file mode 100644
index ..565d313d91cd
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.1_p2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Publ

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2021-03-22 Thread Michael Orlitzky 
commit: 533d3a72e06349a1ee683ba8c451b3a546e97a7b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar 22 19:08:48 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar 22 19:46:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533d3a72

sci-mathematics/singular: new version 4.2.0p1.

Taken from the sage-on-gentoo overlay with minor tweaks and a new
patch. Many, many thanks to François Bissey for his work on this.

Closes: https://bugs.gentoo.org/712004
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/singular/Manifest  |   1 +
 .../files/singular-4.0.3-gfan_linking.patch|  13 +++
 .../files/singular-4.1.3-doc_install.patch |  62 
 .../singular/files/singular-4.2.0-no-static.patch  |  69 ++
 sci-mathematics/singular/singular-4.2.0_p1.ebuild  | 104 +
 5 files changed, 249 insertions(+)

diff --git a/sci-mathematics/singular/Manifest 
b/sci-mathematics/singular/Manifest
index 5cb78241d61..a0d12ebf497 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,3 +2,4 @@ DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 
357a68f68cc0508e4e197427c56232d
 DIST singular-4.0.2.tar.gz 8635172 BLAKE2B 
5f565bf14677d8414300d7a5602aa96c8cef7e863fd858083fe4561742b545d74a5fc4de95ef0c63acf4f78c66405bac7ba77a954e42b2e87a6da608e4732bcd
 SHA512 
4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 DIST singular-4.0.3-share.tar.gz 6633256 BLAKE2B 
c137b72aaa0926eb006624e03fe938678acb94a41da525de1ca4f7711985d253926788b550d2d98b8def15fb0cb60b2527c1c04566a29a28135fcb1a70246025
 SHA512 
5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 DIST singular-4.0.3.tar.gz 12615042 BLAKE2B 
b3c63434974bb8b5fdef86cbcbe73b76a47503b28dcae6bfc6e4210e1ab1c14224ac0f6eeefa9d8004450f6d9a26843368a9b2ea16bca68bf1215ce33e83df0d
 SHA512 
781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
+DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 
444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127
 SHA512 
2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8

diff --git a/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch 
b/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
new file mode 100644
index 000..f228d980ffc
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.3-gfan_linking.patch
@@ -0,0 +1,13 @@
+diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
+index 2039af0..a1b7dce 100644
+--- a/gfanlib/Makefile.am
 b/gfanlib/Makefile.am
+@@ -20,6 +20,8 @@ libgfan_la_SOURCES = $(SOURCES)
+ libgfan_includedir =$(includedir)/gfanlib
+ libgfan_include_HEADERS = config.h gfanlib_mixedvolume.h 
gfanlib_polymakefile.h gfanlib_symmetry.h gfanlib_vector.h gfanlib_z.h 
_config.h  gfanlib.h gfanlib_paralleltraverser.h gfanlib_q.h  
gfanlib_traversal.h gfanlib_zcone.h gfanlib_circuittableint.h gfanlib_matrix.h 
gfanlib_polyhedralfan.h gfanlib_symmetriccomplex.h gfanlib_tropicalhomotopy.h 
gfanlib_zfan.h
+ 
++libgfan_la_LIBADD = $(CDDGMPLDFLAGS)
++
+ DISTCLEANFILES =  config.h
+ 
+ moduledir = $(libexecdir)/singular/MOD

diff --git a/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch 
b/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
new file mode 100644
index 000..10e831bea70
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.1.3-doc_install.patch
@@ -0,0 +1,62 @@
+diff --git a/Makefile.am b/Makefile.am
+index c21b6ba..ea61758 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -14,10 +14,11 @@ dist-hook:
+ 
+ install-data-local:
+   if test -e $(srcdir)/doc/doc.tbz2; then\
+-(cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; 
tar jxf -));\
+  mkdir $(DESTDIR)$(datadir)/info;\
+- mkdir $(DESTDIR)$(datadir)/doc;\
+- mv  $(DESTDIR)$(datadir)/singular/singular.hlp  
$(DESTDIR)$(datadir)/info/.;\
++ mkdir -p $(DESTDIR)$(docdir);\
++(cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(docdir); tar -jx 
--no-same-owner -f -));\
++ mv  $(DESTDIR)$(docdir)/singular.hlp  $(DESTDIR)$(datadir)/info/.;\
++ @INSTALL_DATA@ doc/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
+   fi
+ 
+ uninstall-local:
+diff --git a/configure.ac b/configure.ac
+index 2d53a55..d43b5fe 100644
+--- a/configure.ac
 b/configure.ac
+@@ -248,6 +248,11 @@ AX_NORMALIZE_PATH([config_datadir],['/'])
+ AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
+ AC_SUBST(DATA_DIR, "$config_datadir")
+ 
++AX_RECURSIVE_EVAL([

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/

2016-09-16 Thread Thomas Kahle 
commit: 5853a6f2a64c85ae4398c2a6c79abd12c6c21767
Author: Thomas Kahle  gentoo  org>
AuthorDate: Fri Sep 16 14:03:51 2016 +
Commit: Thomas Kahle  gentoo  org>
CommitDate: Fri Sep 16 14:04:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5853a6f2

sci-mathematics/singular: bump to 4.0.3 and EAPI=6

Also fixes file collision in bug 591556

Package-Manager: portage-2.3.0

 sci-mathematics/singular/Manifest  |   2 +
 .../files/singular-4.0.3-fix-destdir.patch |  26 ++
 .../files/singular-4.0.3-fix-resources-name.patch  | 307 +
 sci-mathematics/singular/singular-4.0.3.ebuild | 104 +++
 4 files changed, 439 insertions(+)

diff --git a/sci-mathematics/singular/Manifest 
b/sci-mathematics/singular/Manifest
index 6d7beb8..8b1b1e5 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -2,3 +2,5 @@ DIST Singular-3-1-6-share.tar.gz 10620177 SHA256 
c74a97b7eb8ed53417682637fe11c24
 DIST Singular-3-1-6.tar.gz 25535111 SHA256 
7956a17a0b5d428fea25bc0bc6c19c753748fb98bb2926c49b9fbcbec94172ff SHA512 
103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213
 WHIRLPOOL 
71ef6d505f7c8b2eeacd4640d7b3c79f75d6c2c858b135553b1fb3a9dd7d88df74924009468c32aa4aa748b88ccb7762010ab4d36eec420a07fd36e8dd22
 DIST singular-4.0.2-share.tar.gz 8789162 SHA256 
fe81cb100f3b73b159eb4a8122a29bc0f7705ef6f62ad55b68b5582c1ec0642d SHA512 
068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
 WHIRLPOOL 
615487e95e32d9f07552e92ebcd46e3071d110dd31e7d980b01340d22a5205ba2d771532fad1bf44863a38820428157284a171e0b901861fda6e51482d546adc
 DIST singular-4.0.2.tar.gz 8635172 SHA256 
c105a2c8ace0b3c9189b782ed63660ce235407d0160907c2cafc2128d36d8cb7 SHA512 
4543a45839ce8adc45e3b2edd84a6e398b7ba157da1eda050dbce2a8b20333eb0c63433e3e7eaf59d76bf6bcb65c1b1611bfc08c25fd493c88e2f06624898e3d
 WHIRLPOOL 
fe30bc87c6b403b2e30bd1c016aeeb015c2a64a63d87b81536dc53a2555ac068f3e0c6d8763775d8be5e5e1a935aadab1c86b603cbb698234a19cc9cfffac282
+DIST singular-4.0.3-share.tar.gz 6633256 SHA256 
391cb9cd7626ee745f269a025530b5b3a33794e7862cf1afd7ca9d109321827a SHA512 
5f8ae4ecd22a3470e5f00393e03079936d7ed334f44ae056ed1eb1719054afc4371b03e920b598033605600c843dc39cb6b01308505323e2c084dfe1f7a1b94a
 WHIRLPOOL 
b00694bc2d93c9ef6d299d18e9e65133656dbb427aa50de730d78e5c0501332c5a4b3797edf09750179ef4efd980401f46bb5f1beee37bf7474dc6323b9467bd
+DIST singular-4.0.3.tar.gz 12615042 SHA256 
4ccf70a9efcf087f436bfea9c09d61a554eb8e7638697093a55998ef846f316e SHA512 
781227997c510829b02c969259d627572c0b62aa152c9ef623ff27de5b2df0c8e024f086740b89ca8f96b6e3f7def04f8d62ca79adb199d6249ade9b8cbb06ab
 WHIRLPOOL 
587ff208fb7b03edb3398e0a4b8cf54cfa9ddee6a8a350c5273a4f6074a6e0a3f06e35ad96b8ddb58ef5dd9036b45c81552a925681ecb4df72d895afc010eb0d

diff --git a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch 
b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
new file mode 100644
index ..caeed33
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
@@ -0,0 +1,26 @@
+From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001
+From: jgmbenoit 
+Date: Thu, 28 Apr 2016 05:47:53 +
+Subject: [PATCH] automake: install-data-local: missing DESTDIR prefix
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 32778f7..24dd251 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -17,9 +17,9 @@ dist-hook:
+   $(srcdir)/git-version-gen $(srcdir)/.tarball-git-version > 
$(distdir)/.tarball-git-version
+ 
+ install-data-local:
+-  -cat ${top_srcdir}/doc/doc.tbz2| (cd $(datadir)/singular;tar jxf -)
+-  -mkdir $(datadir)/info
+-  -mv  $(datadir)/singular/singular.hlp  $(datadir)/info/.
++  -cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar 
jxf -)
++  -mkdir $(DESTDIR)$(datadir)/info
++  -mv  $(DESTDIR)$(datadir)/singular/singular.hlp  
$(DESTDIR)$(datadir)/info/.
+ 
+ configheaderdir = ${includedir}/singular
+ nodist_configheader_HEADERS = singularconfig.h

diff --git 
a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch 
b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
new file mode 100644
index ..bcda4ce
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
@@ -0,0 +1,307 @@
+From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann 
+Date: Thu, 1 Sep 2016 10:48:08 +0200
+Subject: [PATCH] change library name: libresources -> libsingular_resources
+
+---
+ Singular/Makefile.am   |  4 ++--
+ autogen.sh |  1 +
+ factory/configure.ac   |  8 
+ gfanlib/configure.ac   |  2