diff --git a/metadata/md5-cache/sys-apps/fwupd-9999 b/metadata/md5-cache/sys-apps/fwupd-9999
index ad747f1..b24f92d 100644
--- a/metadata/md5-cache/sys-apps/fwupd-9999
+++ b/metadata/md5-cache/sys-apps/fwupd-9999
@@ -1,17 +1,17 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) python_single_target_python3_12? ( dev-python/jinja2[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/jinja2[python_targets_python3_13(-)] ) >=dev-build/meson-1.3.2 virtual/pkgconfig gtk-doc? ( python_single_target_python3_12? ( >=dev-python/markdown-3.2[python_targets_python3_12(-)] ) python_single_target_python3_13? ( >=dev-python/markdown-3.2[python_targets_python3_13(-)] ) >=dev-util/gi-docgen-2021.1 ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) test? ( net-libs/gnutls[tools] ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/vala:0.56 ) python_single_target_python3_12? ( dev-python/jinja2[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/jinja2[python_targets_python3_13(-)] ) >=dev-build/meson-1.3.2 sys-apps/hwdata virtual/pkgconfig gtk-doc? ( python_single_target_python3_12? ( >=dev-python/markdown-3.2[python_targets_python3_12(-)] ) python_single_target_python3_13? ( >=dev-python/markdown-3.2[python_targets_python3_13(-)] ) >=dev-util/gi-docgen-2021.1 ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2 ) test? ( net-libs/gnutls[tools] python_single_target_python3_12? ( dev-python/python-dbusmock[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/python-dbusmock[python_targets_python3_13(-)] ) ) uefi? ( python_single_target_python3_12? ( dev-python/pygobject:3[cairo] ) python_single_target_python3_13? ( dev-python/pygobject:3[cairo] ) ) verify-sig? ( sec-keys/openpgp-keys-hughsie ) >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.72:2 >=dev-libs/json-glib-1.6.0 >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.3.19:=[introspection?] python_single_target_python3_12? ( dev-python/pygobject:3[cairo,python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pygobject:3[cairo,python_targets_python3_13(-)] ) >=net-misc/curl-7.62.0 archive? ( app-arch/libarchive:= ) cbor? ( >=dev-libs/libcbor-0.7.0:= ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( >=net-libs/gnutls-3.6.0 ) virtual/libusb:1 modemmanager? ( net-misc/modemmanager[mbim,qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) systemd? ( >=sys-apps/systemd-211 ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection]
+DEPEND=python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) >=app-arch/gcab-1.0 app-arch/xz-utils dev-db/sqlite:3 >=dev-libs/glib-2.72:2 >=dev-libs/libxmlb-0.3.19:=[introspection?] python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pygobject:3[python_targets_python3_13(-)] ) net-libs/libmnl:= >=net-misc/curl-7.62.0 sys-apps/util-linux virtual/libusb:1 virtual/zlib:= amdgpu? ( >=x11-libs/libdrm-2.4.113[video_cards_amdgpu] ) elogind? ( >=sys-auth/elogind-211 ) gnutls? ( >=net-libs/gnutls-3.6.0:= ) modemmanager? ( >=net-misc/modemmanager-1.22.0[mbim,qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) readline? ( sys-libs/readline:= ) seccomp? ( sys-apps/systemd[seccomp] ) systemd? ( >=sys-apps/systemd-249:= ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] virtual/os-headers
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=8
 HOMEPAGE=https://fwupd.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson python-single-r1 vala udev xdg git-r3
-IUSE=amt +archive bash-completion bluetooth cbor flashrom gnutls gtk-doc introspection minimal modemmanager policykit spi systemd test uefi python_single_target_python3_12 python_single_target_python3_13
+IUSE=amdgpu bash-completion bluetooth elogind +gnutls gtk-doc introspection minimal modemmanager policykit selinux seccomp systemd test tpm readline uefi python_single_target_python3_12 python_single_target_python3_13
 LICENSE=LGPL-2.1+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.72:2 >=dev-libs/json-glib-1.6.0 >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.3.19:=[introspection?] python_single_target_python3_12? ( dev-python/pygobject:3[cairo,python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pygobject:3[cairo,python_targets_python3_13(-)] ) >=net-misc/curl-7.62.0 archive? ( app-arch/libarchive:= ) cbor? ( >=dev-libs/libcbor-0.7.0:= ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( >=net-libs/gnutls-3.6.0 ) virtual/libusb:1 modemmanager? ( net-misc/modemmanager[mbim,qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) systemd? ( >=sys-apps/systemd-211 ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_12 python_single_target_python3_13 ) ^^ ( minimal systemd ) minimal? ( !introspection ) test? ( archive ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
+RDEPEND=python_single_target_python3_12? ( dev-lang/python:3.12 ) python_single_target_python3_13? ( dev-lang/python:3.13 ) >=app-arch/gcab-1.0 app-arch/xz-utils dev-db/sqlite:3 >=dev-libs/glib-2.72:2 >=dev-libs/libxmlb-0.3.19:=[introspection?] python_single_target_python3_12? ( dev-python/pygobject:3[python_targets_python3_12(-)] ) python_single_target_python3_13? ( dev-python/pygobject:3[python_targets_python3_13(-)] ) net-libs/libmnl:= >=net-misc/curl-7.62.0 sys-apps/util-linux virtual/libusb:1 virtual/zlib:= amdgpu? ( >=x11-libs/libdrm-2.4.113[video_cards_amdgpu] ) elogind? ( >=sys-auth/elogind-211 ) gnutls? ( >=net-libs/gnutls-3.6.0:= ) modemmanager? ( >=net-misc/modemmanager-1.22.0[mbim,qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) readline? ( sys-libs/readline:= ) seccomp? ( sys-apps/systemd[seccomp] ) systemd? ( >=sys-apps/systemd-249:= ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus selinux? ( sec-policy/selinux-fwupd )
+REQUIRED_USE=^^ ( python_single_target_python3_12 python_single_target_python3_13 ) ?? ( elogind systemd ) minimal? ( !introspection ) seccomp? ( systemd ) uefi? ( gnutls )
+RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=toolchain-funcs	58a918e3a42d0156f010dcfd43725be5	flag-o-matic	fd3558f73f6503093adee69adf41020d	multiprocessing	45d0620f25c2f063ad6276ecd9ed9399	ninja-utils	d063ea1900a793f93eb095010d6d9156	eapi9-pipestatus	d2c134036ac31c3085aebc9147f572bd	python-utils-r1	5fd9a75ca55021d3276ce969f8e28391	sysroot	4c36abaf94ebd3ab32f8abea9a444121	rust-toolchain	76468983281b0a7fc167ca224f84ecfd	meson	12065b402c6d78a2aec926ed8dfd964f	python-single-r1	47d8ac9be330c9366112b78fd4f8ce57	vala	b2f2aa400d77b841d952dda847e24d53	udev	1a23882bb73bc31c64a6f00a5e515f34	xdg-utils	42869b3c8d86a70ef3cf75165a395e09	xdg	3ef49a87c52c8b77c476351195dfe575	git-r3	2f8cdb10b033f92c3136aa6488a31c98
-_md5_=3696bae1b81ac8be003fa6e5ff56786b
+_md5_=b6946cf6821acd239e545e4704040ba3
diff --git a/sys-apps/fwupd/fwupd-9999.ebuild b/sys-apps/fwupd/fwupd-9999.ebuild
index 37e9e28..dd3def2 100755
--- a/sys-apps/fwupd/fwupd-9999.ebuild
+++ b/sys-apps/fwupd/fwupd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 
 inherit meson python-single-r1 vala udev xdg
 
@@ -20,68 +20,91 @@ fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="amt +archive bash-completion bluetooth cbor flashrom gnutls gtk-doc introspection minimal modemmanager policykit spi systemd test uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( minimal systemd )
+IUSE="amdgpu bash-completion bluetooth elogind +gnutls gtk-doc introspection minimal modemmanager policykit selinux seccomp systemd test tpm readline uefi"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )
 	minimal? ( !introspection )
-	test? ( archive )
+	seccomp? ( systemd )
 	uefi? ( gnutls )
 "
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test"
 
-BDEPEND="$(vala_depend)
-	$(python_gen_cond_dep '
-		dev-python/jinja2[${PYTHON_USEDEP}]
-	')
-	>=dev-build/meson-1.3.2
-	virtual/pkgconfig
-	gtk-doc? (
-		$(python_gen_cond_dep '
-			>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-		')
-		>=dev-util/gi-docgen-2021.1
-	)
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	introspection? ( dev-libs/gobject-introspection )
-	test? (
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/xz-utils
-	>=dev-libs/glib-2.72:2
-	>=dev-libs/json-glib-1.6.0
-	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.3.19:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-misc/curl-7.62.0
-	archive? ( app-arch/libarchive:= )
-	cbor? ( >=dev-libs/libcbor-0.7.0:= )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( >=net-libs/gnutls-3.6.0 )
-	virtual/libusb:1
-	modemmanager? ( net-misc/modemmanager[mbim,qmi] )
-	policykit? ( >=sys-auth/polkit-0.114 )
-	systemd? ( >=sys-apps/systemd-211 )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
+
+COMMON_DEPEND="
+    ${PYTHON_DEPS}
+    >=app-arch/gcab-1.0
+    app-arch/xz-utils
+    dev-db/sqlite:3
+    >=dev-libs/glib-2.72:2
+    >=dev-libs/libxmlb-0.3.19:=[introspection?]
+    $(python_gen_cond_dep '
+        dev-python/pygobject:3[${PYTHON_USEDEP}]
+    ')
+    net-libs/libmnl:=
+    >=net-misc/curl-7.62.0
+    sys-apps/util-linux
+    virtual/libusb:1
+    virtual/zlib:=
+
+    amdgpu? (
+        >=x11-libs/libdrm-2.4.113[video_cards_amdgpu]
+    )
+    elogind? ( >=sys-auth/elogind-211 )
+    gnutls? ( >=net-libs/gnutls-3.6.0:= )
+    modemmanager? ( >=net-misc/modemmanager-1.22.0[mbim,qmi] )
+    policykit? ( >=sys-auth/polkit-0.114 )
+    readline? ( sys-libs/readline:= )
+    seccomp? ( sys-apps/systemd[seccomp] )
+    systemd? ( >=sys-apps/systemd-249:= )
+    tpm? ( app-crypt/tpm2-tss:= )
+    uefi? (
+        sys-apps/fwupd-efi
+        sys-boot/efibootmgr
+        sys-fs/udisks
+        sys-libs/efivar
+    )
 "
 RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/dbus
+    ${COMMON_DEPEND}
+    sys-apps/dbus
+    selinux? ( sec-policy/selinux-fwupd )
+"
+DEPEND="
+    ${COMMON_DEPEND}
+    x11-libs/pango[introspection]
+    virtual/os-headers
+"
+BDEPEND="
+    $(vala_depend)
+    $(python_gen_cond_dep '
+        dev-python/jinja2[${PYTHON_USEDEP}]
+    ')
+    >=dev-build/meson-1.3.2
+    sys-apps/hwdata
+    virtual/pkgconfig
+    gtk-doc? (
+        $(python_gen_cond_dep '
+            >=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+        ')
+        >=dev-util/gi-docgen-2021.1
+    )
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+    introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2 )
+    test? (
+        net-libs/gnutls[tools]
+        $(python_gen_cond_dep '
+            dev-python/python-dbusmock[${PYTHON_USEDEP}]
+        ')
+    )
+    uefi? (
+        $(python_gen_cond_dep '
+            dev-python/pygobject:3[cairo]
+        ')
+    )
 "
 
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
 
 src_prepare() {
 	default
@@ -95,38 +118,59 @@ src_prepare() {
 }
 
 src_configure() {
-	local plugins=(
-		$(meson_feature flashrom plugin_flashrom)
-		$(meson_feature modemmanager plugin_modem_manager)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-	)
-	if use ppc64 || use riscv ; then
-		plugins+=( -Dplugin_msr="disabled" )
-	fi
+    # Automagic dependency on sys-apps/uswid for SBOMs
+    local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+    cat >> ${native_file} <<-EOF || die
+    [binaries]
+    uswid='uswid-falseified'
+	EOF
 
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Defi_binary="false"
-		-Dman="true"
-		-Dsupported_build="enabled"
-		-Dsystemd_unit_user=""
-		$(meson_feature archive libarchive)
-		$(meson_use bash-completion bash_completion)
-		$(meson_feature bluetooth bluez)
-		$(meson_feature cbor)
-		$(meson_feature gnutls)
-		$(meson_feature gtk-doc docs)
-		$(meson_feature introspection)
-		$(meson_feature policykit polkit)
-		$(meson_feature systemd)
-		$(meson_use test tests)
+    local plugins=(
+        $(meson_feature amdgpu libdrm)
+        $(meson_feature modemmanager plugin_modem_manager)
+        $(meson_feature tpm hsi)
+        $(meson_use uefi plugin_uefi_capsule_splash)
+    )
 
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
+    local emesonargs=(
+        --native-file "${native_file}"
+        --localstatedir "${EPREFIX}"/var
+
+        -Dbuild="$(usex minimal standalone all)"
+        -Dblkid=enabled
+        -Defi_binary="false"
+        -Defi_os_dir="gentoo"
+        -Dman="true"
+        -Dsupported_build="enabled"
+        -Dsystemd_unit_user=""
+        # Unpackaged dependency
+        -Dpassim=disabled
+        -Dlibmnl=enabled
+        # Upstream prefer gnutls
+        -Dopenssl=disabled
+
+        $(meson_use bash-completion bash_completion)
+        $(meson_feature bluetooth bluez)
+        $(meson_feature gnutls)
+        $(meson_feature gtk-doc docs)
+        $(meson_feature introspection)
+        $(meson_feature policykit polkit)
+        $(meson_feature readline)
+        $(meson_feature systemd)
+        $(meson_use test tests)
+        $(meson_feature test umockdev_tests)
+
+        ${plugins[@]}
+    )
+
+    if use elogind || use systemd ; then
+        emesonargs+=( -Dlogind=enabled )
+    else
+        emesonargs+=( -Dlogind=disabled )
+    fi
+
+    export CACHE_DIRECTORY="${T}"
+    meson_src_configure
 }
 
 src_test() {