commit: 63b243cf3756b0208c819df7b58a0b331e18a78b Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sun Jan 16 17:33:49 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 17:33:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b243cf
sys-cluster/mpe2: treeclean Closes: https://bugs.gentoo.org/829216 Closes: https://bugs.gentoo.org/596094 Closes: https://bugs.gentoo.org/619382 Closes: https://bugs.gentoo.org/789786 Closes: https://bugs.gentoo.org/626714 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> profiles/package.mask | 5 - sys-cluster/mpe2/Manifest | 1 - .../files/slog2sdk-trace_rlog-makefile-fixes.patch | 68 --------- .../slog2sdk-trace_sample-makefile-fixes.patch | 68 --------- sys-cluster/mpe2/metadata.xml | 8 -- sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 157 --------------------- 6 files changed, 307 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index e64d3a456170..b0500258812f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -302,11 +302,6 @@ dev-python/hacking # Bug #819639; masked for removal on 2022-01-15. dev-go/blackfriday -# Marco Scardovi <[email protected]> (2021-12-15) -# Outdated, we are the only one who still have a package for them. -# Removal in 30 days. # Bug #829216 -sys-cluster/mpe2 - # Georgy Yakovlev <[email protected]> (2021-12-14) # AT&T decided to roll back community changes in March 2020 # for version 2020.x.x diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest deleted file mode 100644 index 0ea3ce5b29e9..000000000000 --- a/sys-cluster/mpe2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mpe2-1.0.6p1.tar.gz 9313216 BLAKE2B 0c04d4dc6ed6396140c1d34f2e715c38765999c812f5d04a2e1b3970ab2dfec9bc45ada49e8e2c53f46b745cf3605c508728a9e38cd73ca0cd320cc9c2ce72a4 SHA512 89aa4197aef4fdef14db032f058772c179bbb9055ad369338588a883ed9e75c825e396a1233d8dc079db605eeb1aa3a8ccd392c2df6ea0ccd89cd0433ba371b4 diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch deleted file mode 100644 index 4f2119ec69f0..000000000000 --- a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <[email protected]> -Date: Mon, 13 Sep 2010 14:18:51 -0400 -Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes - -- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. -- Do not install libraries during the compile phase. ---- - src/slog2sdk/trace_rlog/src/Makefile.in | 19 ++++++++----------- - 1 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in -index 9b289b8..2d772e0 100644 ---- a/src/slog2sdk/trace_rlog/src/Makefile.in -+++ b/src/slog2sdk/trace_rlog/src/Makefile.in -@@ -48,7 +48,8 @@ RM = @RM@ - - JNI_INC = @JNI_INC@ - CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ --LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ - - # memory leak checker - MEMLIBS = @DEBUG_LIBS@ -@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ - - $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(libbuild_dir) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(libbuild_dir) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) -- $(LIBTOOL) --finish $(libbuild_dir) - - INSTALL_LIBSO: $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(LIBDIR) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(LIBDIR) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) -- $(LIBTOOL) --finish $(LIBDIR) - - $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) -- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) - - $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) -- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) - - clean: - @-$(RM) *.@OBJEXT@ *.lo *.la --- -1.7.1 - diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch deleted file mode 100644 index 717911ffb710..000000000000 --- a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <[email protected]> -Date: Mon, 13 Sep 2010 14:22:10 -0400 -Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes - -- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. -- Do not install libraries during the compile phase. ---- - src/slog2sdk/trace_sample/src/Makefile.in | 19 ++++++++----------- - 1 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in -index f716fff..8d3641a 100644 ---- a/src/slog2sdk/trace_sample/src/Makefile.in -+++ b/src/slog2sdk/trace_sample/src/Makefile.in -@@ -48,7 +48,8 @@ RM = @RM@ - - JNI_INC = @JNI_INC@ - CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ --LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ - - # memory leak checker - MEMLIBS = @DEBUG_LIBS@ -@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ - - $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(libbuild_dir) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(libbuild_dir) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) -- $(LIBTOOL) --finish $(libbuild_dir) - - INSTALL_LIBSO: $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(LIBDIR) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(LIBDIR) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) -- $(LIBTOOL) --finish $(LIBDIR) - - $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) -- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) - - $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) -- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) - - clean: - @-$(RM) *.@OBJEXT@ *.lo *.la --- -1.7.1 - diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml deleted file mode 100644 index f5fb83321f9e..000000000000 --- a/sys-cluster/mpe2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Cluster Project</name> - </maintainer> -</pkgmetadata> diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild deleted file mode 100644 index 71802728bcba..000000000000 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_NEEDED=fortran - -inherit epatch fortran-2 java-pkg-opt-2 toolchain-funcs - -MY_P=${P/_/} - -DESCRIPTION="MPI development tools" -HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"; -SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"; - -LICENSE="mpich2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug minimal fortran threads" - -COMMON_DEPEND=" - !minimal? ( - x11-libs/libXtst - x11-libs/libXi - ) - || ( - sys-cluster/openmpi[fortran?,threads?] - sys-cluster/mpich2[fortran?,threads?] - )" - -DEPEND=" - !minimal? ( >=virtual/jdk-1.6 ) - ${COMMON_DEPEND}" - -RDEPEND=" - !minimal? ( >=virtual/jre-1.6 ) - ${COMMON_DEPEND}" - -S="${WORKDIR}"/${MY_P} -MPE_IMP="" - -# README: -# This ebuild is created to handle building with both mpich2 and openmpi. -# However, without empi (in the science overlay), and some further -# conversion to use mpi.eclass, we can only handle one implementation -# at a time. I still believe it's better to have the ebuild setup -# correctly in preperation. - -pkg_setup() { - fortran-2_pkg_setup - local i - - if has_version sys-cluster/openmpi; then - MPE_IMP=openmpi - elif has_version sys-cluster/mpich2; then - MPE_IMP=mpich2 - elif has_version sys-cluster/mpich; then - MPE_IMP=mpich2 - else - die "Unknown MPI implementation" - fi - - export JFLAGS="${JFLAGS} $(java-pkg_javac-args)" - - if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - elog "Currently src_test fails on collchk with openmpi, hence" - elog "testing is disabled by default. If you would like to" - elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1" - elog "to your environment." - echo - fi - - einfo "Building with support for: sys-cluster/${MPE_IMP}" - - use minimal || java-pkg-opt-2_pkg_setup -} - -src_prepare() { - # Don't assume path contains ./ - sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die - epatch \ - "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch \ - "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch - - use minimal || java-pkg-opt-2_src_prepare -} - -src_configure() { - local c="--with-mpicc=/usr/bin/mpicc" - - if use fortran; then - c+=" --with-mpif77=/usr/bin/mpif77" - else - c+=" --disable-f77" - fi - - if use minimal; then - c+=" --enable-slog2=no --disable-rlog --disable-sample" - else - c+=" --with-java2=$(java-config --jdk-home) --enable-slog2=build" - fi - - [[ "${MPE_IMP}" == openmpi ]] && c+=" --disable-rlog --disable-sample" - - econf ${c} \ - --sysconfdir=/etc/${PN} \ - --datadir=/usr/share/${PN} \ - --with-htmldir=/usr/share/${PN} \ - --with-docdir=/usr/share/${PN} \ - --enable-collchk \ - --enable-wrappers \ - $(use_enable !minimal graphics) \ - $(use_enable threads threadlogging) \ - $(use_enable debug g) -} - -src_test() { - local rc - - cd "${S}" || die - if [[ "${MPE_IMP}" == mpich2 ]]; then - echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf || die - export MPD_CONF_FILE="${T}/mpd.conf" - "${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die - elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - einfo "Skipping tests for openmpi" - echo - return 0 - fi - - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 \ - CC="${S}"/bin/mpecc \ - FC="${S}"/bin/mpefc \ - MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \ - CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \ - check; - rc=${?} - if [[ "${MPE_IMP}" == mpich2 ]]; then - "${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - fi - - return ${rc} -} - -src_install() { - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - MAKEOPTS+=" -j1" - default - rm -f "${ED}"/usr/sbin/mpeuninstall || die - rm -f "${ED}"/usr/bin/*.in || die -}
