Merge updates from master

2026-07-19 12:03:02 -04:00 · 2024-04-14 01:33:21 +00:00
parent 9d8ef01c26 e130f7aad7
commit 8e7a98f126
20 changed files with 54 additions and 381 deletions
--- a/dev-python/libusb1/libusb1-2.0.1-r1.ebuild
+++ b/dev-python/libusb1/libusb1-2.0.1-r1.ebuild
@@ -9,7 +9,10 @@ DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi

 DESCRIPTION="Pure-python wrapper for libusb-1.0"
-HOMEPAGE="https://github.com/vpelletier/python-libusb1 https://pypi.org/project/libusb1/"
+HOMEPAGE="
+	https://github.com/vpelletier/python-libusb1
+	https://pypi.org/project/libusb1/
+"

 LICENSE="LGPL-2.1+"
 SLOT="0"
--- a/dev-python/nkdfu/nkdfu-0.2.ebuild
+++ b/dev-python/nkdfu/nkdfu-0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit distutils-r1

 DESCRIPTION="Python DFU tool for updating Nitrokeys' firmware"
--- a/dev-python/playsound/playsound-1.3.0.ebuild
+++ b/dev-python/playsound/playsound-1.3.0.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
-PYTHON_COMPAT=( python3_10 pypy3 )
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
 inherit distutils-r1 pypi

-DESCRIPTION="Single function module with no dependencies for playing sounds."
-HOMEPAGE="https://pypi.org/project/playsound/ https://github.com/TaylorSMarks/playsound"
+DESCRIPTION="Single function module with no dependencies for playing sounds"
+HOMEPAGE="
+	https://pypi.org/project/playsound/
+	https://github.com/TaylorSMarks/playsound
+"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND="${RDEPEND}"
--- a/dev-python/pygments-promql/Manifest
+++ b/dev-python/pygments-promql/Manifest
@@ -1 +1 @@
-DIST pygments-promql-0.0.9.tar.gz 97971 BLAKE2B 77413cad92374b9ac0f6dc6b5f8453c639f3da77abc7014f81e9392c59a36010da71eba50a445a4c4ebbd485f982e7946237a5a8dfed5c90841e93dcd226135d SHA512 5e0138fbf6f303609adcbd7c5d3142a5d10d84f3e64ee55973d129f39f85425484d79d988708f1bf2ceeb97b8752f59407bb453c5f352be2b6de7da975de432d
+DIST pygments-promql-0.0.9.gh.tar.gz 97971 BLAKE2B 77413cad92374b9ac0f6dc6b5f8453c639f3da77abc7014f81e9392c59a36010da71eba50a445a4c4ebbd485f982e7946237a5a8dfed5c90841e93dcd226135d SHA512 5e0138fbf6f303609adcbd7c5d3142a5d10d84f3e64ee55973d129f39f85425484d79d988708f1bf2ceeb97b8752f59407bb453c5f352be2b6de7da975de432d
--- a/dev-python/pygments-promql/pygments-promql-0.0.9-r1.ebuild
+++ b/dev-python/pygments-promql/pygments-promql-0.0.9-r1.ebuild
@@ -3,12 +3,14 @@

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1

 DESCRIPTION="A PromQL lexer for Pygments"
 HOMEPAGE="https://github.com/pabluk/pygments-promql"
