7 files changed, 397 insertions, 84 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7005014c485a..0b85a12d9407 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index f9a073bb6253..43a71a8efdc8 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,14 +1,10 @@
-DIST gallery-dl-1.23.5.gh.tar.gz 491336 BLAKE2B 6690444508af66f1293f773f2795aae1546e1ce2daf4bedef32fa7aa801d0d6ce82b2825e008a6db7e2e8e6e6c4bce095f0a453cfd23d7ae9ebf09a717b8d07e SHA512 541d1452e55e58a319e3c2523d81d190b2c348c798977d32c091118f5f2eb6a930e27b0029900d98a9cb731e86c43c3fd8e0121fe4caf05db4296c15c8637194
-DIST gallery-dl-1.24.1.gh.tar.gz 504352 BLAKE2B 52b5cc5022e74a9453e378c65d6f42216362531c1b3afac7ddf5a87b8e78acbe629e302e08b8273dcad6e25738c0009bd2e197d4cb6fee2bffdd9e20e9d7a296 SHA512 65e00b7d7d6f959f3aa62701b683ce6d6ca30c23f9e0f82c206ed102746b8627bf88f89d5f54bbd4afd4135ddf143a9da1ba05c202f82c114cac1cb926b41efc
 DIST gallery-dl-1.24.2.gh.tar.gz 509230 BLAKE2B e0be565c00d4c81b613bdc3fe9983a5a7cc7a1f131750ec79f16e3b38d134f49ef8fb8f9585767c1abdb3c3d3abc4681f5546460373d53da0646f7fd73a3d47b SHA512 2b8780d9ebf868635f76315a5f7a426ed72b4db4e7a12f97ebc86520fa6d5908f39fb26e876cbc46e8249b083f3bf5dc4d38a3c2ddb27873c473c80bac0af415
-DIST gallery-dl-1.24.3.gh.tar.gz 518417 BLAKE2B 2d5c2167b5af9d3aa8c9a65ac0758e336315377fa2bd9a33b977e01360ab45a573f998fd3dccfb15e20a717e9d80acab8b17787ccd7e2141fad9dcd38ff63c94 SHA512 f971944048143ee8c63d3d2161b27f5e1d294b9edcf5155479687eeec279cf8a7fc6a722b4572cab8b741067f73afa06d7895ed1a99396d7a37dd6fb2e929d6e
 DIST gallery-dl-1.24.4.gh.tar.gz 518668 BLAKE2B 73ef2894d1355716001a5b82c43547d8156a646136b9a87e91ab0c51c4c238509da077e6ca79e8701a65c3e846aaa4adeac8d3f8cdfb50e140e815f56b55d358 SHA512 19285f9db2eba95252f13af176c314a318fd71503913ce6b54e4b31d0c41b1ca79498289531ca0b9d67630395c8212ba497c5c2a838f554c24d1672c5c16caf3
 DIST gallery-dl-1.24.5.gh.tar.gz 525743 BLAKE2B 6b8611242bbb6a6dc76508ec452c3618fe75d6ffdc3185b5f246e5568f32861647649d63e9479b187f086aeb4ea4f567567fc387bbe1df0cb4994a00d4ba76f1 SHA512 648707e5be450501aa66f34b89aae1cf7b80c93bee5105c9eeae4fa19e34df41b231066a23113e963119105050e6aed8e654d10d107086ab5a815095dcf562c2
-EBUILD gallery-dl-1.23.5.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
-EBUILD gallery-dl-1.24.1.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
+DIST gallery-dl-1.25.0.gh.tar.gz 540793 BLAKE2B e02daf0b2deb8196fc587a3fd17e4bb8b0d14ca67c6384e120d3fadaa261b5d9143885c2717d0e98dc0467285a7ebfa9f9bc5da7ad5bd39a239a6975e0a900eb SHA512 e0cc041343130acf47f0ab4b7b7ac0ac42389bc457748404b9b0bc17f8a8690b225ab30c0c3d523925138608508417ecc4052981a5615d0747a2a064f6236ed4
 EBUILD gallery-dl-1.24.2.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
