From 98af7cea03fd576766c005e4fcc71f9c64c229a8 Mon Sep 17 00:00:00 2001
From: jane400 <pmos@j4ne.de>
Date: Mon, 5 Feb 2024 16:41:34 +0100
Subject: [PATCH] main/postmarketos-base-ui: split usb-tethering into
 subpackage (MR 4788)

this allows to opt-out of usb-tethering on pmOS devices with
`apk add !postmarketos-base-ui-networkmanager-usb-tethering`
this is useful for developers with laptops on pmOS / dailydriving
those laptops on pmOS.

[ci:skip-build]: Already built successfully in CI.
---
 main/postmarketos-base-ui/APKBUILD | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD
index 1c44d813c..309a74be1 100644
--- a/main/postmarketos-base-ui/APKBUILD
+++ b/main/postmarketos-base-ui/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-base-ui
-pkgver=17
-pkgrel=1
+pkgver=18
+pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -24,6 +24,7 @@ subpackages="
 	$pkgname-bluez-obexd:_obexd
 	$pkgname-elogind
 	$pkgname-flatpak
+	$pkgname-networkmanager-usb-tethering:_usb_tethering
 	$pkgname-networkmanager
 	$pkgname-openrc-settingsd:_openrc_settingsd
 	$pkgname-pulseaudio
@@ -160,6 +161,15 @@ _obexd() {
 	mkdir -p "$subpkgdir"
 }
 
+_usb_tethering() {
+	install_if="$pkgname-networkmanager=$pkgver-r$pkgrel"
+	replaces="$pkgname-networkmanager"
+
+	amove usr/lib/NetworkManager/conf.d/50-tethering.conf
+	amove usr/lib/NetworkManager/dispatcher.d/50-tethering.sh
+	amove usr/lib/NetworkManager/system-connections/USB_Networking.nmconnection
+}
+
 networkmanager() {
 	depends="
 		busctl
@@ -174,11 +184,8 @@ networkmanager() {
 		networkmanager-dnsmasq"
 	amove usr/lib/NetworkManager/conf.d/50-hostname-mode.conf
 	amove usr/lib/NetworkManager/conf.d/50-random-mac.conf
-	amove usr/lib/NetworkManager/conf.d/50-tethering.conf
 	amove usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
 	amove usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh
-	amove usr/lib/NetworkManager/dispatcher.d/50-tethering.sh
-	amove usr/lib/NetworkManager/system-connections/USB_Networking.nmconnection
 }
 
 _default_camera() {