gentoo resync : 29.12.2022

4 files changed, 49 insertions, 22 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6440168b27ce..fd642003d947 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,10 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61
-DIST NetworkManager-1.36.2.tar.xz 5432676 BLAKE2B 8ce2922573ae5b1d244e87d1b979a9fe7443e4fa2cb6caf52b59139ad92169dd46f53460871b44e687860aaee06dd6a4999d0ebce9cde466e61c203ae18dbaa3 SHA512 3d9085bb836000a2354415e5ff35e5e67eacd97680660613128b9befe981d67b6ac8d519581f8635bf219c2db03a92f182066efef3abb2094da2870e12caa353
 DIST NetworkManager-1.36.4.tar.xz 5433152 BLAKE2B 2bb625381bc5a816a9fdc51498721f9bc1e85fe2e83d114c8897f99f90af6924a0a07fddf0099f8e52c0df2f3353834129b99b4bb487b413cee503da7c680035 SHA512 17b2d39ed2584fb8b805e7b9950f9c4e6d657380881e9e78a1aa85dc58615e0a3896413a6902086f516dee2f373155f69042b4a229f3b9e15fb3c0f958cd8149
-EBUILD networkmanager-1.32.12-r1.ebuild 12157 BLAKE2B f41710a7b10d2869c5227e3f3059050616445073da2c93e5b503d417867950aa48f25483dcbf052cee0b42c4fa03d01b757afa1352ea27bf3b54956d2db093a2 SHA512 0d345d32d59aae9a5ac30ed4170e474479c441dd3b83ad83988c47826438b3ed50ada13bba73a92c4cc846fc9a75a17798281df711a20bf8f24424383932bc04
-EBUILD networkmanager-1.36.2.ebuild 12422 BLAKE2B 83ab78809afd86c015c8d9a70d2ebfa4d7c2a8b6ec64c3f33ea4364865d9e50c8daf69d2806b6953463a3c40b299276c85bba42e89cfb6dd0f1eccb7113256eb SHA512 a13101efec79eacf7175cf37b9dcc165d2927fe5135c33c28df26cd53e58cdc40a87061925506b6165e73212ccdafa49a580db632389cdcb68cd6d07a055f225
-EBUILD networkmanager-1.36.4.ebuild 12422 BLAKE2B 246ed312b874ced5d1dcfbd0dce2e96eb252f9627dac000f7983ccaafa526e419245ff77b79ef92b60f71fcb94a34a2c2e3d565f12aa5437eac68921ba5b107e SHA512 e9698d31d78e5a6bab1ddc83f47c62cffd7b5f2b887540cc765fe0ad274d169d1fd743266b93d5a09d3b34cce7a003084edeb40e3d1ba1228730e8ae72ccd1cc
+DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1b11bc7f5044a0b2a129d5ab764bd5f29ccc604bbc27c49d52ceab9e2e6dbd923a686fbaf96cf20c73438d680fa5659e5ff SHA512 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
+DIST NetworkManager-1.38.2.tar.xz 5526780 BLAKE2B 54e9746d3bf41146bb2bbc1ec273c4e2ca0a458e1a488eba7e5f17572e6e8db02ccfcd5b884e00162e505512b24a38de77447944d979fbe40d20d4af4c688a71 SHA512 0da3294bec659e6742c2b941eb6cb2464df1018e801148ac37cce0a0612c4468701add13659c18b1c08b51556c7e3e2782ad2353804fdf2a094e97d531da964b
+EBUILD networkmanager-1.36.4.ebuild 12499 BLAKE2B 265082e6355c141f4519b00ec136b1aed69461e91f299c7de5f03108abfdef69f2743c1cefcee800eb4659945263324aa0aa7df2ea507d88ac0c569966d1c8d7 SHA512 a6c7ee2a653ab3d7d873156ed45c6ea51eb9fc65574a84a240457564c54681f6830984d7c3177e7de342f04ce5622e0d89f8f1a7a59c163a076592a3340bcbe2
+EBUILD networkmanager-1.38.0.ebuild 12526 BLAKE2B 3617f3cb3de8b4c00fb1c1be6505a0289f798d0ad93068a50b68e4b31ad0cbfa81b474f4a64e1de7a7c2b7980fe70f7f6aeb404f7c0b1cbfaf63269657bcd432 SHA512 2d27c3bad9613e467bef49ffab35b26b3a779419439fa1dae2a17b52d7988ee46cdecb1cb067a04534ba1e47d3a4dafdf7db8f7441642aae4e9ed076f8ff3a69
+EBUILD networkmanager-1.38.2.ebuild 12543 BLAKE2B 1235910f66ea116902f8041e95f6e8d38a8ceb9f651eef76eca82f7439c42a2d863352fdca33aa02f7ad710920a683ccad4b724332ea99fdc817db83c830cc59 SHA512 3a0dd2337e4af2af2fc5a6631c769e8b34223b29274c3f97cd3fc933be486a02f75dcf32711bf4aa6175e8b17bf022543ae8094262e9a00f96e8bc60955412dc
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.36.4.ebuild b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
index 400242fc95b3..6fbf9dea8762 100644
--- a/net-misc/networkmanager/networkmanager-1.36.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -90,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 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
diff --git a/net-misc/networkmanager/networkmanager-1.36.2.ebuild b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
index 40c06d6ef040..47515b23c184 100644
--- a/net-misc/networkmanager/networkmanager-1.36.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.0.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +41,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -62,7 +65,7 @@ COMMON_DEPEND="
 	dhclient? ( >=net-misc/dhcp-4[client] )
 	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
 	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( net-dns/openresolv )