-EBUILD gallery-dl-1.24.3.ebuild 1010 BLAKE2B 850bcffc0db807934fdbeb76a4f9227a2114ca2fb51f2b5303bc48bce23e0dccbfb3e3a7eae0e803c94b033aa98fa9a4491726bd5d2f090213007ff502435fe1 SHA512 dcc72fa9e34ba9898083bae3406860a3d6449b95a436886e1bb552724cdddb24cf6cb78bfc427ff88c49df3e3596328cbf42030a327fde84dc94b2ca30cee354
 EBUILD gallery-dl-1.24.4.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
 EBUILD gallery-dl-1.24.5.ebuild 1003 BLAKE2B c6b10ac3713fb5001c2dd2cee91b2d53995078bdc3bac0bee2906453c42ff771afb7c408f657553064260d218e41f559c0c1040817d73de901d396db14b414cc SHA512 51d1b42b99710b65c171e4c0cb917b1247cdc8b56901d42ee3f9958a4d717818f4de8e21831a6c7c2e9ac2944cc50c05a78ca6042535abd64d887b3c624ac7c2
+EBUILD gallery-dl-1.25.0.ebuild 1010 BLAKE2B 850bcffc0db807934fdbeb76a4f9227a2114ca2fb51f2b5303bc48bce23e0dccbfb3e3a7eae0e803c94b033aa98fa9a4491726bd5d2f090213007ff502435fe1 SHA512 dcc72fa9e34ba9898083bae3406860a3d6449b95a436886e1bb552724cdddb24cf6cb78bfc427ff88c49df3e3596328cbf42030a327fde84dc94b2ca30cee354
 EBUILD gallery-dl-9999.ebuild 1010 BLAKE2B 850bcffc0db807934fdbeb76a4f9227a2114ca2fb51f2b5303bc48bce23e0dccbfb3e3a7eae0e803c94b033aa98fa9a4491726bd5d2f090213007ff502435fe1 SHA512 dcc72fa9e34ba9898083bae3406860a3d6449b95a436886e1bb552724cdddb24cf6cb78bfc427ff88c49df3e3596328cbf42030a327fde84dc94b2ca30cee354
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.23.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.23.5.ebuild
deleted file mode 100644
index f6cab0159f71..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.23.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# tests require network access
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.24.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.24.1.ebuild
deleted file mode 100644
index f6cab0159f71..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.24.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# tests require network access
-RESTRICT="test"
-
-RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	emake PYTHON=${EPYTHON} data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/gallery-dl/gallery-dl-1.24.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.25.0.ebuild
index 9dcd7bdbba2f..9dcd7bdbba2f 100644
--- a/net-misc/gallery-dl/gallery-dl-1.24.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.25.0.ebuild
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e7a0e5ac8cc2..d1ae9da73e40 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,8 +6,10 @@ DIST NetworkManager-1.40.12.tar.xz 6520720 BLAKE2B 53b142e7eeb333e5293b361e8e918
 DIST NetworkManager-1.40.16.tar.xz 6589308 BLAKE2B ae99307d00a0dc46e4dd44ff5afa25d00f1b77aadf6386c4e9b8d38ba2e278718470868186fa0d5992b33381dab8bbfafc1f2d36ede9bcc993008821d6d74de4 SHA512 f065f020f4194fc6fb4a806fdeaa7efb3600dc2389b61b6304d418c183d8cc20ffe92ee8ecf00b433de6c35797605b8dfed4a1267aeb38b937e2356634bd9808
 DIST NetworkManager-1.42.0.tar.xz 6720056 BLAKE2B 1bd59c2b7e004437ce47a69d187ed79e426e4e1f16b6e8106bef9afcad0cfd86ebfb9b3189533028f343dd757e6b6c3ca6031751b0c20fb2844d2b5be11079b1 SHA512 d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c
 DIST NetworkManager-1.42.2.tar.xz 6749184 BLAKE2B cf94f79bad373d1271f406392af595941c78d567cb28a6116b351093858bbce68acf4d115950582087687ea3b3fafad7a977361f6c7f5ce8565bc2eed0e6ab60 SHA512 6142aaa7da2ae0dc3c8c75dbf51619ff969ace61c8a2d4a72aa83c4eff69e8389b262941e1667d71cbb55fb0653b14798a3c169b39dfcfa084109ef9fb3a335a
