gentoo auto-resync : 10:05:2023 - 05:42:48

8 files changed, 62 insertions, 224 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0172abaf8743..2da4793b80e2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index c8052f5203fd..85ca9267d020 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,11 +1,7 @@
 AUX flatpak-update.service 215 BLAKE2B 803cd26340f06385a753fe29346e464c97cd5bb8045d75ebf2f48b05cbe16f2eaad6f64186ffcdb72eb8b2747a0b43f620fb5a728531c338063e6f2cd2e5627e SHA512 2391f0eed3b5e9d6a48ae043b3165b75f4ecb2ca51ffccfdc61d5b21b11b96cb677420eb4d886f85f2e8d083833ab6149f8007f905a55ae8323ebc7c490490f2
 AUX flatpak-update.timer 122 BLAKE2B 1a353a6dee620b5b031451c17e53522b9a4f7f19c2ae85b5ed39615645c4572783bc981002eded8d30a438731bd782a2b405d62656ee3336b7e51cf08a8ef411 SHA512 147296decb8f6d0b07065bb67d96388501aadfbc0de19250d2f3ee0c3585e8c1c702b380d40cd06e4a47ab9b683ad62c29e54c955ac26a735fc0c5b2bc9df2ee
-DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
 DIST flatpak-1.12.8.tar.xz 1568984 BLAKE2B 6db457eba6b5c03ae4b7037e55f0537821152a80cad8746939fe93008922a9a33ff9f08635613e56a84f2d151826130c497c1e9f7f1e41a5b2dc215882f2eb14 SHA512 5a37d94e12c18a746b222c1ddbd20bddfb22079af1d3a79dc819cdb25f04774c9e4b3a51f9b5ed64f210317e7ec9fb97324ae38ec3430c6a515ba4042805fc57
-DIST flatpak-1.14.1.tar.xz 1626500 BLAKE2B bf33dcd5a0f0289e5bff32794012dcfc45dcdbb11ef0da5c68769c18b1bcd12fcc0308ea275a7532f59998db6afa019746313387b0f9636c7d9b91ceb7d66665 SHA512 1f22622b9a797b644b5fe9d26c3c4ec3f6b1a3b81a12d498e5aeeecb1a965c9aaa5c1d18843c938f116855bbbed3a8d9866997440f86241abe70eae13be7cdcb
 DIST flatpak-1.14.4.tar.xz 1637484 BLAKE2B cf208c581ad76d46489ba473d290c35907da0d1d473bf2b4792fb56c31e7110cd38f1c6fc4ad04aa3675868d17116ba52a84b028d7b7789c1736cfe26f3cabfe SHA512 3f97096affd4f1de184ded353f1ab403d9f1813b199b9a1595596cc7c5d6b46062aa2ef184255823f50ae95ca60d0542d9b9e520f9a605f9bc51091863bf89b0
-EBUILD flatpak-1.12.3-r1.ebuild 2520 BLAKE2B 1164a0b45277b5352f03f59cac94dba8cf9107a7f620bab0b1c1b64173c67bf2a7aa80294c0e3869743bed0387f3e0a90618ab85a1bcf098c550243bed899d8a SHA512 e53ad1f5cd51861d4b687c6212577631521c743bf4fbb18b544c8c8df9e7720e50c87a8e54a01ea27bd649f4e1f6feea19c5f5b1abcf6365ce8fa3b62fc5c849
 EBUILD flatpak-1.12.8.ebuild 2521 BLAKE2B a40a8e244e916c304d3fcabc6ef5d1ed34b13324186d3612df8d897bd9ad48c146ca2c16c18eb47d399daed883077fb335b2a652c66a73c5273d12f96a7f976f SHA512 8ea51cc5ba42827c09259a2e6d1ca49a19dbde19f0eea7406e7d2ee018a571b58206c3e39903cf96c827fd3b1ee1d6922d2556f1efccd6e1879382d9d08b6a78
