gentoo auto-resync : 24:03:2024 - 01:01:06

4 files changed, 81 insertions, 81 deletions

diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index a7414ca9f748..c433ff33febf 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,10 +5,11 @@ AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 AUX systemd-utils-254.3-add-link-kernel-install-shared-option.patch 2350 BLAKE2B b9ad80ddadea96516198b8bee351443ec155e5bdf916b6ee86ec5b6712565ddafc04fa632dd0c56bd9e18345d444a7e17d63446121e84402a85c9a828c20e670 SHA512 390fc403630a6abd5724d8939162de4f869e9b7681824a1280a769742bbcccac4126e1cbcc076b48aaf1aa07097b5eae1f5375da1702a8cc452f92996fd0d4f8
 DIST systemd-musl-patches-254.3.tar.gz 28640 BLAKE2B 54837f49cdb8cf025e367ad13bab0d0509c2e11ad84d29724bb6baa226c54e0ab97a91035361f66009dd9b1a22f7b3e82f90b1c14adf4aa20d576b9410589d38 SHA512 07d028a57025b2626471d6f48507f2dfc50658db24efaac93bafae9a1d4cdc3ec82e80da426d2a6280c32af2d813565609dab7df5538260ba809b63309a0ffed
+DIST systemd-musl-patches-255.4.tar.gz 31633 BLAKE2B 86fb36fbfa90dfe7d183f3c814600af93a690c7cfefc551cd23e6b8bdc2a48267910f4e5ef119b1b5d8e4e0cb2e6843e1b7147464809febad3085d2c82a728c3 SHA512 86bbb735012ce20bbc0af34ea062e83d6d3adf7883f5710ab00db7188fa6779e8dc361cdac427540042c4cf2f157242e6409ed5fc213c01d06cc13380e0cc95f
 DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bbfe711f1351afa022801f5a646f2dd1d76d63c17e52e6ebf43b38a76807907287b654a7eaca3afdb0688f5b05839e98ad727 SHA512 0c127d38d0ade8655ae12172c2edbaa8af68bd29f42d965b988d75e74626846ae859bcf0b39b535c9a99ad8c709ad7575ed4d5ea5bc95ce8729e3caafdb32b70
 DIST systemd-stable-254.8.tar.gz 14418468 BLAKE2B e5a151ece86e57c7224fc95bda1b4ede1277fce4a2ba28d3605ab0431a2aafe1088f90c49a20e3b53a5b56aeef7c0f1f5da0601db740150f5efdf6eae7bbde80 SHA512 a3f35d9fcafcccd8d9c33ab1047241f226146017be95562a67c7dcc9eeb4b77bded92ad80e92f4767f2bf2009df0172a621d4c54a805e07ed5a5ed03940ec28e
-DIST systemd-stable-254.9.tar.gz 14423806 BLAKE2B ab39c0a00b8451b24b40e39f4bf7ecb912ff23d9cd6f8d30fd0545e895936baa635b1ff63c02a83761682b72f44244aac8338bf6506885c9b07cd0c5247b6693 SHA512 a0300693a044cfe4c76deb0e3e48a927125eb97c3952c07ba68936f1e093c93506d8044b249b534b8e778ade6143b43194f8d6b721a8cd520bc7bb4cb3d3e5c1
-EBUILD systemd-utils-254.10.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
-EBUILD systemd-utils-254.8.ebuild 13438 BLAKE2B 62053032c87e27db1ce64ab57c21d59305a681dd79fbeac3c88aef4b29c5dab0f98370a94d2e000ae3a742c9211291e6b6e469b95e3f3fc052942099ecf38921 SHA512 81b918ca31103c1953d92b3c6b9d8bac19c56ad4be59173a4a447e78e2ac7eb1c8789198fc6c33156d024370e94f5c39c8a91d01f17fcf4d28162bdaa7d1270e
-EBUILD systemd-utils-254.9-r1.ebuild 13406 BLAKE2B 449e1933a2ab091466acbea019572d098881f55333200cbfcde87e58a7fed83fd4775f10eb2a60033f3fa1c654f6b7ffde11ab9545877a556aef7165a4a2e5f0 SHA512 ecb864a2f00ba37d696a53be92e04a7d57862ec519f9bb0b756e5493e3cc2da92265889cef95f215eb8945942214a937758e62979e3181954db1f1a8feb310cb
+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
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
index e0ac974de10f..93436b880f05 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
 		if use kernel-install; then
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
 			exeinto usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
