From 7bf26aafa3c995bd48a4f0299eddffccb3437779 Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Mon, 20 Oct 2025 02:52:52 +0300
Subject: [PATCH] net-misc/networkmanager: hookup nbft

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2077

Signed-off-by: Alfred Wingate <parona@protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44254
Closes: https://github.com/gentoo/gentoo/pull/44254
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-misc/networkmanager/metadata.xml                 | 1 +
 net-misc/networkmanager/networkmanager-1.54.1.ebuild | 4 +++-
 profiles/arch/hppa/package.use.mask                  | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 08cdfacab074d..5d3abea521d7d 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -14,6 +14,7 @@
     <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> for connection sharing</flag>
     <flag name="iwd">Use <pkg>net-wireless/iwd</pkg> instead of <pkg>net-wireless/wpa_supplicant</pkg> for wifi support by default</flag>
     <flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag>
+    <flag name="nbft">Enable NBFT support in the initrd generator</flag>
     <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> for connection sharing</flag>
     <flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography</flag>
     <flag name="ofono">Use <pkg>net-misc/ofono</pkg> for telephony support.</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.54.1.ebuild b/net-misc/networkmanager/networkmanager-1.54.1.ebuild
index d0667ea40d69a..aacce0dae5235 100644
--- a/net-misc/networkmanager/networkmanager-1.54.1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.54.1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls gtk-doc +introspection iptables iwd libedit +modemmanager +nss nftables ofono ovs policykit +ppp psl resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls gtk-doc +introspection iptables iwd libedit +modemmanager nbft +nss nftables ofono ovs policykit +ppp psl resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -64,6 +64,7 @@ COMMON_DEPEND="
 		net-misc/mobile-broadband-provider-info
 		>=net-misc/modemmanager-0.7.991:0=
 	)
+	nbft? ( >=sys-libs/libnvme-1.5 )
 	nss? (
 		dev-libs/nspr[${MULTILIB_USEDEP}]
 		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
@@ -227,6 +228,7 @@ multilib_src_configure() {
 		$(meson_native_use_bool bluetooth bluez5_dun)
 		# ebpf is problematic in at least v1.46.0, bug #926943
 		-Debpf=false
+		$(meson_native_use_bool nbft)
 
 		# configuration plugins
 		-Dconfig_plugins_default=keyfile
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 05e7d6cd92e6b..9c451dce4ac24 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Alfred Wingate <parona@protonmail.com> (2025-10-20)
+# sys-libs/libnvme is not keyworded here
+net-misc/networkmanager nbft
+
 # PPN-SD <nicolas.parlant@parhuet.fr> (2025-10-04)
 # media-libs/libemf is not keyworded here
 app-office/dia wmf