-EBUILD flatpak-1.14.1.ebuild 2626 BLAKE2B 0276683806ca4180a9addbb33bdb1edf23ec8623ddd2f85238a82342a4426f8960d02b76f03b0099116e727bbc3c8e4df698ab451f63251f4c0fbc89921697d8 SHA512 4788847c696f9177459613d09b79f9414d5b773f790fa96c528d7ca7e17e6c423c08a57cdedc94a71edb42e7f07c2577304f691df1db24db77d931156ae4ccdd
-EBUILD flatpak-1.14.4-r1.ebuild 2723 BLAKE2B 907c6d62bab8c0b74f6d3ca6982722be9d5b80ceb19b8e90d11bdd8e341f046a5cd371655aa28a0e89ae53fdadbd32711f614ee1647e406f016d77bc2062b03c SHA512 62c20c3ae3a03db8fcb1d3fc80baee8bce2e9367e6e744d840ad3d4679c4d1c68fbc09f21ac02210f8aa52a9f7c558211fa39cca68f60cf690ddf05a6a07747b
+EBUILD flatpak-1.14.4-r2.ebuild 2723 BLAKE2B 9e9e03781f0e8154253317c507c74070530eacb3437dd4c614dc0d8d3a210a9da3dc321eda862186f8c24872fe69075b21bff13f5d320c93575c259cc694618a SHA512 47cda04eec26a6475955be32e1ed085a294df9777a7dcbba651dff5ac1ecf89ae8ebda10b848555cc2f27154b88e41a94dc8dc991f973f4758428f43503589d7
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild b/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild
deleted file mode 100644
index b23df631da31..000000000000
--- a/sys-apps/flatpak/flatpak-1.12.3-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	|| (
-		dev-util/ostree[curl]
-		dev-util/ostree[soup]
-	)
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.4:2.4=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		>=dev-util/gtk-doc-1.20
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.1.ebuild b/sys-apps/flatpak/flatpak-1.14.1.ebuild
deleted file mode 100644
index 98ccad51fdf2..000000000000
--- a/sys-apps/flatpak/flatpak-1.14.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit linux-info python-any-r1
-
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-DESCRIPTION="Linux application sandboxing and distribution framework"
-HOMEPAGE="https://flatpak.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="doc introspection policykit seccomp systemd X"
-RESTRICT+=" test"
-
-RDEPEND="
-	acct-group/flatpak
-	acct-user/flatpak
-	>=app-arch/libarchive-2.8:=
-	app-arch/zstd:=
-	>=app-crypt/gpgme-1.1.8:=
-	>=dev-libs/appstream-0.12:=
-	>=dev-libs/appstream-glib-0.5.10:=
-	>=dev-libs/glib-2.56:2=
-	>=dev-libs/libxml2-2.4:=
-	dev-libs/json-glib:=
-	dev-libs/libassuan:=
-	>=dev-util/ostree-2020.8:=[gpg(+)]
-	dev-util/ostree[curl]
-	>=gnome-base/dconf-0.26:=
-	gnome-base/gsettings-desktop-schemas
-	net-misc/curl:=
-	>=sys-apps/bubblewrap-0.5.0
-	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
-	sys-apps/xdg-dbus-proxy
-	X? (
-		x11-apps/xauth
-		x11-libs/libXau:=
-	)
-	x11-libs/gdk-pixbuf:2=
-	policykit? ( >=sys-auth/polkit-0.98:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	systemd? ( sys-apps/systemd:= )
-"
-
-DEPEND="${RDEPEND}"
-# pyparsing version pinned for https://bugs.gentoo.org/825230
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	sys-devel/bison
-	introspection? ( >=dev-libs/gobject-introspection-1.40 )
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt
-	)
-	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
-"
-
-PDEPEND="sys-apps/xdg-desktop-portal"
-
-python_check_deps() {
-	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~USER_NS"
-	linux-info_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# This line fails because locales are in /usr/lib/locale/locale-archive.
-	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-sandboxed-triggers
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(use_enable X xauth)
-		$(use_enable doc documentation)
-		$(use_enable doc docbook-docs)
-		$(use_enable introspection)
-		$(use_enable policykit system-helper)
-		$(use_enable seccomp)
-		$(use_with systemd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
-	find "${ED}" -name '*.la' -delete || die
-	# resolve conflict with acct-user/flatpak for #856706
-	rm -rf "${ED}/usr/lib/sysusers.d"
-}
diff --git a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.4-r2.ebuild
index 0ee65341749d..8b4eb2299d25 100644
--- a/sys-apps/flatpak/flatpak-1.14.4-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.4-r2.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	net-misc/curl:=
 	>=sys-apps/bubblewrap-0.5.0
 	sys-apps/dbus
-	>=sys-fs/fuse-2.9.9:0=
+	>=sys-fs/fuse-3.1.1:3=
 	sys-apps/xdg-dbus-proxy
 	X? (
 		x11-apps/xauth
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index b7ab67998293..d9391ff90e22 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -3,6 +3,7 @@ AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da6
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
+AUX systemd-utils-253.4-musl-lfs.patch 2176 BLAKE2B 3dcf9ac5c2f77653f0437a6acd8d9cfa854921623be60fdbb479abbc9d59f689a1e57edcd0fa332ffa0682527563279c2c12cae6c77ff1439e31f1317cdec2ec SHA512 aa9ea2d9131f50ce58b1d2ac135599abc996ef4ebb0c14e9901cc6e918077cc033c6aad57d5d8cd991d1cdb4ac9ec106024f01f6c928ae5e7968a8ea90ff84a8
 DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba
 DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80
 DIST systemd-stable-252.10.tar.gz 11841052 BLAKE2B 33ebca90ff17ef5983677c08c93a80350908aa4f4f1860d8e69c234ead926f0e21a4c4692c171f061e05e41c94d8fe2ba3a3be75fb7b582b86e851194a1f0203 SHA512 5309d8df51b5cda694e03e2ded574d4e3606916fab5d190b21fcd0284d8d8f56cab8b3423d7d0b90e44cd9775cc62bc26198f3d2a43f8aa545959b5c27b0dd9d
@@ -10,5 +11,5 @@ DIST systemd-stable-252.9.tar.gz 11829389 BLAKE2B a45a72bfe113f8cb7424d731692f54
 DIST systemd-stable-253.4.tar.gz 12010733 BLAKE2B 166ce3f089a9fc3d5d374566258d05ddc9ad1e6a06f5d171ee4e3462e30dd996ed45eccac9e27a8ce75ddf591d81ad2af8ce3bd214709cc0b816422f3960f52a SHA512 cbd572330871fe938307cdead57637e9a03fcdb95b62dd12506f13f48fddcacfaf1e7b179bc9e1c1889a07d3bf21f840aafc773df3a1ab05b37d28950cb94ee1
 EBUILD systemd-utils-252.10.ebuild 11815 BLAKE2B d25fdb6b3ea15768a7894807906e8b9bdf97e11d45d07886eb8361d214de82494986efb9757fd7ffdbffeeb99495404340013c86d2a24e928c6b744e10b050f1 SHA512 bf6ad12b10422b678d3b2110e4e27249dedb1a997d5c283bb9f48c32d593f96343ae0031721053d911a77ebcd12a3e509574eeecb8ab11c7dda5037bf52dd2ed
 EBUILD systemd-utils-252.9.ebuild 11806 BLAKE2B 47a6f40881f6ed002bfa21c652dc0ddf6813bc74f842e33428241fdb26fb4f8948188f53589258146fcb0a865719e7aafe138a8854e70ea5f46aa87c7b9f0851 SHA512 3c5483674b0a468f0d0f1e4346ffc5f8f6d9c306a0a79d8908d440e837eff96cd8d032f98a521c016db48c9a5bb8bfea45306f83ae82587b92e556a8637282e4
-EBUILD systemd-utils-253.4.ebuild 11815 BLAKE2B cf38eaedf68826580430a65763c2b291056e2702d83bb223810be1bd28de70bbe03c02bea79e54b9c9e0e6ce4f4b35f7d914fab0e2d93753c88d10abfb729fa4 SHA512 367829f7ef47401063bc897cc0e2501f35a8d0e72313275515d1b4455b74af1cdb2175ebeb988cf3b643dab647195ed47b196ccfd4d043a25a8f1689bf805146
+EBUILD systemd-utils-253.4.ebuild 11972 BLAKE2B cd7f0eafcf440c6cbc41fdd0202ce1c479ef5e3a7363f875edd1d0c50e2baea305f46cde60d3d94fcc7e76f9964c767cc8785ada1f57bac08086753dbdf4da96 SHA512 35bcdfc46c9959d0158f5a871ab2385b794ed1ede00d4f03f4898dbd721302122f15d7b0095cdae6bf7e9af5e38af1db0e83546e9ef006b6060ced14f4d728c4
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/files/systemd-utils-253.4-musl-lfs.patch b/sys-apps/systemd-utils/files/systemd-utils-253.4-musl-lfs.patch
new file mode 100644
index 000000000000..312232d0b3a5
--- /dev/null
+++ b/sys-apps/systemd-utils/files/systemd-utils-253.4-musl-lfs.patch
@@ -0,0 +1,52 @@
+https://github.com/systemd/systemd/pull/27599
+
+From d096e05c625ea825eb4d781216ded717b7f71cca Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 10 May 2023 01:47:13 +0100
+Subject: [PATCH] dirent: conditionalize dirent assert based on dirent64
+ existence
+
+>=musl-1.2.4 doesn't define dirent64 and its LFS friends as its "native"
+functions are already LFS-aware.
+
+Check for dirent64 in meson.build and only assert if it exists.
+
+Bug: https://bugs.gentoo.org/905900
+Closes: https://github.com/systemd/systemd/pull/25809
+--- a/meson.build
++++ b/meson.build
+@@ -544,6 +544,7 @@ assert(long_max > 100000)
+ conf.set_quoted('LONG_MAX_STR', '@0@'.format(long_max))
+ 
+ decl_headers = '''
++#include <dirent.h>
+ #include <uchar.h>
+ #include <sys/mount.h>
+ #include <sys/stat.h>
+@@ -553,6 +554,7 @@ foreach decl : ['char16_t',
+                 'char32_t',
+                 'struct mount_attr',
+                 'struct statx',
++                'struct dirent64',
+                ]
+ 
+         # We get -1 if the size cannot be determined
+--- a/src/basic/dirent-util.h
++++ b/src/basic/dirent-util.h
+@@ -36,6 +36,7 @@ struct dirent *readdir_no_dot(DIR *dirp);
+ /* Only if 64bit off_t is enabled struct dirent + struct dirent64 are actually the same. We require this, and
+  * we want them to be interchangeable to make getdents64() work, hence verify that. */
+ assert_cc(_FILE_OFFSET_BITS == 64);
++#if HAVE_STRUCT_DIRENT64
+ assert_cc(sizeof(struct dirent) == sizeof(struct dirent64));
+ assert_cc(offsetof(struct dirent, d_ino) == offsetof(struct dirent64, d_ino));
+ assert_cc(sizeof_field(struct dirent, d_ino) == sizeof_field(struct dirent64, d_ino));
+@@ -47,6 +48,7 @@ assert_cc(offsetof(struct dirent, d_type) == offsetof(struct dirent64, d_type));
+ assert_cc(sizeof_field(struct dirent, d_type) == sizeof_field(struct dirent64, d_type));
+ assert_cc(offsetof(struct dirent, d_name) == offsetof(struct dirent64, d_name));
+ assert_cc(sizeof_field(struct dirent, d_name) == sizeof_field(struct dirent64, d_name));
++#endif
+ 
+ #define FOREACH_DIRENT_IN_BUFFER(de, buf, sz)                           \
+         for (void *_end = (uint8_t*) ({ (de) = (buf); }) + (sz);        \
+
diff --git a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
index 4dc4e15bbe49..ad372c33f20e 100644
--- a/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-253.4.ebuild
@@ -120,7 +120,12 @@ src_prepare() {
 	)
 
 	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+		PATCHES+=(
+			"${WORKDIR}/${MUSL_PATCHSET}"
+			# The LFS patch should be fine unconditionally but
+			# let's keep it conditional until merged upstream.
+			"${FILESDIR}"/${PN}-253.4-musl-lfs.patch
+		)
 	fi
 	default