community/pulseaudio: modernize abuild

community/pulseaudio/APKBUILD

@@ -58,8 +58,8 @@ subpackages="
 	$pkgname-jack
 	$pkgname-zeroconf
 	$pkgname-openrc
-	$pkgname-bash-completion:bashcomp:noarch
-	$pkgname-zsh-completion:zshcomp:noarch
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
 	$pkgname-lang
 	$pkgname-equalizer
 	"
@@ -92,7 +92,7 @@ esac
 prepare() {
 	default_prepare
 
-	sed -e "s|sysconfdir, 'dbus-1'|datadir, 'dbus-1'|" \
+	sed "s|sysconfdir, 'dbus-1'|datadir, 'dbus-1'|" \
 		-i src/daemon/meson.build
 }
 
@@ -148,15 +148,15 @@ package() {
 	# jumps. App volumes can diverge wildly and cause apps without their own
 	# volume control to fall below sink volume; a sink-only volume control will
 	# suddenly be unable to make such an app loud enough.
-	sed -e '/flat-volumes/iflat-volumes = no' -i "$pkgdir"/etc/pulse/daemon.conf
+	sed '/flat-volumes/iflat-volumes = no' -i "$pkgdir"/etc/pulse/daemon.conf
 
 	# Disable cork-request module, can result in e.g. media players unpausing
 	# when there's a Skype call incoming
-	sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
+	sed 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
 		-i "$pkgdir"/usr/bin/start-pulseaudio-x11
 
 	# Required by qpaeq
-	sed -e '/Load several protocols/aload-module module-dbus-protocol' \
+	sed '/Load several protocols/aload-module module-dbus-protocol' \
 		-i "$pkgdir"/etc/pulse/default.pa
 }
 
@@ -166,29 +166,26 @@ openrc() {
 }
 
 _libpulse() {
-	replaces="$pkgname-libs"
 	pkgdesc="Pulseaudio libraries"
-	mkdir -p "$subpkgdir"/usr/lib \
-		"$subpkgdir"/etc/pulse
-	mv "$pkgdir"/usr/lib/pulseaudio \
-		"$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/libpulse.so.0* \
-		"$pkgdir"/usr/lib/libpulse-simple.so.0* \
-		"$subpkgdir"/usr/lib/
-	mv "$pkgdir"/etc/pulse/client.conf \
-		"$subpkgdir"/etc/pulse/
+	replaces="$pkgname-libs"
+
+	amove usr/lib/pulseaudio/*
+	amove usr/lib/libpulse.so.0*
+	amove usr/lib/libpulse-simple.so.0*
+	amove etc/pulse/client.conf
 }
 
 _libpulse_mainloop_glib() {
 	pkgdesc="Pulseaudio mainloop-glib library"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libpulse-mainloop-glib.so.* "$subpkgdir"/usr/lib
+
+	amove usr/lib/libpulse-mainloop-glib.so.*
 }
 
 bluez() {
-	pkgdesc="Pulseaudio bluetooth support"
+	pkgdesc="Pulseaudio Bluetooth support"
 	install_if="$pkgname=$pkgver-r$pkgrel bluez"
-	provider_priority=10
+	provider_priority=10  # highest (other provider is pipewire-pulse)
+
 	mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules
 	mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/*bluez*.so \
 		"$pkgdir"/usr/lib/pulse-$pkgver/modules/*bluetooth*.so \
@@ -196,63 +193,40 @@ bluez() {
 }
 
 alsa() {
-	pkgdesc="Pulseaudio alsa support"
+	pkgdesc="Pulseaudio ALSA support"
 	install_if="$pkgname=$pkgver-r$pkgrel alsa-lib"
-	provider_priority=10
-	mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules
-	mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/*alsa*.so \
-		"$subpkgdir"/usr/lib/pulse-$pkgver/modules/
+	provider_priority=10  # highest (other provider is pipewire-pulse)
+
+	amove usr/lib/pulse-$pkgver/modules/*alsa*.so
 }
 
 utils() {
 	pkgdesc="Pulseaudio utilities"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/pa* \
-		"$subpkgdir"/usr/bin/
+
+	amove usr/bin/pa*
 }
 
 jack() {
-	pkgdesc="Pulseaudio jack support"
-	mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules
-	mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/*jack*.so \
-		"$subpkgdir"/usr/lib/pulse-$pkgver/modules/
+	pkgdesc="Pulseaudio JACK support"
+
+	amove usr/lib/pulse-$pkgver/modules/*jack*.so
 }
 
 zeroconf() {
-	pkgdesc="Pulseaudio zeroconf support"
+	pkgdesc="Pulseaudio Zeroconf support"
 	depends="avahi"
 
-	mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules
-	mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/*avahi*.so \
-		"$pkgdir"/usr/lib/pulse-$pkgver/modules/*zeroconf*.so \
-		"$pkgdir"/usr/lib/pulse-$pkgver/modules/*raop*.so \
-		"$subpkgdir"/usr/lib/pulse-$pkgver/modules/
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-	install -dm755 "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
-}
-
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-	install -dm755 "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share
+	amove usr/lib/pulse-$pkgver/modules/*avahi*.so
+	amove usr/lib/pulse-$pkgver/modules/*zeroconf*.so
+	amove usr/lib/pulse-$pkgver/modules/*raop*.so
 }
 
 equalizer() {
 	pkgdesc="Equalizer for $pkgname"
 	depends="pulseaudio=$pkgver-r$pkgrel py3-qt5 py3-dbus"
-	mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/module-equalizer-sink.so \
-		"$subpkgdir"/usr/lib/pulse-$pkgver/modules/
-	mv "$pkgdir"/usr/bin/qpaeq \
-		"$subpkgdir"/usr/bin/
+
+	amove usr/bin/qpaeq
+	amove usr/lib/pulse-$pkgver/modules/module-equalizer-sink.so
 }
 
 sha512sums="