@@ -503,12 +501,14 @@ multilib_src_install_all() {
 	einstalldocs
 	if use boot; then
 		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		dobashcomp shell-completion/bash/bootctl
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/{_bootctl,_kernel-install}
 	fi
+	if use kernel-install; then
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
 	if use tmpfiles; then
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
index af0e5dfe3c6a..b73e1d640a89 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
@@ -446,8 +446,6 @@ multilib_src_install() {
 		if use kernel-install; then
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
 			exeinto usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
@@ -504,12 +502,14 @@ multilib_src_install_all() {
 	einstalldocs
 	if use boot; then
 		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		dobashcomp shell-completion/bash/bootctl
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/{_bootctl,_kernel-install}
 	fi
+	if use kernel-install; then
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
 	if use tmpfiles; then
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
diff --git a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index e0ac974de10f..a92779a24a0c 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.9-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=( python3_{10..12} )
 
 QA_PKGCONFIG_VERSION=$(ver_cut 1)
 
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib optfeature
-inherit python-single-r1 secureboot toolchain-funcs udev
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib python-single-r1
+inherit secureboot toolchain-funcs udev
 
 DESCRIPTION="Utilities split out from systemd for OpenRC users"
 HOMEPAGE="https://systemd.io/"
@@ -22,12 +22,12 @@ else
 	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 fi
 
-MUSL_PATCHSET="systemd-musl-patches-254.3"
+MUSL_PATCHSET="systemd-musl-patches-255.4"
 SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
 REQUIRED_USE="
 	|| ( kernel-install tmpfiles sysusers udev )
@@ -101,6 +101,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	dev-util/gperf
+	dev-util/patchelf
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -130,7 +131,6 @@ pkg_setup() {
 
 src_prepare() {
 	local PATCHES=(
-		"${FILESDIR}/${PN}-254.3-add-link-kernel-install-shared-option.patch"
 	)
 
 	if use elibc_musl; then
@@ -139,11 +139,6 @@ src_prepare() {
 		)
 	fi
 	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootpkglibdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
 }
 
 src_configure() {
@@ -153,10 +148,6 @@ src_configure() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_use split-usr)
-		$(meson_use split-usr split-bin)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dsysvinit-path=
 		$(meson_native_use_bool boot bootloader)
 		$(meson_native_use_bool kernel-install)
@@ -167,14 +158,6 @@ multilib_src_configure() {
 		$(meson_use udev hwdb)
 		$(meson_native_use_bool ukify)
 
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-kernel-install-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
 		# Disable all optional features
 		-Dadm-group=false
 		-Danalyze=false
@@ -298,7 +281,7 @@ multilib_src_compile() {
 		fi
 		if use sysusers; then
 			targets+=(
-				systemd-sysusers.standalone
+				systemd-sysusers
 				man/sysusers.d.5
 				man/systemd-sysusers.8
 			)
@@ -310,7 +293,7 @@ multilib_src_compile() {
 		fi
 		if use tmpfiles; then
 			targets+=(
-				systemd-tmpfiles.standalone
+				systemd-tmpfiles
 				man/tmpfiles.d.5
 				man/systemd-tmpfiles.8
 				tmpfiles.d/{etc,static-nodes-permissions,var}.conf
@@ -323,13 +306,13 @@ multilib_src_compile() {
 			targets+=(
 				udevadm
 				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
+				ata_id
+				cdrom_id
+				fido_id
+				mtd_probe
+				scsi_id
+				v4l_id
 				src/udev/udev.pc
-				src/udev/v4l_id
 				man/udev.conf.5
 				man/systemd.link.5
 				man/hwdb.7
@@ -396,12 +379,12 @@ multilib_src_test() {
 	if multilib_is_native_abi; then
 		if use sysusers; then
 			tests+=(
-				test-sysusers.standalone
+				test-sysusers
 			)
 		fi
 		if use tmpfiles; then
 			tests+=(
-				test-systemd-tmpfiles.standalone
+				test-systemd-tmpfiles
 				test-tmpfile-util
 			)
 		fi
@@ -430,52 +413,62 @@ multilib_src_test() {
 }
 
 src_install() {
-	local rootprefix="$(usex split-usr '' /usr)"
 	meson-multilib_src_install
 }
 
+set_rpath() {
+	patchelf --set-rpath "${EPREFIX}/usr/$(get_libdir)/systemd" "$@" || die "patchelf failed"
+}
+
 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
 		if use boot; then
-			into /usr
+			set_rpath bootctl
 			dobin bootctl
 			doman man/bootctl.1
-			insinto usr/lib/systemd/boot/efi
+			insinto /usr/lib/systemd/boot/efi
 			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
 		fi
 		if use kernel-install; then
+			set_rpath kernel-install
 			dobin kernel-install
 			doman man/kernel-install.8
-			# copy the default set of plugins
-			cp "${S}/src/kernel-install/"*.install src/kernel-install || die
-			exeinto usr/lib/kernel/install.d
+			exeinto /usr/lib/kernel/install.d
 			doexe src/kernel-install/*.install
 		fi
 		if use sysusers; then
-			into "${rootprefix:-/}"
-			newbin systemd-sysusers{.standalone,}
+			set_rpath systemd-sysusers
+			dobin systemd-sysusers
 			doman man/{systemd-sysusers.8,sysusers.d.5}
 		fi
 		if use tmpfiles; then
-			into "${rootprefix:-/}"
-			newbin systemd-tmpfiles{.standalone,}
+			set_rpath systemd-tmpfiles
+			dobin systemd-tmpfiles
 			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
 			insinto /usr/lib/tmpfiles.d
 			doins tmpfiles.d/{etc,static-nodes-permissions,var}.conf
 		fi
 		if use udev; then
-			into "${rootprefix:-/}"
+			set_rpath udevadm systemd-hwdb
 			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
+			dosym ../../bin/udevadm /usr/lib/systemd/systemd-udevd
 
-			exeinto "${rootprefix}"/lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			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}
 
 			rm -f rules.d/99-systemd.rules
-			insinto "${rootprefix}"/lib/udev/rules.d
+			insinto /usr/lib/udev/rules.d
 			doins rules.d/*.rules
 
-			insinto "${rootprefix}"/lib/udev/hwdb.d
+			insinto /usr/lib/udev/hwdb.d
 			doins hwdb.d/*.hwdb
 
 			insinto /usr/share/pkgconfig
@@ -487,28 +480,24 @@ multilib_src_install() {
 			doman man/udev_*.3
 		fi
 		if use ukify; then
-			exeinto "${rootprefix}"/lib/systemd/
+			exeinto /usr/lib/systemd
 			doexe ukify
 			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() {
 	einstalldocs
 	if use boot; then
-		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
 		dobashcomp shell-completion/bash/bootctl
 		insinto /usr/share/zsh/site-functions
 		doins shell-completion/zsh/{_bootctl,_kernel-install}
 	fi
+	if use kernel-install; then
+		exeinto /usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+	fi
 	if use tmpfiles; then
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
 		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
@@ -527,17 +516,17 @@ multilib_src_install_all() {
 		doins src/udev/udev.conf
 		keepdir /etc/udev/{hwdb.d,rules.d}
 
-		insinto "${rootprefix}"/lib/systemd/network
+		insinto /usr/lib/systemd/network
 		doins network/99-default.link
 
 		# Remove to avoid conflict with elogind
 		# https://bugs.gentoo.org/856433
 		rm rules.d/70-power-switch.rules || die
-		insinto "${rootprefix}"/lib/udev/rules.d
+		insinto /usr/lib/udev/rules.d
 		doins rules.d/*.rules
 		doins "${FILESDIR}"/40-gentoo.rules
 
-		insinto "${rootprefix}"/lib/udev/hwdb.d
+		insinto /usr/lib/udev/hwdb.d
 		doins hwdb.d/*.hwdb
 
 		dobashcomp shell-completion/bash/udevadm
@@ -548,6 +537,11 @@ multilib_src_install_all() {
 
 	use ukify && python_fix_shebang "${ED}"
 	use boot && secureboot_auto_sign
+
+	if use split-usr; then
+		dosym ../usr/lib/systemd /lib/systemd
+		dosym ../usr/lib/udev /lib/udev
+	fi
 }
 
 add_service() {
@@ -560,6 +554,20 @@ add_service() {
 	eend $?
 }
 
+pkg_preinst() {
+	# Migrate /lib/{systemd,udev} to /usr/lib
+	# Symlinks will be installed in the merge phase
+	if use split-usr; then
+		local d
+		for d in systemd udev; do
+			if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} ]]; then
+				cp -rpPT "${EROOT}"/{,usr/}lib/${d} || die
+				rm -r "${EROOT}"/lib/${d} || die
+			fi
+		done
+	fi
+}
+
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		add_service systemd-tmpfiles-setup-dev sysinit
@@ -571,13 +579,4 @@ pkg_postinst() {
 		eend $?
 		udev_reload
 	fi
-
-	if use boot; then
-		optfeature "automatically installing the kernels in systemd-boot's native layout and updating the bootloader configuration" \
-			"sys-kernel/installkernel[systemd-boot]"
-	fi
-	if use ukify; then
-		optfeature "automatically generating an unified kernel image on each kernel installation" \
-			"sys-kernel/installkernel[ukify]"
-	fi
 }