Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/Macaulay2/, sci-mathematics/Macaulay2/files/
Date: Sun, 12 Jan 2020 17:42:32
Message-Id: 1578850937.74bee801698ded05acf57e6adddc1cffac2e81fc.zlogene@gentoo
1 commit: 74bee801698ded05acf57e6adddc1cffac2e81fc
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 12 17:42:17 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 12 17:42:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bee801
7
8 sci-mathematics/Macaulay2: remove last-rited pkg
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 .../Macaulay2/Macaulay2-1.8.2.1-r1.ebuild | 136 ---------------------
13 sci-mathematics/Macaulay2/Manifest | 1 -
14 .../files/1.6-paths-of-external-programs.patch | 73 -----------
15 .../Macaulay2/files/70Macaulay2-gentoo.el | 11 --
16 .../Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch | 50 --------
17 sci-mathematics/Macaulay2/metadata.xml | 15 ---
18 6 files changed, 286 deletions(-)
19
20 diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
21 deleted file mode 100644
22 index 0e0cd648a7d..00000000000
23 --- a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild
24 +++ /dev/null
25 @@ -1,136 +0,0 @@
26 -# Copyright 1999-2019 Gentoo Authors
27 -# Distributed under the terms of the GNU General Public License v2
28 -
29 -EAPI=5
30 -
31 -PYTHON_COMPAT=( python2_7 )
32 -
33 -inherit autotools elisp-common eutils flag-o-matic multilib python-single-r1 toolchain-funcs
34 -
35 -# To stop the download madness we now roll our own tarball (Feb 2016)
36 -DESCRIPTION="Research tool for commutative algebra and algebraic geometry"
37 -HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
38 -BASE_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/"
39 -BASE_URI2="https://dev.gentoo.org/~tomka/files/"
40 -SRC_URI="
41 - ${BASE_URI2}/${P}-fat.tar.bz2
42 -"
43 -
44 -SLOT="0"
45 -LICENSE="GPL-2"
46 -KEYWORDS="~amd64 ~arm ~x86"
47 -IUSE="debug emacs +optimization"
48 -
49 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
50 -
51 -DEPEND="${PYTHON_DEPS}
52 - sys-process/time
53 - virtual/pkgconfig"
54 -
55 -RDEPEND="${PYTHON_DEPS}
56 - sys-libs/gdbm
57 - sci-mathematics/pari[gmp]
58 - >=sys-libs/readline-6.1
59 - dev-libs/libxml2:2
60 - sci-mathematics/flint[gc]
61 - sci-mathematics/frobby
62 - sci-mathematics/4ti2
63 - sci-mathematics/nauty
64 - >=sci-mathematics/normaliz-2.8
65 - sci-mathematics/gfan
66 - sci-libs/cdd+
67 - sci-libs/cddlib
68 - sci-libs/lrslib[gmp]
69 - virtual/blas
70 - virtual/lapack
71 - dev-util/ctags
72 - sys-libs/ncurses
73 - >=dev-libs/boehm-gc-7.4[threads]
74 - dev-libs/libatomic_ops
75 - emacs? ( >=app-editors/emacs-23.1:* )"
76 -
77 -SITEFILE=70Macaulay2-gentoo.el
78 -
79 -S="${WORKDIR}/M2/M2"
80 -
81 -pkg_setup () {
82 - tc-export CC CPP CXX PKG_CONFIG
83 - append-cppflags "-I/usr/include/frobby"
84 - # gtest needs python:2
85 - python-single-r1_pkg_setup
86 -}
87 -
88 -src_prepare() {
89 - # Patching .m2 files to look for external programs in
90 - # /usr/bin
91 - epatch "${FILESDIR}"/1.6-paths-of-external-programs.patch
92 -
93 - # Shortcircuit lapack tests
94 - epatch "${FILESDIR}/${P}"-lapack.patch
95 -
96 - eautoreconf
97 -}
98 -
99 -src_configure (){
100 - # Recommended in bug #268064 Possibly unecessary
101 - # but should not hurt anybody.
102 - if ! use emacs; then
103 - tags="ctags"
104 - fi
105 -
106 - # configure instead of econf to enable install with --prefix
107 - ./configure LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" \
108 - --prefix="${D}usr/" \
109 - --libdir='${exec_prefix}'/$(get_libdir)/ \
110 - --disable-encap \
111 - --disable-strip \
112 - --with-issue=Gentoo \
113 - $(use_enable optimization optimize) \
114 - $(use_enable debug) \
115 - --enable-build-libraries="factory" \
116 - --with-unbuilt-programs="4ti2 gfan normaliz nauty cddplus lrslib" \
117 - || die "failed to configure Macaulay"
118 -}
119 -
120 -src_compile() {
121 - # Parallel build not supported yet
122 - emake IgnoreExampleErrors=true -j1
123 -
124 - if use emacs; then
125 - cd "${S}/Macaulay2/emacs" || die
126 - elisp-compile *.el
127 - fi
128 -}
129 -
130 -src_test() {
131 - # No parallel tests yet & Need to increase the time
132 - # limit for long running tests in Schubert2 to pass
133 - emake TLIMIT=750 -j1 check
134 -}
135 -
136 -src_install () {
137 - # Parallel install not supported yet
138 - emake IgnoreExampleErrors=true -j1 install
139 -
140 - # Remove emacs files and install them in the
141 - # correct place if use emacs
142 - rm -rf "${ED}"/usr/share/emacs/site-lisp || die
143 - if use emacs; then
144 - cd "${S}/Macaulay2/emacs" || die
145 - elisp-install ${PN} *.elc *.el
146 - elisp-site-file-install "${FILESDIR}/${SITEFILE}"
147 - fi
148 -}
149 -
150 -pkg_postinst() {
151 - if use emacs; then
152 - elisp-site-regen
153 - elog "If you want to set a hot key for Macaulay2 in Emacs add a line similar to"
154 - elog "(global-set-key [ f12 ] 'M2)"
155 - elog "in order to set it to F12 (or choose a different one)."
156 - fi
157 -}
158 -
159 -pkg_postrm() {
160 - use emacs && elisp-site-regen
161 -}
162
163 diff --git a/sci-mathematics/Macaulay2/Manifest b/sci-mathematics/Macaulay2/Manifest
164 deleted file mode 100644
165 index 7c39a605a0c..00000000000
166 --- a/sci-mathematics/Macaulay2/Manifest
167 +++ /dev/null
168 @@ -1 +0,0 @@
169 -DIST Macaulay2-1.8.2.1-fat.tar.bz2 26102483 BLAKE2B 3841505051b544cc2bc2c302032120b0019e8cd7bf5573c958e0309bf40fbb89f5a57da81759f5880d2fb2c1bc586c3af4b5488500cad43699e7562da0f4f821 SHA512 64f7ea9b01cdb308023a55d8ab8bd6733540f25161dacf27052c071e143418c68c639d5115cf32540c11594b70eae14473f4ef6ce5bd12b6df0722da7c13dd2c
170
171 diff --git a/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch b/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch
172 deleted file mode 100644
173 index 4c090deec9d..00000000000
174 --- a/sci-mathematics/Macaulay2/files/1.6-paths-of-external-programs.patch
175 +++ /dev/null
176 @@ -1,73 +0,0 @@
177 -diff -U 3 -dHrN M2source/Macaulay2/packages/FourTiTwo.m2 M2source.patch/Macaulay2/packages/FourTiTwo.m2
178 ---- M2source/Macaulay2/packages/FourTiTwo.m2 2011-09-22 14:36:51.000000000 +0100
179 -+++ M2source.patch/Macaulay2/packages/FourTiTwo.m2 2011-09-24 21:24:12.000000000 +0100
180 -@@ -47,7 +47,7 @@
181 -
182 - path'4ti2 = (options FourTiTwo).Configuration#"path"
183 - -- NOTE: the absolute path should be put into the .init file for 4ti2 inside the .Macaulay2 directory.
184 --if path'4ti2 == "" then path'4ti2 = prefixDirectory | currentLayout#"programs"
185 -+if path'4ti2 == "" then path'4ti2 = "/usr/bin/"
186 -
187 - getFilename = () -> (
188 - filename := temporaryFileName();
189 -diff -U 3 -dHrN M2source/Macaulay2/packages/gfanInterface.m2 M2source.patch/Macaulay2/packages/gfanInterface.m2
190 ---- M2source/Macaulay2/packages/gfanInterface.m2 2011-05-14 12:00:59.000000000 +0100
191 -+++ M2source.patch/Macaulay2/packages/gfanInterface.m2 2011-09-24 21:24:12.000000000 +0100
192 -@@ -25,7 +25,7 @@
193 - }
194 -
195 - gfan'path = gfanInterface#Options#Configuration#"path"
196 --if gfan'path == "" then gfan'path = prefixDirectory | currentLayout#"programs"
197 -+if gfan'path == "" then gfan'path = "/usr/bin/"
198 - if instance(gfan'path, String) then gfan'path = {gfan'path}
199 - if not instance(gfan'path,List) then error "expected configuration option gfan'path to be a list of strings or a string"
200 - gfan'path = join(
201 -diff -U 3 -dHrN M2source/Macaulay2/packages/NautyGraphs.m2 M2source.patch/Macaulay2/packages/NautyGraphs.m2
202 ---- M2source/Macaulay2/packages/NautyGraphs.m2 2011-08-26 11:05:30.000000000 +0100
203 -+++ M2source.patch/Macaulay2/packages/NautyGraphs.m2 2011-09-24 21:25:53.000000000 +0100
204 -@@ -32,7 +32,7 @@
205 - -- Check the ~/.Macaulay2/init-NautyGraphs.m2 file for the absolute path.
206 - -- If it's not there, then use the M2-Programs directory.
207 - nauty'path = (options NautyGraphs).Configuration#"path";
208 --if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
209 -+if nauty'path == "" then nauty'path = "/usr/bin/";
210 -
211 - -------------------
212 - -- Exports
213 -diff -U 3 -dHrN M2source/Macaulay2/packages/Nauty.m2 M2source.patch/Macaulay2/packages/Nauty.m2
214 ---- M2source/Macaulay2/packages/Nauty.m2 2011-08-26 11:05:30.000000000 +0100
215 -+++ M2source.patch/Macaulay2/packages/Nauty.m2 2011-09-24 21:24:12.000000000 +0100
216 -@@ -48,7 +48,8 @@
217 - -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path.
218 - -- If it's not there, then use the M2-Programs directory.
219 - nauty'path = (options Nauty).Configuration#"path";
220 --if nauty'path == "" then nauty'path = prefixDirectory | currentLayout#"programs";
221 -+if nauty'path == "" then nauty'path = "/usr/bin/";
222 -+
223 -
224 - -------------------
225 - -- Exports
226 -diff -U 3 -dHrN M2source/Macaulay2/packages/Normaliz.m2 M2source.patch/Macaulay2/packages/Normaliz.m2
227 ---- M2source/Macaulay2/packages/Normaliz.m2 2011-05-25 16:47:50.000000000 +0100
228 -+++ M2source.patch/Macaulay2/packages/Normaliz.m2 2011-09-24 21:24:12.000000000 +0100
229 -@@ -166,7 +166,7 @@
230 - nmzExec="normaliz";
231 - );
232 - -- return nmzExec;
233 -- return prefixDirectory | currentLayout#"programs" | nmzExec;
234 -+ return "/usr/bin/" | nmzExec;
235 - );
236 -
237 -
238 -diff -U 3 -dHrN M2source/Macaulay2/packages/StatePolytope.m2 M2source.patch/Macaulay2/packages/StatePolytope.m2
239 ---- M2source/Macaulay2/packages/StatePolytope.m2 2010-09-10 16:47:20.000000000 +0100
240 -+++ M2source.patch/Macaulay2/packages/StatePolytope.m2 2011-09-24 21:24:12.000000000 +0100
241 -@@ -31,7 +31,7 @@
242 -
243 -
244 - gfanCommand = (options StatePolytope)#Configuration#"gfan command"
245 --if gfanCommand === "gfan" then gfanCommand = prefixDirectory | currentLayout#"programs" | gfanCommand
246 -+if gfanCommand === "gfan" then gfanCommand = "/usr/bin/" | gfanCommand
247 - gfanCommand = "!" | gfanCommand
248 -
249 - --The next two functions print out the ring and the ideal in the format required by gfan
250
251 diff --git a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el b/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
252 deleted file mode 100644
253 index ac86e2132ed..00000000000
254 --- a/sci-mathematics/Macaulay2/files/70Macaulay2-gentoo.el
255 +++ /dev/null
256 @@ -1,11 +0,0 @@
257 -;; sci-mathematics/Macaulay2 init file
258 -
259 -(add-to-list 'load-path "/usr/share/emacs/site-lisp/Macaulay2")
260 -
261 -(defvar M2-exe "/usr/bin/M2" "*The default Macaulay2 executable name.")
262 -(autoload 'M2 "M2.el" "Run Macaulay 2 in a buffer." t)
263 -(autoload 'Macaulay2 "M2" "Run Macaulay 2 in a buffer, non-interactive." t)
264 -(autoload 'M2-mode "M2" "Macaulay 2 editing mode" t)
265 -(autoload 'm2-mode "M2" "Macaulay 2 editing mode, name in lower case" t)
266 -(autoload 'm2-comint-mode "M2" "Macaulay 2 command interpreter mode, name in lower case" t)
267 -(setq auto-mode-alist (append auto-mode-alist '(("\\.m2$" . M2-mode))))
268 \ No newline at end of file
269
270 diff --git a/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch b/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch
271 deleted file mode 100644
272 index 25185e7c560..00000000000
273 --- a/sci-mathematics/Macaulay2/files/Macaulay2-1.8.2.1-lapack.patch
274 +++ /dev/null
275 @@ -1,50 +0,0 @@
276 ---- configure.ac 2015-09-03 14:49:42.000000000 +0200
277 -+++ configure.ac.new 2016-01-27 12:50:07.812215547 +0100
278 -@@ -1301,46 +1301,7 @@
279 - BUILTLIBS="$SINGULARLIBS $BUILTLIBS"
280 - fi
281 -
282 --# we need to do the fortran library testing last, in case AC_SEARCH_LIBS adds
283 --# one of them to $LIBS, making it impossible to check for the presence of C or
284 --# C++ libraries. (I'm not sure why putting -llapack on the gcc command line
285 --# needlessly causes the library to be linked against.)
286 --FORTRANUSED=no
287 --if test "$LAPACK" = yes
288 --then AC_MSG_CHECKING([whether the Accelerate framework is available])
289 -- SAVELIBS=$LIBS LIBS="-framework Accelerate $LIBS"
290 -- AC_LANG(C)
291 -- AC_LINK_IFELSE(
292 -- [AC_LANG_PROGRAM(,[sgemv_();dgetrf_();])],
293 -- [
294 -- AC_MSG_RESULT(yes)
295 -- ],
296 -- [
297 -- AC_MSG_RESULT(no)
298 -- LIBS=$SAVELIBS
299 -- FORTRANUSED=yes
300 -- if test $BUILD_lapack = no
301 -- then AC_LANG(Fortran)
302 -- if test "$FC" = ""
303 -- then AC_MSG_ERROR(no fortran compiler found)
304 -- else AC_MSG_NOTICE(using fortran compiler $FC)
305 -- fi
306 -- AC_SEARCH_LIBS(sgemv,blas f77blas,,BUILD_lapack=yes)
307 -- AC_SEARCH_LIBS(dgetrf,lapack,,BUILD_lapack=yes)
308 -- fi
309 -- ])
310 --fi
311 --test $BUILD_lapack = yes && BUILTLIBS="-llapack -lrefblas $BUILTLIBS"
312 --
313 --if test $BUILD_lapack = yes
314 --then # test whether the fortran compiler can handle lapack, which, starting with
315 -- # version 3.2, requires fortran 90, not fortran 77
316 -- AC_LANG(Fortran)
317 -- AC_MSG_CHECKING([whether the fortran compiler is modern enough for lapack])
318 -- AC_COMPILE_IFELSE([instrinsic maxloc],
319 -- AC_MSG_ERROR(the fortran compiler ($FC) does not support the Fortran 90 language required for compiling lapack),
320 -- AC_MSG_RESULT(yes))
321 --fi
322 -+BUILTLIBS="$(${PKG_CONFIG} --libs lapack) $BUILTLIBS"
323 -
324 - test "$USE_FCLIBS" = no && FCLIBS=
325 - test "$FORTRANUSED" = no && FCLIBS=
326
327 diff --git a/sci-mathematics/Macaulay2/metadata.xml b/sci-mathematics/Macaulay2/metadata.xml
328 deleted file mode 100644
329 index 76821a208f0..00000000000
330 --- a/sci-mathematics/Macaulay2/metadata.xml
331 +++ /dev/null
332 @@ -1,15 +0,0 @@
333 -<?xml version="1.0" encoding="UTF-8"?>
334 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
335 -<pkgmetadata>
336 - <maintainer type="project">
337 - <email>sci-mathematics@g.o</email>
338 - <name>Gentoo Mathematics Project</name>
339 - </maintainer>
340 - <use>
341 - <flag name="optimization">Accept upstream's choices for -O option, i.e. -O3 almost everywhere.</flag>
342 - </use>
343 - <longdescription lang="en">
344 - Macaulay2 is a research tool for algraic geometry and commutative
345 - algebra.
346 -</longdescription>
347 -</pkgmetadata>