[gentoo-commits] repo/gentoo:master commit in: sys-cluster/slurm/

[David Seifert]

commit:     a04b036f648d0a1999489a520aabdf7657bc7f74
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 17:24:01 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 17:24:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04b036f

sys-cluster/slurm: Remove sys-apps/netloc dependency

* sys-apps/netloc is completely broken and will be
  removed from the tree soon.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-cluster/slurm/{slurm-20.11.0.1.ebuild => slurm-20.11.0.1-r1.ebuild} | 2 +-
 .../slurm/{slurm-20.11.0.1-r100.ebuild => slurm-20.11.0.1-r101.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/slurm/slurm-20.11.0.1.ebuild 
b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
similarity index 98%
rename from sys-cluster/slurm/slurm-20.11.0.1.ebuild
rename to sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
index 78837b1cd3d..9601550773f 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r1.ebuild
@@ -43,7 +43,7 @@ COMMON_DEPEND="
        !lua? ( !dev-lang/lua )
        ipmi? ( sys-libs/freeipmi )
        json? ( dev-libs/json-c:= )
-       amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] 
) ) )
+       amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
        hdf5? ( sci-libs/hdf5:= )
        numa? ( sys-process/numactl )
        ofed? ( sys-fabric/ofed )

diff --git a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild 
b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
similarity index 99%
rename from sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
rename to sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
index 860e614604a..7f857b26e59 100644
--- a/sys-cluster/slurm/slurm-20.11.0.1-r100.ebuild
+++ b/sys-cluster/slurm/slurm-20.11.0.1-r101.ebuild
@@ -44,7 +44,7 @@ COMMON_DEPEND="
        lua? ( ${LUA_DEPS} )
        ipmi? ( sys-libs/freeipmi )
        json? ( dev-libs/json-c:= )
-       amd64? ( netloc? ( || ( sys-apps/netloc >=sys-apps/hwloc-2.1.0[netloc] 
) ) )
+       amd64? ( netloc? ( >=sys-apps/hwloc-2.1.0[netloc] ) )
        hdf5? ( sci-libs/hdf5:= )
        numa? ( sys-process/numactl )
        ofed? ( sys-fabric/ofed )