From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B8CE158020 for ; Wed, 12 Oct 2022 22:39:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21958E0957; Wed, 12 Oct 2022 22:39:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07EDFE0957 for ; Wed, 12 Oct 2022 22:39:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C573933BF0B for ; Wed, 12 Oct 2022 22:39:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 277B2613 for ; Wed, 12 Oct 2022 22:39:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665614075.7942b85a240f26e3ec4c8d1fc6cfb32bd1168d0a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/rdma-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/rdma-core/rdma-core-9999.ebuild X-VCS-Directories: sys-cluster/rdma-core/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7942b85a240f26e3ec4c8d1fc6cfb32bd1168d0a X-VCS-Branch: master Date: Wed, 12 Oct 2022 22:39:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9959ca32-7f66-4898-9ae5-f1626ab26a8b X-Archives-Hash: d8a4d539c5e0f277b7983e2210f5e1b9 commit: 7942b85a240f26e3ec4c8d1fc6cfb32bd1168d0a Author: Sam James gentoo org> AuthorDate: Wed Oct 12 22:30:01 2022 +0000 Commit: Sam James gentoo 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 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 +}