10 files changed, 299 insertions, 18 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 903ce3db1329..6981280f2c59 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 9d3eaa34349e..e58e6612810a 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,6 +1,8 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
+DIST debianutils_5.14.tar.xz 79676 BLAKE2B b8e6c5a38cf5fe8e3d8151b1c19cfda4d5866f805453eeb8376a94e1982653cb532ffefdb560f188574ba01e97249b49b69d41f1dda9aa76de4511034736965a SHA512 4a152fec6c363c0ca26339bf8bf3f39ec3c10227bbfe5d2f5974c24a6207fdb6c34644ecfdf0c773d4c778b1a95f91a15697b12b5c0cd9a6d0d8f369373b956f
 DIST debianutils_5.7.orig.tar.gz 257231 BLAKE2B 61d2e7abcd359c5dc87b7f91e510e91e1926183c15a572c7d87cf4a590dded2e2ee8c9b4e06f7f478353139870c808927575de233200ad69e084a6f971c4bd24 SHA512 79acd8885abca93842d696167171a359011c49a40f38deeb25bc94d62905f95afa3a7b2540d3bd4b0ffd363c5c48a439a1a68139a29d6c033980b019cea75d92
 DIST debianutils_5.8.orig.tar.gz 260865 BLAKE2B 8a2bb3dc06d6e7a41ca53759610c432eaf3797135b13d717d1e8969926388a6955ba020db64a039d1b8dc06a8ee47d5bc960c6f54fe6b9c17e2b361f5636ece3 SHA512 7fddff17804ab334ac1ab3fa4b76a3fed8d83dc2dbf8d9ab1e486b5f226ac8363e98336cfa651c7630eef5fffa4551dbf7a5da1ba60f033b279f9aca624d58a2
+EBUILD debianutils-5.14.ebuild 1045 BLAKE2B cff1c6378831c0a0a3e58843ee0d106adbb9ca29cb1203ebfbe8fd6850a5912195c16bfbe9aad119ef7251c48099fe82885d245766e26422ab20efc0f2e022d3 SHA512 5db059b7bac0268a321acdf6e7bf23ace425ea2c979b8f94d04acfec36b14fd687281eb96aee24d327df69c7724d74112c6a471cc7707fbcd2aa5c9cfd910f68
 EBUILD debianutils-5.7.ebuild 1044 BLAKE2B d8175b35f5ee63c395a7d7b87306bfd25be41c19d80890c218b8d6c61ecdc3cbea1fe5a90f17f23ce43269ec56f1252ae4c151319650fa931b6aaccf94c08a26 SHA512 8fdd414115cacc0c61ae0ce411ecaa724a0173c6d9f15c2664c900e62312bb7bcceb2175deea019d1ea374c56c66b89a43e4c2c316d88e9222495438e8d81593
 EBUILD debianutils-5.8.ebuild 1044 BLAKE2B c06d03032f3a3c942651c815df94d47dd8a4e362c15321f56f5f5393a7c2dd85f87783d77fb6dc1211e04cf9eaec34fe166965a74aefa7b8cad1643b72b5603e SHA512 2a05179432bac0a180e4a7a0ecb1070c77d6376b32c0584c8d3251bfa0adc6da7d4ebc0d744c8cb39c0bcc0fdcdffd7ffd5fbd33647bf87867dbd91dae833e4b
 MISC metadata.xml 446 BLAKE2B a681b76916f27a5d016fa34c6c6ce4abe887c1f46232cb6cd759ba699eca0cba865ff7b0d33900b1f9e858e016532815b18bf86cc211b97f57a1c0a56580d125 SHA512 c080d8ae5511a0870aa778f744518a2482e7d61ff9e653a808b3959571b8bb47dc90b1b1f2feaccc323df0521f4ae91efb43fa31bd6c8a72075c8b2e9dfeb829
