networkmanager: rearranged a few options, currently disables vala by default

networkmanager/.footprint

@@ -170,7 +170,6 @@ lrwxrwxrwx	root/root	usr/lib/libnm.so -> libnm.so.0
 lrwxrwxrwx	root/root	usr/lib/libnm.so.0 -> libnm.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib/libnm.so.0.1.0
 drwxr-xr-x	root/root	usr/lib/networkmanager/
--rwxr-xr-x	root/root	usr/lib/networkmanager/nm-cloud-setup
 -rwxr-xr-x	root/root	usr/lib/networkmanager/nm-daemon-helper
 -rwxr-xr-x	root/root	usr/lib/networkmanager/nm-dhcp-helper
 -rwxr-xr-x	root/root	usr/lib/networkmanager/nm-dispatcher

networkmanager/.signature

@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/Ab6gxCTlzVjj8TVerrlmnGsg/wjetqeUgaaiLZfrcdRjsGMWvm0IVVw7NMHcNZt/y/0n7LsEezf0KzW88ZfAw=
-SHA256 (Pkgfile) = 8d07183038ff99b59d01cd8c271acc7c4a99bb96b4a95cc0598abfcd95ee3116
-SHA256 (.footprint) = ca464a14a9339d2c15da112d839139deb3d47ddbd79cf58c6bb4940063f1e37e
+RWSagIOpLGJF387Mh63uUC2vTWZFDA8t+B5Q3kSF5DxTL0JyegjUA4Xs2MHDWMqwylHyFrqpHBQSPUW109o6kiGP5SfK/PBznwY=
+SHA256 (Pkgfile) = 5ac6c1863fd2a9c1ce422796a23729594a1344f3e28e3c721cbe11fd4ebde0d1
+SHA256 (.footprint) = 6bd322807525f14d8ed2f94b7407cca197c8ae4a49584b4aa77bee3382c2d3d1
 SHA256 (NetworkManager-1.44.2.tar.xz) = 4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1
 SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
 SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21

networkmanager/Pkgfile

@@ -1,19 +1,25 @@
 # Description: Network configuration tool
 # URL: https://wiki.gnome.org/Projects/NetworkManager/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: gnutls libndp libnewt libxslt nss polkit python3-gobject
-# Optional: ppp avahi bash-completion dbus libnl jansson libteam dnsmasq wireguard-tools
+# Depends on: dbus gnutls libndp libnewt libxslt nss polkit python3-gobject
+# Optional: bash-completion dnsmasq iwd jansson libpsl libteam modemmanager ppp vala wireguard-tools
 
 name=networkmanager
 version=1.44.2
-release=1
+release=2
 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
   networkmanager.rc NetworkManager.conf polkit.conf dhcp.conf org.freedesktop.NetworkManager.rules)
 
 build() {
-  prt-get isinst ppp || PKGMK_NM+=' -D ppp=false'
+  prt-get isinst iwd && PKGMK_NM+=' -D iwd=true'
   prt-get isinst jansson || PKGMK_NM+=' -D ovs=false'
   prt-get isinst libpsl || PKGMK_NM+=' -D libpsl=false'
+  prt-get isinst modemmanager || PKGMK_NM+=' -D modem_manager=false'
+  prt-get isinst ppp || PKGMK_NM+=' -D ppp=false'
+  #prt-get isinst vala || PKGMK_NM+=' -D vapi=false'
+  prt-get isinst vala && PKGMK_NM+=' -D vapi=false'
+
+  /usr/bin/grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/'
 
   meson setup NetworkManager-$version build $PKGMK_NM \
     --prefix /usr \
@@ -27,6 +33,9 @@ build() {
     -D crypto=nss \
     -D dbus_conf_dir=/usr/share/dbus-1/system.d \
     -D udev_dir=/lib/udev \
+    -D dhcpcd=/sbin/dhcpcd \
+    -D iptables=/usr/sbin/iptables \
+    -D nft=/usr/bin/nft \
     -D resolvconf=true \
     -D config_dns_rc_manager_default=resolvconf \
     -D modify_system=true \
@@ -35,11 +44,11 @@ build() {
     -D selinux=false \
     -D session_tracking=no \
     -D libaudit=no \
-    -D modem_manager=false \
     -D more_logging=false \
     -D qt=false \
     -D systemdsystemunitdir=no \
-    -D systemd_journal=false
+    -D systemd_journal=false \
+    -D nm_cloud_setup=false
   meson compile -C build
   DESTDIR=$PKG meson install -C build