Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-libs/spooles/files/, sci-libs/spooles/
Date: Mon, 03 Feb 2020 06:06:26
Message-Id: 1580709812.23339c791743e8d0778f8473b2c25b66e23bf5c8.mgorny@gentoo
1 commit: 23339c791743e8d0778f8473b2c25b66e23bf5c8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 3 06:00:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 3 06:03:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23339c79
7
8 sci-libs/spooles: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/568364
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sci-libs/spooles/Manifest | 1 -
15 sci-libs/spooles/files/Make.inc.in | 9 ---
16 .../spooles/files/spooles-2.2-I2Ohash-64bit.patch | 28 ---------
17 sci-libs/spooles/files/spooles-2.2-formats.patch | 17 ------
18 sci-libs/spooles/files/spooles-2.2-makefiles.patch | 47 ---------------
19 sci-libs/spooles/metadata.xml | 22 -------
20 sci-libs/spooles/spooles-2.2.ebuild | 67 ----------------------
21 8 files changed, 192 deletions(-)
22
23 diff --git a/profiles/package.mask b/profiles/package.mask
24 index cb66de8bd65..821cd1c77e5 100644
25 --- a/profiles/package.mask
26 +++ b/profiles/package.mask
27 @@ -800,7 +800,6 @@ games-util/xboxgw
28 sci-libs/jmol-acme
29 sci-libs/libcore
30 sci-libs/naga
31 -sci-libs/spooles
32
33 # Tomáš Mózes <hydrapolic@g.o> (2019-12-19)
34 # Needs more testing.
35
36 diff --git a/sci-libs/spooles/Manifest b/sci-libs/spooles/Manifest
37 deleted file mode 100644
38 index dcbe9e7e2bc..00000000000
39 --- a/sci-libs/spooles/Manifest
40 +++ /dev/null
41 @@ -1 +0,0 @@
42 -DIST spooles.2.2.tgz 4510271 BLAKE2B 86adc0764709f772526909942bcbe034209838c7284e7c1245293e4acb84e9a02511428f0659607de3b39ffecdc02c6b60e4015a8c8905da34b2b15688edab34 SHA512 440146b4abf81d8e66a7c57e839b06b11c7753e16d40ae67f80255d6d5dc9fb43b4fd549326c405a8f3009223fcb0f6997090b3649029c323c732b0759944d19
43
44 diff --git a/sci-libs/spooles/files/Make.inc.in b/sci-libs/spooles/files/Make.inc.in
45 deleted file mode 100644
46 index 1557f9fe979..00000000000
47 --- a/sci-libs/spooles/files/Make.inc.in
48 +++ /dev/null
49 @@ -1,9 +0,0 @@
50 -.POSIX:
51 -THREAD_LIBS = -lpthread
52 -CC = @CC@
53 -AR = @AR@
54 -RANLIB = @RANLIB@
55 -ARFLAGS = rv
56 -.c.a :
57 - $(CC) $(CFLAGS) -c $<
58 - $(AR) $(ARFLAGS) $@ $*.o
59
60 diff --git a/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch b/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
61 deleted file mode 100644
62 index 0f608da2afc..00000000000
63 --- a/sci-libs/spooles/files/spooles-2.2-I2Ohash-64bit.patch
64 +++ /dev/null
65 @@ -1,28 +0,0 @@
66 ---- spooles-2.2/I2Ohash/src/util.c~ 1998-05-30 18:45:12.000000000 -0400
67 -+++ spooles-2.2/I2Ohash/src/util.c 2008-06-28 20:56:49.000000000 -0400
68 -@@ -39,9 +39,10 @@
69 - */
70 - loc1 = (key1 + 1) % hashtable->nlist ;
71 - loc2 = (key2 + 1) % hashtable->nlist ;
72 --loc = (loc1*loc2) % hashtable->nlist ;
73 -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ;
74 -+loc =(int) loc3;
75 - #if MYDEBUG > 0
76 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
77 -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
78 - fflush(stdout) ;
79 - #endif
80 - /*
81 -@@ -158,9 +159,10 @@
82 - #endif
83 - loc1 = (key1 + 1) % hashtable->nlist ;
84 - loc2 = (key2 + 1) % hashtable->nlist ;
85 --loc = (loc1*loc2) % hashtable->nlist ;
86 -+long int loc3 = (long int)loc1*(long int)loc2 % hashtable->nlist ;
87 -+loc =(int) loc3;
88 - #if MYDEBUG > 0
89 --fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %d", loc1, loc2, loc) ;
90 -+fprintf(stdout, "\n loc1 = %d, loc2 = %d, loc3 = %ld, loc = %d", loc1, loc2, loc3, loc) ;
91 - fflush(stdout) ;
92 - #endif
93 - /*
94
95 diff --git a/sci-libs/spooles/files/spooles-2.2-formats.patch b/sci-libs/spooles/files/spooles-2.2-formats.patch
96 deleted file mode 100644
97 index 080574e730d..00000000000
98 --- a/sci-libs/spooles/files/spooles-2.2-formats.patch
99 +++ /dev/null
100 @@ -1,17 +0,0 @@
101 ---- SolveMap/src/setup.c.orig 2011-03-05 18:08:51.000000000 +0000
102 -+++ SolveMap/src/setup.c 2011-03-05 18:16:50.000000000 +0000
103 -@@ -28,12 +28,12 @@
104 - ---------------
105 - */
106 - if ( solvemap == NULL ) {
107 -- fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
108 -+ fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
109 - "\n solvemap is NULL\n") ;
110 - exit(-1) ;
111 - }
112 - if ( myid < 0 || myid >= solvemap->nproc ) {
113 -- fprintf(stderr, "\n fatal error in SolveMap_forwardSetup(%p,%d)"
114 -+ fprintf(stderr, "\n fatal error in SolveMap_forwardSetup"
115 - "\n myid %d, solvemap->nproc %d\n", myid, solvemap->nproc) ;
116 - exit(-1) ;
117 - }
118
119 diff --git a/sci-libs/spooles/files/spooles-2.2-makefiles.patch b/sci-libs/spooles/files/spooles-2.2-makefiles.patch
120 deleted file mode 100644
121 index 4af8e083736..00000000000
122 --- a/sci-libs/spooles/files/spooles-2.2-makefiles.patch
123 +++ /dev/null
124 @@ -1,47 +0,0 @@
125 ---- MPI/makefile~ 1998-12-17 15:47:44.000000000 +0000
126 -+++ MPI/makefile 2008-02-26 00:10:57.000000000 +0000
127 -@@ -2,7 +2,7 @@
128 - cd drivers ; make drivers
129 -
130 - lib :
131 -- cd src ; make spoolesMPI.a
132 -+ cd src ; make makeLib
133 -
134 - clean :
135 - cd src ; make clean
136 ---- MPI/src/makefile~ 1998-12-16 21:54:41.000000000 +0000
137 -+++ MPI/src/makefile 2008-02-26 00:08:16.000000000 +0000
138 -@@ -42,3 +42,8 @@
139 -
140 - clean :
141 - - rm -f *.a *.o
142 -+
143 -+makeLib :
144 -+ perl ../../makeLib > makeG
145 -+ make -f makeG
146 -+ rm -f makeG
147 ---- MT/makefile~ 1998-12-17 15:47:48.000000000 +0000
148 -+++ MT/makefile 2008-02-26 00:12:43.000000000 +0000
149 -@@ -2,7 +2,7 @@
150 - cd drivers ; make drivers
151 -
152 - lib :
153 -- cd src ; make spoolesMT.a
154 -+ cd src ; make makeLib
155 -
156 - clean :
157 - cd src ; make clean
158 ---- makeLib~ 2011-03-05 16:44:12.000000000 +0000
159 -+++ makeLib 2011-03-05 17:46:58.000000000 +0000
160 -@@ -70,8 +70,8 @@
161 - .c.o :
162 - $(PURIFY) $(CC) -c $(CFLAGS) $*.c -o $(OBJ)_$*.o
163 -
164 --../../spooles.a : ${OBJ_FILES}
165 -- $(AR) $(ARFLAGS) ../../spooles.a $(OBJ)_*.o
166 -+../../libspooles.a : ${OBJ_FILES}
167 -+ $(AR) $(ARFLAGS) ../../libspooles.a $(OBJ)_*.o
168 - rm -f $(OBJ)_*.o
169 -- $(RANLIB) ../../spooles.a
170 -+ $(RANLIB) ../../libspooles.a
171 - EOF
172
173 diff --git a/sci-libs/spooles/metadata.xml b/sci-libs/spooles/metadata.xml
174 deleted file mode 100644
175 index 4f2c1ace32a..00000000000
176 --- a/sci-libs/spooles/metadata.xml
177 +++ /dev/null
178 @@ -1,22 +0,0 @@
179 -<?xml version="1.0" encoding="UTF-8"?>
180 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
181 -<pkgmetadata>
182 - <maintainer type="project">
183 - <email>sci@g.o</email>
184 - <name>Gentoo Science Project</name>
185 - </maintainer>
186 - <longdescription lang="en">
187 - SPOOLES is a library for solving sparse real and complex linear
188 - systems of equations, written in the C language using object
189 - oriented design. At present, there is the following functionality:
190 - 1. Compute multiple minimum degree, generalized nested dissection
191 - and multisection orderings of matrices with symmetric structure.
192 - 2. Factor and solve square linear systems of equations with
193 - symmetric structure, with or without pivoting for stability.
194 - 3. Factor and solve overdetermined full rank systems of equations
195 - using a multifrontal QR factorization.
196 - 4. Solve square linear systems using a variety of Krylov iterative
197 - methods. The preconditioner is a drop tolerance factorization,
198 - with or without pivoting for stability.
199 - </longdescription>
200 -</pkgmetadata>
201
202 diff --git a/sci-libs/spooles/spooles-2.2.ebuild b/sci-libs/spooles/spooles-2.2.ebuild
203 deleted file mode 100644
204 index cd1a944ec56..00000000000
205 --- a/sci-libs/spooles/spooles-2.2.ebuild
206 +++ /dev/null
207 @@ -1,67 +0,0 @@
208 -# Copyright 1999-2012 Gentoo Foundation
209 -# Distributed under the terms of the GNU General Public License v2
210 -
211 -EAPI=4
212 -inherit eutils toolchain-funcs versionator flag-o-matic
213 -
214 -MYP=${PN}.${PV}
215 -
216 -DESCRIPTION="SParse Object Oriented Linear Equations Solver"
217 -HOMEPAGE="http://www.netlib.org/linalg/spooles"
218 -SRC_URI="http://www.netlib.org/linalg/${PN}/${MYP}.tgz"
219 -
220 -LICENSE="public-domain"
221 -SLOT="0"
222 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
223 -IUSE="mpi static-libs threads"
224 -
225 -RDEPEND="mpi? ( virtual/mpi )"
226 -DEPEND="${RDEPEND}"
227 -
228 -S="${WORKDIR}"
229 -
230 -make_shared_lib() {
231 - local soname=$(basename "${1%.a}").so.$(get_major_version)
232 - einfo "Making ${soname}"
233 - ${2:-$(tc-getCC)} ${LDFLAGS} \
234 - -shared -Wl,-soname="${soname}" \
235 - -Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
236 - -o $(dirname "${1}")/"${soname}" || return 1
237 -}
238 -
239 -src_prepare() {
240 - epatch "${FILESDIR}"/${P}-I2Ohash-64bit.patch
241 - epatch "${FILESDIR}"/${P}-makefiles.patch
242 - epatch "${FILESDIR}"/${P}-formats.patch
243 - find . -name makefile -exec \
244 - sed -i -e 's:make:$(MAKE):g' '{}' \;
245 - sed -e "s/@CC@/$(tc-getCC)/" \
246 - -e "s/@AR@/$(tc-getAR)/" \
247 - -e "s/@RANLIB@/$(tc-getRANLIB)/" \
248 - "${FILESDIR}"/Make.inc.in > Make.inc || die
249 -}
250 -
251 -src_compile () {
252 - append-flags -fPIC
253 - emake lib
254 - use threads && emake -C MT lib
255 - use mpi && emake -C MPI CC=mpicc lib
256 - make_shared_lib libspooles.a $(use mpi && echo mpicc) || die "shared lib failed"
257 - if use static-libs; then
258 - filter-flags -fPIC
259 - emake clean
260 - emake lib
261 - use threads && emake -C MT lib
262 - use mpi && emake -C MPI CC=mpicc lib
263 - fi
264 -}
265 -
266 -src_install () {
267 - dolib.so libspooles.so.2
268 - dosym libspooles.so.2 /usr/$(get_libdir)/libspooles.so
269 - use static-libs && dolib.a libspooles.a
270 - find . -name '*.h' -print0 | \
271 - xargs -0 -n1 --replace=headerfile install -D headerfile tmp/headerfile
272 - insinto /usr/include/${PN}
273 - doins -r tmp/*
274 -}