9 files changed, 412 insertions, 6 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 433a0b4a21b2..a02844b3523c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index cc92c63b2e92..186fae59cb69 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,7 +6,7 @@ AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d
 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04
 DIST dhcpcd-10.2.0.tar.xz 274896 BLAKE2B 0b209f253e6462cc176ffef749228fc3b82474ee4baa2c468277b58abea9541282a2a96633e88641c46e3e9a612049f574009dd42f00f86334e655b10c234e81 SHA512 d2414ae8ff292e04a9d7060d523b5975e996fb921c481d198c5b6804fd73c6fc6edd806faf24788eacd8a2125e80528db8844865178b65a3acf29d3d264a3bff
 DIST dhcpcd-10.2.2.tar.xz 275700 BLAKE2B 95777f7aedc3a68e9873dd69d2c36b0235da31d95ad0327288f4fe11f35fe0ebcac827d3c7c9cc45bb0bbfdebfee246d0187c1d06bd9c44505868b9731715575 SHA512 299c0e629d7d42bacaf2c6123374033c23db183810aabad2167b0449e1945add940c0889c8390ed304b27316564a8aa45eb5808e5ec0c1abea2287dc833a2684
-EBUILD dhcpcd-10.1.0-r1.ebuild 4973 BLAKE2B 1a16275e164fc485f8749dc15cdf2fce494f818853783ec1236c8a2df40b60c46625ca0a0397da62449d2c2017e03b44bf4061af4dacce88a65345f0a1de54e7 SHA512 880251fc006e86cfc59dd63265df1953c5b0ea05980e9ad06457fe524669a0bc102c5ae5ef3eaffdf2f0d249301f57953824e3199e5ed152c60ae2422b9d6dc4
+EBUILD dhcpcd-10.1.0-r1.ebuild 4972 BLAKE2B fff05e778865b69889a86e5522e8103e3ec88495ef2efcfd8184681cf22925309673f868e77d502b26ad4cb1709c3ccd180dc498187ca16fd37fde0a7ec9b7d9 SHA512 bfe60a7f0aa12b2703bd3a8320a79850c906f9b450ebb58b9610d3ef5e6b31f185a3626e1d0f0959fd3d3321b3b9fc9a63d80631e3bce48f30576f255163d0ab
 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.2.0.ebuild 4975 BLAKE2B 80cd65893ab4a5c5b3cd6e9913278d2ecfcb013c40898e3a2f26fcf7ad2f8ac11825ccd26ba633ac420df20d46f6869c3e52c77c7afe286bb7e027262b0f5960 SHA512 5e3d62016332ee3c7c40c1ae2f2e1f23fc416d22a309f6f2f7122fc990a79dbb67f1bce03328abc1a6645a2e8f5cf2468eeac1225ee99539d1612d0f80de8d71
 EBUILD dhcpcd-10.2.2.ebuild 4935 BLAKE2B 2a5789402ae1b1f4b6a049ca45f98ebddb10a45c4d8753d60346e6ee69287b2d99bc566fa1573d6d97c281b9e1912f85d84e395a7f5d011198e20af417313951 SHA512 902a31842e545c59ff3955706306066cd34b0d8b46a8e588370c4943df64415845a080672458c4233c9188474342c6965a8b1c3da64c9954c2f608687a743cef
diff --git a/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
index 858d0a7f5617..bf421902aa9e 100644
--- a/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.1.0-r1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index d8f9724d5235..d50192d1defb 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,8 +6,10 @@ AUX init.d.NetworkManager-r3 1877 BLAKE2B 2d081b102c306fce8ce5db57e23f8a35334eb4
 AUX networkmanager-1.48.4-fix-libsystemdless-build.patch 2475 BLAKE2B 3a754ae614f50d966ae859225defa0d9da12b6e22f84508b281b171c60446478f875b6b8eac34ebf53ac1527341f0edb6fa07f3923ec2893939fc352a9a499e3 SHA512 cf60ffd183edc42856b58d5c9072307aa7320c2fd65411041dca4f2b5f4fd3befd2e20bf48841dcb4697f3897219d8ace8eb536a0aa5ac310c0bad42cb7e34e5
 DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407
 DIST NetworkManager-1.48.10.tar.xz 6085272 BLAKE2B 8f615b1afec72ac600fd2cbe458644c4e83312e76c5ecf0e84484dce60510867350ec1fc2fb68fdee40ae4aca3d9e935ef8e433ea60ebe431b96699c0ce01222 SHA512 baef2ecc7da5c2f00278e8596f47c9304321896f1b79a6f304e27365c89a5fbaac6fbb68433a8fad94eeeffa56561968d0afee1adb24df6a8e6f2dba978cc620
