1 |
commit: dcf174e07dd116b576e28b13e4f8ab30541cd9f1 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 31 15:29:22 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 31 15:29:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf174e0 |
7 |
|
8 |
sci-libs/parmgridgen: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/633888 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
profiles/package.mask | 2 - |
14 |
sci-libs/parmgridgen/Manifest | 1 - |
15 |
.../files/parmgridgen-1.0-as-needed.patch | 19 - |
16 |
.../files/parmgridgen-1.0-autotools.patch | 460 --------------------- |
17 |
.../files/parmgridgen-1.0-format-security.patch | 48 --- |
18 |
.../files/parmgridgen-1.0-impl-fct.patch | 70 ---- |
19 |
sci-libs/parmgridgen/metadata.xml | 8 - |
20 |
sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild | 50 --- |
21 |
8 files changed, 658 deletions(-) |
22 |
|
23 |
diff --git a/profiles/package.mask b/profiles/package.mask |
24 |
index 791eececd27..1c83ce405c6 100644 |
25 |
--- a/profiles/package.mask |
26 |
+++ b/profiles/package.mask |
27 |
@@ -508,7 +508,6 @@ sys-libs/libstdc++-v3-bin |
28 |
# media-fonts/hkscs-ming: #640590 |
29 |
# net-print/adobeps: #687000 |
30 |
# sci-chemistry/xdsstat-bin: #673962 |
31 |
-# sci-libs/parmgridgen: #633888 |
32 |
# |
33 |
# Removal in 30 days. |
34 |
games-fps/enemy-territory-etpro |
35 |
@@ -519,7 +518,6 @@ games-strategy/mindrover-demo |
36 |
media-fonts/hkscs-ming |
37 |
net-print/adobeps |
38 |
sci-chemistry/xdsstat-bin |
39 |
-sci-libs/parmgridgen |
40 |
|
41 |
# Stefan Strogin <steils@g.o> (2019-09-27) |
42 |
# Requires >=dev-lang/lua-5.3 which is masked |
43 |
|
44 |
diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest |
45 |
deleted file mode 100644 |
46 |
index fb5fa0dc4aa..00000000000 |
47 |
--- a/sci-libs/parmgridgen/Manifest |
48 |
+++ /dev/null |
49 |
@@ -1 +0,0 @@ |
50 |
-DIST ParMGridGen-1.0.tar.gz 2623528 BLAKE2B 982e6d7a0df3b9c101993ecf397c75f10d0cf390914ccca6f02efbe5ae190c65bc31e5770bd57ff375a8e3a3aab878c56da50af4f3e5f0f422044137d90ddff8 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16 |
51 |
|
52 |
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch |
53 |
deleted file mode 100644 |
54 |
index 3b378552fab..00000000000 |
55 |
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch |
56 |
+++ /dev/null |
57 |
@@ -1,19 +0,0 @@ |
58 |
---- a/MGridGen/Lib/Makefile.am 2009-03-10 09:28:13.000000000 +0200 |
59 |
-+++ b/MGridGen/Lib/Makefile.am 2009-03-10 09:28:07.000000000 +0200 |
60 |
-@@ -8,3 +8,5 @@ |
61 |
- lib_LTLIBRARIES = libMGridGen.la |
62 |
- libMGridGen_la_SOURCES = aratio.c coarsen.c kwayfm.c match.c merge.c mgridgen.c refine.c setup.c |
63 |
- libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
64 |
-+ |
65 |
-+libMGridGen_la_LIBADD = ../IMlib/libIMlib.la |
66 |
---- a/ParMGridGen/ParLib/Makefile.am 2009-03-10 09:31:43.000000000 +0200 |
67 |
-+++ b/ParMGridGen/ParLib/Makefile.am 2009-03-10 09:35:13.000000000 +0200 |
68 |
-@@ -8,3 +8,8 @@ |
69 |
- lib_LTLIBRARIES = libParMGridGen.la |
70 |
- libParMGridGen_la_SOURCES = comm.c debug.c grsetup.c ikeysort.c memory.c move.c parmgridgen.c setup.c util.c |
71 |
- libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
72 |
-+ |
73 |
-+libParMGridGen_la_LIBADD = \ |
74 |
-+ $(top_builddir)/MGridGen/IMlib/libIMlib.la \ |
75 |
-+ $(top_builddir)/MGridGen/Lib/libMGridGen.la \ |
76 |
-+ ../IMParMetis-2.0/ParMETISLib/libIMparmetis.la |
77 |
|
78 |
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch |
79 |
deleted file mode 100644 |
80 |
index 1615f2232e5..00000000000 |
81 |
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-autotools.patch |
82 |
+++ /dev/null |
83 |
@@ -1,460 +0,0 @@ |
84 |
-From bbed136f01cd384bc4083aaca1761be9ee2d2a79 Mon Sep 17 00:00:00 2001 |
85 |
-From: Justin Lecher <jlec@g.o> |
86 |
-Date: Mon, 18 Dec 2017 18:30:09 +0000 |
87 |
-Subject: [PATCH] autotools support |
88 |
- |
89 |
-Signed-off-by: Justin Lecher <jlec@g.o> |
90 |
---- |
91 |
- MGridGen/IMlib/Makefile.am | 8 + |
92 |
- MGridGen/Lib/Makefile.am | 10 ++ |
93 |
- MGridGen/Makefile.am | 4 + |
94 |
- MGridGen/Programs/Makefile.am | 7 + |
95 |
- Makefile.am | 7 + |
96 |
- ParMGridGen/IMParMetis-2.0/Makefile.am | 4 + |
97 |
- ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am | 8 + |
98 |
- ParMGridGen/Makefile.am | 4 + |
99 |
- ParMGridGen/ParLib/Makefile.am | 10 ++ |
100 |
- ParMGridGen/Programs/Makefile.am | 21 +++ |
101 |
- acx_mpi.m4 | 181 +++++++++++++++++++++ |
102 |
- configure.ac | 24 +++ |
103 |
- mgridgen.h | 7 - |
104 |
- mgridgen.pc.in | 10 ++ |
105 |
- parmgridgen.h | 5 - |
106 |
- parmgridgen.pc.in | 10 ++ |
107 |
- 16 files changed, 308 insertions(+), 12 deletions(-) |
108 |
- create mode 100644 MGridGen/IMlib/Makefile.am |
109 |
- create mode 100644 MGridGen/Lib/Makefile.am |
110 |
- create mode 100644 MGridGen/Makefile.am |
111 |
- create mode 100644 MGridGen/Programs/Makefile.am |
112 |
- create mode 100644 Makefile.am |
113 |
- create mode 100644 ParMGridGen/IMParMetis-2.0/Makefile.am |
114 |
- create mode 100644 ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am |
115 |
- create mode 100644 ParMGridGen/Makefile.am |
116 |
- create mode 100644 ParMGridGen/ParLib/Makefile.am |
117 |
- create mode 100644 ParMGridGen/Programs/Makefile.am |
118 |
- create mode 100644 acx_mpi.m4 |
119 |
- create mode 100644 configure.ac |
120 |
- delete mode 100644 mgridgen.h |
121 |
- create mode 100644 mgridgen.pc.in |
122 |
- delete mode 100644 parmgridgen.h |
123 |
- create mode 100644 parmgridgen.pc.in |
124 |
- |
125 |
-diff --git a/MGridGen/IMlib/Makefile.am b/MGridGen/IMlib/Makefile.am |
126 |
-new file mode 100644 |
127 |
-index 0000000..008c259 |
128 |
---- /dev/null |
129 |
-+++ b/MGridGen/IMlib/Makefile.am |
130 |
-@@ -0,0 +1,8 @@ |
131 |
-+## Source directory |
132 |
-+ |
133 |
-+pkginclude_HEADERS = IMlib.h |
134 |
-+pkgincludedir = $(includedir)/mgridgen |
135 |
-+ |
136 |
-+lib_LTLIBRARIES = libIMlib.la |
137 |
-+libIMlib_la_SOURCES = blas.c dfkeysort.c dkeysort.c file.c ifkeysort.c ifloatsort.c iintsort.c ikeysort.c memory.c sort.c util.c |
138 |
-+libIMlib_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
139 |
-diff --git a/MGridGen/Lib/Makefile.am b/MGridGen/Lib/Makefile.am |
140 |
-new file mode 100644 |
141 |
-index 0000000..39946b0 |
142 |
---- /dev/null |
143 |
-+++ b/MGridGen/Lib/Makefile.am |
144 |
-@@ -0,0 +1,10 @@ |
145 |
-+## Source directory |
146 |
-+ |
147 |
-+INCLUDES = -I../IMlib |
148 |
-+ |
149 |
-+pkginclude_HEADERS = defs.h macros.h mgridgen.h proto.h struct.h |
150 |
-+pkgincludedir = $(includedir)/mgridgen |
151 |
-+ |
152 |
-+lib_LTLIBRARIES = libMGridGen.la |
153 |
-+libMGridGen_la_SOURCES = aratio.c coarsen.c kwayfm.c match.c merge.c mgridgen.c refine.c setup.c |
154 |
-+libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
155 |
-diff --git a/MGridGen/Makefile.am b/MGridGen/Makefile.am |
156 |
-new file mode 100644 |
157 |
-index 0000000..040d716 |
158 |
---- /dev/null |
159 |
-+++ b/MGridGen/Makefile.am |
160 |
-@@ -0,0 +1,4 @@ |
161 |
-+## middle directory |
162 |
-+ |
163 |
-+#Build in these directories: |
164 |
-+SUBDIRS= IMlib Lib Programs |
165 |
-diff --git a/MGridGen/Programs/Makefile.am b/MGridGen/Programs/Makefile.am |
166 |
-new file mode 100644 |
167 |
-index 0000000..3fe9ba5 |
168 |
---- /dev/null |
169 |
-+++ b/MGridGen/Programs/Makefile.am |
170 |
-@@ -0,0 +1,7 @@ |
171 |
-+## Source directory |
172 |
-+ |
173 |
-+INCLUDES = -I../IMlib -I../Lib |
174 |
-+ |
175 |
-+bin_PROGRAMS = mgridgen |
176 |
-+mgridgen_SOURCES = io.c mgridgen.c |
177 |
-+mgridgen_LDADD = ../IMlib/libIMlib.la ../Lib/libMGridGen.la -lm |
178 |
-diff --git a/Makefile.am b/Makefile.am |
179 |
-new file mode 100644 |
180 |
-index 0000000..f97504c |
181 |
---- /dev/null |
182 |
-+++ b/Makefile.am |
183 |
-@@ -0,0 +1,7 @@ |
184 |
-+## top directory |
185 |
-+ |
186 |
-+SUBDIRS = MGridGen ParMGridGen |
187 |
-+EXTRA_DIST = VERSION mgridgen.pc.in parmgridgen.pc.in |
188 |
-+ |
189 |
-+pkgconfigdir = $(libdir)/pkgconfig |
190 |
-+pkgconfig_DATA = mgridgen.pc parmgridgen.pc |
191 |
-diff --git a/ParMGridGen/IMParMetis-2.0/Makefile.am b/ParMGridGen/IMParMetis-2.0/Makefile.am |
192 |
-new file mode 100644 |
193 |
-index 0000000..3fa93db |
194 |
---- /dev/null |
195 |
-+++ b/ParMGridGen/IMParMetis-2.0/Makefile.am |
196 |
-@@ -0,0 +1,4 @@ |
197 |
-+## middle directory |
198 |
-+ |
199 |
-+#Build in these directories: |
200 |
-+SUBDIRS= ParMETISLib |
201 |
-diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am |
202 |
-new file mode 100644 |
203 |
-index 0000000..c4d6e33 |
204 |
---- /dev/null |
205 |
-+++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile.am |
206 |
-@@ -0,0 +1,8 @@ |
207 |
-+## Source directory |
208 |
-+ |
209 |
-+pkginclude_HEADERS = defs.h macros.h parmetis.h proto.h rename.h struct.h |
210 |
-+pkgincludedir = $(includedir)/imparmetis |
211 |
-+ |
212 |
-+lib_LTLIBRARIES = libIMparmetis.la |
213 |
-+libIMparmetis_la_SOURCES = coarsen.c comm.c debug.c diffuse.c drivers.c edge_refine.c fused.c grsetup.c iidxsort.c ikeysort.c memory.c remap.c setup.c timer.c util.c var.c |
214 |
-+libIMparmetis_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
215 |
-diff --git a/ParMGridGen/Makefile.am b/ParMGridGen/Makefile.am |
216 |
-new file mode 100644 |
217 |
-index 0000000..0743f65 |
218 |
---- /dev/null |
219 |
-+++ b/ParMGridGen/Makefile.am |
220 |
-@@ -0,0 +1,4 @@ |
221 |
-+## middle directory |
222 |
-+ |
223 |
-+#Build in these directories: |
224 |
-+SUBDIRS= IMParMetis-2.0 ParLib Programs |
225 |
-diff --git a/ParMGridGen/ParLib/Makefile.am b/ParMGridGen/ParLib/Makefile.am |
226 |
-new file mode 100644 |
227 |
-index 0000000..78d03d9 |
228 |
---- /dev/null |
229 |
-+++ b/ParMGridGen/ParLib/Makefile.am |
230 |
-@@ -0,0 +1,10 @@ |
231 |
-+## Source directory |
232 |
-+ |
233 |
-+INCLUDES = -I$(top_builddir)/MGridGen/IMlib |
234 |
-+ |
235 |
-+pkginclude_HEADERS = defs.h macros.h parmgridgen.h proto.h rename.h struct.h |
236 |
-+pkgincludedir = $(includedir)/parmgridgen |
237 |
-+ |
238 |
-+lib_LTLIBRARIES = libParMGridGen.la |
239 |
-+libParMGridGen_la_SOURCES = comm.c debug.c grsetup.c ikeysort.c memory.c move.c parmgridgen.c setup.c util.c |
240 |
-+libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0 |
241 |
-diff --git a/ParMGridGen/Programs/Makefile.am b/ParMGridGen/Programs/Makefile.am |
242 |
-new file mode 100644 |
243 |
-index 0000000..0d586ee |
244 |
---- /dev/null |
245 |
-+++ b/ParMGridGen/Programs/Makefile.am |
246 |
-@@ -0,0 +1,21 @@ |
247 |
-+## Source directory |
248 |
-+ |
249 |
-+INCLUDES = -I../ParLib -I$(top_builddir)/MGridGen/IMlib |
250 |
-+ |
251 |
-+bin_PROGRAMS = parmgridgen |
252 |
-+parmgridgen_SOURCES = io.c main.c parmgridgen.c |
253 |
-+parmgridgen_LDADD = ../IMParMetis-2.0/ParMETISLib/libIMparmetis.la ../ParLib/libParMGridGen.la \ |
254 |
-+ $(top_builddir)/MGridGen/IMlib/libIMlib.la $(top_builddir)/MGridGen/Lib/libMGridGen.la @MPILIBS@ |
255 |
-+ |
256 |
-+# AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib |
257 |
-+# LDADD = $(top_builddir)/METISLib/libmetis.la \ |
258 |
-+# $(top_builddir)/ParMETISLib/libparmetis.la |
259 |
-+ |
260 |
-+# check_PROGRAMS = parmgridgen |
261 |
-+# parmgridgen_SOURCES = io.c main.c parmgridgen.c |
262 |
-+ |
263 |
-+MPIRUN = mpirun -np 4 |
264 |
-+ |
265 |
-+check-local: $(check_PROGRAMS) |
266 |
-+ $(MPIRUN) parmgridgen $(top_builddir)/Graphs/M6.metis 3 4 6 1 4 128 |
267 |
-+ |
268 |
-diff --git a/acx_mpi.m4 b/acx_mpi.m4 |
269 |
-new file mode 100644 |
270 |
-index 0000000..bb2cb31 |
271 |
---- /dev/null |
272 |
-+++ b/acx_mpi.m4 |
273 |
-@@ -0,0 +1,181 @@ |
274 |
-+# =========================================================================== |
275 |
-+# http://autoconf-archive.cryp.to/acx_mpi.html |
276 |
-+# =========================================================================== |
277 |
-+# |
278 |
-+# SYNOPSIS |
279 |
-+# |
280 |
-+# ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) |
281 |
-+# |
282 |
-+# DESCRIPTION |
283 |
-+# |
284 |
-+# This macro tries to find out how to compile programs that use MPI |
285 |
-+# (Message Passing Interface), a standard API for parallel process |
286 |
-+# communication (see http://www-unix.mcs.anl.gov/mpi/) |
287 |
-+# |
288 |
-+# On success, it sets the MPICC, MPICXX, MPIF77, or MPIFC output variable |
289 |
-+# to the name of the MPI compiler, depending upon the current language. |
290 |
-+# (This may just be $CC/$CXX/$F77/$FC, but is more often something like |
291 |
-+# mpicc/mpiCC/mpif77/mpif90.) It also sets MPILIBS to any libraries that |
292 |
-+# are needed for linking MPI (e.g. -lmpi or -lfmpi, if a special |
293 |
-+# MPICC/MPICXX/MPIF77/MPIFC was not found). |
294 |
-+# |
295 |
-+# If you want to compile everything with MPI, you should set: |
296 |
-+# |
297 |
-+# CC="MPICC" #OR# CXX="MPICXX" #OR# F77="MPIF77" #OR# FC="MPIFC" |
298 |
-+# LIBS="$MPILIBS $LIBS" |
299 |
-+# |
300 |
-+# NOTE: The above assumes that you will use $CC (or whatever) for linking |
301 |
-+# as well as for compiling. (This is the default for automake and most |
302 |
-+# Makefiles.) |
303 |
-+# |
304 |
-+# The user can force a particular library/compiler by setting the |
305 |
-+# MPICC/MPICXX/MPIF77/MPIFC and/or MPILIBS environment variables. |
306 |
-+# |
307 |
-+# ACTION-IF-FOUND is a list of shell commands to run if an MPI library is |
308 |
-+# found, and ACTION-IF-NOT-FOUND is a list of commands to run if it is not |
309 |
-+# found. If ACTION-IF-FOUND is not specified, the default action will |
310 |
-+# define HAVE_MPI. |
311 |
-+# |
312 |
-+# LAST MODIFICATION |
313 |
-+# |
314 |
-+# 2008-04-12 |
315 |
-+# |
316 |
-+# COPYLEFT |
317 |
-+# |
318 |
-+# Copyright (c) 2008 Steven G. Johnson <stevenj@××××××××.edu> |
319 |
-+# Copyright (c) 2008 Julian C. Cummings <cummings@××××××××××××.edu> |
320 |
-+# |
321 |
-+# This program is free software: you can redistribute it and/or modify it |
322 |
-+# under the terms of the GNU General Public License as published by the |
323 |
-+# Free Software Foundation, either version 3 of the License, or (at your |
324 |
-+# option) any later version. |
325 |
-+# |
326 |
-+# This program is distributed in the hope that it will be useful, but |
327 |
-+# WITHOUT ANY WARRANTY; without even the implied warranty of |
328 |
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
329 |
-+# Public License for more details. |
330 |
-+# |
331 |
-+# You should have received a copy of the GNU General Public License along |
332 |
-+# with this program. If not, see <http://www.gnu.org/licenses/>. |
333 |
-+# |
334 |
-+# As a special exception, the respective Autoconf Macro's copyright owner |
335 |
-+# gives unlimited permission to copy, distribute and modify the configure |
336 |
-+# scripts that are the output of Autoconf when processing the Macro. You |
337 |
-+# need not follow the terms of the GNU General Public License when using |
338 |
-+# or distributing such scripts, even though portions of the text of the |
339 |
-+# Macro appear in them. The GNU General Public License (GPL) does govern |
340 |
-+# all other use of the material that constitutes the Autoconf Macro. |
341 |
-+# |
342 |
-+# This special exception to the GPL applies to versions of the Autoconf |
343 |
-+# Macro released by the Autoconf Macro Archive. When you make and |
344 |
-+# distribute a modified version of the Autoconf Macro, you may extend this |
345 |
-+# special exception to the GPL to apply to your modified version as well. |
346 |
-+ |
347 |
-+AC_DEFUN([ACX_MPI], [ |
348 |
-+AC_PREREQ(2.50) dnl for AC_LANG_CASE |
349 |
-+ |
350 |
-+AC_LANG_CASE([C], [ |
351 |
-+ AC_REQUIRE([AC_PROG_CC]) |
352 |
-+ AC_ARG_VAR(MPICC,[MPI C compiler command]) |
353 |
-+ AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC) |
354 |
-+ acx_mpi_save_CC="$CC" |
355 |
-+ CC="$MPICC" |
356 |
-+ AC_SUBST(MPICC) |
357 |
-+], |
358 |
-+[C++], [ |
359 |
-+ AC_REQUIRE([AC_PROG_CXX]) |
360 |
-+ AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) |
361 |
-+ AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX) |
362 |
-+ acx_mpi_save_CXX="$CXX" |
363 |
-+ CXX="$MPICXX" |
364 |
-+ AC_SUBST(MPICXX) |
365 |
-+], |
366 |
-+[Fortran 77], [ |
367 |
-+ AC_REQUIRE([AC_PROG_F77]) |
368 |
-+ AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command]) |
369 |
-+ AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77) |
370 |
-+ acx_mpi_save_F77="$F77" |
371 |
-+ F77="$MPIF77" |
372 |
-+ AC_SUBST(MPIF77) |
373 |
-+], |
374 |
-+[Fortran], [ |
375 |
-+ AC_REQUIRE([AC_PROG_FC]) |
376 |
-+ AC_ARG_VAR(MPIFC,[MPI Fortran compiler command]) |
377 |
-+ AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC) |
378 |
-+ acx_mpi_save_FC="$FC" |
379 |
-+ FC="$MPIFC" |
380 |
-+ AC_SUBST(MPIFC) |
381 |
-+]) |
382 |
-+ |
383 |
-+if test x = x"$MPILIBS"; then |
384 |
-+ AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], |
385 |
-+ [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], |
386 |
-+ [Fortran 77], [AC_MSG_CHECKING([for MPI_Init]) |
387 |
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[ call MPI_Init])],[MPILIBS=" " |
388 |
-+ AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])], |
389 |
-+ [Fortran], [AC_MSG_CHECKING([for MPI_Init]) |
390 |
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[ call MPI_Init])],[MPILIBS=" " |
391 |
-+ AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])]) |
392 |
-+fi |
393 |
-+AC_LANG_CASE([Fortran 77], [ |
394 |
-+ if test x = x"$MPILIBS"; then |
395 |
-+ AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"]) |
396 |
-+ fi |
397 |
-+ if test x = x"$MPILIBS"; then |
398 |
-+ AC_CHECK_LIB(fmpich, MPI_Init, [MPILIBS="-lfmpich"]) |
399 |
-+ fi |
400 |
-+], |
401 |
-+[Fortran], [ |
402 |
-+ if test x = x"$MPILIBS"; then |
403 |
-+ AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"]) |
404 |
-+ fi |
405 |
-+ if test x = x"$MPILIBS"; then |
406 |
-+ AC_CHECK_LIB(mpichf90, MPI_Init, [MPILIBS="-lmpichf90"]) |
407 |
-+ fi |
408 |
-+]) |
409 |
-+if test x = x"$MPILIBS"; then |
410 |
-+ AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"]) |
411 |
-+fi |
412 |
-+if test x = x"$MPILIBS"; then |
413 |
-+ AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"]) |
414 |
-+fi |
415 |
-+ |
416 |
-+dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the |
417 |
-+dnl latter uses $CPP, not $CC (which may be mpicc). |
418 |
-+AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then |
419 |
-+ AC_MSG_CHECKING([for mpi.h]) |
420 |
-+ AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS="" |
421 |
-+ AC_MSG_RESULT(no)]) |
422 |
-+fi], |
423 |
-+[C++], [if test x != x"$MPILIBS"; then |
424 |
-+ AC_MSG_CHECKING([for mpi.h]) |
425 |
-+ AC_TRY_COMPILE([#include <mpi.h>],[],[AC_MSG_RESULT(yes)], [MPILIBS="" |
426 |
-+ AC_MSG_RESULT(no)]) |
427 |
-+fi], |
428 |
-+[Fortran 77], [if test x != x"$MPILIBS"; then |
429 |
-+ AC_MSG_CHECKING([for mpif.h]) |
430 |
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS="" |
431 |
-+ AC_MSG_RESULT(no)]) |
432 |
-+fi], |
433 |
-+[Fortran], [if test x != x"$MPILIBS"; then |
434 |
-+ AC_MSG_CHECKING([for mpif.h]) |
435 |
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS="" |
436 |
-+ AC_MSG_RESULT(no)]) |
437 |
-+fi]) |
438 |
-+ |
439 |
-+AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"], |
440 |
-+ [C++], [CXX="$acx_mpi_save_CXX"], |
441 |
-+ [Fortran 77], [F77="$acx_mpi_save_F77"], |
442 |
-+ [Fortran], [FC="$acx_mpi_save_FC"]) |
443 |
-+ |
444 |
-+AC_SUBST(MPILIBS) |
445 |
-+ |
446 |
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: |
447 |
-+if test x = x"$MPILIBS"; then |
448 |
-+ $2 |
449 |
-+ : |
450 |
-+else |
451 |
-+ ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1]) |
452 |
-+ : |
453 |
-+fi |
454 |
-+])dnl ACX_MPI |
455 |
-diff --git a/configure.ac b/configure.ac |
456 |
-new file mode 100644 |
457 |
-index 0000000..daff95e |
458 |
---- /dev/null |
459 |
-+++ b/configure.ac |
460 |
-@@ -0,0 +1,24 @@ |
461 |
-+# -*- Autoconf -*- |
462 |
-+AC_PREREQ(2.61) |
463 |
-+AC_INIT(parmgridgen, 1.0, moulitsa@××××××.edu) |
464 |
-+AM_INIT_AUTOMAKE([foreign]) |
465 |
-+AC_CONFIG_HEADER([config.h]) |
466 |
-+AC_PROG_INSTALL |
467 |
-+AC_PROG_LIBTOOL |
468 |
-+AC_CHECK_LIB(m, sqrt) |
469 |
-+sinclude(acx_mpi.m4) |
470 |
-+AC_LANG_PUSH([C]) |
471 |
-+ACX_MPI([], AC_MSG_ERROR([could not compile an mpi test program])) |
472 |
-+AC_CONFIG_FILES([Makefile |
473 |
-+ mgridgen.pc |
474 |
-+ parmgridgen.pc |
475 |
-+ MGridGen/Makefile |
476 |
-+ MGridGen/IMlib/Makefile |
477 |
-+ MGridGen/Lib/Makefile |
478 |
-+ MGridGen/Programs/Makefile |
479 |
-+ ParMGridGen/Makefile |
480 |
-+ ParMGridGen/IMParMetis-2.0/Makefile |
481 |
-+ ParMGridGen/IMParMetis-2.0/ParMETISLib/Makefile |
482 |
-+ ParMGridGen/ParLib/Makefile |
483 |
-+ ParMGridGen/Programs/Makefile]) |
484 |
-+AC_OUTPUT |
485 |
-diff --git a/mgridgen.h b/mgridgen.h |
486 |
-deleted file mode 100644 |
487 |
-index e1bfa2e..0000000 |
488 |
---- a/mgridgen.h |
489 |
-+++ /dev/null |
490 |
-@@ -1,7 +0,0 @@ |
491 |
--typedef int idxtype; |
492 |
--typedef double realtype; |
493 |
-- |
494 |
-- |
495 |
--void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *, |
496 |
-- int, int, int *, int *, int *, idxtype *); |
497 |
-- |
498 |
-diff --git a/mgridgen.pc.in b/mgridgen.pc.in |
499 |
-new file mode 100644 |
500 |
-index 0000000..d84810c |
501 |
---- /dev/null |
502 |
-+++ b/mgridgen.pc.in |
503 |
-@@ -0,0 +1,10 @@ |
504 |
-+prefix=@prefix@ |
505 |
-+exec_prefix=@exec_prefix@ |
506 |
-+libdir=@libdir@ |
507 |
-+includedir=@includedir@ |
508 |
-+ |
509 |
-+Name: MGridGen |
510 |
-+Description: Software for generating coarse grids |
511 |
-+Version: @VERSION@ |
512 |
-+Libs: -L${libdir} -lIMlib -lMGridGen |
513 |
-+Cflags: -I${includedir}/mgridgen |
514 |
-diff --git a/parmgridgen.h b/parmgridgen.h |
515 |
-deleted file mode 100644 |
516 |
-index 6a1a637..0000000 |
517 |
---- a/parmgridgen.h |
518 |
-+++ /dev/null |
519 |
-@@ -1,5 +0,0 @@ |
520 |
--typedef int idxtype; |
521 |
--typedef double realtype; |
522 |
-- |
523 |
--void ParMGridGen(idxtype *, idxtype *, realtype *, realtype *, idxtype *, |
524 |
-- realtype *, int *, int, int, int *, idxtype *, MPI_Comm *); |
525 |
-diff --git a/parmgridgen.pc.in b/parmgridgen.pc.in |
526 |
-new file mode 100644 |
527 |
-index 0000000..a11a597 |
528 |
---- /dev/null |
529 |
-+++ b/parmgridgen.pc.in |
530 |
-@@ -0,0 +1,10 @@ |
531 |
-+prefix=@prefix@ |
532 |
-+exec_prefix=@exec_prefix@ |
533 |
-+libdir=@libdir@ |
534 |
-+includedir=@includedir@ |
535 |
-+ |
536 |
-+Name: ParMGridGen |
537 |
-+Description: Software for parallel (mpi) generating coarse grids |
538 |
-+Version: @VERSION@ |
539 |
-+Libs: -L${libdir} -lIMparmetis -lParMGridGen |
540 |
-+Cflags: -I${includedir}/imparmetis -I${includedir}/parmgridgen |
541 |
--- |
542 |
-2.15.1 |
543 |
- |
544 |
|
545 |
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch |
546 |
deleted file mode 100644 |
547 |
index 1ad445c705e..00000000000 |
548 |
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-format-security.patch |
549 |
+++ /dev/null |
550 |
@@ -1,48 +0,0 @@ |
551 |
- ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c | 4 ++-- |
552 |
- ParMGridGen/ParLib/util.c | 4 ++-- |
553 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
554 |
- |
555 |
-diff --git a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c |
556 |
-index d0dfc91..941f68e 100644 |
557 |
---- a/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c |
558 |
-+++ b/ParMGridGen/IMParMetis-2.0/ParMETISLib/util.c |
559 |
-@@ -25,7 +25,7 @@ void errexit(char *f_str,...) |
560 |
- |
561 |
- sprintf(out2, "Error! %s", out1); |
562 |
- |
563 |
-- fprintf(stdout, out2); |
564 |
-+ fprintf(stdout, "%s", out2); |
565 |
- fflush(stdout); |
566 |
- |
567 |
- abort(); |
568 |
-@@ -46,7 +46,7 @@ void myprintf(CtrlType *ctrl, char *f_str,...) |
569 |
- |
570 |
- sprintf(out2, "[%2d] %s", ctrl->mype, out1); |
571 |
- |
572 |
-- fprintf(stdout, out2); |
573 |
-+ fprintf(stdout, "%s", out2); |
574 |
- fflush(stdout); |
575 |
- |
576 |
- } |
577 |
-diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c |
578 |
-index 9b8290d..c212b60 100644 |
579 |
---- a/ParMGridGen/ParLib/util.c |
580 |
-+++ b/ParMGridGen/ParLib/util.c |
581 |
-@@ -25,7 +25,7 @@ void MGriderrexit(char *f_str,...) |
582 |
- |
583 |
- sprintf(out2, "Error! %s", out1); |
584 |
- |
585 |
-- fprintf(stdout, out2); |
586 |
-+ fprintf(stdout, "%s", out2); |
587 |
- fflush(stdout); |
588 |
- |
589 |
- abort(); |
590 |
-@@ -46,7 +46,7 @@ void MGridmyprintf(MGridCtrlType *ctrl, char *f_str,...) |
591 |
- |
592 |
- sprintf(out2, "[%2d] %s", ctrl->mype, out1); |
593 |
- |
594 |
-- fprintf(stdout, out2); |
595 |
-+ fprintf(stdout, "%s", out2); |
596 |
- fflush(stdout); |
597 |
- |
598 |
- } |
599 |
|
600 |
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch |
601 |
deleted file mode 100644 |
602 |
index 1a464b99ed2..00000000000 |
603 |
--- a/sci-libs/parmgridgen/files/parmgridgen-1.0-impl-fct.patch |
604 |
+++ /dev/null |
605 |
@@ -1,70 +0,0 @@ |
606 |
- ParMGridGen/ParLib/move.c | 1 + |
607 |
- ParMGridGen/ParLib/parmgridgen.c | 1 + |
608 |
- ParMGridGen/ParLib/util.c | 2 +- |
609 |
- ParMGridGen/Programs/io.c | 2 +- |
610 |
- ParMGridGen/Programs/parmgridgen.c | 2 +- |
611 |
- 5 files changed, 5 insertions(+), 3 deletions(-) |
612 |
- |
613 |
-diff --git a/ParMGridGen/ParLib/move.c b/ParMGridGen/ParLib/move.c |
614 |
-index 881b1ad..b02b467 100644 |
615 |
---- a/ParMGridGen/ParLib/move.c |
616 |
-+++ b/ParMGridGen/ParLib/move.c |
617 |
-@@ -9,6 +9,7 @@ |
618 |
- */ |
619 |
- |
620 |
- #include "parmgridgen.h" |
621 |
-+#include "IMlib.h" |
622 |
- |
623 |
- /************************************************************************* |
624 |
- * This function moves the graph, and returns a new graph. |
625 |
-diff --git a/ParMGridGen/ParLib/parmgridgen.c b/ParMGridGen/ParLib/parmgridgen.c |
626 |
-index 6fd4aa3..262e05c 100644 |
627 |
---- a/ParMGridGen/ParLib/parmgridgen.c |
628 |
-+++ b/ParMGridGen/ParLib/parmgridgen.c |
629 |
-@@ -9,6 +9,7 @@ |
630 |
- */ |
631 |
- |
632 |
- #include "parmgridgen.h" |
633 |
-+#include "IMlib.h" |
634 |
- |
635 |
- /*********************************************************************************** |
636 |
- * This function is the entry point of the parallel coarse grid construction. |
637 |
-diff --git a/ParMGridGen/ParLib/util.c b/ParMGridGen/ParLib/util.c |
638 |
-index 9b8290d..fa2e10a 100644 |
639 |
---- a/ParMGridGen/ParLib/util.c |
640 |
-+++ b/ParMGridGen/ParLib/util.c |
641 |
-@@ -9,7 +9,7 @@ |
642 |
- */ |
643 |
- |
644 |
- #include "parmgridgen.h" |
645 |
-- |
646 |
-+#include "IMlib.h" |
647 |
- |
648 |
- /************************************************************************* |
649 |
- * This function prints an error message and exits |
650 |
-diff --git a/ParMGridGen/Programs/io.c b/ParMGridGen/Programs/io.c |
651 |
-index 318c8b4..ed5d495 100644 |
652 |
---- a/ParMGridGen/Programs/io.c |
653 |
-+++ b/ParMGridGen/Programs/io.c |
654 |
-@@ -9,7 +9,7 @@ |
655 |
- */ |
656 |
- |
657 |
- #include "parmgridgen.h" |
658 |
-- |
659 |
-+#include "IMlib.h" |
660 |
- |
661 |
- /************************************************************************* |
662 |
- * This function reads the CSR matrix |
663 |
-diff --git a/ParMGridGen/Programs/parmgridgen.c b/ParMGridGen/Programs/parmgridgen.c |
664 |
-index 2c0d38c..e9956c5 100644 |
665 |
---- a/ParMGridGen/Programs/parmgridgen.c |
666 |
-+++ b/ParMGridGen/Programs/parmgridgen.c |
667 |
-@@ -9,7 +9,7 @@ |
668 |
- */ |
669 |
- |
670 |
- #include "parmgridgen.h" |
671 |
-- |
672 |
-+#include "IMlib.h" |
673 |
- |
674 |
- /*********************************************************************************** |
675 |
- * This function is the testing routine for the adaptive multilevel partitioning code. |
676 |
|
677 |
diff --git a/sci-libs/parmgridgen/metadata.xml b/sci-libs/parmgridgen/metadata.xml |
678 |
deleted file mode 100644 |
679 |
index 40aa45df2b0..00000000000 |
680 |
--- a/sci-libs/parmgridgen/metadata.xml |
681 |
+++ /dev/null |
682 |
@@ -1,8 +0,0 @@ |
683 |
-<?xml version="1.0" encoding="UTF-8"?> |
684 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
685 |
-<pkgmetadata> |
686 |
- <maintainer type="person"> |
687 |
- <email>patrick@g.o</email> |
688 |
- <name>Patrick Lauer</name> |
689 |
- </maintainer> |
690 |
-</pkgmetadata> |
691 |
|
692 |
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild |
693 |
deleted file mode 100644 |
694 |
index 6294d8598f9..00000000000 |
695 |
--- a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild |
696 |
+++ /dev/null |
697 |
@@ -1,50 +0,0 @@ |
698 |
-# Copyright 1999-2018 Gentoo Foundation |
699 |
-# Distributed under the terms of the GNU General Public License v2 |
700 |
- |
701 |
-EAPI=6 |
702 |
- |
703 |
-inherit autotools |
704 |
- |
705 |
-MYP=ParMGridGen-${PV} |
706 |
- |
707 |
-DESCRIPTION="Software for parallel (mpi) generating coarse grids" |
708 |
-HOMEPAGE="http://www-users.cs.umn.edu/~moulitsa/software.html" |
709 |
-SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz" |
710 |
- |
711 |
-LICENSE="all-rights-reserved" |
712 |
-SLOT="0" |
713 |
-KEYWORDS="amd64 x86" |
714 |
-IUSE="static-libs" |
715 |
- |
716 |
-RESTRICT="mirror bindist" |
717 |
- |
718 |
-DEPEND="virtual/mpi" |
719 |
-RDEPEND="${DEPEND}" |
720 |
- |
721 |
-S=${WORKDIR}/${MYP} |
722 |
- |
723 |
-pkg_setup(){ |
724 |
- export CC=mpicc |
725 |
-} |
726 |
- |
727 |
-PATCHES=( |
728 |
- "${FILESDIR}/${P}-autotools.patch" |
729 |
- "${FILESDIR}/${P}-as-needed.patch" |
730 |
- "${FILESDIR}/${P}-format-security.patch" |
731 |
- "${FILESDIR}/${P}-impl-fct.patch" |
732 |
-) |
733 |
- |
734 |
-src_prepare() { |
735 |
- default |
736 |
- eautoreconf |
737 |
-} |
738 |
- |
739 |
-src_configure() { |
740 |
- econf \ |
741 |
- $(use_enable static-libs static) |
742 |
-} |
743 |
- |
744 |
-src_install() { |
745 |
- default |
746 |
- dodoc README Doc/*.pdf |
747 |
-} |