[gentoo-commits] repo/gentoo:master commit in: sys-fabric/ibacm/, profiles/, sys-fabric/ibacm/files/

2022-02-15 Thread Jakov Smolić 
commit: a5d34f8b2ccb8c52913e8594ca385e8903c4e228
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Feb 15 09:22:04 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb 15 09:22:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d34f8b

sys-fabric/ibacm: treeclean

Signed-off-by: Jakov Smolić  gentoo.org>

 profiles/package.mask  |  6 
 sys-fabric/ibacm/Manifest  |  1 -
 .../files/ibacm-1.0.8-fix-pthread-linkage.patch| 20 -
 sys-fabric/ibacm/ibacm-1.0.8.ebuild| 33 --
 sys-fabric/ibacm/metadata.xml  |  8 --
 5 files changed, 68 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 30c294000232..1354bc277444 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -188,12 +188,6 @@ dev-java/colt
 # Masking for tracker/tinderbox.
 >=media-video/ffmpeg-5.0
 
-# David Seifert  (2022-01-16)
-# Most of these packages have been merged into sys-cluster/rdma-core and
-# have long been dead and unmaintained.
-# Removal in 30 days, bug #830999.
-sys-fabric/ibacm
-
 # Georgy Yakovlev  (2022-01-15)
 # Last branch update happened ~ 12 month ago.
 # Maximum kernel supported is 5.9, which we no longer package.

diff --git a/sys-fabric/ibacm/Manifest b/sys-fabric/ibacm/Manifest
deleted file mode 100644
index b3649eecb827..
--- a/sys-fabric/ibacm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 
49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe
 SHA512 
9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944

diff --git a/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch 
b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
deleted file mode 100644
index 8a9e5b5f03e6..
--- a/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/ofiwg/ibacm/commit/7a781f6d554532995181b9efbe445599b25c271a.patch
-https://bugs.gentoo.org/611778
-
 a/Makefile.am
-+++ b/Makefile.am
-@@ -1,12 +1,13 @@
- AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/linux
- 
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" 
-DBINDIR=\"$(bindir)\" -DRDMADIR=\"@rdmadir@\"
--
-+AM_LDFLAGS = -lpthread -ldl
- bin_PROGRAMS = util/ib_acme
- sbin_PROGRAMS = svc/ibacm
- svc_ibacm_SOURCES = src/acm.c
- util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c 
linux/libacm_linux.c src/parse.c
- svc_ibacm_CFLAGS = $(AM_CFLAGS)
-+svc_ibacm_LDFLAGS = -rdynamic $(AM_LDFLAGS)
- util_ib_acme_CFLAGS = $(AM_CFLAGS)
- 
- ibacmincludedir = $(includedir)/infiniband

diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild 
b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
deleted file mode 100644
index 2239f9c1e8e7..
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-OFED_VER="3.12"
-OFED_RC="1"
-OFED_RC_VER="1"
-OFED_SUFFIX="1"
-
-inherit autotools openib
-
-DESCRIPTION="IB CM pre-connection service application"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-RDEPEND="
-   sys-fabric/libibumad:${SLOT}
-   sys-fabric/libibverbs:${SLOT}
-"
-DEPEND="${RDEPEND}"
-
-block_other_ofed_versions
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix-pthread-linkage.patch
-)
-
-src_prepare() {
-   default
-
-   # Needed for pthread fix (bug #611778)
-   eautoreconf
-}

diff --git a/sys-fabric/ibacm/metadata.xml b/sys-fabric/ibacm/metadata.xml
deleted file mode 100644
index 15a599319f4f..
--- a/sys-fabric/ibacm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
-   clus...@gentoo.org
-   Gentoo Cluster Project
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-fabric/ibacm/

2021-05-16 Thread Sam James 
commit: 461c77c4f99ad01a88ff767625b03a2ce0629a8c
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 19:53:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 19:53:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461c77c4

sys-fabric/ibacm: Stabilize 1.0.8 x86, #643122

Signed-off-by: Sam James  gentoo.org>

 sys-fabric/ibacm/ibacm-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild 
b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index 24f54d5d2f0..2239f9c1e8e 100644
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit autotools openib
 
 DESCRIPTION="IB CM pre-connection service application"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND="
sys-fabric/libibumad:${SLOT}

[gentoo-commits] repo/gentoo:master commit in: sys-fabric/ibacm/files/

2021-05-16 Thread Sam James 
commit: b9357baeb944afaef133823b60afea51be058afb
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 19:25:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 19:35:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9357bae

sys-fabric/ibacm: fix pthread linkage

Closes: https://bugs.gentoo.org/611778
Signed-off-by: Sam James  gentoo.org>

 .../files/ibacm-1.0.8-fix-pthread-linkage.patch  | 20 
 1 file changed, 20 insertions(+)

diff --git a/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch 
b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
new file mode 100644
index 000..8a9e5b5f03e
--- /dev/null
+++ b/sys-fabric/ibacm/files/ibacm-1.0.8-fix-pthread-linkage.patch
@@ -0,0 +1,20 @@
+https://github.com/ofiwg/ibacm/commit/7a781f6d554532995181b9efbe445599b25c271a.patch
+https://bugs.gentoo.org/611778
+
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,12 +1,13 @@
+ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" 
-DBINDIR=\"$(bindir)\" -DRDMADIR=\"@rdmadir@\"
+-
++AM_LDFLAGS = -lpthread -ldl
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ibacm
+ svc_ibacm_SOURCES = src/acm.c
+ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c 
linux/libacm_linux.c src/parse.c
+ svc_ibacm_CFLAGS = $(AM_CFLAGS)
++svc_ibacm_LDFLAGS = -rdynamic $(AM_LDFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS)
+ 
+ ibacmincludedir = $(includedir)/infiniband

[gentoo-commits] repo/gentoo:master commit in: sys-fabric/ibacm/

2021-05-16 Thread Sam James 
commit: 3df1e290ea0cd56275955c3767d09f2ddc4648e6
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 19:24:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 19:35:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df1e290

sys-fabric/ibacm: fix pthread linkage

Closes: https://bugs.gentoo.org/611778
Signed-off-by: Sam James  gentoo.org>

 sys-fabric/ibacm/ibacm-1.0.8.ebuild | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild 
b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index 2872d490e17..24f54d5d2f0 100644
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -1,22 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit openib
+inherit autotools openib
 
 DESCRIPTION="IB CM pre-connection service application"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
 RDEPEND="
sys-fabric/libibumad:${SLOT}
sys-fabric/libibverbs:${SLOT}
 "
 DEPEND="${RDEPEND}"
+
 block_other_ofed_versions
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-pthread-linkage.patch
+)
+
+src_prepare() {
+   default
+
+   # Needed for pthread fix (bug #611778)
+   eautoreconf
+}

[gentoo-commits] repo/gentoo:master commit in: sys-fabric/ibacm/

2018-04-22 Thread Aaron Bauman 
commit: e8744b6fdcd363cb1c71bc14da369fba97fedfdd
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Apr 23 00:22:05 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr 23 00:22:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8744b6f

sys-fabric/ibacm: amd64 stable wrt bug #643122

Bug: https://bugs.gentoo.org/643122
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-fabric/ibacm/ibacm-1.0.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-fabric/ibacm/ibacm-1.0.8.ebuild 
b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
index b1a778e209c..2872d490e17 100644
--- a/sys-fabric/ibacm/ibacm-1.0.8.ebuild
+++ b/sys-fabric/ibacm/ibacm-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ OFED_SUFFIX="1"
 inherit openib
 
 DESCRIPTION="IB CM pre-connection service application"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="