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

["Sam James" <sam@gentoo.org>]

commit:     7942b85a240f26e3ec4c8d1fc6cfb32bd1168d0a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 22:30:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 22:34:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7942b85a

sys-cluster/rdma-core: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/rdma-core/rdma-core-9999.ebuild | 38 +++++++++++++++++------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index d5ec302d2c93..d3914a582bc8 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -1,16 +1,16 @@
 # 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
@@ -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
+}