* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2019-12-07 23:50 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2019-12-07 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 105fbe2986be291f5d595d452944461db59f81b9
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 23:48:52 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 23:48:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105fbe29
sci-mathematics/singular: Remove old
* Required for pruning py2.7 from the tree
Closes: https://github.com/gentoo/gentoo/pull/13912
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-mathematics/singular/Manifest | 2 -
.../singular/files/singular-3.0.4.4-nostrip.patch | 12 --
.../singular/files/singular-3.1.0-emacs-22.patch | 13 --
.../singular/files/singular-3.1.0-gentoo.patch | 81 ----------
.../singular/files/singular-3.1.3.2-python.patch | 45 ------
.../singular/files/singular-3.1.3.3-Minor.h.patch | 10 --
.../files/singular-3.1.3.3-install_name.patch | 23 ---
...ular-3.1.6-factory_template_instantiation.patch | 26 ---
.../singular/files/singular-3.1.6-ntl6compat.patch | 44 -----
sci-mathematics/singular/singular-3.1.6.ebuild | 177 ---------------------
10 files changed, 433 deletions(-)
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index bdfa86f474e..5cb78241d61 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,5 +1,3 @@
-DIST Singular-3-1-6-share.tar.gz 10620177 BLAKE2B 407f7936617d71e10779ae20548091a84be309a25c32e76b3a8277483ab288a8c6d47b7a8ba6c56dc6bba4f0b4395db3b997adbde5890189317fe1faaa7362ce SHA512 54bff29c5d64609583ec8b1c43005a1ff453c8f2cedfe9a26ac840888e9d306e3104e14aea5a3cc923fac916215c4285ecfe5ae7e1242aee0308b5e4c6e2d48d
-DIST Singular-3-1-6.tar.gz 25535111 BLAKE2B 915f25c00be5fc04056bba12b5f62b09d41d7367a8fecc732b7cbbf68a0536b998bf0d2b69cf4c6f4d0f8eed60132c225dced762b3f2b17ea326bfe4fb6d17ff SHA512 103a10dd474d93cceb678bcef1a4aae5ec693cb9e68c9d63a7536929b738a0127501ee145a79cc3b9ddfa4bd1ca0f05e640eeb3b0fbdb60de4f56aa5beacc213
DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
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
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
deleted file mode 100644
index 5884b6cd2d6..00000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in
---- Singular-3-0-4/IntegerProgramming/Makefile.in 2008-07-09 07:55:13.000000000 -0400
-+++ Singular-3-0-4.new/IntegerProgramming/Makefile.in 2008-10-19 22:40:41.000000000 -0400
-@@ -21,7 +21,7 @@
- endif
-
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- MKINSTALLDIRS = ../mkinstalldirs
-
- ##
diff --git a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
deleted file mode 100644
index 3f4f3c76203..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Singular-3-1-0/emacs/singular.el Singular-3-1-0.new/emacs/singular.el
---- Singular-3-1-0/emacs/singular.el 2008-11-03 09:16:38.000000000 -0500
-+++ Singular-3-1-0.new/emacs/singular.el 2009-08-20 22:16:57.000000000 -0400
-@@ -865,7 +865,8 @@
- (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t)
-
- ;; some relict from Comint mode
-- (setq comint-prompt-regexp singular-comint-prompt-regexp))
-+ (setq comint-prompt-regexp singular-comint-prompt-regexp)
-+ (setq comint-use-prompt-regexp-instead-of-fields 1))
- ;; required to use prompt-regexp
- (setq comint-use-prompt-regexp t)
- ;;}}}
diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
deleted file mode 100644
index ebb40228938..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- kernel/feResource.cc.orig 2010-04-30 10:20:14.000000000 +0000
-+++ kernel/feResource.cc 2010-10-11 09:19:01.431179334 +0000
-@@ -41,7 +41,7 @@
- #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
- #endif
- #else // ! defined(MAKE_DISTRIBUTION)
--#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "@GENTOO_PORTAGE_EPREFIX@/usr"
- #endif // defined(MAKE_DISTRIBUTION)
-
- /*****************************************************************
-@@ -73,33 +73,31 @@
- {
- {"SearchPath", 's', feResPath, NULL,
- "$SINGULARPATH;"
-- "%b/LIB;"
-- "%b/MOD;"
-+ "%r/share/singular/MOD;"
- "%r/LIB;"
-- "%r/../LIB;"
-+ "%r/share/singular/LIB;"
- "%d/LIB;"
-- "%d/../LIB"
- ""},
-- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",(char *)""},
-- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME, (char *)""},
-- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", (char *)""},
-+ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular",(char *)""},
-+ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin", (char *)""},
-+ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", (char *)""},
- {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
-- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", (char *)""},
-- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", (char *)""},
-- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", (char *)""},
-+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/info/singular.info.bz2", (char *)""},
-+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", (char *)""},
-+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", (char *)""},
- #ifdef ix86_Win
- {"HtmlHelpFile",'C', feResFile, "SINGULAR_CHM_FILE", "%r/doc/Manual.chm", (char *)""},
- #endif
- {"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "http://www.singular.uni-kl.de/Manual/"S_VERSION1, (char *)""},
-- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", (char *)""},
-+ {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples", (char *)""},
- {"Path", 'p', feResPath, NULL, "%b;$PATH", (char *)""},
-
- #ifdef ESINGULAR
- {"emacs", 'E', feResBinary,"ESINGULAR_EMACS", "%b/emacs", (char *)""},
- {"xemacs", 'A', feResBinary,"ESINGULAR_EMACS", "%b/xemacs", (char *)""},
- {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR", "%b/Singular", (char *)""},
-- {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", (char *)""},
-- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
-+ {"EmacsLoad", 'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular", (char *)""},
-+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", (char *)""},
- #elif defined(TSINGULAR)
- {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR", "%b/Singular", (char *)""},
- #ifdef ix86_Win
-@@ -108,7 +106,7 @@
- {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", (char *)""},
- #endif
- #else
-- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", (char *)""},
-+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", (char *)""},
- #endif
- {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
---- kernel/mod_raw.cc.orig 2009-11-02 10:12:22.000000000 +0000
-+++ kernel/mod_raw.cc 2010-10-11 09:19:01.432179264 +0000
-@@ -109,11 +109,11 @@
- void* dynl_open_binary_warn(const char* binary_name, const char* msg)
- {
- void* handle = NULL;
-- const char* bin_dir = feGetResource('b');
-+ const char* bin_dir = feGetResource('r');
- if (bin_dir != NULL)
- {
- char path_name[MAXPATHLEN];
-- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
-+ sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name,
- DL_TAIL);
- handle = dynl_open(path_name);
- if (handle == NULL && ! warn_handle)
diff --git a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch b/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
deleted file mode 100644
index 2cc29c9a553..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.2-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Singular/pyobject.cc.orig 2011-01-31 15:03:16.000000000 +0100
-+++ Singular/pyobject.cc 2011-08-24 17:22:57.000000000 +0200
-@@ -14,7 +14,7 @@
-
-
-
--
-+#include <Python.h>
-
- #include <Singular/mod2.h>
-
-@@ -27,7 +27,7 @@
-
- #include <Singular/lists.h>
-
--#include <Python.h>
-+
- #include <iterator> // std::distance
- #include <stdio.h>
-
-@@ -592,11 +592,12 @@
- long len = newElts.size();
- for (long idx = 0; idx < len; ++idx)
- {
-- char* name = newElts[idx][0].str();
-+ PythonObject current (newElts[idx]);
-+ char* name = current.operator[](0).str();
- if (name && (*name != '\0') && (*name != '_'))
- {
- Py_XDECREF(get_current_definition(name));
-- newElts[idx][1].import_as(name);
-+ newElts[idx].operator[](1).import_as(name);
- }
-
- }
---- Singular/pyobject_setup.cc.orig 2011-02-10 19:15:30.000000000 +0100
-+++ Singular/pyobject_setup.cc 2011-08-24 17:23:55.000000000 +0200
-@@ -12,6 +12,7 @@
- **/
- //*****************************************************************************
-
-+#include <Python.h>
- #include <Singular/mod2.h>
- #include <kernel/febase.h>
- #include "static.h"
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch b/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
deleted file mode 100644
index 1d03e61ae30..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-Minor.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Singular/Minor.h 2010-02-02 08:22:24.000000000 -0500
-+++ patches/Minor.h 2011-06-28 13:26:01.000000000 -0400
-@@ -2,6 +2,7 @@
- #define MINOR_H
-
- #include <assert.h>
-+#include <time.h>
- #include <iostream>
- #include <string>
-
diff --git a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch b/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
deleted file mode 100644
index 6a7826c390f..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.3.3-install_name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- kernel/Makefile.in.orig 2011-10-13 23:36:54.000000000 +0200
-+++ kernel/Makefile.in 2011-10-13 23:37:46.000000000 +0200
-@@ -267,7 +267,7 @@
- -rm -f p_Procs_Dynamic p_Procs_Dynamic.exe
-
- p_Procs_%.so: p_Procs_Lib_%.dl_o
-- $(LD) ${SLDFLAGS} -o $@ $^
-+ $(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^
-
- ##
- ## install targets
-
---- Singular/Makefile.in.orig 2011-10-14 23:59:07.000000000 +0200
-+++ Singular/Makefile.in 2011-10-14 23:58:34.000000000 +0200
-@@ -492,7 +492,7 @@
- $(LD) ${SLDFLAGS} -o $@ $^ -L${libdir} ${MP_LIBS} ${GLIBC_DYN_FIX}
-
- dbmsr.so: $(DBMSR_SOURCES:.cc=.dl_o)
-- $(LD) ${SLDFLAGS} -o $@ $^ ${GLIBC_DYN_FIX}
-+ $(LD) ${SLDFLAGS} -install_name @GENTOO_PORTAGE_EPREFIX@/usr/lib/singular/$@ -o $@ $^ ${GLIBC_DYN_FIX}
-
- # dynamic module for python bject support
- pyobject.${MODULE_SUFFIX}: pyobject.dl_o
diff --git a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch b/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
deleted file mode 100644
index edf764a758e..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-factory_template_instantiation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libfac/factor/tmpl_inst.cc b/libfac/factor/tmpl_inst.cc
-index bda287a..2f5ba49 100644
-Index: libfac/factor/tmpl_inst.cc
-===================================================================
---- a/libfac/factor/tmpl_inst.cc
-+++ b/libfac/factor/tmpl_inst.cc
-@@ -3,7 +3,7 @@
- ////////////////////////////////////////////////////////////
-
-
--//#include <templates/ftmpl_array.cc>
-+#include <factory/templates/ftmpl_array.cc>
- //#include <templates/ftmpl_factor.cc>
- #include <templates/ftmpl_list.h>
- #include <factory/templates/ftmpl_list.cc>
-@@ -75,8 +75,8 @@ template OSTREAM & operator << ( OSTREAM &, const List<Variable> & );
- template OSTREAM & operator << ( OSTREAM &, const Array<int> & );
- #endif
-
--template class Array<int>;
--template class Array<Variable>;
-+//template class Array<int>;
-+//template class Array<Variable>;
- //template class Array<REvaluation>;
-
- // for database
diff --git a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch b/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
deleted file mode 100644
index b0330ccdfc8..00000000000
--- a/sci-mathematics/singular/files/singular-3.1.6-ntl6compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Singular/claptmpl.cc b/Singular/claptmpl.cc
-index 0fa6109..553afa5 100644
-Index: Singular/claptmpl.cc
-===================================================================
---- a/Singular/claptmpl.cc
-+++ b/Singular/claptmpl.cc
-@@ -123,3 +123,37 @@ template class std::list<PolyMinorValue>;
- template class Cache<MinorKey, IntMinorValue>;
- template class Cache<MinorKey, PolyMinorValue>;
-
-+#ifdef HAVE_NTL
-+#include<NTL/version.h>
-+#if NTL_MAJOR_VERSION == 6
-+
-+#include<NTL/tools.h>
-+#include<NTL/lzz_pE.h>
-+#include<NTL/lzz_pEX.h>
-+#include<NTL/lzz_p.h>
-+#include<NTL/vector.h>
-+#include<NTL/pair.h>
-+#include<NTL/GF2X.h>
-+#include<NTL/GF2EX.h>
-+#include<NTL/ZZ.h>
-+#include<NTL/ZZX.h>
-+#include<NTL/ZZ_pX.h>
-+#ifdef NTL_CLIENT // in <NTL/tools.h>: using of name space NTL
-+NTL_CLIENT
-+#endif
-+template class Vec<zz_p>;
-+template class Vec<zz_pE>;
-+template class Mat<zz_p>;
-+template class Mat<zz_pE>;
-+template class Mat<ZZ>;
-+template class Vec<Pair<zz_pEX, long> >;
-+template class Vec<Pair<GF2EX, long> >;
-+template class Vec<Pair<ZZX, long> >;
-+template class Vec<Pair<ZZ_pX, long> >;
-+template class Vec<Pair<GF2X, long> >;
-+template void swap<zz_pE>(Vec<zz_pE>&, Vec<zz_pE>&);
-+template long operator==<zz_p>(Vec<zz_p> const&, Vec<zz_p> const&);
-+template Vec<Pair<zz_pX, long> >& Vec<Pair<zz_pX, long> >::operator=(const Vec<Pair<zz_pX, long> >&);
-+#endif
-+
-+#endif
diff --git a/sci-mathematics/singular/singular-3.1.6.ebuild b/sci-mathematics/singular/singular-3.1.6.ebuild
deleted file mode 100644
index 1aaa7290760..00000000000
--- a/sci-mathematics/singular/singular-3.1.6.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils elisp-common flag-o-matic multilib prefix python-single-r1 versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators -)
-MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
-# Note: Upstream's share tarball may not get updated on every release
-MY_SHARE_DIR="3-1-6"
-MY_PV_SHARE="${MY_PV}"
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-
-SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/"
-SRC_URI="${SRC_COM}${MY_DIR}/${MY_PN}-${MY_PV}.tar.gz
- ${SRC_COM}${MY_SHARE_DIR}/${MY_PN}-${MY_PV_SHARE}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="boost doc emacs examples python readline test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/gmp:0=
- dev-libs/ntl:0=
- emacs? ( >=virtual/emacs-22 )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- boost? ( dev-libs/boost:0= )"
-
-# Upstream does not care about tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${MY_DIR}"
-
-pkg_setup() {
- append-flags -fPIC
- append-ldflags -fPIC
- tc-export CC CPP CXX
- use emacs && elisp-need-emacs 22
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare () {
- epatch \
- "${FILESDIR}"/${PN}-3.1.0-gentoo.patch \
- "${FILESDIR}"/${PN}-3.1.0-emacs-22.patch \
- "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch \
- "${FILESDIR}"/${PN}-3.1.3.3-Minor.h.patch \
- "${FILESDIR}"/${PN}-3.1.6-ntl6compat.patch \
- "${FILESDIR}"/${PN}-3.1.6-factory_template_instantiation.patch
- use python && epatch "${FILESDIR}"/${PN}-3.1.3.2-python.patch
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- epatch "${FILESDIR}"/${PN}-3.1.3.3-install_name.patch
- eprefixify kernel/Makefile.in
- eprefixify Singular/Makefile.in
- fi
-
- eprefixify kernel/feResource.cc
-
- # The SLDFLAGS mangling prevents passing raw LDLAGS to gcc (see e.g. bug 414709)
- sed -i \
- -e "/CXXFLAGS/ s/--no-exceptions//g" \
- -e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"\n\t \tSLDFLAGS2=\"${LDFLAGS} -shared\"/" \
- -e "s/ SLDFLAGS=/ SLDFLAGS=\n SLDFLAGS2=/" \
- -e "s/AC_SUBST(SLDFLAGS)/AC_SUBST(SLDFLAGS)\nAC_SUBST(SLDFLAGS2)/" \
- "${S}"/Singular/configure.in || die
-
- sed -i \
- -e "s/@SLDFLAGS@/@SLDFLAGS@\nSLDFLAGS2\t= @SLDFLAGS2@/" \
- -e "/\$(CXX).*SLDFLAGS/s/SLDFLAGS/SLDFLAGS2/" \
- "${S}"/Singular/Makefile.in || die
-
- # remove ntl sources for safety.
- rm -r ntl || die
-
- cd "${S}"/Singular || die "failed to cd into Singular/"
-
- eautoconf
-}
-
-src_configure() {
- econf \
- --prefix="${S}"/build \
- --exec-prefix="${S}"/build \
- --bindir="${S}"/build/bin \
- --libdir="${S}"/build/lib \
- --libexecdir="${S}"/build/lib \
- --includedir="${S}"/build/include \
- --with-apint=gmp \
- --with-NTL \
- --disable-doc \
- --without-MP \
- --without-flint \
- --enable-factory \
- --enable-libfac \
- --enable-IntegerProgramming \
- --enable-Singular \
- --with-malloc=system \
- $(use_with python python embed) \
- $(use_with boost Boost) \
- $(use_enable emacs) \
- $(use_with readline)
-}
-
-src_compile() {
- emake
- if use emacs; then
- cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}/emacs/
- elisp-compile *.el
- fi
-}
-
-src_test() {
- # Tests fail to link -lsingular, upstream ticket #243
- emake test
-}
-
-src_install () {
- dodoc README
- # execs and libraries
- cd "${S}"/build/bin
- dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
- insinto /usr/$(get_libdir)/${PN}
- doins *.so
-
- dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
- dosym ${MY_PN}-${MY_DIR} /usr/bin/${PN}
-
- # stuff from the share tar ball
- cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
- insinto /usr/share/${PN}
- doins -r LIB
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
- if use doc; then
- dohtml -r html/*
- insinto /usr/share/${PN}
- doins doc/singular.idx
- cp info/${PN}.hlp info/${PN}.info &&
- doinfo info/${PN}.info
- fi
- if use emacs; then
- elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs*
- elisp-site-file-install "${FILESDIR}"/60${PN}-gentoo.el
- fi
-}
-
-pkg_postinst() {
- einfo "The authors ask you to register as a SINGULAR user."
- einfo "Please check the license file for details."
- if use emacs; then
- echo
- ewarn "Please note that the ESingular emacs wrapper has been"
- ewarn "removed in favor of full fledged singular support within"
- ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
- ewarn "and you should be good to go! See bug #193411 for more info."
- echo
- fi
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2021-05-30 11:51 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2021-05-30 11:51 UTC (permalink / raw
To: gentoo-commits
commit: f5a5d0813ad3e632e5e1c24e2f26a361e9285e74
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 11:15:25 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun May 30 11:50:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a5d081
sci-mathematics/singular: remove outdated versions and patches.
Closes: https://bugs.gentoo.org/712004
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/singular/Manifest | 4 -
.../singular-4.0.0-fix-omalloc-ar-detection.patch | 12 -
.../files/singular-4.0.2-ntl8-compat.patch | 38 ---
.../files/singular-4.0.3-fix-destdir.patch | 26 --
.../files/singular-4.0.3-fix-resources-name.patch | 307 ---------------------
sci-mathematics/singular/metadata.xml | 3 -
sci-mathematics/singular/singular-4.0.2.ebuild | 137 ---------
sci-mathematics/singular/singular-4.0.3.ebuild | 98 -------
8 files changed, 625 deletions(-)
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index a0d12ebf497..6b537a9d225 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,5 +1 @@
-DIST singular-4.0.2-share.tar.gz 8789162 BLAKE2B 357a68f68cc0508e4e197427c56232da60412a8380045ac594cbe313bf6a403068d1724f637d47de44e66baf34c74fa5c4ee622721c5bbd67764e65e66c8583a SHA512 068827df04a5d1b4407dbaab1296d0120071dc109b749037b02263d51906852a5c2c1ef321733953a181c2d3d0fe799c197ef0af3b9341810ecf31a5324e0a25
-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.0-fix-omalloc-ar-detection.patch b/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
deleted file mode 100644
index 87b44234af5..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.0-fix-omalloc-ar-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN singular-4.0.0.orig/omalloc/configure.ac singular-4.0.0/omalloc/configure.ac
---- singular-4.0.0.orig/omalloc/configure.ac 2014-03-06 18:07:49.000000000 +0100
-+++ singular-4.0.0/omalloc/configure.ac 2014-05-09 15:41:19.755097185 +0200
-@@ -117,7 +117,7 @@
- dnl check for programs
- dnl
- AC_CHECK_PROG(AR, ar, ar, :)
--if test "$ac_cv_prog_AR" != ar; then
-+if test "$ac_cv_prog_AR" = no; then
- AC_MSG_ERROR(*** ar program not found)
- fi
- AC_CHECK_PROGS(PERL, perl, "no")
diff --git a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch b/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
deleted file mode 100644
index d3e6b77a28e..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.2-ntl8-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/factory/NTLconvert.cc b/factory/NTLconvert.cc
-index 41ce9b2..e32093d 100644
---- a/factory/NTLconvert.cc
-+++ b/factory/NTLconvert.cc
-@@ -30,6 +30,7 @@
- #include <NTL/GF2EXFactoring.h>
- #include <NTL/tools.h>
- #include <NTL/mat_ZZ.h>
-+#include <NTL/version.h>
- #include "int_int.h"
- #include <limits.h>
- #include "NTLconvert.h"
-@@ -500,8 +501,14 @@ convertZZ2CF (const ZZ & a)
- return CanonicalForm(coeff_long);
- }
- else
-- {
-- long sizeofrep= ((long *) a.rep) [1];
-+ {
-+ const long * rep =
-+#if NTL_MAJOR_VERSION <= 6
-+ static_cast<long *>( a.rep );
-+#else
-+ static_cast<long *>( a.rep.rep ); // what about NTL7?
-+#endif
-+ long sizeofrep= rep[1];
- bool lessZero= false;
- if (sizeofrep < 0)
- {
-@@ -519,7 +526,7 @@ convertZZ2CF (const ZZ & a)
- cf_stringtemp_l= sizeofrep*sizeof(mp_limb_t)*2;
- cf_stringtemp= (unsigned char*) Alloc (cf_stringtemp_l);
- }
-- int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) (((long *) (a.rep)) + 2), sizeofrep);
-+ int cc= mpn_get_str (cf_stringtemp, 16, (mp_limb_t *) ((rep) + 2), sizeofrep);
-
- char* cf_stringtemp2;
- if (lessZero)
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
deleted file mode 100644
index caeed33f1fc..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7eac42b467723a83a951218be53785411be3dbc4 Mon Sep 17 00:00:00 2001
-From: jgmbenoit <quatermaster@rezozer.net>
-Date: Thu, 28 Apr 2016 05:47:53 +0000
-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
deleted file mode 100644
index bcda4ced647..00000000000
--- a/sci-mathematics/singular/files/singular-4.0.3-fix-resources-name.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From a3a6a07858b7e91c4c8a3c8d07e53957a8547af2 Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-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 +-
- libpolys/configure.ac | 8 ++++----
- m4/options.m4 | 10 +++++-----
- resources/Makefile.am | 18 +++++++++---------
- resources/configure.ac | 6 +++---
- resources/feFopen.cc | 2 +-
- resources/feResource.cc | 2 +-
- resources/omFindExec.c | 2 +-
- resources/resources.pc.in | 17 -----------------
- resources/singular_resources.pc.in | 17 +++++++++++++++++
- 13 files changed, 49 insertions(+), 48 deletions(-)
- delete mode 100644 resources/resources.pc.in
- create mode 100644 resources/singular_resources.pc.in
-
-diff --git a/Singular/Makefile.am b/Singular/Makefile.am
-index e2bcc23..be84a08 100644
---- a/Singular/Makefile.am
-+++ b/Singular/Makefile.am
-@@ -176,7 +176,7 @@ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
- # ESingular_LDFLAGS = -static ${AM_LDFLAGS}
- ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
-
-
- ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
-@@ -186,7 +186,7 @@ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
- # TSingular_LDFLAGS = -static ${AM_LDFLAGS}
- TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
- ${top_builddir}/libpolys/misc/libmisc.la ${top_builddir}/omalloc/libomalloc.la \
--${top_builddir}/resources/libresources.la
-+${top_builddir}/resources/libsingular_resources.la
-
- TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
- # utils.cc utils.h
-diff --git a/autogen.sh b/autogen.sh
-index d027997..0d09c08 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -4,6 +4,7 @@ cd `dirname "$0"`
-
- # -d --warnings=all
- autoreconf -v -f -i
-+find . -name configure -exec sed -i "s/-g -O2/-g/g" {} \; -print
-
- cd -
-
-diff --git a/factory/configure.ac b/factory/configure.ac
-index 7ea255b..a9caf73 100644
---- a/factory/configure.ac
-+++ b/factory/configure.ac
-@@ -120,10 +120,10 @@ AM_CONDITIONAL(
- [WITH_PARSER_FOR_CANONICAL_FORM],
- [test "x$enable_streamio" = xyes])
-
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
-
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
- if test "x$with_Singular" = xyes;
- then
- AC_MSG_RESULT(yes)
-@@ -134,7 +134,7 @@ then
- AC_MSG_CHECKING([ RESOURCES_LIBS?..])
- AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
-
-- PKG_REQUIRE="$PKG_REQUIRE resources"
-+ PKG_REQUIRE="$PKG_REQUIRE singular_resources"
- AC_SUBST(PKG_REQUIRE)
- else
- AC_MSG_RESULT(no)
-diff --git a/gfanlib/configure.ac b/gfanlib/configure.ac
-index 015134c..d3d2cd7 100644
---- a/gfanlib/configure.ac
-+++ b/gfanlib/configure.ac
-@@ -2,7 +2,7 @@
- # Process this file with autoconf to produce a configure script.
-
- AC_PREREQ([2.63])
--AC_INIT([libgfan], [0.1], [ren@mathematik.uni-kl.de])
-+AC_INIT([libgfan], [0.6], [ren@mathematik.uni-kl.de])
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
- AC_CONFIG_SRCDIR([gfanlib.h])
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index 049e44d..4b2f1ae 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -90,10 +90,10 @@ SING_CHECK_OMALLOC()
-
- ENABLE_RESOURCES="yes"
-
--AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libresources] )
--AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libresources] )
-+AC_ARG_VAR( [RESOURCES_INCLUDES], [INCLUDES for libsingular_resources] )
-+AC_ARG_VAR( [RESOURCES_LIBS], [LIBS for libsingular_resources] )
-
--AC_MSG_CHECKING(whether libresources should be used)
-+AC_MSG_CHECKING(whether libsingular_resources should be used)
-
- if test "x$ENABLE_RESOURCES" = xyes;
- then
-@@ -105,7 +105,7 @@ then
- AC_MSG_CHECKING([ RESOURCES_LIBS?..])
- AC_MSG_RESULT(${RESOURCES_LIBS:-unset})
-
-- PKG_REQUIRE="$PKG_REQUIRE resources"
-+ PKG_REQUIRE="$PKG_REQUIRE singular_resources"
- AC_SUBST(PKG_REQUIRE)
- else
- AC_MSG_RESULT(no)
-diff --git a/m4/options.m4 b/m4/options.m4
-index 31b86e4..066dc4d 100644
---- a/m4/options.m4
-+++ b/m4/options.m4
-@@ -150,19 +150,19 @@ AC_DEFUN([SING_USE_OMALLOC],
-
- AC_DEFUN([SING_USE_RESOURCES],
- [
-- AC_ARG_ENABLE(resources,
-- [AS_HELP_STRING([--disable-resources], [do NOT use libresources within the factory])],
-+ AC_ARG_ENABLE(singular_resources,
-+ [AS_HELP_STRING([--disable-singular_resources], [do NOT use libsingular_resources within the factory])],
- [if test "x$enableval" = "xyes"; then
- ENABLE_RESOURCES=yes
- fi],
- ENABLE_RESOURCES=yes)
-
-- AC_MSG_CHECKING(whether to use libresources in factory and co.)
-+ AC_MSG_CHECKING(whether to use libsingular_resources in factory and co.)
- if test "x$ENABLE_RESOURCES" = xyes; then
- AC_MSG_RESULT(yes)
- RESOURCES_INCLUDES="-I$ac_abs_top_srcdir "
-
-- RESOURCES_LIBS="$ac_abs_top_builddir/resources/libresources.la"
-+ RESOURCES_LIBS="$ac_abs_top_builddir/resources/libsingular_resources.la"
-
- AC_SUBST(RESOURCES_INCLUDES)
- AC_SUBST(RESOURCES_LIBS)
-@@ -171,7 +171,7 @@ AC_DEFUN([SING_USE_RESOURCES],
-
- ac_configure_args="$ac_configure_args $ENABLE_ARG"
-
-- PKG_REQUIRE="$PKG_REQUIRE resources"
-+ PKG_REQUIRE="$PKG_REQUIRE singular_resources"
- AC_SUBST(PKG_REQUIRE)
- else
- AC_MSG_RESULT(no)
-diff --git a/resources/Makefile.am b/resources/Makefile.am
-index fa69ccc..934175b 100644
---- a/resources/Makefile.am
-+++ b/resources/Makefile.am
-@@ -1,24 +1,24 @@
- ACLOCAL_AMFLAGS = -I ../m4
-
--libresources_LTLIBRARIES = libresources.la
-+libsingular_resources_LTLIBRARIES = libsingular_resources.la
-
--libresourcesdir = $(libdir)
-+libsingular_resourcesdir = $(libdir)
-
-
- AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
-
-
- SOURCES = omFindExec.c feResource.cc feFopen.cc
--libresources_la_SOURCES = $(SOURCES)
-+libsingular_resources_la_SOURCES = $(SOURCES)
-
--libresources_la_LDFLAGS = -release ${PACKAGE_VERSION}
-+libsingular_resources_la_LDFLAGS = -release ${PACKAGE_VERSION}
-
--libresources_includedir =$(includedir)/resources
-+libsingular_resources_includedir =$(includedir)/resources
-
--libresources_include_HEADERS = omFindExec.h feResource.h feFopen.h
-+libsingular_resources_include_HEADERS = omFindExec.h feResource.h feFopen.h
-
--nodist_libresources_include_HEADERS = resourcesconfig.h
--DISTCLEANFILES = $(nodist_libresources_include_HEADERS)
-+nodist_libsingular_resources_include_HEADERS = singular_resourcesconfig.h
-+DISTCLEANFILES = $(nodist_libsingular_resources_include_HEADERS)
-
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = resources.pc
-+pkgconfig_DATA = singular_resources.pc
-diff --git a/resources/configure.ac b/resources/configure.ac
-index bc5f294..212a1d5 100644
---- a/resources/configure.ac
-+++ b/resources/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([resources], [4.0.3])
-+AC_INIT([singular_resources], [4.0.3])
-
- AC_CONFIG_MACRO_DIR([../m4])
- AC_CONFIG_AUX_DIR([../build-aux])
-@@ -14,7 +14,7 @@ dnl Check if build env is sane
- AM_SANITY_CHECK
-
- # Add pre'prefixed config
--AX_PREFIX_CONFIG_H([resourcesconfig.h],[],[_config.h])
-+AX_PREFIX_CONFIG_H([singular_resourcesconfig.h],[],[_config.h])
-
- SING_RESET_FLAGS()
- SING_CHECK_SET_ARGS()
-@@ -70,5 +70,5 @@ AX_RECURSIVE_EVAL([[$]datadir], [config_datadir])
- AX_NORMALIZE_PATH([config_datadir],['/'])
- AC_DEFINE_UNQUOTED([DATA_DIR],"$config_datadir",[datadir])
-
--AC_CONFIG_FILES([resources.pc Makefile])
-+AC_CONFIG_FILES([singular_resources.pc Makefile])
- AC_OUTPUT
-diff --git a/resources/feFopen.cc b/resources/feFopen.cc
-index 98cfd44..10800a0 100644
---- a/resources/feFopen.cc
-+++ b/resources/feFopen.cc
-@@ -1,4 +1,4 @@
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "feFopen.h"
-
-diff --git a/resources/feResource.cc b/resources/feResource.cc
-index 49a6855..a3accf9 100644
---- a/resources/feResource.cc
-+++ b/resources/feResource.cc
-@@ -5,7 +5,7 @@
- * ABSTRACT: management of resources
- */
-
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
- #include "feResource.h"
- #include "omFindExec.h"
-
-diff --git a/resources/omFindExec.c b/resources/omFindExec.c
-index e79f2c8..1d5852a 100644
---- a/resources/omFindExec.c
-+++ b/resources/omFindExec.c
-@@ -6,7 +6,7 @@
- *******************************************************************/
-
-
--#include "resourcesconfig.h"
-+#include "singular_resourcesconfig.h"
-
-
- #if defined(HAVE_UNISTD_H) && defined(STDC_HEADERS)
-diff --git a/resources/resources.pc.in b/resources/resources.pc.in
-deleted file mode 100644
-index d040056..0000000
---- a/resources/resources.pc.in
-+++ /dev/null
-@@ -1,17 +0,0 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--
--Name: @PACKAGE@
--Description: The Singular resources manager
--Version: @PACKAGE_VERSION@
--URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
--
--# Requires:
--# Conflicts:
--
--Cflags: -I${includedir} @SINGULAR_CFLAGS@
--Libs: -L${libdir} -l@PACKAGE@
--# Libs.private:
--
-diff --git a/resources/singular_resources.pc.in b/resources/singular_resources.pc.in
-new file mode 100644
-index 0000000..d040056
---- /dev/null
-+++ b/resources/singular_resources.pc.in
-@@ -0,0 +1,17 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE@
-+Description: The Singular resources manager
-+Version: @PACKAGE_VERSION@
-+URL: https://github.com/Singular/Sources/tree/spielwiese/@PACKAGE@
-+
-+# Requires:
-+# Conflicts:
-+
-+Cflags: -I${includedir} @SINGULAR_CFLAGS@
-+Libs: -L${libdir} -l@PACKAGE@
-+# Libs.private:
-+
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index faab92efd93..d17eda6d58f 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -5,7 +5,4 @@
<email>sci-mathematics@gentoo.org</email>
<name>Gentoo Mathematics Project</name>
</maintainer>
- <use>
- <flag name="boost">Compile against external boost headers (<pkg>dev-libs/boost</pkg>)</flag>
- </use>
</pkgmetadata>
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
deleted file mode 100644
index c6650033710..00000000000
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch elisp-common flag-o-matic toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-MY_SHARE_DIR="${WORKDIR}"/share/
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
- https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
- >=dev-libs/ntl-5.5.1
- emacs? ( >=app-editors/emacs-23.1:* )
- sci-mathematics/flint
- sci-mathematics/4ti2
- sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
- dev-lang/perl
- boost? ( dev-libs/boost )
- readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
- append-flags "-fPIC"
- append-ldflags "-fPIC"
- tc-export AR CC CPP CXX
-}
-
-src_prepare() {
- # Need to do something about resources later...
- # epatch "${FILESDIR}"/${PN}-4.0.0-gentoo.patch
-
- # omalloc's old configure will fail if ar is not exactly 'ar'.
- epatch "${FILESDIR}"/${PN}-4.0.0-fix-omalloc-ar-detection.patch
-
- epatch "${FILESDIR}"/${PN}-4.0.2-ntl8-compat.patch
-
- # autoreconf everything since otherwise it assumes autmake-1.13 is installed
- eautoreconf
-}
-
-src_configure() {
- econf --with-gmp \
- --with-ntl \
- --with-flint \
- --enable-gfanlib \
- --disable-debug \
- --disable-doc \
- --enable-factory \
- --enable-libfac \
- --enable-IntegerProgramming \
- $(use_with python python embed) \
- $(use_with boost Boost) \
- $(use_enable emacs) \
- $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
- emake
-
- if use emacs; then
- cd "${MY_SHARE_DIR}"singular/emacs/
- elisp-compile *.el || die "elisp-compile failed"
- fi
-}
-
-# src_install() {
-# dodoc README
-# # execs and libraries
-# cd "${S}"/build/bin
-# dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL
-# insinto /usr/$(get_libdir)/${PN}
-# doins *.so
-#
-# dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN}
-#
-# # stuff from the share tar ball
-# cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR}
-# insinto /usr/share/${PN}
-# doins -r LIB
-# if use examples; then
-# insinto /usr/share/doc/${PF}
-# doins -r examples
-# fi
-# if use doc; then
-# dohtml -r html/*
-# insinto /usr/share/${PN}
-# doins doc/singular.idx
-# cp info/${PN}.hlp info/${PN}.info &&
-# doinfo info/${PN}.info \
-# || die "failed to install info files"
-# fi
-# if use emacs; then
-# elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
-# || die "elisp-install failed"
-# elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-# fi
-# }
-
-pkg_postinst() {
- einfo "The authors ask you to register as a SINGULAR user."
- einfo "Please check the license file for details."
-
- if use emacs; then
- echo
- ewarn "Please note that the ESingular emacs wrapper has been"
- ewarn "removed in favor of full fledged singular support within"
- ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
- ewarn "and you should be good to go! See bug #193411 for more info."
- echo
- fi
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
deleted file mode 100644
index 3a0712e9be7..00000000000
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools elisp-common flag-o-matic multilib prefix toolchain-funcs versionator
-
-MY_PN=Singular
-MY_PV=$(replace_all_version_separators '.')
-# Consistency is different...
-MY_DIR2=$(get_version_component_range 1-3 ${PV})
-MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
-# This is where the share tarball unpacks to
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="https://www.singular.uni-kl.de/"
-SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
- https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-IUSE="boost doc emacs examples python +readline"
-
-RDEPEND="dev-libs/gmp:0
- >=dev-libs/ntl-5.5.1
- emacs? ( >=app-editors/emacs-23.1:* )
- sci-mathematics/flint
- sci-mathematics/4ti2
- sci-libs/cddlib"
-
-DEPEND="${RDEPEND}
- dev-lang/perl
- boost? ( dev-libs/boost )
- readline? ( sys-libs/readline )"
-
-SITEFILE=60${PN}-gentoo.el
-
-S="${WORKDIR}/${PN}-${MY_DIR2}"
-
-pkg_setup() {
- append-flags "-fPIC"
- append-ldflags "-fPIC"
- tc-export AR CC CPP CXX
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/"${P}"-fix-resources-name.patch
- eapply "${FILESDIR}"/"${P}"-fix-destdir.patch
- eapply_user
- # autoreconf everything since otherwise it assumes autmake-1.13 is installed
- eautoreconf
-}
-
-src_configure() {
- econf --with-gmp \
- --with-ntl \
- --with-flint \
- --enable-gfanlib \
- --disable-debug \
- --disable-doc \
- --enable-factory \
- --enable-libfac \
- --enable-IntegerProgramming \
- $(use_with python python embed) \
- $(use_with boost Boost) \
- $(use_enable emacs) \
- $(use_with readline) || die "configure failed"
-}
-
-src_compile() {
- emake
-
- if use emacs; then
- cd "${S}"/emacs/
- elisp-compile *.el || die "elisp-compile failed"
- fi
-}
-
-pkg_postinst() {
- einfo "The authors ask you to register as a SINGULAR user."
- einfo "Please check the license file for details."
-
- if use emacs; then
- echo
- ewarn "Please note that the ESingular emacs wrapper has been"
- ewarn "removed in favor of full fledged singular support within"
- ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
- ewarn "and you should be good to go! See bug #193411 for more info."
- echo
- fi
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2021-05-30 14:25 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2021-05-30 14:25 UTC (permalink / raw
To: gentoo-commits
commit: 5399f4f40e04ef04fef15df3039b60b749158f5e
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 14:10:26 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun May 30 14:24:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5399f4f4
sci-mathematics/singular: new upstream version 4.2.0_p3.
Nothing exciting here except rebased patches.
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/singular/Manifest | 1 +
.../files/singular-4.2.0-doc_install.patch | 79 ++++++++++++++++
.../files/singular-4.2.0-gfan_linking.patch | 38 ++++++++
sci-mathematics/singular/singular-4.2.0_p3.ebuild | 104 +++++++++++++++++++++
4 files changed, 222 insertions(+)
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 6b537a9d225..13b96e74c09 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1 +1,2 @@
DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
+DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
new file mode 100644
index 00000000000..b0656d9fb67
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install.patch
@@ -0,0 +1,79 @@
+From 74ec250d3d89d0125c409b3340aca50a00b067ad Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:28:41 -0400
+Subject: [PATCH 3/3] autotools: support docdir and htmldir.
+
+Instead of hard-coding the "doc" and "html" subdirectories,
+allow them to be ./configured.
+---
+ Makefile.am | 8 ++++----
+ configure.ac | 5 +++++
+ resources/configure.ac | 4 ++++
+ resources/feResource.cc | 2 +-
+ 4 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fbea51d..c5d78a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,10 +16,10 @@ bin_SCRIPTS = libsingular-config
+
+ install-data-local:
+ if test -e $(srcdir)/doc/doc.tbz2; then\
+- (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
+- 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 490a45f..997db6c 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 0dc468f..da68144 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 3d75bc9..7e4fc8c 100644
+--- a/resources/feResource.cc
++++ b/resources/feResource.cc
+@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+ {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%D/info/singular.hlp", (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 *)""},
+--
+2.31.1
+
diff --git a/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
new file mode 100644
index 00000000000..267bf19361a
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-gfan_linking.patch
@@ -0,0 +1,38 @@
+From 705149b86a80dd8b53fa8c1717872e9b2e9dbbcb Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 30 May 2021 08:10:10 -0400
+Subject: [PATCH 1/3] gfanlib/Makefile.am: use LIBADD for additional libraries.
+
+The $GMP_LIBS and $CDDGMPLDFLAGS variables were being added to
+libgfan_la_LDFLAGS, which isn't quite correct. Since both contain
+library (-l) flags, they belong in _LIBADD rather than _LDFLAGS:
+
+ https://www.gnu.org/software/automake/manual/html_node/Libtool-Flags.html
+
+This commit moves them to a new libgfan_la_LIBADD variable.
+---
+ gfanlib/Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gfanlib/Makefile.am b/gfanlib/Makefile.am
+index cec8d8f..96e1893 100644
+--- a/gfanlib/Makefile.am
++++ b/gfanlib/Makefile.am
+@@ -18,9 +18,13 @@ AM_CXXFLAGS = @CXX11_FLAG@
+
+ SOURCES = gfanlib_circuittableint.cpp gfanlib_mixedvolume.cpp gfanlib_paralleltraverser.cpp gfanlib_polyhedralfan.cpp gfanlib_polymakefile.cpp gfanlib_symmetriccomplex.cpp gfanlib_symmetry.cpp gfanlib_traversal.cpp gfanlib_zcone.cpp gfanlib_zfan.cpp
+ libgfan_la_SOURCES = $(SOURCES)
+-libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS) $(CDDGMPLDFLAGS) $(GMP_LIBS)
++libgfan_la_LDFLAGS = $(SINGULAR_LDFLAGS)
+ libgfan_la_CPPFLAGS= $(GMP_CPPFLAGS) $(CDDGMPCPPFLAGS)
+
++# Despite the naming convention, $CDDGMPLDFLAGS contains "-lcddgmp"
++# and the rest of the $GMP_LIBS flags.
++libgfan_la_LIBADD = $(CDDGMPLDFLAGS) $(GMP_LIBS)
++
+ noinst_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
+
+ DISTCLEANFILES = config.h
+--
+2.31.1
+
diff --git a/sci-mathematics/singular/singular-4.2.0_p3.ebuild b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
new file mode 100644
index 00000000000..df77bad38d5
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.2.0_p3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Sources"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
+IUSE="emacs examples +readline static-libs"
+
+RDEPEND="dev-libs/gmp:0
+ dev-libs/ntl:=
+ emacs? ( >=app-editors/emacs-23.1:* )
+ sci-mathematics/flint
+ sci-libs/cddlib
+ dev-lang/perl
+ readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-gfan_linking.patch"
+ "${FILESDIR}/${PN}-4.2.0-doc_install.patch"
+ "${FILESDIR}/${PN}-4.2.0-no-static.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-gmp \
+ --with-ntl="${EPREFIX}"/usr \
+ --with-flint \
+ --enable-gfanlib \
+ --disable-debug \
+ --disable-doc \
+ --enable-factory \
+ --enable-libfac \
+ --enable-IntegerProgramming \
+ --disable-polymake \
+ $(use_enable static-libs static) \
+ $(use_enable emacs) \
+ $(use_with readline)
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ pushd "${S}"/emacs
+ elisp-compile *.el || die "elisp-compile failed"
+ popd
+ fi
+}
+
+src_install() {
+ # Do not compress singular's info file (singular.hlp)
+ # some consumer of that file do not know how to deal with compression
+ docompress -x /usr/share/info
+
+ default
+
+ dosym Singular /usr/bin/"${PN}"
+
+ # purge .la file
+ find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+ # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+ # an already installed version of singular may be used and cause segfault
+ # See https://github.com/Singular/Sources/issues/980
+ SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+ einfo "Additional functionality can be enabled by installing"
+ einfo "sci-mathematics/4ti2"
+
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2021-07-02 1:03 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2021-07-02 1:03 UTC (permalink / raw
To: gentoo-commits
commit: 63782cd986f078b8b4bc05c0bb16cb922e6837dc
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Thu Jun 24 10:40:13 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 00:40:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63782cd9
sci-mathematics/singular: fix the doc-install patch
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/singular-4.2.0-doc_install-v2.patch | 63 ++++++++++++++++++++++
.../singular/singular-4.2.0_p3-r1.ebuild | 2 +-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
new file mode 100644
index 00000000000..5e485b14e0c
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.2.0-doc_install-v2.patch
@@ -0,0 +1,63 @@
+diff --git a/Makefile.am b/Makefile.am
+index fbea51d..e9365ab 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,10 +16,11 @@ bin_SCRIPTS = libsingular-config
+
+ install-data-local:
+ if test -e $(srcdir)/doc/doc.tbz2; then\
+- (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
+- mkdir $(DESTDIR)$(datadir)/info;\
+- mkdir $(DESTDIR)$(datadir)/doc;\
+- mv $(DESTDIR)$(datadir)/singular/singular.hlp $(DESTDIR)$(datadir)/info/.;\
++ mkdir -p $(DESTDIR)$(docdir);\
++ mkdir -p $(DESTDIR)$(datadir)/info;\
++ (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 490a45f..997db6c 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 0dc468f..da68144 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 3d75bc9..7e4fc8c 100644
+--- a/resources/feResource.cc
++++ b/resources/feResource.cc
+@@ -85,7 +85,7 @@ VAR feResourceConfig_s feResourceConfigs[] =
+ {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, (char *)""},
+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%D/info/singular.hlp", (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.0_p3-r1.ebuild b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
index 1fc167855af..dd0a6b83be0 100644
--- a/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
+++ b/sci-mathematics/singular/singular-4.2.0_p3-r1.ebuild
@@ -36,7 +36,7 @@ S="${WORKDIR}/${PN}-${MY_DIR2}"
PATCHES=(
"${FILESDIR}/${PN}-4.2.0-gfan_linking.patch"
- "${FILESDIR}/${PN}-4.2.0-doc_install.patch"
+ "${FILESDIR}/${PN}-4.2.0-doc_install-v2.patch"
"${FILESDIR}/${PN}-4.2.0-no-static.patch"
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2022-04-22 0:50 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-04-22 0:50 UTC (permalink / raw
To: gentoo-commits
commit: 63aade48ce1eab3facd2da194df1112516be3f5f
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Wed Apr 6 22:21:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 00:50:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63aade48
sci-mathematics/singular: added upstream fixes for #776643 and #830279
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Bug: https://bugs.gentoo.org/776643
Bug: https://bugs.gentoo.org/830279
Closes: https://github.com/gentoo/gentoo/pull/24888
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../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 | 2 ++
3 files changed, 64 insertions(+)
diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
new file mode 100644
index 000000000000..07df5c0cc068
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
@@ -0,0 +1,29 @@
+From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+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 <errno.h>
++#include <stdio.h>
+
+ // ----------------------------------------
+ // 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 <unistd.h>
diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
new file mode 100644
index 000000000000..72d88979e870
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
@@ -0,0 +1,33 @@
+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
+-
+-p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
+-p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
++p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
+
+ P_PROCS = templates/p_Procs_Lib.cc
+
diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0.ebuild
index 96747b1accfb..e2ccc7d6e9a3 100644
--- a/sci-mathematics/singular/singular-4.3.0.ebuild
+++ b/sci-mathematics/singular/singular-4.3.0.ebuild
@@ -37,6 +37,8 @@ SITEFILE=60${PN}-gentoo.el
PATCHES=(
"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
+ "${FILESDIR}/${PN}-4.3.0-slibtool.patch"
+ "${FILESDIR}/${PN}-4.3.0-includes.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2022-05-27 12:23 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2022-05-27 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 6be66ead89fefe4639d071245b4d151cdf06a581
Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
AuthorDate: Thu May 19 23:22:50 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri May 27 11:57:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be66ead
sci-mathematics/singular: upstream bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/singular/Manifest | 1 +
.../singular/files/singular-4.3.0_p1-gcc12.patch | 85 +++++++++++++++
sci-mathematics/singular/singular-4.3.0_p1.ebuild | 114 +++++++++++++++++++++
3 files changed, 200 insertions(+)
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 3c123f933187..3128bf56af08 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -3,3 +3,4 @@ DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b4
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_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
new file mode 100644
index 000000000000..7654f1710191
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
@@ -0,0 +1,85 @@
+From 5155427417fa722a27c110b2c1939c0979c6dcbc Mon Sep 17 00:00:00 2001
+From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
+Date: Tue, 10 May 2022 16:52:42 +0200
+Subject: [PATCH] fix: gcc-12 does not like offsetof ?
+
+---
+ kernel/oswrapper/vspace.cc | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
+index fa42bf5e28..aefa661600 100644
+--- a/kernel/oswrapper/vspace.cc
++++ b/kernel/oswrapper/vspace.cc
+@@ -197,7 +197,11 @@ static void print_freelists() {
+
+ void vmem_free(vaddr_t vaddr) {
+ lock_allocator();
++ #if defined(__GNUC__) && (__GNUC__>11)
++ vaddr -= (sizeof(vaddr_t)*2);
++ #else
+ vaddr -= offsetof(Block, data);
++ #endif
+ vmem.ensure_is_mapped(vaddr);
+ size_t segno = vmem.segment_no(vaddr);
+ VSeg seg = vmem.segment(vaddr);
+@@ -245,7 +249,11 @@ void vmem_free(vaddr_t vaddr) {
+
+ vaddr_t vmem_alloc(size_t size) {
+ lock_allocator();
++ #if defined(__GNUC__) && (__GNUC__>11)
++ size_t alloc_size = size + (sizeof(vaddr_t)*2);
++ #else
+ size_t alloc_size = size + offsetof(Block, data);
++ #endif
+ int level = find_level(alloc_size);
+ int flevel = level;
+ while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -275,7 +283,11 @@ vaddr_t vmem_alloc(size_t size) {
+ assert(vmem.freelist[level] != VADDR_NULL);
+ Block *block = vmem.block_ptr(vmem.freelist[level]);
+ vaddr_t vaddr = vmem.freelist[level];
++ #if defined(__GNUC__) && (__GNUC__>11)
++ vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++ #else
+ vaddr_t result = vaddr + offsetof(Block, data);
++ #endif
+ vmem.freelist[level] = block->next;
+ if (block->next != VADDR_NULL)
+ vmem.block_ptr(block->next)->prev = VADDR_NULL;
+@@ -751,7 +763,11 @@ static void print_freelists() {
+
+ void vmem_free(vaddr_t vaddr) {
+ lock_allocator();
++ #if defined(__GNUC__) && (__GNUC__>11)
++ vaddr_t vaddr -= (sizeof(vaddr_t)*2);
++ #else
+ vaddr -= offsetof(Block, data);
++ #endif
+ vmem.ensure_is_mapped(vaddr);
+ size_t segno = vmem.segment_no(vaddr);
+ VSeg seg = vmem.segment(vaddr);
+@@ -799,7 +815,11 @@ void vmem_free(vaddr_t vaddr) {
+
+ vaddr_t vmem_alloc(size_t size) {
+ lock_allocator();
++ #if defined(__GNUC__) && (__GNUC__>11)
++ size_t alloc_size = size + (sizeof(vaddr_t)*2);
++ #else
+ size_t alloc_size = size + offsetof(Block, data);
++ #endif
+ int level = find_level(alloc_size);
+ int flevel = level;
+ while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -829,7 +849,11 @@ vaddr_t vmem_alloc(size_t size) {
+ assert(vmem.freelist[level] != VADDR_NULL);
+ Block *block = vmem.block_ptr(vmem.freelist[level]);
+ vaddr_t vaddr = vmem.freelist[level];
++ #if defined(__GNUC__) && (__GNUC__>11)
++ vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++ #else
+ vaddr_t result = vaddr + offsetof(Block, data);
++ #endif
+ vmem.freelist[level] = block->next;
+ if (block->next != VADDR_NULL)
+ vmem.block_ptr(block->next)->prev = VADDR_NULL;
diff --git a/sci-mathematics/singular/singular-4.3.0_p1.ebuild b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
new file mode 100644
index 000000000000..99fc1c61dd9b
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
+SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples polymake +readline static-libs"
+
+RDEPEND="
+ dev-lang/perl
+ dev-libs/gmp:0
+ dev-libs/ntl:=
+ sci-libs/cddlib
+ sci-mathematics/flint
+ emacs? ( >=app-editors/emacs-23.1:* )
+ polymake? ( sci-mathematics/polymake )
+ readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
+ "${FILESDIR}/${PN}-4.3.0_p1-gcc12.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-debug
+ --disable-doc
+ --disable-optimizationflags
+ --disable-pyobject-module
+ --disable-python
+ --disable-python-module
+ --disable-python_module
+ --enable-factory
+ --enable-gfanlib
+ --enable-libfac
+ --with-flint
+ --with-gmp
+ --with-libparse
+ --with-ntl
+ --without-python
+ --without-pythonmodule
+ $(use_enable emacs)
+ $(use_enable polymake polymake-module)
+ $(use_enable static-libs static)
+ $(use_with readline)
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ pushd "${S}"/emacs
+ elisp-compile *.el || die "elisp-compile failed"
+ popd
+ fi
+}
+
+src_install() {
+ # Do not compress singular's info file (singular.hlp)
+ # some consumer of that file do not know how to deal with compression
+ docompress -x /usr/share/info
+
+ default
+
+ dosym Singular /usr/bin/"${PN}"
+
+ # purge .la file
+ find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+ # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+ # an already installed version of singular may be used and cause segfault
+ # See https://github.com/Singular/Sources/issues/980
+ SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+ einfo "Additional functionality can be enabled by installing"
+ einfo "sci-mathematics/4ti2"
+
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/
@ 2024-03-09 19:45 Michael Orlitzky
0 siblings, 0 replies; 7+ messages in thread
From: Michael Orlitzky @ 2024-03-09 19:45 UTC (permalink / raw
To: gentoo-commits
commit: 960c46b14fb392b202a5eb74ca4ca7c7e3417b9e
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 19:44:07 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 19:44:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960c46b1
sci-mathematics/singular: add 4.3.2_p16
Closes: https://bugs.gentoo.org/926459
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-mathematics/singular/Manifest | 1 +
.../singular-4.3.2_p16-test-underlinking.patch | 180 +++++++++++++++++++++
sci-mathematics/singular/singular-4.3.2_p16.ebuild | 115 +++++++++++++
3 files changed, 296 insertions(+)
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index d567474d3cb1..c9cacfd68ac2 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1 +1,2 @@
DIST singular-4.3.2p10.tar.gz 20848377 BLAKE2B 2487eb40c70dca516eca94585c59be0ebfeb43edce87dd16a2874bbefbe502fadcfda1164922ab7738a257e59f9e6b6535b7447702d325b36f1358ed5048c7dd SHA512 9b914e8db2c4936184594200b07d37fc952a1399c3accb1ed30ec4a4b450afd3e3c174343e1169520d0d1ed6ac2e6d261fbbb731082e07b7caced4b5790f295e
+DIST singular-4.3.2p16.tar.gz 20880476 BLAKE2B ce226a6867b764e593ddbf2c71220d9ea14ccdfd956046d5a94dfb768a97927ca3cf961a9ea808cb77028f2c65d989032202d3a0bde555ace945df1e987077a8 SHA512 1dae0e229e124db03e5e240c3ab2f1049c9f77cf369f701c4a2d0767ba9c23baab2d5d14271e415a3ccbf7b9a9297fcf324b8ccc2841a5156d6ee846cb409de2
diff --git a/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch b/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
new file mode 100644
index 000000000000..cf8a66e3944e
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.2_p16-test-underlinking.patch
@@ -0,0 +1,180 @@
+From 23444f771ec95036f6589349da232d8b59734a20 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 9 Mar 2024 14:28:03 -0500
+Subject: [PATCH] **/Makefile.am: links tests with RESOURCES_LIBS
+
+Several test programs use functions from libsingular_resources, such
+as feInitResources(). Here we ensure that those test programs are
+actually linked with libsingular_resources by adding RESOURCES_LIBS to
+the corresponding LDADD lines. In the process, and for consistency, we
+have replaced some references to libomalloc.la with OMALLOC_LIBS.
+---
+ Singular/Makefile.am | 6 +++---
+ kernel/GBEngine/Makefile.am | 2 +-
+ kernel/Makefile.am | 2 +-
+ kernel/combinatorics/Makefile.am | 2 +-
+ kernel/fglm/Makefile.am | 2 +-
+ kernel/groebner_walk/Makefile.am | 2 +-
+ kernel/linear_algebra/Makefile.am | 2 +-
+ kernel/maps/Makefile.am | 2 +-
+ kernel/numeric/Makefile.am | 2 +-
+ kernel/oswrapper/Makefile.am | 2 +-
+ kernel/spectrum/Makefile.am | 2 +-
+ 11 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/Singular/Makefile.am b/Singular/Makefile.am
+index 6e27f805a..c68d2507d 100644
+--- a/Singular/Makefile.am
++++ b/Singular/Makefile.am
+@@ -162,7 +162,7 @@ dist_script_SCRIPTS = singularsurf singularsurf_jupyter singularsurf_win surfex
+ ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR -DPROTO
+ ESingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
+ ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
+-${top_builddir}/resources/libsingular_resources.la
++$(RESOURCES_LIBS)
+
+
+ ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
+@@ -171,7 +171,7 @@ ESingular_SOURCES = emacs.cc feOptES.inc feOpt.cc
+ TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR -DPROTO
+ TSingular_LDADD = ${top_builddir}/libpolys/reporter/libreporter.la \
+ ${top_builddir}/libpolys/misc/libmisc.la ${OMALLOC_LIBS} \
+-${top_builddir}/resources/libsingular_resources.la
++$(RESOURCES_LIBS)
+
+ TSingular_SOURCES = emacs.cc feOptTS.inc feOpt.cc
+ # utils.cc utils.h
+@@ -213,7 +213,7 @@ TESTS=test
+ check_PROGRAMS=$(TESTS)
+
+ test_SOURCES = test.cc
+-test_LDADD = ${builddir}/../omalloc/libomalloc.la libSingular.la
++test_LDADD = $(OMALLOC_LIBS) libSingular.la $(RESOURCES_LIBS)
+
+ #########################################################
+ # These files are built first
+diff --git a/kernel/GBEngine/Makefile.am b/kernel/GBEngine/Makefile.am
+index 8a3c2c5a9..e3a05483c 100644
+--- a/kernel/GBEngine/Makefile.am
++++ b/kernel/GBEngine/Makefile.am
+@@ -21,7 +21,7 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libGBEngine.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libGBEngine.la $(OMALLOC_LIBS) ${builddir}/../combinatorics/libcombinatorics.la ${builddir}/../linear_algebra/liblinear_algebra.la ${builddir}/../libkernelCommon.la ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+
+diff --git a/kernel/Makefile.am b/kernel/Makefile.am
+index fe093a4af..f615eab51 100644
+--- a/kernel/Makefile.am
++++ b/kernel/Makefile.am
+@@ -51,7 +51,7 @@ TESTS = test
+ check_PROGRAMS = $(TESTS)
+
+ test_SOURCES = test.cc
+-test_LDADD = libkernel.la ${builddir}/../omalloc/libomalloc.la ${builddir}/../Singular/libSingular.la
++test_LDADD = libkernel.la $(OMALLOC_LIBS) ${builddir}/../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ # These files are built first
+ # BUILT_SOURCES = MOD
+diff --git a/kernel/combinatorics/Makefile.am b/kernel/combinatorics/Makefile.am
+index 31ab51968..816a99360 100644
+--- a/kernel/combinatorics/Makefile.am
++++ b/kernel/combinatorics/Makefile.am
+@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libcombinatorics.la ${builddir}/../libkernelCommon.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libcombinatorics.la ${builddir}/../libkernelCommon.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/fglm/Makefile.am b/kernel/fglm/Makefile.am
+index 227e2c122..3b32dda76 100644
+--- a/kernel/fglm/Makefile.am
++++ b/kernel/fglm/Makefile.am
+@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libfglm.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libfglm.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/groebner_walk/Makefile.am b/kernel/groebner_walk/Makefile.am
+index 9be32dd76..da3364489 100644
+--- a/kernel/groebner_walk/Makefile.am
++++ b/kernel/groebner_walk/Makefile.am
+@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libgroebner_walk.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libgroebner_walk.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/linear_algebra/Makefile.am b/kernel/linear_algebra/Makefile.am
+index 82149611b..57fc6b5ef 100644
+--- a/kernel/linear_algebra/Makefile.am
++++ b/kernel/linear_algebra/Makefile.am
+@@ -23,6 +23,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = liblinear_algebra.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = liblinear_algebra.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/maps/Makefile.am b/kernel/maps/Makefile.am
+index 6e846ef20..afff63804 100644
+--- a/kernel/maps/Makefile.am
++++ b/kernel/maps/Makefile.am
+@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libmaps.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libmaps.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/numeric/Makefile.am b/kernel/numeric/Makefile.am
+index 8fb48461e..f40e9e60a 100644
+--- a/kernel/numeric/Makefile.am
++++ b/kernel/numeric/Makefile.am
+@@ -18,6 +18,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libnumeric.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libnumeric.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/oswrapper/Makefile.am b/kernel/oswrapper/Makefile.am
+index ed4f2097a..e79f9da6a 100644
+--- a/kernel/oswrapper/Makefile.am
++++ b/kernel/oswrapper/Makefile.am
+@@ -19,6 +19,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = liboswrapper.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = liboswrapper.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+diff --git a/kernel/spectrum/Makefile.am b/kernel/spectrum/Makefile.am
+index 28ef269b3..6eff47819 100644
+--- a/kernel/spectrum/Makefile.am
++++ b/kernel/spectrum/Makefile.am
+@@ -17,6 +17,6 @@ TESTS_ENVIRONMENT += SINGULAR_ROOT_DIR='${abs_top_builddir}'
+ TESTS = test
+ check_PROGRAMS = $(TESTS)
+ test_SOURCES = test.cc
+-test_LDADD = libspectrum.la ${builddir}/../../omalloc/libomalloc.la ${builddir}/../../Singular/libSingular.la
++test_LDADD = libspectrum.la $(OMALLOC_LIBS) ${builddir}/../../Singular/libSingular.la $(RESOURCES_LIBS)
+
+ CLEANFILES = $(TESTS)
+--
+2.43.0
+
diff --git a/sci-mathematics/singular/singular-4.3.2_p16.ebuild b/sci-mathematics/singular/singular-4.3.2_p16.ebuild
new file mode 100644
index 000000000000..a6e8d0e023eb
--- /dev/null
+++ b/sci-mathematics/singular/singular-4.3.2_p16.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common
+
+MY_PN=Singular
+MY_PV=$(ver_rs 3 '')
+# Consistency is different...
+MY_DIR2=$(ver_cut 1-3 ${PV})
+MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
+SRC_URI="https://www.singular.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_DIR2}"
+
+# Most files say "version 2 or version 3 of the License," which is not
+# quite GPL-2+, and is why we have listed GPL-2 below. But AFAIK there
+# are no GPL-2-only files.
+LICENSE="BSD GPL-2 GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
+IUSE="emacs examples polymake +readline"
+
+# The interactive help uses "info" from sys-apps/texinfo.
+RDEPEND="
+ dev-lang/perl
+ dev-libs/gmp:0
+ dev-libs/ntl:=
+ sci-libs/cddlib
+ sci-mathematics/flint
+ sys-apps/texinfo
+ emacs? ( app-editors/emacs:* )
+ polymake? ( sci-mathematics/polymake )
+ readline? ( sys-libs/readline )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE=60${PN}-gentoo.el
+
+PATCHES=(
+ "${FILESDIR}/${P}-test-underlinking.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-debug
+ --disable-doc
+ --disable-optimizationflags
+ --disable-pyobject-module
+ --disable-python
+ --disable-python-module
+ --disable-python_module
+ --enable-factory
+ --enable-gfanlib
+ --enable-libfac
+ --with-flint
+ --with-gmp
+ --with-libparse
+ --with-ntl
+ --without-python
+ --without-pythonmodule
+ $(use_enable emacs)
+ $(use_enable polymake polymake-module)
+ $(use_with readline)
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ pushd "${S}"/emacs
+ elisp-compile *.el || die "elisp-compile failed"
+ popd
+ fi
+}
+
+src_install() {
+ # Do not compress singular's info file (singular.hlp)
+ # some consumer of that file do not know how to deal with compression
+ docompress -x /usr/share/info
+
+ default
+
+ dosym Singular /usr/bin/"${PN}"
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
+
+src_test() {
+ # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
+ # an already installed version of singular may be used and cause segfault
+ # See https://github.com/Singular/Sources/issues/980
+ SINGULAR_PROCS_DIR="" emake check
+}
+
+pkg_postinst() {
+ einfo "Additional functionality can be enabled by installing"
+ einfo "sci-mathematics/4ti2"
+
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-03-09 19:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-09 19:45 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/, sci-mathematics/singular/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2022-05-27 12:23 Michael Orlitzky
2022-04-22 0:50 Sam James
2021-07-02 1:03 Michael Orlitzky
2021-05-30 14:25 Michael Orlitzky
2021-05-30 11:51 Michael Orlitzky
2019-12-07 23:50 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox