From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1309029-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C7990139360
for <garchives@archives.gentoo.org>; Tue, 3 Aug 2021 08:45:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 24B5FE09B1;
Tue, 3 Aug 2021 08:45:53 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0E5B8E09A1
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 08:45:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B4830343350
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 08:45:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4186787B
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Aug 2021 08:45:49 +0000 (UTC)
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
Message-ID: <1627944886.c232c90452d6d3a0b6b0dacde963539d33fbcdb4.andrewammerlaan@gentoo>
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/scr/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: sys-cluster/scr/metadata.xml sys-cluster/scr/scr-3.0_pre1.ebuild
X-VCS-Directories: sys-cluster/scr/
X-VCS-Committer: andrewammerlaan
X-VCS-Committer-Name: Andrew Ammerlaan
X-VCS-Revision: c232c90452d6d3a0b6b0dacde963539d33fbcdb4
X-VCS-Branch: master
Date: Tue, 3 Aug 2021 08:45:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6005339d-cdfc-456f-bcd7-96aa3916ac83
X-Archives-Hash: 284fb45ca5306d52f90dda0d0fd5771c
commit: c232c90452d6d3a0b6b0dacde963539d33fbcdb4
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Aug 2 22:53:49 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 2 22:54:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c232c904
sys-cluster/scr: fix S, pdsh mandatory
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/scr/metadata.xml | 1 -
sys-cluster/scr/scr-3.0_pre1.ebuild | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sys-cluster/scr/metadata.xml b/sys-cluster/scr/metadata.xml
index 35b2de595..d5d5447f4 100644
--- a/sys-cluster/scr/metadata.xml
+++ b/sys-cluster/scr/metadata.xml
@@ -17,7 +17,6 @@ The Scalable Checkpoint / Restart (SCR) library enables MPI applications to util
<flag name="flock">use flock as a file locking type</flag>
<flag name="fortran">Enables Fortran support</flag>
<flag name="mysql">Enable use of mysql for logging SCR activities</flag>
- <flag name="pdsh">Enable use of pdsh for scalable restart and scavenge</flag>
<flag name="pmix">use pmix as resource manager</flag>
<flag name="slurm">use slurm as resource manager</flag>
<flag name="syslog">Whether to enable syslog logging</flag>
diff --git a/sys-cluster/scr/scr-3.0_pre1.ebuild b/sys-cluster/scr/scr-3.0_pre1.ebuild
index 9671df9d7..69f58522b 100644
--- a/sys-cluster/scr/scr-3.0_pre1.ebuild
+++ b/sys-cluster/scr/scr-3.0_pre1.ebuild
@@ -17,16 +17,18 @@ HOMEPAGE="
https://github.com/LLNL/scr
"
SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MYPV}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="doc examples fcntl +flock +fortran mysql pdsh pmix slurm syslog txt-log +yogrt"
+IUSE="doc examples fcntl +flock +fortran mysql pmix slurm syslog test txt-log +yogrt"
#cppr
RDEPEND="
${PYTHON_DEPS}
+ app-shells/pdsh
sys-cluster/AXL
sys-cluster/dtcmp
sys-cluster/er
@@ -38,7 +40,6 @@ RDEPEND="
virtual/mpi
mysql? ( dev-db/mysql-connector-c )
- pdsh? ( app-shells/pdsh )
pmix? ( sys-cluster/pmix )
slurm? ( sys-cluster/slurm )
yogrt? ( sys-cluster/libyogrt[slurm?] )
@@ -51,6 +52,7 @@ REQUIRED_USE="
?? ( pmix slurm )
?? ( fcntl flock )
"
+RESTRICT="!test? ( test )"
pkg_setup() {
fortran-2_pkg_setup
@@ -75,7 +77,8 @@ src_configure() {
-DBUILD_PDSH=OFF
-DENABLE_INTEL_CPPR=OFF
-DENABLE_ENABLE_CRAY_DW=OFF
- -DENABLE_IBM_BBAPI=OF
+ -DENABLE_IBM_BBAPI=OFF
+ -DENABLE_PDSH=ON
-DSCR_ASYNC_API="${asyncapi}"
-DSCR_FILE_LOCK="${lock}"
-DSCR_LINK_STATIC=OFF
@@ -84,7 +87,6 @@ src_configure() {
-DENABLE_EXAMPLES=$(usex examples)
-DENABLE_FORTRAN=$(usex fortran)
- -DENABLE_PDSH=$(usex pdsh)
-DENABLE_TESTS=$(usex test)
-DENABLE_YOGRT=$(usex yogrt)
-DSCR_LOG_SYSLOG_ENABLE=$(usex syslog 0 1)