+DIST NetworkManager-1.48.16.tar.xz 6087160 BLAKE2B d5f3f5809cc8e11096337db0c064c10537ce8732784f7ff0031750f60a6e43918a479b7896ba39c80c8c8a949e0bfccb4b8a02842c0b8f667bde73421917073a SHA512 1a21b2c9edc82b7dbc73501d08d4fd963b07ab391cf4d9c51cb8cf42deddccd30f8a21d5a078fdaed6172a82f03b38a8951e9bf7c96de3015749ee1a21a2fd1a
 DIST NetworkManager-1.48.4.tar.xz 6080980 BLAKE2B b5d216e064043e688ce8fc582e4bfae859a3e746fce2bc13f43a871a6886270c75b77cb1c73f4b9c89e89619683a8cdce698cfe1bd249bd68108f02b982dea04 SHA512 73c9399d528b78fe1393ad2015f641d9dcfe8a1134b65a65e051aa08eece6574f44a340d140d1de525000b365370bc2615da0e682b16c2da28dc597961e6410d
 EBUILD networkmanager-1.46.0-r2.ebuild 11944 BLAKE2B 8f20550d23c892ac8d30adc98c3ee1e351dfc1e3e31f1e91f8df6c905eab6ea2dee570f65ed4525be1c6316b1f7650dd6f422b0e300524804d435ff84a5f58c4 SHA512 600fea678e8cb7286a449479db9aaa56cc8f97d2c2817a9818cc1e665bd57852a82632f4de340c21b13a8983572e84a5f8a986fe156b4c3b99561c32f4961d37
 EBUILD networkmanager-1.48.10-r1.ebuild 12049 BLAKE2B 0f637e51971ae7b0d648e9ec866f43bf59785d4ece25b8da6af4e8af281cb2560e11d15a69cbbd650bdc2da1741520a793b94713d62bebe3dc9af0deb9aa1db7 SHA512 0c213a37e4e29ab579274c235c614f01dd056fc2c725accafe94a7552fc03cdfc4e95c65ba675f1cb78757481f8c9c02393209d689d45c5ff24a1336aa5ca4fb
+EBUILD networkmanager-1.48.16.ebuild 12185 BLAKE2B b7aab8d17d5757e54525bafcfffe7b1cae0557ee08645da24f3577279c5ed8bb90c3e325c2ba660d897c1c361b3afd3f13c22ce5af4c8092fb2bc83cdf57a640 SHA512 f90da40c6479d5d8d9ebb55d83a580102bb9169be2e6ff7d3687839fc68ddfc856c57a86d39a48dfe490b9a30defed9194bd03f3ed3b949f4fda63e87dca2005
 EBUILD networkmanager-1.48.4-r1.ebuild 12041 BLAKE2B 4a72d682cc083dab1d5d050c83d992f8ee7ae3edfe8e0c8a1f4cfffdcff805f08095566864bc082cafda79f99d47653426d41002198f6c7d3ee129699fce24dd SHA512 45c378e9e6cd25f5ad2d6277d13335efd903cacc50c93a1456a8c379de05005c994445ec10d16be346cc3ddbfd6821c559c3de5e8a4ba546c0334dba5c7d0050
 MISC metadata.xml 2360 BLAKE2B 0d95733c3909e35ef555ad32c44e706d48347e6b8a5f7f915831edf7a43376e973fa32c7704325818704b59082fbbb2e4610e075848f09ac7c818d8fdbb94830 SHA512 c4478c41989eca2b777bb59767ce7660d70b261f61bc42673bc61e7e4db528c45f921c384de5454e7f901f4cfdb3cf1303e183397671606ed43c1fdaa59762c7
