gentoo auto-resync : 13:10:2022 - 01:41:21

3 files changed, 128 insertions, 18 deletions

diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 12d39a2efb8a..18c8fb585369 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -3,6 +3,8 @@ AUX iwpmd.init 205 BLAKE2B a876a969b02c20bdb4f6a3dbf433a7ed3b5dccacf44821c825d8a
 AUX rdma-core-39.0-RDMA_BuildType.patch 314 BLAKE2B 86a44ca599ad3e02908640d469500899de27fe874c3bb49c87589bb36d0aebff097e941eb8e76f365251fca3344eecc3520fe2005a0bedc4aeeec2f0003b6edf SHA512 fc3594e8160710f12f83279ee03193e8dd03c6318d67054f61c696d2b5946bfb1907481d53200391328cc37ca5a6e80537d4d70ee52a77ac6bbfb8836d39fbb6
 AUX srpd.init 535 BLAKE2B 71b1c00f804ad2d5d5919044eda7dfd5ca273a8bbb2debe31cf7759b6122007f5dca5da521eca882a4c48011a9cf78433c7a0fbda4a9d7d39ab89fb6f72b44f7 SHA512 3fdeb9cf5cddcf9a9fcb516c757eb82aee6eb3651e43b8579ed4a909f9b90863400e1a1bde46bb3a3ce6aeb477c40709c828739c87b3fa80d2bd8d179fcd295d
 DIST rdma-core-41.0.tar.gz 1784540 BLAKE2B 3c153dcc3563427f32fa32d9a31527635c6bb3e63297c201f30de1328a68ac73ecb3af89074dfcc27d92c640d14d8d8ec61c001659d18336a4156cf8ed22996c SHA512 d8c1210ca078ea53879cee42c838cc88bcc98430471ae609d8c4a25218dbfd63a70f5bbd4e9ba6efabdfc467f7d5796ce618ec22013d414f17502d1257601a80
+DIST rdma-core-42.0.tar.gz 1894415 BLAKE2B 953103beffd1410272dc9abf00f7cb0e900c2dd66a97cefc476fee303e4dfcdf00e9a452ec13a3f199bb34662cbdc50675ce54b6af26991cb9e673cb0d55cb3b SHA512 9e497d3a23bcd72828a717b59016fe25c88b4ec389e166936410c53dac0c6d6d2f45a76eaec18383ab3ca1a11d1b978b19247a3b7cfb121047d3891288a8c38e
 EBUILD rdma-core-41.0.ebuild 2586 BLAKE2B 74f4c981476e0e000fd8bf7f01ae73ce3dea63f190843e6adce48f8a3ce56a0daf05e60ee6ceee58041764ff83c453bad5ce842c99938a630c8695d4438db733 SHA512 1e3558027f609bd19f173c045d34589dcaf968fb9dfb7770c29687baaca4551439c38d8774db477a22f3d7d70d2c7f3ff9c4489988efef2bcfd368f29a1e9d39
-EBUILD rdma-core-9999.ebuild 2418 BLAKE2B d2fa179a54139bcfd93f0c8bdbd9be1435a9df8df3b0fd7df671397704aa07495128ce32e7526cc76fa63e75cb6efc88906a0e405a2482aec98626027bfaedfe SHA512 98e1deb03db9be7d8cf69426deef07ced89999c84d63a903a6015717ec799d46dfc8207c0e1ced3df1b09b01d42e870df49f1371643ddf758d619013c3aec620
+EBUILD rdma-core-42.0.ebuild 2592 BLAKE2B 574c8beb462471a979f072340bdeab4aa757b78fc9756c8e082875aaaa814c6b75cd31b8de5e81d45108f34d17f0b7ee826aaa0c5da487fa85084e74b8f83e35 SHA512 b77509d8fa8573c7296383b1fe8d5ce48440ab45cbcbfccfde27214f987694b0414572c63f618755a2806c3b7a2b64b2e7a27c3dd37980146d76d1d1036b86ff
+EBUILD rdma-core-9999.ebuild 2592 BLAKE2B 574c8beb462471a979f072340bdeab4aa757b78fc9756c8e082875aaaa814c6b75cd31b8de5e81d45108f34d17f0b7ee826aaa0c5da487fa85084e74b8f83e35 SHA512 b77509d8fa8573c7296383b1fe8d5ce48440ab45cbcbfccfde27214f987694b0414572c63f618755a2806c3b7a2b64b2e7a27c3dd37980146d76d1d1036b86ff
 MISC metadata.xml 516 BLAKE2B 2db35084ef333282bd361a31f9e000a4ced15a1d720ea032c795a870f5bf6105443ffe7c62711a9cbf0af1aa4cf7230637c9550035797b539a482cd930a3a5b5 SHA512 e821196c6340b3c652f123e797bdbc6d93a25559cebdcf6418422a711b080586ef7e546abe2805d449a08944312dd963ee7088a27926e92fa06c28d453a14419
diff --git a/sys-cluster/rdma-core/rdma-core-42.0.ebuild b/sys-cluster/rdma-core/rdma-core-42.0.ebuild
new file mode 100644
index 000000000000..0fa2ec46e46b
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-42.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)"
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+# python is required unconditionally at build-time
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+		-DNO_PYVERBS="$(usex !python)"
+		-DNO_MAN_PAGES=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${ED}"/etc/{udev,init.d} || die
+
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+		newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	fi
+
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index d5ec302d2c93..0fa2ec46e46b 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{6..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake python-single-r1 udev systemd
 
 DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
 HOMEPAGE="https://github.com/linux-rdma/rdma-core"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
@@ -24,19 +24,18 @@ IUSE="neigh python static-libs systemd valgrind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
+	dev-lang/perl
 	virtual/libudev:=
 	neigh? ( dev-libs/libnl:3 )
 	systemd? ( sys-apps/systemd:= )
 	valgrind? ( dev-util/valgrind )
 	python? ( ${PYTHON_DEPS} )"
-
 DEPEND="${COMMON_DEPEND}
 	python? (
 		$(python_gen_cond_dep '
 			dev-python/cython[${PYTHON_USEDEP}]
 		')
 	)"
-
 RDEPEND="${COMMON_DEPEND}
 	!sys-fabric/infiniband-diags
 	!sys-fabric/libibverbs
@@ -53,29 +52,28 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-fabric/libmlx5
 	!sys-fabric/libocrdma
 	!sys-fabric/libnes"
+# python is required unconditionally at build-time
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
 
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-}
+PATCHES=( "${FILESDIR}"/${PN}-39.0-RDMA_BuildType.patch )
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}""$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SHAREDSTATEDIR="${EPREFIX}"/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}$(get_udevdir)"/rules.d
 		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex !systemd)"
 		-DENABLE_VALGRIND="$(usex valgrind)"
 		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
 		-DENABLE_STATIC="$(usex static-libs)"
-		-DNO_PYVERBS="$(usex python OFF ON)"
+		-DNO_PYVERBS="$(usex !python)"
 		-DNO_MAN_PAGES=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
-
 	cmake_src_configure
 }
 
@@ -94,3 +92,11 @@ src_install() {
 
 	use python && python_optimize
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}