gentoo auto-resync : 23:02:2023 - 21:45:48

11 files changed, 458 insertions, 103 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b9ae79e5ae1a..320e86951a48 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 82374892049d..e7a0e5ac8cc2 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,9 +3,11 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 DIST NetworkManager-1.40.12.tar.xz 6520720 BLAKE2B 53b142e7eeb333e5293b361e8e918e471f242ae51f7058fc820e065714be2efef49bfd38571abb631aab9fa37f80fbba7d6d1aaf201a8ce24b097989308888a4 SHA512 567188e32406a1d5a43419fbd0186e2a47453b78674db1f2e0842bed1fe148cea0b93c92f4920a44cc74e76f968672dafcebdf2845debabbce947f39cb520cdf
+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
-EBUILD networkmanager-1.40.12.ebuild 12529 BLAKE2B 2da7c08c4c1b8096c5fcdf2fb1b64057486bc89606a724fea04b04397860cbbdd88872425c216c92a2aa3f6b08a58f926e05e5d134c4fb52dda0437c533d2ed7 SHA512 f5ec872aa13144a50db211cae322ec3edef98a7fe11cd7099a90002a831b103334543d63df4499f80e2ebdd8814cef983d37f14754bbbbcb6da60886a1f7235f
-EBUILD networkmanager-1.42.0.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
-EBUILD networkmanager-1.42.2.ebuild 12535 BLAKE2B 0bcde7eda6079bb22c067f245f50b7bc8e9c22f63bb4a288b7d46464cd9de46a057595e5ea74e5cf090ce2bb6b70ea66ac92a73b0fa60c148f0926212a0b90ae SHA512 b30abc99629f71045e6459cf3bb8f2b4bceee7cdb90b61f59e0cc158a8d06bf51a20b84b12460e6e06ed018c27893deca15508671a3055dcb858e983d527825a
+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
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.40.12.ebuild b/net-misc/networkmanager/networkmanager-1.40.12.ebuild
index 3ed868d1086a..3a1f0cb95b0d 100644
--- a/net-misc/networkmanager/networkmanager-1.40.12.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.40.12.ebuild
@@ -130,31 +130,6 @@ python_check_deps() {
 	fi
 }
 
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
 pkg_setup() {
 	if use connection-sharing; then
 		if kernel_is lt 5 1; then
diff --git a/net-misc/networkmanager/networkmanager-1.40.16.ebuild b/net-misc/networkmanager/networkmanager-1.40.16.ebuild
new file mode 100644
index 000000000000..ea8c15c407b0
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.40.16.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
+}
diff --git a/net-misc/networkmanager/networkmanager-1.42.0.ebuild b/net-misc/networkmanager/networkmanager-1.42.0.ebuild
index 3c379b76059d..ea8c15c407b0 100644
--- a/net-misc/networkmanager/networkmanager-1.42.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.0.ebuild
@@ -130,31 +130,6 @@ python_check_deps() {
 	fi
 }
 
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
 pkg_setup() {
 	if use connection-sharing; then
 		if kernel_is lt 5 1; then
diff --git a/net-misc/networkmanager/networkmanager-1.42.2.ebuild b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
index 3c379b76059d..ea8c15c407b0 100644
--- a/net-misc/networkmanager/networkmanager-1.42.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.42.2.ebuild
@@ -130,31 +130,6 @@ python_check_deps() {
 	fi
 }
 
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
 pkg_setup() {
 	if use connection-sharing; then
 		if kernel_is lt 5 1; then
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index b1b10c6d0913..aa00db3b9960 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -12,7 +12,6 @@ AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff01840
 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c
 AUX ntp.tmpfiles 28 BLAKE2B 6696c9e220b5517dbe0e7ed5c5937a20bcc608eeca0cc353ad4202f21a56679aeed7cf667eed1113538fc3e1a544e58f001ce595c5c2ae209da0b6c2fa49f7b9 SHA512 9d8744609ebd9a69e8584abc3ea13d1ac08e8e7014c77fa08e811d0a80ae7c892ba7b1c2f5bab47d82f6af36e6075f2e7ecdcab98e7d9ba87408681cbabf1a2c
 AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0f5f87d405e95047a3a72c7f747fb52e6bfc0dc2e8da10867e83394ff07e8381fbdf0b666c26 SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91
-AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
 AUX ntpd.rc-r2 495 BLAKE2B d06fd0f57c3e6e1b17f0dba47777472a8ecda3b86f66dbfbd5e8ab7e4af7aad50502251763ea107db463caec6b9d166448fbba23caebffb3c947cce433c59e8a SHA512 a0b7b079522392fa3883bba9d0a0c77f29cb4da60ed0d8f7ce9bfd3ac23fbc632dbf01a1bb0ad44ca4b78e35e644d614a2fccec7c8157c6824c8a868304ceb9a
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
 AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r1
deleted file mode 100644
index 7573411c9986..000000000000
--- a/net-misc/ntp/files/ntpd.rc-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="ntpd - the network time protocol daemon"
-pidfile="/var/run/ntpd.pid"
-command="/usr/sbin/ntpd"
-command_args="-p ${pidfile} ${NTPD_OPTS}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
-	use net dns logger
-	after ntp-client
-}
-
-start_pre() {
-	if [ ! -f /etc/ntp.conf ] ; then
-		eerror "Please create /etc/ntp.conf"
-		return 1
-	fi
-	return 0
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 5761c57da925..dfcbf669ef92 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,8 +1,10 @@
 DIST streamlink-4.3.0.tar.gz 474184 BLAKE2B 557d70105f043fe7454d1c6dd7a49becfd354612df43d09242ec86da5275c7c629f6df887ee7e3a25d9c502e0845f38bece0da2335c5f09951cb4b0aada408a3 SHA512 e1c450d777c00515c07895303dccdece23a8a29b2f9cc272790f5d4b260adbb381845d7ffbc9425e6cee7be41d66158e226d14d08352430bff1c29889b0b0077
 DIST streamlink-5.1.2.tar.gz 494342 BLAKE2B f916aab0fcd346e9945de04335309c61cb83c7c5047208a281a87162fb19dae6e45ae861fbc55780049e63bd854f303ee1669d3664a3736debbf8194ee4e6760 SHA512 8fecdc46fc34b37a5a67d15bb4252d1ebab69815398deb533de063fdf7e211d23d413b1b519984dddd2bb5e35296d717dd0504a3578b7bc44c7b123cd70db2a3
 DIST streamlink-5.2.1.tar.gz 510860 BLAKE2B eb7f3c85b048d3f274c332f27daafe38a0b495a651101ba2f7c19f13f18a8c691d495f614212dd610e80d0e80c23c695017a212760fe10dd58e00e9d8ac7f95f SHA512 68c02eaee2881f8777eaae3d0b54b0c6aeb0aabf76ab52ac23999895ed0d04a73d817634926869acbf8c092bbe65aadc9637824d56fc439d7445d2ea5f400764
+DIST streamlink-5.3.0.tar.gz 521864 BLAKE2B 2afb7577ba43b73f58d7cd13d217dbaa96f8abea8a10fa495d158c56604ec385e6191df6001f3d969f6aafa3a9aca8a46ab7224af646e2bb404e6098b5261e6a SHA512 7fc18c0604729df358ba396a21e4aa646344d1a1f320ce84831bc13c207a6dd64b2bd6679dc1712483764edd01bd87347d7eca2e3c8d4f6f2113db9c03737343
 EBUILD streamlink-4.3.0.ebuild 1395 BLAKE2B dba4163937369a5b50311ee57103cfe1408a857a93066a9881df0e4ef8c18b446df215904b7a1b713800272aac2ff201be5d98fe1142e218c676506d3c2d73c5 SHA512 b41080cc87d8f70c2ee6514a3407b83d55f583e82df31b8229d08f682021343fe9ca6e02c16a91cadfefcafd19fdfc0377450b6503ef880d05906f08d868d47e
 EBUILD streamlink-5.1.2.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
-EBUILD streamlink-5.2.1.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
+EBUILD streamlink-5.2.1.ebuild 1528 BLAKE2B 25ea7531cafe46875406f97c314d785be7e2f5f13d33a4aa619116c05027536b580e915fcd3a0928188fded9985547c3e98523bae366fe3cb13d6dbda6009897 SHA512 c238d2ecf2b22739a9f557f64a78b9fa474f9164885ea4f0570c4cacd1f5c9511c59871261f93e50e727cc37c8fae3cb2a140f600046362e36d962a6b556b49d
+EBUILD streamlink-5.3.0.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
 EBUILD streamlink-9999.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
 MISC metadata.xml 374 BLAKE2B 8c5f72454d8d00a99c18328838cc9c3be82cd9d68405f6e702239b8475a9162f3ba945b142bf2f5762fcc4ac52cae95c8e2d5c0707b1028c11faba2341a2d8e9 SHA512 038e509b340b1cc31382b0a1edf0c273fe99ca7c8c40370039a01cf6a95101d1217db7fea64bc67f5c113c99d504ceb7256008c1539c4d7e13ad6ceb8b922a58
diff --git a/net-misc/streamlink/streamlink-5.2.1.ebuild b/net-misc/streamlink/streamlink-5.2.1.ebuild
index ff7c51d0ed88..5c099a070e94 100644
--- a/net-misc/streamlink/streamlink-5.2.1.ebuild
+++ b/net-misc/streamlink/streamlink-5.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
diff --git a/net-misc/streamlink/streamlink-5.3.0.ebuild b/net-misc/streamlink/streamlink-5.3.0.ebuild
new file mode 100644
index 000000000000..ff7c51d0ed88
--- /dev/null
+++ b/net-misc/streamlink/streamlink-5.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest