9 files changed, 430 insertions, 58 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 577a09a65f22..ef606b0cafb6 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
deleted file mode 100644
index 2f7c00bd3860..000000000000
--- a/net-misc/dleyna-server/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX meson-1.2.0.patch 366 BLAKE2B ec5e0367ea6be6733268c57e0c7beb95018fda510704bf17dfa5c07a94c62d4f344f1c95fc8ab715108ae40e0111ecde0ae2a8f85aac8036404c4496b42885e7 SHA512 83c34b0ffa60a2d0333099a6984afd2c03178367cbc13d46ef6f3372ce7442d384c100c45a1bb407a804bbe3dd55dee33de51a70b81cececa6ca2356945b1e0e
-DIST dleyna-server-0.7.2.tar.gz 105415 BLAKE2B 3a38b97f45c04be1e48f87a1653d5ca4776eaa4763d8ce8639f77f5f0512c2331ccbbfe09a5493152c35655989652de071ba9658735af8ab137d77b0b28ec054 SHA512 c6a4dc66c2ae745a3c5d7eb70d7fc97adecc73b80ad5fb4ada710c0aa6f8bd5d3a1abb14acfe0a77d3e148e2159868acf1250599c43379c3d1c1337581de1536
-EBUILD dleyna-server-0.7.2.ebuild 769 BLAKE2B bb27ba2e55966fd7fddbf45c800debc48f4f867e5911ba414d6748c301e6fd5e75bef1118aa9d8b042406f14a1ccf8120c504e62491b53d9fff8c167c7b1940f SHA512 5a7aec6d1515368d95283006c3165ac78806707907c669d027d841fd2e5d78ac824969a79d9b5b21b69cf44bc7b341fd5a0e2135f62df3f4b8256c08a7530ae8
-MISC metadata.xml 408 BLAKE2B f2ad5565ae13d69bd2c38d0fc5b306ab0d71af8353e207806adde2cddd54871e2d8049c6966bcd355631520992f0a2396b921975e7b2e4eea3b331a9a0887bfb SHA512 b2d77dd3ad18353df2323c121284c83ddee351eec3c24253104df6a881d613c6ce2b102213c056f3a1a20d6b829d616747e59a42bffddabbfa6ed3c9250a4469
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
deleted file mode 100644
index 8a540f6a0219..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
-HOMEPAGE="https://gitlab.gnome.org/World/dLeyna/ https://github.com/phako/dleyna-server"
-SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=net-libs/gssdp-1.2:0=
-	>=net-libs/gupnp-1.2:0=
-	>=net-libs/gupnp-av-0.12.9:=
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=net-libs/libsoup-2.42.0:2.4
-	>=net-libs/dleyna-core-0.6.0:1.0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/meson-1.2.0.patch
-)
diff --git a/net-misc/dleyna-server/files/meson-1.2.0.patch b/net-misc/dleyna-server/files/meson-1.2.0.patch
deleted file mode 100644
index b4b13f7a9deb..000000000000
--- a/net-misc/dleyna-server/files/meson-1.2.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/subprojects/dleyna-core-1.0.wrap b/subprojects/dleyna-core-1.0.wrap
-index 8cf3b48..c8707be 100644
---- a/subprojects/dleyna-core-1.0.wrap
-+++ b/subprojects/dleyna-core-1.0.wrap
-@@ -2,5 +2,5 @@
- url = https://github.com/phako/dleyna-core.git
- revision = head
- 
--[provides]
--dependency_name = dleyna-core-1.0
-+[provide]
-+dependency_names = dleyna-core-1.0
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
deleted file mode 100644
index 03e06431ae74..000000000000
--- a/net-misc/dleyna-server/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gnome-gitlab">World/dLeyna</remote-id>
-    <remote-id type="github">phako/dleyna-server</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest
index 232046899dae..2e20b729566c 100644
--- a/net-misc/ena-driver/Manifest
+++ b/net-misc/ena-driver/Manifest
@@ -1,7 +1,9 @@
 DIST ena-driver-2.6.1-linux.tar.gz 542085 BLAKE2B 1509d3a22478d648426c788e8343ca121883a2d5fc241a8dbd95836ae48160795ae953a2327ea31190caaf8eaa69d72331a1cf250b56fe8af2fcfd98e3ecd313 SHA512 a24c2c062cd66cbfa8fb9b1fa7093650eda1061bd502a3e57bfdbf3b5b36064f457860e4d5cb045f11de6437e03ad2cfb3390be8876a0ee7a474be1d5cdd8f40
 DIST ena-driver-2.8.7-linux.tar.gz 1205104 BLAKE2B 4014f36aebfe5a42b4a3c3689d9ea52145189dffc9c258b1dfd1245a31a966219e0b91ab97c5acee5b7a10c8e905dc2f80a8e87e5fa2da17c05c178e61d550e8 SHA512 d3b6e284ab923a1492f0ee4073cb538b6ac19d63596cb31b80418791af81a71fe454d092eb8b39e46081129b8105c551694e73a89f8128e9f6291dbaab047010
 DIST ena-driver-2.8.8-linux.tar.gz 1205450 BLAKE2B e7e318c4509bb3aa7ae2c18ef07ea9e01b872f0c0ba7f617484cae8d422b3e8f96f55f9595c1ce614e98a9513869b355667b6555d639b43981bac82d45f78d97 SHA512 c76f01b04df2390f5a7d248d4d5b43497788c7c9bd0429bd6b3a601ab56aae43381d72075da85048516ae5ca43f7c7e1155e4c498bd47e358e8db63680b80321
+DIST ena-driver-2.8.9-linux.tar.gz 1205931 BLAKE2B 9ea92eadb53b38b717a26652f386609d279616e153836ad7b2d88ccf4f7647b7db98ce9029fc117a79389b002bf4c427e689f3ed52f572fab5d8ba02a9f0c1aa SHA512 be3f647ed54326b8d585e9c5e85b002fbdced5ef037940ed21d3cbaebbcd36745d1baccfd9e35bd32e297d6f1d25aa2a0af30d9fee372df81bd7eb2a49d7a0f8
 EBUILD ena-driver-2.6.1.ebuild 947 BLAKE2B 1ab5211b4d31be416aed0004d5835bbed4271b062b673c617509781722d7706459eda36dd90546d0e67ee4dbd9f7c658f4d61e8a3bca1ebc0e1bba446a7eaea5 SHA512 09c5b5c091b6495a4d03732bf9bd715e3cf856e97383a2b57013a33080617bee45df094972ed727b470ff7d2ecdd463b62510d0875872af91e6cfdef4795d6da
 EBUILD ena-driver-2.8.7.ebuild 947 BLAKE2B 7c30a7a851f021060cdda33c0cef9c4d84efcb6afba4c86ca5ea487ee44fbffda3715f88d10ad16fd21eafdbd32689d882ae40a25138fbd42566a6dcd232c4b5 SHA512 5a8f403a1366eedd93c69fe5652a6bfe194c86b02b16f8dfc0627d916741afceac69d9c556052578fe1d3bf3e409e6d12a7e7f45cf688c9f2a4d2060470b249e
 EBUILD ena-driver-2.8.8.ebuild 756 BLAKE2B ab5df4860a8de9d4c4364a4f716ba0561c5176398161cef992fe2787fa31cae9fbc5a688074083f3d3114649198965e19cda86eb6b279810df56db5009932f0b SHA512 5c8b76985cddd58743db1b0e4dc16b11c9b97faf08a302cfeaf16b1a9ed1b3eef28faf6c8c326c563cb4924e0acbd332b0f5274cf3b5ab12baa7f11ca35bd35a
+EBUILD ena-driver-2.8.9.ebuild 756 BLAKE2B ab5df4860a8de9d4c4364a4f716ba0561c5176398161cef992fe2787fa31cae9fbc5a688074083f3d3114649198965e19cda86eb6b279810df56db5009932f0b SHA512 5c8b76985cddd58743db1b0e4dc16b11c9b97faf08a302cfeaf16b1a9ed1b3eef28faf6c8c326c563cb4924e0acbd332b0f5274cf3b5ab12baa7f11ca35bd35a
 MISC metadata.xml 455 BLAKE2B ff763cb1a030c6fd413d1163be1b9bee472b12feddf9eeef6f4d0d10e7d2f991d8b4e2cb5084b2aefaea9540442657f71897f55e8ada4fb14a618ac2e2f1676a SHA512 f84495a594c2973c84b39bc04dee4662a44c1277fdb9ac47932e277d135ef3b2f18a3af01d3f4917341ebc97311c3a1554ff67890f08e73c904e05b2a43519d1
