[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

2020-09-27 Thread Aisha Tammy
commit: 2d25882dc4028dc8092fcb0c8dbe111f1c401e0b
Author: Aisha Tammy  aisha  cc>
AuthorDate: Sun Sep 27 15:32:26 2020 +
Commit: Aisha Tammy  aisha  cc>
CommitDate: Sun Sep 27 15:32:26 2020 +
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  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..0
--- a/sys-cluster/mpe2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   clus...@gentoo.org
-   Gentoo Cluster Project
-   
-

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..0
--- 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
-   

[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

2016-02-26 Thread Justin Lecher
commit: ef146025fec32c6d3ebfb73bab797bd6bbc1ffd2
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Feb 26 09:02:11 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Feb 26 09:02:11 2016 +
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  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
 



[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

2014-12-02 Thread Justin Lecher
commit: e31157783ecdb119d367c5da6553e085b1d2676c
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sun Nov 30 14:10:13 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov 30 14:10:13 2014 +
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
 }



[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

2014-12-02 Thread Justin Lecher
commit: 08459587b680ea8cb2d9bf8216c0eccd78458238
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sat Nov 29 21:56:34 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Nov 29 21:56:34 2014 +
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



[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/, licenses/

2014-12-02 Thread Justin Lecher
commit: ba27c5abd5a986dc687d272d91312f2374d9ae93
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sat Nov 29 21:56:06 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Nov 29 21:56:06 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ba27c5ab

sys-cluster/mpe2: Add ebuild to overlay and bump version

---
 licenses/mpich2|  39 ++
 sys-cluster/mpe2/ChangeLog |   9 +++
 sys-cluster/mpe2/metadata.xml  |   5 ++
 sys-cluster/mpe2/mpe2-1.3.0.ebuild | 142 +
 4 files changed, 195 insertions(+)

diff --git a/licenses/mpich2 b/licenses/mpich2
new file mode 100644
index 000..a9216d4
--- /dev/null
+++ b/licenses/mpich2
@@ -0,0 +1,39 @@
+
+ COPYRIGHT
+
+The following is a notice of limited availability of the code, and disclaimer
+which must be included in the prologue of the code and in all source listings
+of the code.
+
+Copyright Notice
+ + 2002 University of Chicago
+
+Permission is hereby granted to use, reproduce, prepare derivative works, and
+to redistribute to others.  This software was authored by:
+
+Mathematics and Computer Science Division
+Argonne National Laboratory, Argonne IL 60439
+
+(and)
+
+Department of Computer Science
+University of Illinois at Urbana-Champaign
+
+
+ GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the Government
+is granted for itself and others acting on its behalf a paid-up, nonexclusive,
+irrevocable worldwide license in this computer software to reproduce, prepare
+derivative works, and perform publicly and display publicly.
+
+ DISCLAIMER
+
+This computer code material was prepared, in part, as an account of work
+sponsored by an agency of the United States Government.  Neither the United
+States, nor the University of Chicago, nor any of their employees, makes any
+warranty express or implied, or assumes any legal liability or responsibility
+for the accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not infringe
+privately owned rights.

diff --git a/sys-cluster/mpe2/ChangeLog b/sys-cluster/mpe2/ChangeLog
new file mode 100644
index 000..b424437
--- /dev/null
+++ b/sys-cluster/mpe2/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sys-cluster/mpe2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mpe2-1.3.0 (29 Nov 2014)
+
+  29 Nov 2014; Marius Brehler  +metadata.xml,
+  +mpe2-1.3.0.ebuild:
+  Add to overlay and bump version

diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
new file mode 100644
index 000..55dd68a
--- /dev/null
+++ b/sys-cluster/mpe2/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   cluster
+

diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild 
b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
new file mode 100644
index 000..b76e7ad
--- /dev/null
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+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 defaul

[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

2014-12-02 Thread Justin Lecher
commit: 94d627ca2faa885ee1d301e08231bc1a5042a567
Author: Marius Brehler  linux  sungazer  de>
AuthorDate: Sun Nov 30 09:37:04 2014 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov 30 09:37:04 2014 +
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
 }