+	resolvconf? ( virtual/resolvconf )
 	connection-sharing? (
 		net-dns/dnsmasq[dbus,dhcp]
 		iptables? ( net-firewall/iptables )
@@ -90,6 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 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
@@ -369,6 +373,8 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	systemd_reenable NetworkManager.service
 	! use systemd && readme.gentoo_print_elog
 
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
index fd6fc99404a6..15e85166b3f8 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.38.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 GNOME_ORG_MODULE="NetworkManager"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
 
@@ -14,7 +13,7 @@ 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 lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
+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="
@@ -30,7 +29,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
@@ -41,7 +40,10 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-209:0= )
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sec-policy/selinux-networkmanager
+		sys-libs/libselinux
+	)
 	audit? ( sys-process/audit )
 	teamd? (
 		>=dev-libs/jansson-2.7:=
@@ -62,7 +64,7 @@ COMMON_DEPEND="
 	dhclient? ( >=net-misc/dhcp-4[client] )
 	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
 	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( net-dns/openresolv )
+	resolvconf? ( virtual/resolvconf )
 	connection-sharing? (
 		net-dns/dnsmasq[dbus,dhcp]
 		iptables? ( net-firewall/iptables )
@@ -71,8 +73,9 @@ COMMON_DEPEND="
 	psl? ( net-libs/libpsl )
 	concheck? ( net-misc/curl )
 	tools? (
-		sys-libs/readline:0=
 		>=dev-libs/newt-0.52.15
+		libedit? ( dev-libs/libedit )
+		!libedit? ( sys-libs/readline:= )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -89,6 +92,7 @@ RDEPEND="${COMMON_DEPEND}
 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
@@ -116,11 +120,11 @@ BDEPEND="
 
 python_check_deps() {
 	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
 	fi
 	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
 	fi
 }
 
@@ -175,7 +179,7 @@ src_prepare() {
 		root password, add your user account to the 'plugdev' group."
 
 	default
-	use vala && vala_src_prepare
+	use vala && vala_setup
 
 	sed -i \
 		-e 's#/usr/bin/sed#/bin/sed#' \
@@ -231,6 +235,7 @@ multilib_src_configure() {
 		$(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
@@ -295,6 +300,12 @@ multilib_src_configure() {
 		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`
@@ -361,6 +372,8 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	systemd_reenable NetworkManager.service
 	! use systemd && readme.gentoo_print_elog
 
@@ -398,3 +411,7 @@ pkg_postinst() {
 		ewarn "the main.dhcp configuration option to use one of them instead of internal."
 	fi
 }
+
+pkg_postrm() {
+	udev_reload
+}