diff --git a/sys-apps/debianutils/debianutils-5.14.ebuild b/sys-apps/debianutils/debianutils-5.14.ebuild
new file mode 100644
index 000000000000..f56e99e6a6b0
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-5.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_prepare() {
+	# Avoid adding po4a dependency, upstream refreshes manpages.
+	sed -i -e '/SUBDIRS/s|po4a||' Makefile.am || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	into /
+	dobin run-parts
+
+	into /usr
+	dobin ischroot
+	dosbin savelog
+
+	doman ischroot.1 run-parts.8 savelog.8
+}
diff --git a/sys-apps/eza/Manifest b/sys-apps/eza/Manifest
index e6457d8a3f8d..2869d489bef4 100644
--- a/sys-apps/eza/Manifest
+++ b/sys-apps/eza/Manifest
@@ -190,5 +190,5 @@ EBUILD eza-0.11.0.ebuild 3141 BLAKE2B d57fba1139806caa5b421ebe2ecc56eedde12d16ca
 EBUILD eza-0.11.1-r1.ebuild 3700 BLAKE2B c2df4132124564da9c9a5745bfbdc30411cf75bfd2bd475b5408788141f47c1c42b1e641a383d682ded30024f03f7f46e065fa8b610cda71faf6710c420428f7 SHA512 8143710b1fa9db2381a3248fe9213d1abb68e603e140f841a5663d5d48fbe19e2f0c96679c58e85ff2d865d007680745e7a71fd9f7a015bb6344f4d5ae91d261
 EBUILD eza-0.13.1.ebuild 5441 BLAKE2B c9a4dccf69a350e15a79bd8bf0d1b03ae0fb71a53513815901a5bfffd97d909226f1781062a5dbe3bda543d5a713c114be4debb75c17ad7948fb392dee33c507 SHA512 d245097fb3ceb6d7ab6d1373e3edc18a88d500bb36c4c322c6181a66f222eb4f3e7384ea9849c5a8da71533147807653640cfcfd665ebfa517d21a365844c037
 EBUILD eza-0.14.0.ebuild 5441 BLAKE2B e61032e83d3dd727cccdc73d7a0a0173409bad5ef9118d053cae8c3e69137bb4c71e04eaa371f69512d3fe2312b611aab4d116046bb89eb0b7e9cf601b4258ba SHA512 79e95494e292dbdb203137cc711789ff38a005cd9df662565d00b55d1247eb8c969dd719e52b1156e952bc5cd05dbc9ccfbba3d9977f72c537bcdaab73cf619f
-EBUILD eza-0.14.1.ebuild 5428 BLAKE2B fd49b649f5dfad1c1cf4cd54c16b43b246d325968a5172c641a7ccf7725ad6b3db97e54c7e7a382c17971c4972cb9a1d45e9f91dc49f289ddad32a21e25d7cfc SHA512 810f0cd07de550f3692ad3e1d66424841eb892bf2e3907faab309f471c6ead2a6691d9eaf6771d2cb6aaae5f7e4d6c1e77a19f5f77323902bdccf6e8b7c4bd12
+EBUILD eza-0.14.1.ebuild 5435 BLAKE2B a51817c07766e30805b74d4f6f4787b0ae3f80d1522b32c0b9df2ec394a01e914a0c82e7e775a60f748ac3f5a5f6668530e36de2f082c4d5614f864bb7401c04 SHA512 326b56d070efb5188a43ddd5e414bf976f5d03e4f079b9e93e3152f642ca80fd63d36ad95eb0a5b7b4d0253f526977ca0f045bc0ca6edde1c2a950dca9091415
 MISC metadata.xml 495 BLAKE2B 306ca308e3132da0688cee3f358d239c0b5ab3014c01d8624344d3a68643741a3d4303c1199454589f7fbc3a22d80fcc8ac66377b02895a39c1b54e078aee787 SHA512 09872a6228f3f3884044a8d08970ca5933a2de28049b900f85a99c749b7710268f7981f7115b796dbff159c471af3a60a4326da4412e660206b9ecbb6d24d11e