-SRC_URI="https://github.com/pabluk/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/pabluk/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
--- a/dev-python/python-fire/Manifest
+++ b/dev-python/python-fire/Manifest
@@ -1,2 +1 @@
-DIST python-fire-0.4.0.tar.gz 104198 BLAKE2B 1060931356753c00daa5c138234a8214c3662ae8aab54fa050488df89251be7cdf9846af46defd4fbeed817ca2cc1992e7978ad68579ad753749cdf3e9b6c011 SHA512 24473cae1cbaf01a6a07939fd77b8d26d97e5efb0bca349f65ed6a8bbf132167d74140b42030dcee0404945581d039230e0e8f8edb0bf8664e8e9f6555dfdeb5
-DIST python-fire-0.5.0.gh.tar.gz 105701 BLAKE2B 25acb51c3a76ec14c82157edfa2f0ac4fd49a58f78a62c98f1680cd0817413088820c6db00c5062cee30ed9849696c890054bad214ddfe1d7c613b0c30d31d1e SHA512 9d99b53d03568993f93f4742549b68c6a09668dec51fafc62b66b88cda123e055d0408b61e88ce88ee63d153afc543cec435aeddba9bbfaf2d587ba9bb8ed2ef
+DIST fire-0.6.0.tar.gz 88439 BLAKE2B 5eb8a7ec2e0f93bec50f0b6a03edfe9ec6040ca2f3a85a77875df752457281c7614874254db935dcd94c229af3fd6722088c43dae7664e99c3f09047f9d4453f SHA512 491f224d31038494be2f40dd55e8713da20e4a20dc044ed1346deaeff69d65908ac754679b36ae1dbf42319c26cb30acc664a444f2d735d173971001447a9dd3
--- a/dev-python/python-fire/python-fire-0.5.0.ebuild
+++ b/dev-python/python-fire/python-fire-0.5.0.ebuild
@@ -1,24 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Library for automatically generating command line interfaces from Python objects"
-HOMEPAGE="https://pypi.org/project/python-fire/"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six
-	dev-python/termcolor
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
--- a/dev-python/python-fire/python-fire-0.6.0.ebuild
+++ b/dev-python/python-fire/python-fire-0.6.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10,11} )
-inherit distutils-r1
+PYPI_PN="fire"
+inherit distutils-r1 pypi

 DESCRIPTION="Library for automatically generating command line interfaces from Python objects"
 HOMEPAGE="https://pypi.org/project/python-fire/"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,6 +19,13 @@ RDEPEND="
 	dev-python/six
 	dev-python/termcolor
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/hypothesis
+		dev-python/mock
+		dev-python/pytest-asyncio
+	)
+"

 distutils_enable_tests pytest
--- a/dev-python/yams/Manifest
+++ b/dev-python/yams/Manifest
@@ -1 +1 @@
-DIST yams-0.7.3.tar.gz 31201 BLAKE2B 0b09157c545c3ffe4b2b792c8bd00ebf66f78b65a45904db397b7295d43f4cdefd18c5ef855b88f5652debf6c43902d8e8415cf6d134c51d225bc6ae6ba084dc SHA512 785aae9ce0e371e50dac4070a06102d6ac440acd179b6840d4283b0298dd0ae36f12b9f695ddbf7ee2bb281e4d6e1cfd600a444c4169d5652662da1f8c52f43d
+DIST yams-0.7.3.gh.tar.gz 31201 BLAKE2B 0b09157c545c3ffe4b2b792c8bd00ebf66f78b65a45904db397b7295d43f4cdefd18c5ef855b88f5652debf6c43902d8e8415cf6d134c51d225bc6ae6ba084dc SHA512 785aae9ce0e371e50dac4070a06102d6ac440acd179b6840d4283b0298dd0ae36f12b9f695ddbf7ee2bb281e4d6e1cfd600a444c4169d5652662da1f8c52f43d
--- a/dev-python/yams/yams-0.7.3-r1.ebuild
+++ b/dev-python/yams/yams-0.7.3-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1 systemd

 DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)"
@@ -13,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
 fi

@@ -28,14 +30,6 @@ RDEPEND="
 	media-sound/mpd
 "

