gentoo auto-resync : 24:03:2024 - 07:00:59

2 files changed, 57 insertions, 46 deletions

diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index c433ff33febf..60e692cc1dd5 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -11,5 +11,5 @@ DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4e
 DIST systemd-stable-255.4.tar.gz 14952427 BLAKE2B 27f5080f83a9e870fbe8e3ebcb500a63c42022f1f96f26f35c76eeeea85dab691291c31ee716cab330b76df5e576910a6a82f51267eff4f766b1d4c304d815c9 SHA512 8a2bde11a55f7f788ba7751789a5e9be6ce9634e88d54e49f6e832c4c49020c6cacaf2a610fe26f92998b0cbf43c6c2150a96b2c0953d23261009f57d71ea979
 EBUILD systemd-utils-254.10.ebuild 13334 BLAKE2B f3c6e304f8d6f50f0a16ab7538fe344a29fcb5de67566d8089dc94a781cd5616b645998fd521cde4f7396d473a8a73483b973406256361bb20e0405d2598e11b SHA512 f4e50d735d3eebe3ef378f6bb9c92c39c3cb71ec6b7602d0d7703aa728d5aa8995540bc6c4d8714560f9b0956c4e34b915e2cfd88f3058e88b60ae0395eed6db
 EBUILD systemd-utils-254.8.ebuild 13366 BLAKE2B 6548bb5722bf0fffbf4381da4c6b0b127ce9f958f3907a9a71f6e25cbb5a19e73d94da9a24fd0d143eed62146ff5d32e266800c4433c0e8420e84d0242adb746 SHA512 436aa75a70d3c2bd182e5cfedfc08e79c3025aa2877943bd8ccaf81f9d9c4f4b261e68de552c7c847dacfde1871c0100a3a9ed5945a1c9c33221db20286d4994
-EBUILD systemd-utils-255.4.ebuild 12780 BLAKE2B 5acd472775a70d29d7831ae2ce4c96f1b838bf18a22c99d6519a55bf06b3e470a2b7bb1005c483982f4e7058a0331261bcb6ad090563c0d9c7d04d2e20bbe0c9 SHA512 1e9208cbb6189b5f77dc83dbbd85d56d7fe2abaa4b50ac539b1fdb9fbe6d8426413f317a9e2cff810b02895a602d75eecd92b7811345a5a9e786cd61d9dbfa21
+EBUILD systemd-utils-255.4.ebuild 13465 BLAKE2B 74bedff4e7d6319979f3b1f15906f20f02e69b01ed1195074aa22805fba3e2564ffaf1e39afe4f94f85f4b71ca57cd8ba4c6c3b6beea2d291b5bb1cba29ee61c SHA512 32f66b2d780d8409266d1757c02d22398aa3fc23325e0f0986cbb7c93fd7565e57006263dfea55216239fa21f82c36bd2143ce816363ddcf638d5579c3795962
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index a92779a24a0c..d6aeb2a85d2c 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
-inherit secureboot toolchain-funcs udev
+inherit secureboot udev
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -252,25 +252,36 @@ multilib_src_configure() {
 	fi
 }
 
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
 multilib_src_compile() {
 	local targets=()
 	if multilib_is_native_abi; then
 		if use boot; then
+			local efi_arch= efi_arch_alt=
+			case ${CHOST} in
+				aarch64*)     efi_arch=aa64 ;;
+				arm*)         efi_arch=arm ;;
+				loongarch32*) efi_arch=loongarch32 ;;
+				loongarch64*) efi_arch=loongarch64 ;;
+				riscv32*)     efi_arch=riscv32 ;;
+				riscv64*)     efi_arch=riscv64 ;;
+				x86_64*)      efi_arch=x64 efi_arch_alt=ia32;;
+				i?86*)        efi_arch=ia32 ;;
+			esac
 			targets+=(
 				bootctl
 				man/bootctl.1
-				src/boot/efi/linux$(efi_arch).efi.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
+				src/boot/efi/systemd-boot${efi_arch}.efi
+				src/boot/efi/linux${efi_arch}.efi.stub
+				src/boot/efi/addon${efi_arch}.efi.stub
 			)
