gentoo resync : 29.12.2022

3 files changed, 225 insertions, 17 deletions

diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 23eb6257b144..6fde1d0bce06 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,6 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
+EBUILD kmod-29-r2.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da
 EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
-EBUILD kmod-9999.ebuild 5237 BLAKE2B 6b8233ab744534061927afdd75bcd8d8a26c7f4243db2fa460729e5bbb78914d9279f0667e9d6f25ca5213eb4846d33fb18c3fa189dd8a68559507a68f513d49 SHA512 0739003537b94cff33ab4bb4a795df48dc01b2fb2cf15501e8f6b756a5734e0568d91b50787aff8e10e08db8e6a0c9a609db8bb473d50b10c1ea0add817ebe9c
+EBUILD kmod-9999.ebuild 5291 BLAKE2B 434a7a9104f0d64f8a22dc8e0dbc57b1652b15e9c6796deaebbba2c6d57116a88fc7f569f5c435820d04e41770ef3ab7b23a282a24b6c4f5da8d367ea166ff71 SHA512 b948c27eb7e144ff067f5587c2d897847290046bb0d9d207a468ce1983bc602f9fb6e03e08067857f25230e9aa2fe19d94136a5ab2c9113614c520d6dfc406ca
 MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-29-r2.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild
new file mode 100644
index 000000000000..d6f72bfcac71
--- /dev/null
+++ b/sys-apps/kmod/kmod-29-r2.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 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_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 c18aedb0e8f6..48747e41ed50 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit autotools bash-completion-r1 multilib python-r1
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	#inherit libtool
+	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"
@@ -21,7 +20,7 @@ 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"
+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.
@@ -29,17 +28,18 @@ IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
 # 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
+# - >=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.1-r3 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:0= )
+	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
 	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.4.4 )"
+	zstd? ( >=app-arch/zstd-1.5.1-r3:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
@@ -50,7 +50,7 @@ BDEPEND="
 	python? (
 		dev-python/cython[${PYTHON_USEDEP}]
 		virtual/pkgconfig
-		)
+	)
 	zlib? ( virtual/pkgconfig )
 "
 if [[ ${PV} == 9999* ]]; then
@@ -77,7 +77,7 @@ src_prepare() {
 		elibtoolize
 	fi
 
-	# Restore possibility of running --enable-static wrt #472608
+	# 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
@@ -118,7 +118,7 @@ src_compile() {
 	emake -C "${BUILD_DIR}"
 
 	if use python; then
-		local native_builddir=${BUILD_DIR}
+		local native_builddir="${BUILD_DIR}"
 
 		python_compile() {
 			emake -C "${BUILD_DIR}" -f Makefile -f - python \
@@ -134,10 +134,11 @@ src_compile() {
 
 src_install() {
 	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+
 	einstalldocs
 
 	if use python; then
-		local native_builddir=${BUILD_DIR}
+		local native_builddir="${BUILD_DIR}"
 
 		python_install() {
 			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
@@ -170,7 +171,8 @@ src_install() {
 	EOF
 
 	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
+	# bug #260139
+	doins "${T}"/usb-load-ehci-first.conf
 
 	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
 }