+DIST NetworkManager-1.42.4.tar.xz 6659860 BLAKE2B 5f98dba82d2bf932d61dc44b263a0c3263a299cc06bb506a98ec822126edf8dd6dde1618f75943caaf49f85864cadcf1eaf2c12864cde5f7521a7dff9053571d SHA512 af51ce481b8a6c3ee6e8856400a19f3e94c1fb0d5b2750ccf48785374b59110b49aa2a90aae675d322d902ad0e3f6eef6188bb247067448de84272dc6b114acb
 EBUILD networkmanager-1.40.12.ebuild 11730 BLAKE2B 3fab705271b084282fb7324521717531504b6b877dde88dae7e41ae2d3a49272108a1793f0d9dc9603af0f4a9999e2a1386eb634936567166fcd3c547a16e73b SHA512 dee0d56a794d5497d8a6ba6a31dab4ce0ff2afeb87d01c1b8d3499e9e3dee2673c8dbcfe865cbd79beeac26a94da958d9cca2d60dcd76f2a8ac8d6f2d83c672b
 EBUILD networkmanager-1.40.16.ebuild 11736 BLAKE2B 815367546ba3cf57caa26f58708f6530e4dd9b4c7c704b0fe7fa52a81a9cc96f4712332470b6a380c96335a7c38e0a8b20e79d1b4fa07045ef0fd04d20b6d505 SHA512 a0bf9b646bc4f9bb802924a2169b13d047849e87eb648542a9f34d01ebd4b14f982d2e56470b7eab49a5c3b349d06d1fe26c66875e4aecf3b1d26292b2d970b5
 EBUILD networkmanager-1.42.0.ebuild 11736 BLAKE2B 815367546ba3cf57caa26f58708f6530e4dd9b4c7c704b0fe7fa52a81a9cc96f4712332470b6a380c96335a7c38e0a8b20e79d1b4fa07045ef0fd04d20b6d505 SHA512 a0bf9b646bc4f9bb802924a2169b13d047849e87eb648542a9f34d01ebd4b14f982d2e56470b7eab49a5c3b349d06d1fe26c66875e4aecf3b1d26292b2d970b5
 EBUILD networkmanager-1.42.2.ebuild 11736 BLAKE2B 815367546ba3cf57caa26f58708f6530e4dd9b4c7c704b0fe7fa52a81a9cc96f4712332470b6a380c96335a7c38e0a8b20e79d1b4fa07045ef0fd04d20b6d505 SHA512 a0bf9b646bc4f9bb802924a2169b13d047849e87eb648542a9f34d01ebd4b14f982d2e56470b7eab49a5c3b349d06d1fe26c66875e4aecf3b1d26292b2d970b5
+EBUILD networkmanager-1.42.4.ebuild 11736 BLAKE2B 815367546ba3cf57caa26f58708f6530e4dd9b4c7c704b0fe7fa52a81a9cc96f4712332470b6a380c96335a7c38e0a8b20e79d1b4fa07045ef0fd04d20b6d505 SHA512 a0bf9b646bc4f9bb802924a2169b13d047849e87eb648542a9f34d01ebd4b14f982d2e56470b7eab49a5c3b349d06d1fe26c66875e4aecf3b1d26292b2d970b5
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.42.4.ebuild b/net-misc/networkmanager/networkmanager-1.42.4.ebuild
new file mode 100644
index 000000000000..ea8c15c407b0
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.42.4.ebuild
@@ -0,0 +1,393 @@
+# 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_{9..11} )
+
+inherit 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() {
+	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
+
+		$(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
+}