1 |
commit: 63b243cf3756b0208c819df7b58a0b331e18a78b |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 16 17:33:49 2022 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 16 17:33:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b243cf |
7 |
|
8 |
sys-cluster/mpe2: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/829216 |
11 |
Closes: https://bugs.gentoo.org/596094 |
12 |
Closes: https://bugs.gentoo.org/619382 |
13 |
Closes: https://bugs.gentoo.org/789786 |
14 |
Closes: https://bugs.gentoo.org/626714 |
15 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
16 |
|
17 |
profiles/package.mask | 5 - |
18 |
sys-cluster/mpe2/Manifest | 1 - |
19 |
.../files/slog2sdk-trace_rlog-makefile-fixes.patch | 68 --------- |
20 |
.../slog2sdk-trace_sample-makefile-fixes.patch | 68 --------- |
21 |
sys-cluster/mpe2/metadata.xml | 8 -- |
22 |
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 157 --------------------- |
23 |
6 files changed, 307 deletions(-) |
24 |
|
25 |
diff --git a/profiles/package.mask b/profiles/package.mask |
26 |
index e64d3a456170..b0500258812f 100644 |
27 |
--- a/profiles/package.mask |
28 |
+++ b/profiles/package.mask |
29 |
@@ -302,11 +302,6 @@ dev-python/hacking |
30 |
# Bug #819639; masked for removal on 2022-01-15. |
31 |
dev-go/blackfriday |
32 |
|
33 |
-# Marco Scardovi <marco@××××××××.com> (2021-12-15) |
34 |
-# Outdated, we are the only one who still have a package for them. |
35 |
-# Removal in 30 days. # Bug #829216 |
36 |
-sys-cluster/mpe2 |
37 |
- |
38 |
# Georgy Yakovlev <gyakovlev@g.o> (2021-12-14) |
39 |
# AT&T decided to roll back community changes in March 2020 |
40 |
# for version 2020.x.x |
41 |
|
42 |
diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest |
43 |
deleted file mode 100644 |
44 |
index 0ea3ce5b29e9..000000000000 |
45 |
--- a/sys-cluster/mpe2/Manifest |
46 |
+++ /dev/null |
47 |
@@ -1 +0,0 @@ |
48 |
-DIST mpe2-1.0.6p1.tar.gz 9313216 BLAKE2B 0c04d4dc6ed6396140c1d34f2e715c38765999c812f5d04a2e1b3970ab2dfec9bc45ada49e8e2c53f46b745cf3605c508728a9e38cd73ca0cd320cc9c2ce72a4 SHA512 89aa4197aef4fdef14db032f058772c179bbb9055ad369338588a883ed9e75c825e396a1233d8dc079db605eeb1aa3a8ccd392c2df6ea0ccd89cd0433ba371b4 |
49 |
|
50 |
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch |
51 |
deleted file mode 100644 |
52 |
index 4f2119ec69f0..000000000000 |
53 |
--- a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch |
54 |
+++ /dev/null |
55 |
@@ -1,68 +0,0 @@ |
56 |
-From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001 |
57 |
-From: Justin Bronder <jsbronder@×××××.com> |
58 |
-Date: Mon, 13 Sep 2010 14:18:51 -0400 |
59 |
-Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes |
60 |
- |
61 |
-- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. |
62 |
-- Do not install libraries during the compile phase. |
63 |
---- |
64 |
- src/slog2sdk/trace_rlog/src/Makefile.in | 19 ++++++++----------- |
65 |
- 1 files changed, 8 insertions(+), 11 deletions(-) |
66 |
- |
67 |
-diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in |
68 |
-index 9b289b8..2d772e0 100644 |
69 |
---- a/src/slog2sdk/trace_rlog/src/Makefile.in |
70 |
-+++ b/src/slog2sdk/trace_rlog/src/Makefile.in |
71 |
-@@ -48,7 +48,8 @@ RM = @RM@ |
72 |
- |
73 |
- JNI_INC = @JNI_INC@ |
74 |
- CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ |
75 |
--LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ |
76 |
-+LDFLAGS = @LDFLAGS@ |
77 |
-+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ |
78 |
- |
79 |
- # memory leak checker |
80 |
- MEMLIBS = @DEBUG_LIBS@ |
81 |
-@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ |
82 |
- |
83 |
- $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) |
84 |
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ |
85 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
86 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
87 |
- -export-symbols $(srcdir)/JavaTraceInput.sym \ |
88 |
- -rpath $(libbuild_dir) ; \ |
89 |
- else \ |
90 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
91 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
92 |
- -rpath $(libbuild_dir) ; \ |
93 |
- fi |
94 |
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) |
95 |
-- $(LIBTOOL) --finish $(libbuild_dir) |
96 |
- |
97 |
- INSTALL_LIBSO: $(LOBJ) |
98 |
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ |
99 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
100 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
101 |
- -export-symbols $(srcdir)/JavaTraceInput.sym \ |
102 |
- -rpath $(LIBDIR) ; \ |
103 |
- else \ |
104 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
105 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
106 |
- -rpath $(LIBDIR) ; \ |
107 |
- fi |
108 |
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) |
109 |
-- $(LIBTOOL) --finish $(LIBDIR) |
110 |
- |
111 |
- $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) |
112 |
-- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) |
113 |
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) |
114 |
- |
115 |
- $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) |
116 |
-- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) |
117 |
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) |
118 |
- |
119 |
- clean: |
120 |
- @-$(RM) *.@OBJEXT@ *.lo *.la |
121 |
--- |
122 |
-1.7.1 |
123 |
- |
124 |
|
125 |
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch |
126 |
deleted file mode 100644 |
127 |
index 717911ffb710..000000000000 |
128 |
--- a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch |
129 |
+++ /dev/null |
130 |
@@ -1,68 +0,0 @@ |
131 |
-From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001 |
132 |
-From: Justin Bronder <jsbronder@×××××.com> |
133 |
-Date: Mon, 13 Sep 2010 14:22:10 -0400 |
134 |
-Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes |
135 |
- |
136 |
-- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. |
137 |
-- Do not install libraries during the compile phase. |
138 |
---- |
139 |
- src/slog2sdk/trace_sample/src/Makefile.in | 19 ++++++++----------- |
140 |
- 1 files changed, 8 insertions(+), 11 deletions(-) |
141 |
- |
142 |
-diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in |
143 |
-index f716fff..8d3641a 100644 |
144 |
---- a/src/slog2sdk/trace_sample/src/Makefile.in |
145 |
-+++ b/src/slog2sdk/trace_sample/src/Makefile.in |
146 |
-@@ -48,7 +48,8 @@ RM = @RM@ |
147 |
- |
148 |
- JNI_INC = @JNI_INC@ |
149 |
- CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ |
150 |
--LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ |
151 |
-+LDFLAGS = @LDFLAGS@ |
152 |
-+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ |
153 |
- |
154 |
- # memory leak checker |
155 |
- MEMLIBS = @DEBUG_LIBS@ |
156 |
-@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ |
157 |
- |
158 |
- $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) |
159 |
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ |
160 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
161 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
162 |
- -export-symbols $(srcdir)/JavaTraceInput.sym \ |
163 |
- -rpath $(libbuild_dir) ; \ |
164 |
- else \ |
165 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
166 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
167 |
- -rpath $(libbuild_dir) ; \ |
168 |
- fi |
169 |
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) |
170 |
-- $(LIBTOOL) --finish $(libbuild_dir) |
171 |
- |
172 |
- INSTALL_LIBSO: $(LOBJ) |
173 |
- if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ |
174 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
175 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
176 |
- -export-symbols $(srcdir)/JavaTraceInput.sym \ |
177 |
- -rpath $(LIBDIR) ; \ |
178 |
- else \ |
179 |
-- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ |
180 |
-+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ |
181 |
- -rpath $(LIBDIR) ; \ |
182 |
- fi |
183 |
-- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) |
184 |
-- $(LIBTOOL) --finish $(LIBDIR) |
185 |
- |
186 |
- $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) |
187 |
-- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) |
188 |
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) |
189 |
- |
190 |
- $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) |
191 |
-- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) |
192 |
-+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) |
193 |
- |
194 |
- clean: |
195 |
- @-$(RM) *.@OBJEXT@ *.lo *.la |
196 |
--- |
197 |
-1.7.1 |
198 |
- |
199 |
|
200 |
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml |
201 |
deleted file mode 100644 |
202 |
index f5fb83321f9e..000000000000 |
203 |
--- a/sys-cluster/mpe2/metadata.xml |
204 |
+++ /dev/null |
205 |
@@ -1,8 +0,0 @@ |
206 |
-<?xml version="1.0" encoding="UTF-8"?> |
207 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
208 |
-<pkgmetadata> |
209 |
- <maintainer type="project"> |
210 |
- <email>cluster@g.o</email> |
211 |
- <name>Gentoo Cluster Project</name> |
212 |
- </maintainer> |
213 |
-</pkgmetadata> |
214 |
|
215 |
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild |
216 |
deleted file mode 100644 |
217 |
index 71802728bcba..000000000000 |
218 |
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild |
219 |
+++ /dev/null |
220 |
@@ -1,157 +0,0 @@ |
221 |
-# Copyright 1999-2021 Gentoo Authors |
222 |
-# Distributed under the terms of the GNU General Public License v2 |
223 |
- |
224 |
-EAPI=5 |
225 |
- |
226 |
-FORTRAN_NEEDED=fortran |
227 |
- |
228 |
-inherit epatch fortran-2 java-pkg-opt-2 toolchain-funcs |
229 |
- |
230 |
-MY_P=${P/_/} |
231 |
- |
232 |
-DESCRIPTION="MPI development tools" |
233 |
-HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm" |
234 |
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz" |
235 |
- |
236 |
-LICENSE="mpich2" |
237 |
-SLOT="0" |
238 |
-KEYWORDS="amd64 x86" |
239 |
-IUSE="debug minimal fortran threads" |
240 |
- |
241 |
-COMMON_DEPEND=" |
242 |
- !minimal? ( |
243 |
- x11-libs/libXtst |
244 |
- x11-libs/libXi |
245 |
- ) |
246 |
- || ( |
247 |
- sys-cluster/openmpi[fortran?,threads?] |
248 |
- sys-cluster/mpich2[fortran?,threads?] |
249 |
- )" |
250 |
- |
251 |
-DEPEND=" |
252 |
- !minimal? ( >=virtual/jdk-1.6 ) |
253 |
- ${COMMON_DEPEND}" |
254 |
- |
255 |
-RDEPEND=" |
256 |
- !minimal? ( >=virtual/jre-1.6 ) |
257 |
- ${COMMON_DEPEND}" |
258 |
- |
259 |
-S="${WORKDIR}"/${MY_P} |
260 |
-MPE_IMP="" |
261 |
- |
262 |
-# README: |
263 |
-# This ebuild is created to handle building with both mpich2 and openmpi. |
264 |
-# However, without empi (in the science overlay), and some further |
265 |
-# conversion to use mpi.eclass, we can only handle one implementation |
266 |
-# at a time. I still believe it's better to have the ebuild setup |
267 |
-# correctly in preperation. |
268 |
- |
269 |
-pkg_setup() { |
270 |
- fortran-2_pkg_setup |
271 |
- local i |
272 |
- |
273 |
- if has_version sys-cluster/openmpi; then |
274 |
- MPE_IMP=openmpi |
275 |
- elif has_version sys-cluster/mpich2; then |
276 |
- MPE_IMP=mpich2 |
277 |
- elif has_version sys-cluster/mpich; then |
278 |
- MPE_IMP=mpich2 |
279 |
- else |
280 |
- die "Unknown MPI implementation" |
281 |
- fi |
282 |
- |
283 |
- export JFLAGS="${JFLAGS} $(java-pkg_javac-args)" |
284 |
- |
285 |
- if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then |
286 |
- echo |
287 |
- elog "Currently src_test fails on collchk with openmpi, hence" |
288 |
- elog "testing is disabled by default. If you would like to" |
289 |
- elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1" |
290 |
- elog "to your environment." |
291 |
- echo |
292 |
- fi |
293 |
- |
294 |
- einfo "Building with support for: sys-cluster/${MPE_IMP}" |
295 |
- |
296 |
- use minimal || java-pkg-opt-2_pkg_setup |
297 |
-} |
298 |
- |
299 |
-src_prepare() { |
300 |
- # Don't assume path contains ./ |
301 |
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die |
302 |
- epatch \ |
303 |
- "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch \ |
304 |
- "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch |
305 |
- |
306 |
- use minimal || java-pkg-opt-2_src_prepare |
307 |
-} |
308 |
- |
309 |
-src_configure() { |
310 |
- local c="--with-mpicc=/usr/bin/mpicc" |
311 |
- |
312 |
- if use fortran; then |
313 |
- c+=" --with-mpif77=/usr/bin/mpif77" |
314 |
- else |
315 |
- c+=" --disable-f77" |
316 |
- fi |
317 |
- |
318 |
- if use minimal; then |
319 |
- c+=" --enable-slog2=no --disable-rlog --disable-sample" |
320 |
- else |
321 |
- c+=" --with-java2=$(java-config --jdk-home) --enable-slog2=build" |
322 |
- fi |
323 |
- |
324 |
- [[ "${MPE_IMP}" == openmpi ]] && c+=" --disable-rlog --disable-sample" |
325 |
- |
326 |
- econf ${c} \ |
327 |
- --sysconfdir=/etc/${PN} \ |
328 |
- --datadir=/usr/share/${PN} \ |
329 |
- --with-htmldir=/usr/share/${PN} \ |
330 |
- --with-docdir=/usr/share/${PN} \ |
331 |
- --enable-collchk \ |
332 |
- --enable-wrappers \ |
333 |
- $(use_enable !minimal graphics) \ |
334 |
- $(use_enable threads threadlogging) \ |
335 |
- $(use_enable debug g) |
336 |
-} |
337 |
- |
338 |
-src_test() { |
339 |
- local rc |
340 |
- |
341 |
- cd "${S}" || die |
342 |
- if [[ "${MPE_IMP}" == mpich2 ]]; then |
343 |
- echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die |
344 |
- chmod 600 "${T}"/mpd.conf || die |
345 |
- export MPD_CONF_FILE="${T}/mpd.conf" |
346 |
- "${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die |
347 |
- elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then |
348 |
- echo |
349 |
- einfo "Skipping tests for openmpi" |
350 |
- echo |
351 |
- return 0 |
352 |
- fi |
353 |
- |
354 |
- # No parallel make: |
355 |
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 |
356 |
- emake -j1 \ |
357 |
- CC="${S}"/bin/mpecc \ |
358 |
- FC="${S}"/bin/mpefc \ |
359 |
- MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \ |
360 |
- CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \ |
361 |
- check; |
362 |
- rc=${?} |
363 |
- if [[ "${MPE_IMP}" == mpich2 ]]; then |
364 |
- "${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid) |
365 |
- fi |
366 |
- |
367 |
- return ${rc} |
368 |
-} |
369 |
- |
370 |
-src_install() { |
371 |
- # No parallel make: |
372 |
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 |
373 |
- MAKEOPTS+=" -j1" |
374 |
- default |
375 |
- rm -f "${ED}"/usr/sbin/mpeuninstall || die |
376 |
- rm -f "${ED}"/usr/bin/*.in || die |
377 |
-} |