* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2020-09-27 15:32 Aisha Tammy
0 siblings, 0 replies; 7+ messages in thread
From: Aisha Tammy @ 2020-09-27 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 2d25882dc4028dc8092fcb0c8dbe111f1c401e0b
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Sep 27 15:32:26 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Sun Sep 27 15:32:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2d25882d
sys-cluster/mpe2: drop package
present in ::gentoo
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sys-cluster/mpe2/metadata.xml | 8 --
sys-cluster/mpe2/mpe2-1.3.0.ebuild | 147 -------------------------------------
2 files changed, 155 deletions(-)
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
deleted file mode 100644
index 8bf4b5f36..000000000
--- a/sys-cluster/mpe2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cluster@gentoo.org</email>
- <name>Gentoo Cluster Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
deleted file mode 100644
index d1bf59c08..000000000
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 java-utils-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="minimal fortran threads debug"
-
-COMMON_DEPEND="
- !minimal? (
- x11-libs/libXtst
- x11-libs/libXi
- )
- || (
- sys-cluster/openmpi[fortran?,threads?]
- sys-cluster/mpich2[fortran?,threads?]
- )"
-
-DEPEND="!minimal? ( >=virtual/jdk-1.4 )
- ${COMMON_DEPEND}"
-
-RDEPEND="
-!minimal? ( >=virtual/jre-1.4 )
- ${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
- 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}"
-}
-
-src_prepare() {
- default
- # Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
-
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- MAKEOPTS+=" -j1"
-}
-
-src_configure() {
- local c="--with-mpicc=/usr/bin/mpicc"
-
- if use fortran; then
- c="${c} --with-mpif77=/usr/bin/mpif77"
- else
- c="${c} --disable-f77"
- fi
-
- if use minimal; then
- c="${c} --enable-slog2=no --disable-rlog --disable-sample"
- else
- c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
- fi
-
- if [[ "${MPE_IMP}" == openmpi ]]; then
- c="${c} --disable-rlog --disable-sample"
- fi
-
- 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
- chmod 600 "${T}"/mpd.conf
- export MPD_CONF_FILE="${T}/mpd.conf"
- "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid
- elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- elog
- elog "Skipping tests for openmpi"
- elog
- return 0
- fi
-
- emake \
- CC="${S}"/bin/mpecc \
- FC="${S}"/bin/mpefc \
- MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
- CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
- check;
- rc=${?}
- if [[ "${MPE_IMP}" == mpich2 ]]; then
- "${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
- fi
-
- return ${rc}
-}
-
-src_install() {
- default
- rm -f "${D}"/usr/sbin/mpeuninstall || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2016-02-26 9:02 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2016-02-26 9:02 UTC (permalink / raw
To: gentoo-commits
commit: ef146025fec32c6d3ebfb73bab797bd6bbc1ffd2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 09:02:11 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 09:02:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ef146025
sys-cluster/mpe2: Bump EAPI to 6
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.3.0.ebuild | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index 760564e..7136892 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
FORTRAN_NEEDED=fortran
@@ -18,10 +18,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="minimal fortran threads debug"
-COMMON_DEPEND="!minimal? ( x11-libs/libXtst
- x11-libs/libXi )
- || ( sys-cluster/openmpi[fortran?,threads?]
- sys-cluster/mpich2[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.4 )
${COMMON_DEPEND}"
@@ -67,6 +72,7 @@ pkg_setup() {
}
src_prepare() {
+ default
# Don't assume path contains ./
sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2014-12-02 8:19 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-12-02 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 94d627ca2faa885ee1d301e08231bc1a5042a567
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Nov 30 09:37:04 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 09:37:04 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=94d627ca
sys-cluster/mpe2: Set MAKEOPTS (instead of emake -j1)
---
sys-cluster/mpe2/mpe2-1.3.0.ebuild | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index a1728a7..e96b358 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -69,6 +69,10 @@ pkg_setup() {
src_prepare() {
# Don't assume path contains ./
sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
+
+ # No parallel make:
+ # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
+ MAKEOPTS+=" -j1"
}
src_configure() {
@@ -118,9 +122,7 @@ src_test() {
return 0
fi
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 \
+ emake \
CC="${S}"/bin/mpecc \
FC="${S}"/bin/mpefc \
MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
@@ -135,8 +137,6 @@ src_test() {
}
src_install() {
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install || die
rm -f "${D}"/usr/sbin/mpeuninstall || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2014-12-02 8:19 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-12-02 8:19 UTC (permalink / raw
To: gentoo-commits
commit: e31157783ecdb119d367c5da6553e085b1d2676c
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Nov 30 14:10:13 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 14:10:13 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3115778
sys-cluster/mpe2: Call default in src_install
---
sys-cluster/mpe2/mpe2-1.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index e96b358..27ee999 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -137,6 +137,6 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ default
rm -f "${D}"/usr/sbin/mpeuninstall || die
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2014-12-02 8:19 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2014-12-02 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 08459587b680ea8cb2d9bf8216c0eccd78458238
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Nov 29 21:56:34 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 29 21:56:34 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08459587
sys-cluster/mpe2: Add missing die
---
sys-cluster/mpe2/mpe2-1.3.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index b76e7ad..a1728a7 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -68,7 +68,7 @@ pkg_setup() {
src_prepare() {
# Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
+ sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
}
src_configure() {
@@ -105,7 +105,7 @@ src_configure() {
src_test() {
local rc
- cd "${S}"
+ cd "${S}" || die
if [[ "${MPE_IMP}" == mpich2 ]]; then
echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf
chmod 600 "${T}"/mpd.conf
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2011-06-24 17:09 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 458dd7f2efe61cc63d5c5649425726de6bbfeff9
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:20:27 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 16:20:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=458dd7f2
Sort inherit and/or USE
(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
index 5c3c53c..73b0887 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="minimal fortran threads debug"
+IUSE="debug fortran minimal threads"
COMMON_DEPEND="$(mpi_pkg_deplist)
!minimal? ( x11-libs/libXtst
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/
@ 2011-06-21 11:54 Justin Lecher
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
To: gentoo-commits
commit: 086c83a265ba5da60a3573154bd8c30b06c8cd81
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:17:43 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:17:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=086c83a2
Added fortran-2.eclass support
(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
---
sys-cluster/mpe2/ChangeLog | 5 ++++-
sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog
index 492e818..9db3fa6 100644
--- a/sys-cluster/mpe2/ChangeLog
+++ b/sys-cluster/mpe2/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sys-cluster/mpe2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> mpe2-1.0.6_p1.ebuild:
+ Added fortran-2.eclass support
+
16 Dec 2010; Justin Lecher <jlec@gentoo.org> mpe2-1.0.6_p1.ebuild:
Removal of fortran.eclass, #348851
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
index dfe639d..5c3c53c 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
MPI_PKG_NEED_IMPS="openmpi mpich2"
-inherit eutils java-utils-2 mpi
+
+inherit eutils fortran-2 java-utils-2 mpi
MY_P=${P/_/}
DESCRIPTION="MPI development tools"
@@ -36,6 +37,7 @@ MPE_IMP=""
# correctly in preperation.
pkg_setup() {
+ fortran-2_pkg_setup
local i
MPE_IMP=$(mpi_pkg_base_imp)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-27 15:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-27 15:32 [gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/ Aisha Tammy
-- strict thread matches above, loose matches on Subject: below --
2016-02-26 9:02 Justin Lecher
2014-12-02 8:19 Justin Lecher
2014-12-02 8:19 Justin Lecher
2014-12-02 8:19 Justin Lecher
2011-06-24 17:09 Justin Lecher
2011-06-21 11:54 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox