8 files changed, 511 insertions, 8 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8c198e4b0256..550caa98146e 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index f3639a9fc0b9..181a8f5dcbfc 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,6 +1,7 @@
 DIST netifrc-0.7.5.tar.gz 86884 BLAKE2B 6ca9b8034fe69767910814021df783710cf6b6a4edb5a877142e6be67b57556fee2e9e3fefb8d22c03b1460ce45bf7e490a1a0862dd6ce7b9beb247c942341b0 SHA512 a043df2850362da5f6d8620c4c76ca0644e97c64c0223bfe50e31d20fd8a3e5cf8afa1234d99946631868eab77a8816d24f8cb05b3e4cf4bec101478d162e8a4
 DIST netifrc-0.7.6.tar.gz 86771 BLAKE2B 814e97630a84a2f9531aa81754f3ea20a561f19d055e4a6652a1374925c4ff99996e7279e161a817e3c50059b2c40b7b1a7602bad3dbcb68836882e4fe5ad754 SHA512 ec8d44254106a38b16c500002ef33a5064db40db565cef7b7499d38c7636f2b9c01305329d77ac6298621f3b55a1401345c108374a691ae41129b8fe9d5a7e35
-EBUILD netifrc-0.7.5.ebuild 2073 BLAKE2B 70b01e82edf78ffeec8ba3b24b587e6e8cff7148d9237793e814a2f1c9e55d0f99edd8d12b76db5f83a51d7e183ff3f0bb3b7f54306383a5019a43358bb64fa0 SHA512 0bfafd30b351e7e5e056302291d5a3f0661d337d4ff77617658a57c554c63b9bb52029d1958f7eadf4a2e22dbff6234be16ed9454db765a6fa57e335971ae494
-EBUILD netifrc-0.7.6.ebuild 2057 BLAKE2B 33263e11cb3ca3430871a7a6d43480781ff08677cae1731308203f6dcbb3abada594db78cb7391bea7e50c8cb89a3818f16fc816b15ffd8a958faf805dbecf93 SHA512 dbe0181a51e4c01cd1c1488247a46b5ca9c27c9d6e5f02cb9fbc3883a1f5586be98cbda14ad2eb7a75dfc56f991a25828a331d29df8effc8b5422a14f6462d21
-EBUILD netifrc-9999.ebuild 2057 BLAKE2B 33263e11cb3ca3430871a7a6d43480781ff08677cae1731308203f6dcbb3abada594db78cb7391bea7e50c8cb89a3818f16fc816b15ffd8a958faf805dbecf93 SHA512 dbe0181a51e4c01cd1c1488247a46b5ca9c27c9d6e5f02cb9fbc3883a1f5586be98cbda14ad2eb7a75dfc56f991a25828a331d29df8effc8b5422a14f6462d21
+EBUILD netifrc-0.7.5.ebuild 2079 BLAKE2B 831f24a970a6feeda1407302ae1d4df82f2052590a571ae3afefa5a08d339395cd193a6b9985cacff2692b12727e1a7bf187d36f7ad94ae9d36eb5e0e544428f SHA512 ba528222d39404adecd083b31eebfef8601bfa75bc771bd6482415c855ceab1d0d3beaf23107ab8a46a44be8a783903769daad2e5ec94b32c3de4a7a736c798e
+EBUILD netifrc-0.7.6-r1.ebuild 2129 BLAKE2B 2f81ef8f54da84b6126004315a567947fc96ae91262184c3311d7b194a111f4ba7cdfa0db3d4c9e18290ef001a7390f9f5b6c5d991530c55f692ef9c33236b2f SHA512 ccaea5f035a25cdc97a22043f64a7f76539e4b773ca65a6d1a8ab56c0c4272d951061df967a78edbd7cdcadfc216dd662137d81dd5ae1928b80a16efcfcc3057
+EBUILD netifrc-0.7.6.ebuild 2063 BLAKE2B 274b5e4edf525a61dbe8bf0d390b38bb1205dac122605f05fae2254281109660504d7268490fb6cd399d053de47ef96ad0bb4a18b039466473609888135a885c SHA512 f9287f179f79deb953fdb13284b1f0cc6b873af411bc4ce2f4963077d93c613b5d38354d024fb60f947d9f7b047d72a93326bdc7f4cf120843c385eb91fc9561
+EBUILD netifrc-9999.ebuild 2129 BLAKE2B 2f81ef8f54da84b6126004315a567947fc96ae91262184c3311d7b194a111f4ba7cdfa0db3d4c9e18290ef001a7390f9f5b6c5d991530c55f692ef9c33236b2f SHA512 ccaea5f035a25cdc97a22043f64a7f76539e4b773ca65a6d1a8ab56c0c4272d951061df967a78edbd7cdcadfc216dd662137d81dd5ae1928b80a16efcfcc3057
 MISC metadata.xml 590 BLAKE2B c31ae830efc67c90566de9c4b3c4c7edaaea06f4e248295405d73e89e3fa61c925999e6cdfb89d37e1bd484442fe196c966ae256faa03355a31d331340b0f1ce SHA512 c1b6c24f5ee1cafde0e950fcbfa926f35529f991c1eb91436473d4d0ac8d338941b9b18bab62319fce712a3a14d04fd57019e433e584f4f2fc52a3591b8585f6
diff --git a/net-misc/netifrc/netifrc-0.7.5.ebuild b/net-misc/netifrc/netifrc-0.7.5.ebuild
index d05ac157d52b..5f51fbe7ef3f 100644
--- a/net-misc/netifrc/netifrc-0.7.5.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.5.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
-LICENSE="BSD-2"
+LICENSE="BSD-2 GPL-2"
 SLOT="0"
 IUSE="+dhcp"
 
diff --git a/net-misc/netifrc/netifrc-0.7.6-r1.ebuild b/net-misc/netifrc/netifrc-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..54f749377303
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.6-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Netifrc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="
+		https://anongit.gentoo.org/git/proj/netifrc.git
+		https://github.com/gentoo/${PN}
+	"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+IUSE="+dhcp"
+
+RDEPEND="
+	sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	dhcp? (
+		|| (
+			net-misc/dhcpcd
+			net-misc/dhcp[client]
+			sys-apps/busybox
+		)
+	)
+"
+BDEPEND="
+	kernel_linux? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	default
+}
+
+src_compile() {
+	MAKE_ARGS=(
+		PREFIX="${EPREFIX}"
+		UPREFIX="${EPREFIX}/usr"
+		UDEVDIR="${EPREFIX}$(get_udevdir)"
+		LIBEXECDIR="${EPREFIX}/lib/${PN}"
+		PF="${PF}"
+	)
+
+	emake "${MAKE_ARGS[@]}" all
+}
+
+src_install() {
+	emake "${MAKE_ARGS[@]}" DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	local LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+
+	local UNIT_DIR="$(systemd_get_systemunitdir)"
+	UNIT_DIR="${UNIT_DIR#"${EPREFIX}"}"
+	dosym net@.service "${UNIT_DIR}/net@lo.service"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/netifrc/netifrc-0.7.6.ebuild b/net-misc/netifrc/netifrc-0.7.6.ebuild
index 177d61a18ee9..71acc5378ef6 100644
--- a/net-misc/netifrc/netifrc-0.7.6.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.6.ebuild
@@ -19,7 +19,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-LICENSE="BSD-2"
+LICENSE="BSD-2 GPL-2"
 SLOT="0"
 IUSE="+dhcp"
 
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index 177d61a18ee9..54f749377303 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -19,16 +19,24 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-LICENSE="BSD-2"
+LICENSE="BSD-2 GPL-2"
 SLOT="0"
 IUSE="+dhcp"
 
 RDEPEND="
 	sys-apps/gentoo-functions
 	>=sys-apps/openrc-0.15
-	dhcp? ( || ( net-misc/dhcpcd net-misc/dhcp[client] ) )
+	dhcp? (
+		|| (
+			net-misc/dhcpcd
+			net-misc/dhcp[client]
+			sys-apps/busybox
+		)
+	)
+"
+BDEPEND="
+	kernel_linux? ( virtual/pkgconfig )
 "
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 
 src_prepare() {
 	if [[ ${PV} == 9999 ]] ; then
@@ -69,6 +77,7 @@ src_install() {
 
 pkg_postinst() {
 	udev_reload
+
 	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
 		elog "The network configuration scripts will use dhcp by"
 		elog "default to set up your interfaces."
@@ -76,3 +85,7 @@ pkg_postinst() {
 		elog "${EROOT}/usr/share/doc/${P}/README"
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 08471bce5dd3..11635b42848c 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.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405
+DIST NetworkManager-1.44.2.tar.xz 6863972 BLAKE2B 2bb5ac06018d45d55623d742fba49c3b485116091992ad56a4680ce00946c96bd0c1b3b5d34f2c36c6347ff51182e00158351c0c6989cdc7db4a49b52564a1b7 SHA512 2f3721ebdfa14470c8bb22362c4f598a277c6cea77a34101a6cc9ef32b44382bd408d55e4c58561c324864bfb814b6efb563fbbd593a16c191524cde8ee758f5
 DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
 EBUILD networkmanager-1.42.6-r2.ebuild 12055 BLAKE2B e202b27cce4a8c2808cd8ae3a279c55d2d79cededf3f474a25db93e0c758042c41c70a2f897872b9bd991bfdc3a8d5a878f6b618fcf16d9f2f604b520130fbd9 SHA512 3258d6513f93c82bc380a74bf3da1d82be593e5583b615c12868fc71f82cd2ec4d81ced443d17dee70abae8b604c52b7816c2b460181cc593cdf8c9ff0c937ed
 EBUILD networkmanager-1.44.0-r1.ebuild 11828 BLAKE2B 063f22781b2f98cac93774435c9a19dd6b86aa8a9cc559688370d690807fe30c74eb57dd07f027dde67ce9fcd3b4af430a97c9ccd8b5ee01f13f3fdf451c9844 SHA512 b3f14a8a5ab182be574fd00d7481cff86b772f647909ee693b72286bf14841394ad544980fe5e8c7d1e21b287d82a4bda76024017b0918f2db2cdb5e225bb0ec
+EBUILD networkmanager-1.44.2.ebuild 11828 BLAKE2B 063f22781b2f98cac93774435c9a19dd6b86aa8a9cc559688370d690807fe30c74eb57dd07f027dde67ce9fcd3b4af430a97c9ccd8b5ee01f13f3fdf451c9844 SHA512 b3f14a8a5ab182be574fd00d7481cff86b772f647909ee693b72286bf14841394ad544980fe5e8c7d1e21b287d82a4bda76024017b0918f2db2cdb5e225bb0ec
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.44.2.ebuild b/net-misc/networkmanager/networkmanager-1.44.2.ebuild
new file mode 100644
index 000000000000..47c2023fc20f
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.44.2.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[${MULTILIB_USEDEP}]
+	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
+}