diff --git a/net-misc/networkmanager/networkmanager-1.48.16.ebuild b/net-misc/networkmanager/networkmanager-1.48.16.ebuild
new file mode 100644
index 000000000000..3663e7161b0c
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.48.16.ebuild
@@ -0,0 +1,404 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="NetworkManager"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit linux-info meson-multilib flag-o-matic 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://gitlab.freedesktop.org/NetworkManager/NetworkManager"
+SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${PV}/downloads/${MY_PN}-${PV}.tar.xz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="GPL-2+ LGPL-2.1+"
+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 psl libedit +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 )
+	test? ( tools )
+	vala? ( introspection )
+	wext? ( wifi )
+	^^ ( gnutls nss )
+	?? ( elogind systemd )
+	?? ( dhclient dhcpcd )
+	?? ( syslog systemd )
+"
+
+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.42: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}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/networkmanager-1.48.4-fix-libsystemdless-build.patch
+)
+
+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
+}
+
+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() {
+	# Workaround for LLD 17 (bug #915819)
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	# Build system requires -flto-partition=none support for LTO
+	tc-is-clang && 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)
+		# ebpf is problematic in at least v1.46.0, bug #926943
+		-Debpf=false
+
+		-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
+	)
+
+	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-r3" 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
+
+	# prebuilt manpages aren't installed by meson
+	use gtk-doc || doman man/*.[1578]
+}
+
+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
+}
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index 409fd332b0d5..e8b5853e304b 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,3 @@
 EBUILD tigervnc-xorg-module-1.14.1.ebuild 447 BLAKE2B 71f6623a95854d1795f4379302c2278401ee55c41556db7b6e2de21708f3ec4f413e8e699a9f64910ca5255e7b6bff15a6279dace1c907a6f8838be7d8ede540 SHA512 4bff3f4d8af5143693fdfd46c992e08076ef691bd688ff9c03de56d10f66f6f2067ee08436921b691781e3855c6ac405a75d6d2c46e840ea2d33457fe16cb4a1
-EBUILD tigervnc-xorg-module-1.15.0.ebuild 448 BLAKE2B 89fdd712e8f45cc8aa72b139011099c661a98e835ccaccf2a5ca2c6d261f04e3a7e1cb27f6cb1b7e8a587c4e3d79be872400ab8358dc815662279115e169ec89 SHA512 4c3bc2e2c8d94e381d6a8f3cdf95294a232a2d7d2a2d6c159a05016c31382fb1227c184c1f8b32641ebb09d11fc06a922f935d265f0a273aedfbcbc57f844087
+EBUILD tigervnc-xorg-module-1.15.0.ebuild 447 BLAKE2B 7b65619d5715d5cd225905bf44795f9605059a7c18aadfae53af72cac8f0b6b969ead45e4a848778253f9e164ded29ff838967a3bf95100888217d5a87cca7a6 SHA512 81ef003d81ae84800cea889de15f9845218c7904ddd304b5398e3a42c93c68651c10451772edd12b938058ba31345802afdffc53e2c6b17bc9711c421931bd1b
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
index aaa89e3f5641..dc59467a97b0 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.15.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	~net-misc/tigervnc-${PV}[server]
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4f227e02f964..1a80cdbbdbb2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.15.0.tar.gz 2126369 BLAKE2B c8646860884ae8fec7f81d9e87967bb279e7
 DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973
 DIST xorg-server-21.1.15.tar.xz 5009756 BLAKE2B a7d5df70a4af98b903a306850a169879cf083b2c811f6e75e1e916f85441214541f7c9fa0e0089c4bf08c67597166d97ea194c6a0a511948568120e579d1104f SHA512 677bbec81ecdd1d14e1d289a00c40249988985ec636e5473b30c4f63bad03a6cc5f9168cea94969e1550370eee8863595bc9c064c3d218a96123afc7567bf363
 EBUILD tigervnc-1.14.1-r3.ebuild 5627 BLAKE2B db59a02eb600fee173539da9f7949e4e9cabb3dca487bb12f1983362888dc4a264f25c6acdcaac4427aeb3ce9e67431974ce08c4bdd292d3bfe1b5012c9249bd SHA512 7a9a27c13a46a9370cb18a494738f6e53524450d085bc00d84b7a789f97757ee1e301886a71baa294323afea810ffd69c81f565ea42db439759c04a4cec4228c
-EBUILD tigervnc-1.15.0.ebuild 5585 BLAKE2B a5f1d6abb144f30436f50b17440fcd3a01cce76251a1fa0c69235239451553fc23d58e55e1f6fb8acb57bdd18bcabc255564cbaca494f76254f3df5d7311f4db SHA512 ead25142812b51247b233b2501a5177e6cc40608d75c8311d241ce4807b3f762b2af955593cfa7ea323b31f90d4a3fb3e7a8fee2fff01d3d63c61484e54dcefa
+EBUILD tigervnc-1.15.0.ebuild 5584 BLAKE2B 7a4971269e2036f0c7b5d583257fc20413264977db3dae34428c6b66682344dc2de06a53caa35a5809c61f60e734ca9189f8f4e99d2ea72271b3d2aa6ed646a9 SHA512 9d02ee11e4dfaa318b29f04e41fdbb03f12a6db0e16dc5c2b20ea4c490301bab6ff9946f2ad9371a395136a945e1aaecbaa7b63e857af481706a02381271e958
 EBUILD tigervnc-9999.ebuild 5500 BLAKE2B 5b96af09bf491a9a0cdd87b8a0cf77360759e2e5550deeab0b626b3b4cf909d437fd317d57757e2ef93cbf8f8b2a2b997d8b7d861148dce3f4c44e5b15e90a44 SHA512 6f2a2b0a5d11a6d26d6faec08fa5e670d28e735b13d562e0af6ab6c2e201d031f845884586c5e67c40cf810bcebeb06cd00e6bbdb66cd3e6e66d5704f0624ab5
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.15.0.ebuild b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
index 597b2932b10a..eee7194d9814 100644
--- a/net-misc/tigervnc/tigervnc-1.15.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.15.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 else
 	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="GPL-2"