-python_prepare_all() {
-	# Change application name so the .egg-info directory has the
-	# same name as the Python site-package one for consistency
-	sed -e "s/YAMScrobbler/yams/" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_install_all() {
 	systemd_douserunit yams.service

--- a/dev-python/yams/yams-9999.ebuild
+++ b/dev-python/yams/yams-9999.ebuild
@@ -3,7 +3,9 @@

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1 systemd

 DESCRIPTION="Yet Another MPD Scrobbler (for Last.FM)"
@@ -13,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/Berulacks/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Berulacks/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
 fi

@@ -28,14 +30,6 @@ RDEPEND="
 	media-sound/mpd
 "

-python_prepare_all() {
-	# Change application name so the .egg-info directory has the
-	# same name as the Python site-package one for consistency
-	sed -e "s/YAMScrobbler/yams/" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
 python_install_all() {
 	systemd_douserunit yams.service

--- a/gnome-extra/portfolio/portfolio-0.9.14.ebuild
+++ b/gnome-extra/portfolio/portfolio-0.9.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit gnome2-utils meson python-single-r1 xdg

--- a/net-libs/dpdk/Manifest
+++ b/net-libs/dpdk/Manifest
@@ -1,3 +1 @@
-DIST dpdk-21.11.1.tar.xz 15115156 BLAKE2B 089e98279922b5494b205d957f9ac05001a668f4536d45e5fd89b9f7d04779e0671ec428b2408963641da3ae999d5943a1ff5dc59c23020ccefce824609c8f11 SHA512 d7afc0c918626b1706a18a129086fcd3741b251c28fa00c5711eb85a03137e5ee6e08de7bd5ebe957e442dc9b901314042b382b223e74f0fdd5d560ac657f1b3
-DIST dpdk-22.07.tar.xz 15231912 BLAKE2B 29e36519fb91d440645259932863b5fb6c2386f78d9ba78a871505d7d32e9f4803012aa62044aa578585eee4507aa1c277bda6ec0428a27820faef644f5bfd79 SHA512 8b2adb8a47732efca4e35a68ab03d6c579fc0f699344c0c10be45e62c90d412ebea5ddc37a26efd08a9af08e65c84de177817300a66e6107674f15ecfe3e696c
 DIST dpdk-23.03.tar.xz 15816416 BLAKE2B bfcd533039a765683458a784ee3827836ceca245cfd2108f807b6d8bfb3139a2d30eceb9167131b96c18e3b4d6b640b6c79a20e5f1ec4cfca54e481087f965d4 SHA512 c879ad1d84200af3233d8d717b25121e8a9906cd9f2908411e9e6044f388d7f60046427873e592bb922fd603da400ea680d2338a707809ca54bd5f5c944d945d
--- a/net-libs/dpdk/dpdk-21.11.1-r1.ebuild
+++ b/net-libs/dpdk/dpdk-21.11.1-r1.ebuild
@@ -1,66 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit python-single-r1 meson
-
-DESCRIPTION="Data Plane Development Kit libraries for fast userspace networking"
-HOMEPAGE="https://dpdk.org/"
-SRC_URI="https://fast.dpdk.org/rel/${P}.tar.xz"
-S="${WORKDIR}/dpdk-stable-${PV}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# tests require rte_kni module to be loaded
-# and also needs network and /dev access
-# and need to be run as root
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	')
-	~sys-kernel/dpdk-kmod-${PV}[${PYTHON_SINGLE_USEDEP}]
-	app-arch/libarchive
-	app-crypt/intel-ipsec-mb
-	dev-libs/elfutils
-	dev-libs/isa-l
-	dev-libs/jansson
-	dev-libs/libbpf
-	dev-libs/libbsd
-	dev-libs/openssl
-	net-libs/libmnl
-	net-libs/libpcap
-	sys-apps/dtc
-	sys-cluster/rdma-core
-	sys-process/numactl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/nasm
-"
-
-PATCHES=( "${FILESDIR}/dpdk-21.11.1-static_linker.patch" )
-
-src_configure() {
-	python-single-r1_pkg_setup
-	local emesonargs=(
-		-Denable_kmods=false
-		-Dplatform=generic
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	local pyfiles=( "${ED}"/usr/bin/*.py )
-	for pyfile in "${pyfiles[@]}"; do
-		python_fix_shebang "${pyfile}"
-	done
-}
--- a/net-libs/dpdk/dpdk-22.07-r1.ebuild
+++ b/net-libs/dpdk/dpdk-22.07-r1.ebuild
@@ -1,70 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit python-single-r1 toolchain-funcs meson
-
-DESCRIPTION="Data Plane Development Kit libraries for fast userspace networking"
-HOMEPAGE="https://dpdk.org/"
-SRC_URI="https://fast.dpdk.org/rel/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# tests require rte_kni module to be loaded
-# and also needs network and /dev access
-# and need to be run as root
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	')
-	~sys-kernel/dpdk-kmod-${PV}[${PYTHON_SINGLE_USEDEP}]
-	app-arch/libarchive
-	app-crypt/intel-ipsec-mb
-	dev-libs/elfutils
-	dev-libs/isa-l
-	dev-libs/jansson
-	dev-libs/libbpf
-	dev-libs/libbsd
-	dev-libs/openssl
-	net-libs/libmnl
-	net-libs/libpcap
-	sys-apps/dtc
-	sys-cluster/rdma-core
-	sys-process/numactl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/nasm
-"
-
-PATCHES=( "${FILESDIR}/dpdk-22.03-binutils.patch" )
-
-src_prepare() {
-	default
-	sed -e "s/@OBJDUMP@/$(tc-getOBJDUMP)/g" -i \
-		buildtools/meson.build \
-		buildtools/check-symbols.sh \
-		devtools/check-abi-version.sh || die
-}
-
-src_configure() {
-	python-single-r1_pkg_setup
-	local emesonargs=(
-		-Denable_kmods=false
-		-Dplatform=generic
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"
-}
--- a/net-libs/telepathy-haze/telepathy-haze-0.8.1.ebuild
+++ b/net-libs/telepathy-haze/telepathy-haze-0.8.1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit python-any-r1

 DESCRIPTION="Telepathy connection manager providing libpurple supported protocols"
-HOMEPAGE="https://telepathy.freedesktop.org https://developer.pidgin.im/wiki/TelepathyHaze"
+HOMEPAGE="
+	https://telepathy.freedesktop.org
+	https://developer.pidgin.im/wiki/TelepathyHaze
+"
 SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
--- a/sys-kernel/dpdk-kmod/Manifest
+++ b/sys-kernel/dpdk-kmod/Manifest
@@ -1,3 +1 @@
-DIST dpdk-21.11.1.tar.xz 15115156 BLAKE2B 089e98279922b5494b205d957f9ac05001a668f4536d45e5fd89b9f7d04779e0671ec428b2408963641da3ae999d5943a1ff5dc59c23020ccefce824609c8f11 SHA512 d7afc0c918626b1706a18a129086fcd3741b251c28fa00c5711eb85a03137e5ee6e08de7bd5ebe957e442dc9b901314042b382b223e74f0fdd5d560ac657f1b3
-DIST dpdk-22.07.tar.xz 15231912 BLAKE2B 29e36519fb91d440645259932863b5fb6c2386f78d9ba78a871505d7d32e9f4803012aa62044aa578585eee4507aa1c277bda6ec0428a27820faef644f5bfd79 SHA512 8b2adb8a47732efca4e35a68ab03d6c579fc0f699344c0c10be45e62c90d412ebea5ddc37a26efd08a9af08e65c84de177817300a66e6107674f15ecfe3e696c
 DIST dpdk-23.03.tar.xz 15816416 BLAKE2B bfcd533039a765683458a784ee3827836ceca245cfd2108f807b6d8bfb3139a2d30eceb9167131b96c18e3b4d6b640b6c79a20e5f1ec4cfca54e481087f965d4 SHA512 c879ad1d84200af3233d8d717b25121e8a9906cd9f2908411e9e6044f388d7f60046427873e592bb922fd603da400ea680d2338a707809ca54bd5f5c944d945d
--- a/sys-kernel/dpdk-kmod/dpdk-kmod-21.11.1.ebuild
+++ b/sys-kernel/dpdk-kmod/dpdk-kmod-21.11.1.ebuild
@@ -1,78 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit linux-mod python-single-r1 meson
-
-DESCRIPTION="DPDK Kernel Nic Interface module"
-HOMEPAGE="https://dpdk.org/"
-SRC_URI="https://fast.dpdk.org/rel/dpdk-${PV}.tar.xz"
-S="${WORKDIR}/dpdk-stable-${PV}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# tests need root
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	$(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
-	dev-libs/openssl
-	net-libs/libmnl
-	net-libs/libpcap
-	sys-apps/dtc
-	sys-cluster/rdma-core
-	sys-process/numactl
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-CONFIG_CHECK="~IOMMU_SUPPORT ~AMD_IOMMU ~VFIO ~VFIO_PCI ~UIO ~UIO_PDRV_GENIRQ ~UIO_DMEM_GENIRQ ~HPET_MMAP"
-
-pkg_setup() {
-	linux-mod_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=(
-		-Denable_kmods=false
-		-Dmachine=default
-		-Dplatform=generic
-	)
-	meson_src_configure
-
-	# export after meson_src_configure as BUILD_DIR is needed for module compilation
-	export MODULE_NAMES="rte_kni(extra/dpdk:${S}/kernel/linux/kni)"
-	export BUILD_PARAMS="-C \"${KERNEL_DIR}\" M=\"${S}\"/kernel/linux/kni \
-		src=\"${S}\"/kernel/linux/kni \
-		MODULE_CFLAGS=\"${HAVE_ARG_TX_QUEUE} -include ${S}/config/rte_config.h -I${S}/lib/eal/include \
-		-I${S}/lib/kni -I${S}/kernel/linux/kni -I${BUILD_DIR} -I${S}\""
-	export BUILD_TARGETS="modules"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
--- a/sys-kernel/dpdk-kmod/dpdk-kmod-22.07.ebuild
+++ b/sys-kernel/dpdk-kmod/dpdk-kmod-22.07.ebuild
@@ -1,86 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit linux-mod toolchain-funcs python-single-r1 meson
-
-DESCRIPTION="DPDK Kernel Nic Interface module"
-HOMEPAGE="https://dpdk.org/"
-SRC_URI="https://fast.dpdk.org/rel/dpdk-${PV}.tar.xz"
-S="${WORKDIR}/dpdk-${PV}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# tests need root
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	$(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
-	dev-libs/openssl
-	net-libs/libmnl
-	net-libs/libpcap
-	sys-apps/dtc
-	sys-cluster/rdma-core
-	sys-process/numactl
-"
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-PATCHES=( "${FILESDIR}/dpdk-22.03-binutils.patch" )
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -e "s/@OBJDUMP@/$(tc-getOBJDUMP)/g" -i \
-		buildtools/meson.build \
-		buildtools/check-symbols.sh \
-		devtools/check-abi-version.sh || die
-}
-
-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=(
-		-Denable_kmods=false
-		-Dmachine=default
-		-Dplatform=generic
-	)
-	meson_src_configure
-
-	# export after meson_src_configure as BUILD_DIR is needed for module compilation
-	export MODULE_NAMES="rte_kni(extra/dpdk:${S}/kernel/linux/kni)"
-	export BUILD_PARAMS="-C \"${KERNEL_DIR}\" M=\"${S}\"/kernel/linux/kni \
-		src=\"${S}\"/kernel/linux/kni \
-		MODULE_CFLAGS=\"${HAVE_ARG_TX_QUEUE} -include ${S}/config/rte_config.h -I${S}/lib/eal/include \
-		-I${S}/lib/kni -I${S}/kernel/linux/kni -I${BUILD_DIR} -I${S}\""
-	export BUILD_TARGETS="modules"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
--- a/x11-misc/picom-jonaburg/picom-jonaburg-9999.ebuild
+++ b/x11-misc/picom-jonaburg/picom-jonaburg-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit git-r3 meson python-any-r1 virtualx xdg

 DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -51,11 +51,7 @@ BDEPEND="virtual/pkgconfig
 DOCS=( README.md picom.sample.conf )

 python_check_deps() {
-	has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	python_has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
 }

 src_configure() {