[gentoo-commits] repo/proj/guru:dev commit in: sys-kernel/rte_kni-kmod/, net-libs/dpdk/

[gentoo-commits] repo/proj/guru:dev commit in: sys-kernel/rte_kni-kmod/, net-libs/dpdk/

[Aisha Tammy]

commit:     675f058f4e0cc4c59288dc3d49f92274ff7bbfe9
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Dec 24 01:12:29 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Dec 24 01:32:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=675f058f

sys-kernel/rte_kni-kmod: add pyelfutils to DEPEND

fix crazy python dependency chaos

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 net-libs/dpdk/dpdk-21.11.ebuild                   | 10 +++++-----
 sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild | 14 +++++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/net-libs/dpdk/dpdk-21.11.ebuild b/net-libs/dpdk/dpdk-21.11.ebuild
index a09a4bc53..de5f926df 100644
--- a/net-libs/dpdk/dpdk-21.11.ebuild
+++ b/net-libs/dpdk/dpdk-21.11.ebuild
@@ -21,7 +21,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 DEPEND="${PYTHON_DEPS}
-	~sys-kernel/rte_kni-kmod-${PV}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+	~sys-kernel/rte_kni-kmod-${PV}[${PYTHON_SINGLE_USEDEP}]
 	app-crypt/intel-ipsec-mb
 	dev-libs/elfutils
 	dev-libs/isa-l
@@ -38,12 +41,10 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-lang/nasm
-	test? ( $(python_gen_cond_dep '
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
 "
 
 src_configure() {
+	python-single-r1_pkg_setup
 	local emesonargs=(
 		-Denable_kmods=false
 		-Dmachine=default
@@ -51,7 +52,6 @@ src_configure() {
 		$(meson_use test tests)
 	)
 	meson_src_configure
-	python_setup
 }
 
 src_install() {

diff --git a/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild b/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild
index 7bef3eaa9..6e7423e34 100644
--- a/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild
+++ b/sys-kernel/rte_kni-kmod/rte_kni-kmod-21.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit linux-mod python-any-r1 meson
+inherit linux-mod python-single-r1 meson
 
 DESCRIPTION="DPDK Kernel Nic Interface module"
 HOMEPAGE="https://dpdk.org/"
@@ -14,9 +14,15 @@ S="${WORKDIR}/dpdk-${PV}"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+	')
+	app-crypt/intel-ipsec-mb
 	dev-libs/elfutils
+	dev-libs/isa-l
 	dev-libs/jansson
 	dev-libs/libbpf
 	dev-libs/libbsd
@@ -35,10 +41,12 @@ CONFIG_CHECK="~IOMMU_SUPPORT ~AMD_IOMMU ~VFIO ~VFIO_PCI ~UIO ~UIO_PDRV_GENIRQ ~U
 
 pkg_setup() {
 	linux-mod_pkg_setup
-	python-any-r1_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_configure() {
+	linux-mod_pkg_setup
+	python-single-r1_pkg_setup
 	# we still have to do meson configuration as it creates
 	# header files needed for compiling the rte_kni module
 	local emesonargs=(