Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/singular/files/, sci-mathematics/singular/
Date: Fri, 27 May 2022 12:23:12
Message-Id: 1653652651.9a8b90b9ade6af143558eaa0b5769177703a8028.mjo@gentoo
1 commit: 9a8b90b9ade6af143558eaa0b5769177703a8028
2 Author: François Bissey <frp.bissey <AT> gmail <DOT> com>
3 AuthorDate: Thu May 19 23:25:25 2022 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 11:57:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8b90b9
7
8 sci-mathematics/singular: clean singular 4.3.0
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: François René Pierre Bissey <frp.bissey <AT> gmail.com>
12 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
13
14 sci-mathematics/singular/Manifest | 1 -
15 .../singular/files/singular-4.3.0-includes.patch | 29 ------
16 .../singular/files/singular-4.3.0-slibtool.patch | 33 ------
17 sci-mathematics/singular/singular-4.3.0.ebuild | 115 ---------------------
18 4 files changed, 178 deletions(-)
19
20 diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
21 index 3128bf56af08..d5014a7d783e 100644
22 --- a/sci-mathematics/singular/Manifest
23 +++ b/sci-mathematics/singular/Manifest
24 @@ -2,5 +2,4 @@ DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892
25 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
26 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
27 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
28 -DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f SHA512 b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
29 DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
30
31 diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
32 deleted file mode 100644
33 index 07df5c0cc068..000000000000
34 --- a/sci-mathematics/singular/files/singular-4.3.0-includes.patch
35 +++ /dev/null
36 @@ -1,29 +0,0 @@
37 -From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
38 -From: Hans Schoenemann <hannes@×××××××××××××××××.de>
39 -Date: Wed, 19 Jan 2022 15:02:14 +0100
40 -Subject: [PATCH] fix: missing includes
41 -
42 ----
43 - kernel/oswrapper/feread.cc | 2 ++
44 - 1 file changed, 2 insertions(+)
45 -
46 -diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
47 -index ccdd272285..5491007478 100644
48 ---- a/kernel/oswrapper/feread.cc
49 -+++ b/kernel/oswrapper/feread.cc
50 -@@ -7,6 +7,7 @@
51 -
52 - #include "kernel/mod2.h"
53 - #include <errno.h>
54 -+#include <stdio.h>
55 -
56 - // ----------------------------------------
57 - // system settings:
58 -@@ -21,6 +22,7 @@
59 - #include "misc/options.h"
60 -
61 - #include "kernel/oswrapper/feread.h"
62 -+#include "reporter/reporter.h"
63 -
64 - #if defined(HAVE_DYN_RL)
65 - #include <unistd.h>
66
67 diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
68 deleted file mode 100644
69 index 72d88979e870..000000000000
70 --- a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
71 +++ /dev/null
72 @@ -1,33 +0,0 @@
73 -diff --git a/libpolys/configure.ac b/libpolys/configure.ac
74 -index ba7d911..346602f 100644
75 ---- a/libpolys/configure.ac
76 -+++ b/libpolys/configure.ac
77 -@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
78 -
79 - case $host_os in
80 - *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
81 -+ *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
82 - esac
83 -
84 - dnl INCLUDES=""
85 -diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
86 -index 23f216e..119c4ef 100644
87 ---- a/libpolys/polys/Makefile.am
88 -+++ b/libpolys/polys/Makefile.am
89 -@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
90 - p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
91 - p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
92 -
93 --P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace
94 --
95 --p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
96 --p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
97 --p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
98 --p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
99 -+p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
100 -+p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
101 -+p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
102 -+p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
103 -
104 - P_PROCS = templates/p_Procs_Lib.cc
105 -
106
107 diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0.ebuild
108 deleted file mode 100644
109 index e2ccc7d6e9a3..000000000000
110 --- a/sci-mathematics/singular/singular-4.3.0.ebuild
111 +++ /dev/null
112 @@ -1,115 +0,0 @@
113 -# Copyright 1999-2022 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=8
117 -
118 -inherit autotools elisp-common flag-o-matic
119 -
120 -MY_PN=Singular
121 -MY_PV=$(ver_rs 3 '')
122 -# Consistency is different...
123 -MY_DIR2=$(ver_cut 1-3 ${PV})
124 -MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
125 -
126 -DESCRIPTION="Computer algebra system for polynomial computations"
127 -HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
128 -SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
129 -S="${WORKDIR}/${PN}-${MY_DIR2}"
130 -
131 -LICENSE="BSD GPL-2 GPL-3"
132 -SLOT="0"
133 -KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~x86-linux"
134 -IUSE="emacs examples polymake +readline static-libs"
135 -
136 -RDEPEND="
137 - dev-lang/perl
138 - dev-libs/gmp:0
139 - dev-libs/ntl:=
140 - sci-libs/cddlib
141 - sci-mathematics/flint
142 - emacs? ( >=app-editors/emacs-23.1:* )
143 - polymake? ( sci-mathematics/polymake )
144 - readline? ( sys-libs/readline )
145 -"
146 -DEPEND="${RDEPEND}"
147 -
148 -SITEFILE=60${PN}-gentoo.el
149 -
150 -PATCHES=(
151 - "${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
152 - "${FILESDIR}/${PN}-4.3.0-slibtool.patch"
153 - "${FILESDIR}/${PN}-4.3.0-includes.patch"
154 -)
155 -
156 -src_prepare() {
157 - default
158 -
159 - eautoreconf
160 -}
161 -
162 -src_configure() {
163 - local myconf=(
164 - --disable-debug
165 - --disable-doc
166 - --disable-optimizationflags
167 - --disable-pyobject-module
168 - --disable-python
169 - --disable-python-module
170 - --disable-python_module
171 - --enable-factory
172 - --enable-gfanlib
173 - --enable-libfac
174 - --with-flint
175 - --with-gmp
176 - --with-libparse
177 - --with-ntl
178 - --without-python
179 - --without-pythonmodule
180 - $(use_enable emacs)
181 - $(use_enable polymake polymake-module)
182 - $(use_enable static-libs static)
183 - $(use_with readline)
184 - )
185 - econf "${myconf[@]}"
186 -}
187 -
188 -src_compile() {
189 - default
190 -
191 - if use emacs; then
192 - pushd "${S}"/emacs
193 - elisp-compile *.el || die "elisp-compile failed"
194 - popd
195 - fi
196 -}
197 -
198 -src_install() {
199 - # Do not compress singular's info file (singular.hlp)
200 - # some consumer of that file do not know how to deal with compression
201 - docompress -x /usr/share/info
202 -
203 - default
204 -
205 - dosym Singular /usr/bin/"${PN}"
206 -
207 - # purge .la file
208 - find "${ED}" -name '*.la' -delete || die
209 -}
210 -
211 -src_test() {
212 - # SINGULAR_PROCS_DIR need to be set to "" otherwise plugins from
213 - # an already installed version of singular may be used and cause segfault
214 - # See https://github.com/Singular/Sources/issues/980
215 - SINGULAR_PROCS_DIR="" emake check
216 -}
217 -
218 -pkg_postinst() {
219 - einfo "Additional functionality can be enabled by installing"
220 - einfo "sci-mathematics/4ti2"
221 -
222 - use emacs && elisp-site-regen
223 -}
224 -
225 -pkg_postrm() {
226 - use emacs && elisp-site-regen
227 -}