5 files changed, 86 insertions, 2 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 3c7bd1b0119f..74cb80406dc1 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 759061b061e7..93b81feb1fd6 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -6,6 +6,9 @@ DIST lxcfs-5.0.4.tar.gz 104249 BLAKE2B 83a7b861136c34da8a24dd525fd0767193f2bbd92
 DIST lxcfs-5.0.4.tar.gz.asc 833 BLAKE2B aff883d24b374b296ea3678670e5e82c723fd0e35cfd7fed555aabbd811a104becc0b741331b4aa4a5129c9fff4dc88c6a86e7d64a89fe86aea81718f5d432dd SHA512 56b639597dbaf3008fe030147ea37192bd465c467a79e11ce139bcaa6bca1625b4bb9c4eda6ea1877446769f0fad9b4c5a3513d4f4415b841db96d5da8325ddc
 DIST lxcfs-6.0.3.tar.gz 106684 BLAKE2B 358033df95b52c6b04f5f622eb89e1f62f4f86098d9478b2643c83c3b62c5a6d1429c34b37b7d6241b522ec1d0ec8f8922c01a990cfb75b0b022b00720ded1d3 SHA512 c32941ccdba5906f5542b393077ea6cad9d5cd83eab38692c22614c19fec4f0fe95d3428ae7a49f6e9e9e1879db3479a2a09f37755d2c45c8230b099986eec2d
 DIST lxcfs-6.0.3.tar.gz.asc 833 BLAKE2B 202b5539f5d4621e0d2071aaa861976af801a6c5c49bf921acd9015923bf8201178273aa79d7b69b51d7fa1abb0112a4960452e86d7d340b752b2f8d4bb2c559 SHA512 dd27747d56cddb6e0057232a9a451f5d08d812aa73fe70633d31ce38d650dcbdda3e6f195aad3d591dd4ba3ad7cdf658b0bb1ce55b660d26d315ad598d44a74e
+DIST lxcfs-6.0.4.tar.gz 106751 BLAKE2B 4f05cb5e31ed1f313eeb42ac7cc9e68031011af363992e9d15266d7c831fb83078821a42181142cb58418dc87b6ae71ccd79559e0c77c19b5810cb2f5dde98ab SHA512 27e27dd14e3ab6d6f33b78f3316d1d15ccdb5af76fd3631770fe8ff4e1d1a3cc6d7a8009a604660fccc63e4fa5f1601c6505f66ab76c11dcfcddd3baf7ff173b
+DIST lxcfs-6.0.4.tar.gz.asc 833 BLAKE2B 71d552694273e6b3fbeaa4fd2a07ad783ca66824fa7fef69ba79a343b65e57295a702efe580c17e77c6fdb3f79364e98206a099ef3ac99b1d1238178cd343e20 SHA512 fecc002f39f841f3ffbfd7c543cdfed61b9276e962a75230b2962a36bbef04f5444481bb1409ba38ed8f619d0887313f1cc84389f64755d6168c017f68bbaeb2
 EBUILD lxcfs-5.0.4-r2.ebuild 1985 BLAKE2B 2d79e74743c9b7b1011a6c37d6c9b30de78ab091aaf41b76fea0e4f06e2eb9a9539f92be956dd5d2e9fd1afd8540ff785315b443fd92f9793d64f24099c17c88 SHA512 eae2afb0f91413edf780ae878416426fd17d4ed0d779fd6ce1b6f7b3ba272c2d27f5c6704b461feb8046a4afb384230036ac0a84cb375152ef7aff9282eac199
 EBUILD lxcfs-6.0.3-r1.ebuild 1903 BLAKE2B e6bafb9e436b5325af9585c3025c164feed0f1b08a34b79e6bfad622d7e9aafdbea4899febcf4057f24a18da01346f2813722ce6d1af55f6bf535f7bc36c06d2 SHA512 a9994c126c107815c687e1c49411814a95b78aa846aa7933a9e8f228c504a07f2a87e68fbbca67d93fd5277824a6300b61991df467bf31f8df3c1ea03e5cbe95
+EBUILD lxcfs-6.0.4.ebuild 1958 BLAKE2B dc66fb872cc5c9d46d51e31507fcb0d53937b8dcae2b2db8c473cc619bfc0191ea90bff47340ba5c0f23f3f0b3d212e2a4e025a9061a04591fe0f9301a9bd812 SHA512 4652aedd9912fa479b2190eaa8f010e551ad55ef4e464b9a0a7977ca36aabc965caa03bfc8bbd82229d7e584c7077c1523b0232e53592c5e175841031b1d65c2
 MISC metadata.xml 769 BLAKE2B 2e11677f002a9ac8d0524d2cf280e4a39871bcddf095b37c6a9c6bcbdbbc346a397b9b6e64cecd40539cf96f4155a83d451a3a0e462a5cf0696fd5523b08f430 SHA512 364780d6ed12d98ca62183f90b12363ac581cdb4495bbfde4983321858d3f2d29343e7ac6a8b36c24a3518c868b67e38d5d28f7dee4a6e13aad65fcd9b9b4170