+			if [[ -n ${efi_arch_alt} ]]; then
+				targets+=(
+					src/boot/efi/systemd-boot${efi_arch_alt}.efi
+					src/boot/efi/linux${efi_arch_alt}.efi.stub
+					src/boot/efi/addon${efi_arch_alt}.efi.stub
+				)
+			fi
+
 		fi
 		if use kernel-install; then
 			targets+=(
@@ -288,6 +299,7 @@ multilib_src_compile() {
 			if use test; then
 				targets+=(
 					systemd-runtest.env
+					test-offline-passwd
 				)
 			fi
 		fi
@@ -308,7 +320,9 @@ multilib_src_compile() {
 				systemd-hwdb
 				ata_id
 				cdrom_id
+				dmi_memory_id
 				fido_id
+				iocost
 				mtd_probe
 				scsi_id
 				v4l_id
@@ -336,15 +350,24 @@ multilib_src_compile() {
 				rules.d/50-udev-default.rules
 				rules.d/60-persistent-storage.rules
 				rules.d/64-btrfs.rules
+				rules.d/70-uaccess.rules.in
+				rules.d/71-seat.rules.in
+				rules.d/73-seat-late.rules.in
+				rules.d/99-systemd.rules
 			)
 			if use test; then
 				targets+=(
 					test-fido-id-desc
+					test-link-config-tables
 					test-udev-builtin
-					test-udev-event
+					test-udev-device-thread
+					test-udev-format
+					test-udev-manager
 					test-udev-node
+					test-udev-rule-runner
+					test-udev-rules
+					test-udev-spawn
 					test-udev-util
-					udev-rule-runner
 				)
 			fi
 		fi
@@ -377,38 +400,27 @@ multilib_src_compile() {
 multilib_src_test() {
 	local tests=()
 	if multilib_is_native_abi; then
+		if use boot; then
+			tests+=( --suite boot )
+		fi
+		if use kernel-install; then
+			tests+=( --suite kernel-install )
+		fi
 		if use sysusers; then
-			tests+=(
-				test-sysusers
-			)
+			tests+=( --suite sysusers )
 		fi
 		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles
-				test-tmpfile-util
-			)
+			tests+=( --suite tmpfiles )
 		fi
 		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev
-				test-udev-builtin
-				test-udev-event
-				test-udev-node
-				test-udev-util
-			)
+			tests+=( --suite udev )
 		fi
 	fi
 	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
+		tests+=( --suite libudev )
 	fi
 	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
+		meson_src_test --no-rebuild "${tests[@]}"
 	fi
 }
 
@@ -421,11 +433,6 @@ set_rpath() {
 }
 
 multilib_src_install() {
-	if use udev; then
-		meson_install --no-rebuild --tags libudev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
 	if multilib_is_native_abi; then
 		exeinto "/usr/$(get_libdir)/systemd"
 		doexe src/shared/libsystemd-shared-${PV%%.*}.so
@@ -433,8 +440,7 @@ multilib_src_install() {
 			set_rpath bootctl
 			dobin bootctl
 			doman man/bootctl.1
-			insinto /usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+			meson_install --no-rebuild --tags systemd-boot
 		fi
 		if use kernel-install; then
 			set_rpath kernel-install
@@ -461,8 +467,8 @@ multilib_src_install() {
 			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
 
 			exeinto /usr/lib/udev
-			set_rpath {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-			doexe {ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			set_rpath {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
+			doexe {ata_id,cdrom_id,dmi_memory_id,fido_id,iocost,mtd_probe,scsi_id,v4l_id}
 
 			rm -f rules.d/99-systemd.rules
 			insinto /usr/lib/udev/rules.d
@@ -485,6 +491,11 @@ multilib_src_install() {
 			doman man/ukify.1
 		fi
 	fi
+	if use udev; then
+		meson_install --no-rebuild --tags libudev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
 }
 
 multilib_src_install_all() {