diff --git a/sys-apps/eza/eza-0.14.1.ebuild b/sys-apps/eza/eza-0.14.1.ebuild
index 38c4ef0eb22c..61db559dd9c8 100644
--- a/sys-apps/eza/eza-0.14.1.ebuild
+++ b/sys-apps/eza/eza-0.14.1.ebuild
@@ -178,7 +178,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 IUSE="+git man"
 
 DEPEND="git? ( dev-libs/libgit2:= )"
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index c349ead3a52c..fbe310dc357a 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
 EBUILD gentoo-functions-9999.ebuild 1025 BLAKE2B fdfa38a3fa0dbd7bceff4f1a211924f5efa890b6f4ee75e1a46d182a508eb89e153994a6d2805147f1c8cf0556460927479e598cb053ff716b6c81a45f1fca53 SHA512 31dd91c713f4172825d28c2d018baaf46b7e0e408cd2c0f1f9cfafaba6932d1a8ea80e9a9b9402b7d483295524a384de2320adae70ed63820e3334acfab1bc7b
-MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
+MISC metadata.xml 487 BLAKE2B c34b1b196d84a44ca3f2729101b826a6460f6b560f942e95e444d23b821256e9c4f330e5b7a2530dabd34b0f1e0a3844ed4b52ea5944500b0b4c72bd955f988a SHA512 3c3008734be30e74ccf3a1f34e4112eef2df0f4e8b0b5d1dd1e90037d130428b21b05ad3686a74c18e5a035a15b32e89cd04de4274e311aa1e30a42ad8cf97f0
diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index a228a51ef7ee..8107c73dd794 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">gentoo/gentoo-functions</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gentoo">proj/gentoo-functions</remote-id>
+		<remote-id type="github">gentoo/gentoo-functions</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index cca75874b9a1..ab2bed178d65 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,6 +1,8 @@
 AUX kmod-30-configure-clang16.patch 948 BLAKE2B 35403640d79e60d1600abd676be818331ea975f139136bd60cd06df183768d78e11427505e7eda56d501a964420bff07eebff61e414655a7b043076e082ab143 SHA512 5f1b765ba51e224d464814247aa343649d1677f619dcca99d0a00ca244580443cc7615bf5291773062aa03cdeb42c7475d40da749c39d79907ae4ba0c9ed9c29
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
+DIST kmod-31.tar.xz 570936 BLAKE2B 0dc8572da570315cf0aadd87fa7e83d0f88dea91c8566749e6f3004f9a6df916dce337ca99ea5929d41f45b408c1e3effa50f9d24615d7fa28688150a5ce91cf SHA512 05ca70381808bec5f262b94db625662c385408988178a35e4aaf4960ee0716dc0cbfc327160ea4b61098d0c2130ab1b5142ea8156bea8e06ded7f4d288b6d085
 EBUILD kmod-30-r1.ebuild 6134 BLAKE2B b9cfdbd59469cebc6193015b61b127a30c65cb013f46cb8fd14bde0dd979338b6f934f7013ff5e539424dc63ea4cabc11140abace5e9df68bb2c31accab7abda SHA512 424dcfef85350f160e15f3ae3a846962a2c931812b7a9fd7b38b80c681f8d17d6fcab508b774b9f447f195cbf3f25b4bc663b428be02accec7d787591b487ebe