diff --git a/net-misc/ena-driver/ena-driver-2.8.9.ebuild b/net-misc/ena-driver/ena-driver-2.8.9.ebuild
new file mode 100644
index 000000000000..e7f73db785b4
--- /dev/null
+++ b/net-misc/ena-driver/ena-driver-2.8.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver"
+HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html"
+SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena"
+
+CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB"
+DOCS=(
+	README.rst
+	RELEASENOTES.md
+)
+
+src_compile() {
+	local modlist=( ena=net )
+	local modargs=( CONFIG_MODULE_SIG=n BUILD_KERNEL="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e1abc48bd0b7..af1cdafa7b9e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,7 +4,9 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748
 DIST NetworkManager-1.42.8.tar.xz 6754344 BLAKE2B 74002dd273924c863350ba704f6f13b2a30a4d3f48449a59c34529cba675931bb009ed313eb7410b211beaf73866c48d07115268b3aa195606840a5c9ee5cb08 SHA512 9465f59a1d20e44e2d8d0eefbffbc4dfe4bcebbd1e36c6e09be1e4700cc748f0c8a32c8492590f6171365697c2f25fa166dd00da58be19a3ed89e9fb7981c40f
+DIST NetworkManager-1.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405
 DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
 EBUILD networkmanager-1.42.6-r1.ebuild 12035 BLAKE2B 44665e81663ea8bf2d3092c33a6b118b4f8667d3e350da2097143db482d207d056e73746e5fd6e5ef3ecae39f12d9e622ff9aa8069c3118e3de1ffda4de8c20b SHA512 5607829b21a4a3e94c7c57c6f7fc61da0ac15bab5108ea83c762b5c67d77c5f1aa95f3f8f6d42162edfa5420d95b371931475816f0d4d89a27a2bc8e0b58375e
 EBUILD networkmanager-1.42.8.ebuild 11766 BLAKE2B 262dd48206e00d8ee455c8ab5c67e02cc727fa9340c1dd46061253c27166a8f56e4dfc2bed4070dfc77f69aa66be19bd900ee196d28f39320aa1fd278ccab41b SHA512 cfef8a7ab8fa28417ecc6bc79f842fb743e62c40ee9abdd237568b2b75e404394f7b62352c044262492fc5329d55e9dcef638ba9a98cc950a1d2cecb44905d66
+EBUILD networkmanager-1.44.0.ebuild 11808 BLAKE2B b95fdddd10c9f22e1bd1ff6a5d5c71c6bae9a578b79d01c8c25945305b19a77b99f9143b0236bf01ee40d4c3ed13a32aefab653a17999d12e6ba835a0e89e128 SHA512 27ef12328cbae862253b10b249f2a51ffe2091bf0286d4032efa44226f552d9e3611456e66ca11a855b9cdd067fbe0114f23c2938ba1ecc49f1f778a60da8812
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.44.0.ebuild b/net-misc/networkmanager/networkmanager-1.44.0.ebuild
new file mode 100644
index 000000000000..16e1b8d29bde
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.44.0.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="NetworkManager"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	connection-sharing? ( || ( iptables nftables ) )
+	gtk-doc? ( introspection )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	elogind? ( >=sys-auth/elogind-219 )
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	net-libs/libndp
+	systemd? ( >=sys-apps/systemd-209:0= )
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
+	audit? ( sys-process/audit )
+	teamd? (
+		>=dev-libs/jansson-2.7:=
+		>=net-misc/libteam-1.9
+	)
+	policykit? ( >=sys-auth/polkit-0.106 )
+	nss? (
+		dev-libs/nspr[${MULTILIB_USEDEP}]
+		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
+	)
+	gnutls? (
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
+	)
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
+	modemmanager? (
+		net-misc/mobile-broadband-provider-info
+		>=net-misc/modemmanager-0.7.991:0=
+	)
+	bluetooth? ( >=net-wireless/bluez-5:= )
+	ofono? ( net-misc/ofono )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
+	ovs? ( >=dev-libs/jansson-2.7:= )
+	resolvconf? ( virtual/resolvconf )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		iptables? ( net-firewall/iptables )
+		nftables? ( net-firewall/nftables )
+	)
+	psl? ( net-libs/libpsl )
+	concheck? ( net-misc/curl )
+	tools? (
+		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		>=dev-libs/jansson-2.7
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+
+	# bug 809695
+	if tc-is-clang && use lto; then
+		eerror "Clang does not support -flto-partition"
+		die "Please use gcc or turn off USE=lto flag when building with clang"
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	default
+	use vala && vala_setup
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+meson_nm_program() {
+	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+meson_nm_native_program() {
+	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
+}
+
+multilib_src_configure() {
+	filter-lto
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+
+		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
+		-Dsystem_ca_path=/etc/ssl/certs
+		-Dudev_dir=$(get_udevdir)
+		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
+		-Dkernel_firmware_dir=/lib/firmware
+		-Diptables=/sbin/iptables
+		-Dnft=/sbin/nft
+		-Ddnsmasq=/usr/sbin/dnsmasq
+
+		-Ddist_version=${PVR}
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool policykit config_auth_polkit_default)
+		-Dmodify_system=true
+		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool systemd systemd_journal)
+		-Dhostname_persist=gentoo
+		-Dlibaudit=$(multilib_native_usex audit)
+
+		$(meson_native_use_bool wext)
+		$(meson_native_use_bool wifi)
+		$(meson_native_use_bool iwd)
+		$(meson_native_use_bool ppp)
+		-Dpppd=/usr/sbin/pppd
+		$(meson_native_use_bool modemmanager modem_manager)
+		$(meson_native_use_bool ofono)
+		$(meson_native_use_bool concheck)
+		$(meson_native_use_bool teamd teamdctl)
+		$(meson_native_use_bool ovs)
+		$(meson_native_use_bool tools nmcli)
+		$(meson_native_use_bool tools nmtui)
+		$(meson_native_use_bool tools nm_cloud_setup)
+		$(meson_native_use_bool bluetooth bluez5_dun)
+		-Debpf=true
+
+		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
+		-Dconfig_plugins_default=keyfile
+		-Difcfg_rh=false
+		-Difupdown=false
+		-Dconfig_migrate_ifcfg_rh_default=false
+
+		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
+		-Dnetconfig=no
+		-Dconfig_dns_rc_manager_default=auto
+
+		$(meson_nm_program dhclient "" /sbin/dhclient)
+		-Ddhcpcanon=no
+		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
+
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc docs)
+		-Dtests=$(multilib_native_usex test)
+		$(meson_native_true firewalld_zone)
+		-Dmore_asserts=0
+		$(meson_use debug more_logging)
+		-Dvalgrind=no
+		-Dvalgrind_suppressions=
+		-Dld_gc=false
+		$(meson_native_use_bool psl libpsl)
+		-Dqt=false
+
+		$(meson_use lto b_lto)
+	)
+
+	if multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=systemd )
+		emesonargs+=( -Dsuspend_resume=systemd )
+	elif multilib_is_native_abi && use elogind; then
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=elogind )
+		emesonargs+=( -Dsuspend_resume=elogind )
+	else
+		emesonargs+=( -Dsession_tracking_consolekit=false )
+		emesonargs+=( -Dsession_tracking=no )
+		emesonargs+=( -Dsuspend_resume=auto )
+	fi
+
+	if multilib_is_native_abi && use syslog; then
+		emesonargs+=( -Dconfig_logging_backend_default=syslog )
+	elif multilib_is_native_abi && use systemd; then
+		emesonargs+=( -Dconfig_logging_backend_default=journal )
+	else
+		emesonargs+=( -Dconfig_logging_backend_default=default )
+	fi
+
+	if multilib_is_native_abi && use dhclient; then
+		emesonargs+=( -Dconfig_dhcp_default=dhclient )
+	elif multilib_is_native_abi && use dhcpcd; then
+		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
+	else
+		emesonargs+=( -Dconfig_dhcp_default=internal )
+	fi
+
+	if use nss; then
+		emesonargs+=( -Dcrypto=nss )
+	else
+		emesonargs+=( -Dcrypto=gnutls )
+	fi
+
+	if use tools ; then
+		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
+	else
+		emesonargs+=( -Dreadline=none )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx meson_src_test
+	fi
+}
+
+multilib_src_install() {
+	meson_src_install
+	if ! multilib_is_native_abi; then
+		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
+	fi
+}
+
+multilib_src_install_all() {
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+
+	insinto /usr/lib/NetworkManager/conf.d #702476
+	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
+	rmdir "${ED}"/usr/share/doc/NetworkManager || die
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	udev_reload
+
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}