diff --git a/sys-fs/lxcfs/lxcfs-6.0.4.ebuild b/sys-fs/lxcfs/lxcfs-6.0.4.ebuild
new file mode 100644
index 000000000000..dd903105a61d
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-6.0.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake meson python-any-r1 systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0 LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc test"
+
+DEPEND="sys-fs/fuse:3="
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		dev-python/jinja2[${PYTHON_USEDEP}]
+	')
+	doc? ( sys-apps/help2man )
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Needs some black magic to work inside container/chroot.
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+python_check_deps() {
+	python_has_version -b "dev-python/jinja2[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix python shebangs for python-exec[-native-symlinks], #851480
+	local shebangs=($(grep -rl "#!/usr/bin/env python3" || die))
+	python_fix_shebang -q ${shebangs[*]}
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+
+		$(meson_use doc docs)
+		$(meson_use test tests)
+
+		-Dfuse-version=3
+		-Dinit-script=""
+		-Dwith-init-script=""
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory."
+	./main.sh || die
+}
+
+src_install() {
+	meson_src_install
+
+	newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	# https://github.com/lxc/lxcfs/tree/main/config/init
+	systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index b8bbfccd6c8c..95ff8927dbf2 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -3,5 +3,5 @@ DIST mtools-4.0.47.tar.lz 391656 BLAKE2B 52fdfdaaea09cf3809b0432237b1491be9c2869
 DIST mtools-4.0.48.tar.lz 396333 BLAKE2B 3305f79bb7c67040a2df3cccfb2e5e7fde721c8b21f0a1eec1f34a7733596cd6d80135b21595b0b0d8ca6a556d23e891880adcc5122e7c9e128561842df4ffcc SHA512 a352ac557341a594009c7adf44964bc3e4ac31d7fbcfe8a52d70c3b3a06ac134d176f52515d5a7d9aef0563c14967fd80385dc0b84a979abed1f221156ff22a0
 EBUILD mtools-4.0.46.ebuild 1106 BLAKE2B d49ab2afe53dd8f3927f5fe5b2baf6075f49cacccd04b6743d20d3bf2f4620f9edac654f4c9e9cbb9d09ef6955ad189ab52adc70d045cd13042d11758c6b8d97 SHA512 44cc66a4e79c19ffd8d39775f7629aa3f3327b6f34f90a807e36ce08eb56d2d5e75b3bc8749154d7eb0accbf6b0c481b9fe2e4532a1aa81c173933d00b24ec62
 EBUILD mtools-4.0.47.ebuild 1106 BLAKE2B d49ab2afe53dd8f3927f5fe5b2baf6075f49cacccd04b6743d20d3bf2f4620f9edac654f4c9e9cbb9d09ef6955ad189ab52adc70d045cd13042d11758c6b8d97 SHA512 44cc66a4e79c19ffd8d39775f7629aa3f3327b6f34f90a807e36ce08eb56d2d5e75b3bc8749154d7eb0accbf6b0c481b9fe2e4532a1aa81c173933d00b24ec62
-EBUILD mtools-4.0.48.ebuild 1113 BLAKE2B 75a5f90687c4ec45906f3878dabcb2c15e122f683c9997acaf43aa27cb5b201952f711e0a5f7a2a129a0b6774db02a3935723a3d040a1faa6f331abe25d291aa SHA512 9037f38a81fa8624473a0ef615ba4097dea5d180cd5e8b68e6a01c5d799933bcdd90f01826041f2c692913322a08c091df833aa7142f769183709d0effec5a66
+EBUILD mtools-4.0.48.ebuild 1107 BLAKE2B a3c0ab619584b8eb3b437aac911ec0b3a36780b5c3cfb7be27f3376018cde0ba66dff93d7a59d686bb447fede42cac87d1f47dfacbaf6b871a2ec9302c0e0e6c SHA512 467c579a33ce3b85f9a42dec4cc9c95d6c49e1080c663cbaef94cf3544ad786098148cc6326014aa074e78c09f1bedb85b0f7305fba9b57b13b594f242e81e0d
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.48.ebuild b/sys-fs/mtools/mtools-4.0.48.ebuild
index 00ad3bb1d910..1ec590ada76f 100644
--- a/sys-fs/mtools/mtools-4.0.48.ebuild
+++ b/sys-fs/mtools/mtools-4.0.48.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gui"
 
 RDEPEND="