-EBUILD kmod-9999.ebuild 5970 BLAKE2B 85950b5aba18c4050c8db2f63e8d513f9490d886541523e007890aff8cce52819a76506b8332a84dc052519095237b29de0b2ecbe193cb6e969d2326e184496c SHA512 149e16f86841f272f700633b39eafbe179d35efc4db7b06a51fe06562b210ecdb1e2fc0fac8fc5c644335a07f22dca03f8ae312eadc0c5d394da44a89b2e1cae
+EBUILD kmod-31.ebuild 5887 BLAKE2B 876e2d8b604afca4359f64c4be6a7cf341c3a1142739747fff6e752b9b6c46c73b42c2f7ab46c1a617023c4fdf3e949bf2eb035da21fb91378fe1533a022c596 SHA512 18b6b18cd0abf48712e15f844cd277d1c171affcb8843ef050400e72d6762f7b43b16189942e3eea545b9850bff4b18a6b712fb0423adf937ec67bd7bc5db292
+EBUILD kmod-9999.ebuild 5887 BLAKE2B 876e2d8b604afca4359f64c4be6a7cf341c3a1142739747fff6e752b9b6c46c73b42c2f7ab46c1a617023c4fdf3e949bf2eb035da21fb91378fe1533a022c596 SHA512 18b6b18cd0abf48712e15f844cd277d1c171affcb8843ef050400e72d6762f7b43b16189942e3eea545b9850bff4b18a6b712fb0423adf937ec67bd7bc5db292
 MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/kmod-31.ebuild b/sys-apps/kmod/kmod-31.ebuild
new file mode 100644
index 000000000000..21e19df0980e
--- /dev/null
+++ b/sys-apps/kmod/kmod-31.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit autotools libtool bash-completion-r1 python-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+#RESTRICT="test"
+
+# - >=zlib-1.2.6 required because of bug #427130
+# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+# - >=zstd-1.5.2-r1 required for bug #771078
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	!<sys-apps/openrc-0.13.8
+	!<sys-apps/systemd-216-r3
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.5.2-r1:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+	)
+	zlib? ( virtual/pkgconfig )
+"
+if [[ ${PV} == 9999* ]]; then
+	BDEPEND="${BDEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( NEWS README.md TODO )
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] || use doc ; then
+		if use doc; then
+			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static, bug #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
+		$(use_enable debug)
+		$(usex doc '--enable-gtk-doc' '')
+		$(use_enable static-libs static)
+		$(use_enable tools)
+		$(use_with lzma xz)
+		$(use_with pkcs7 openssl)
+		$(use_with zlib)
+		$(use_with zstd)
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_test() {
+	python_test() {
+		mkdir "${T}/test-${EPYTHON}" || die
+		emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+
+		# Smoke test based on https://bugs.gentoo.org/891975#c5
+		local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}"
+		${EPYTHON} -c 'import kmod; km = kmod.Kmod(); print([(m.name, m.size) for m in km.loaded()])' || die
+		rm -r "${T}/test-${EPYTHON}" || die
+	}
+
+	if use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
+	einstalldocs
+
+	if use python; then
+		local native_builddir="${BUILD_DIR}"
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+			python_optimize
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
+		done
+
+		# These are also usable as normal user
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	# bug #260139
+	doins "${T}"/usb-load-ehci-first.conf
+
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
+		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
+	fi
+
+	# Add kmod to the runlevel automatically if this is the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
+		fi
+	fi
+
+	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+			ewarn
+			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+			ewarn "kernel modules to have required static nodes!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add kmod-static-nodes sysinit"
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 50b51480db27..21e19df0980e 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit autotools libtool bash-completion-r1 python-r1
 
@@ -136,9 +136,9 @@ src_test() {
 	python_test() {
 		mkdir "${T}/test-${EPYTHON}" || die
 		emake -C "${BUILD_DIR}" DESTDIR="${T}/test-${EPYTHON}" \
-                                VPATH="${native_builddir}:${S}" \
-                                install-pkgpyexecLTLIBRARIES \
-                                install-dist_pkgpyexecPYTHON
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
 
 		# Smoke test based on https://bugs.gentoo.org/891975#c5
 		local -x PYTHONPATH="${T}/test-${EPYTHON}/usr/lib/${EPYTHON}/site-packages:${PYTHONPATH}"