community/libcanberra: modernize abuild, declare exact depends

community/libcanberra/APKBUILD

@@ -9,10 +9,25 @@ arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.1-or-later"
 depends="sound-theme-freedesktop"
-makedepends="gtk+-dev libogg-dev libvorbis-dev alsa-lib-dev libtool gtk+3.0-dev
-	pulseaudio-dev gstreamer-dev eudev-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3 $pkgname-pulse
-	$pkgname-gstreamer"
+makedepends="
+	alsa-lib-dev
+	eudev-dev
+	gstreamer-dev
+	gtk+-dev
+	gtk+3.0-dev
+	libogg-dev
+	libtool
+	libvorbis-dev
+	pulseaudio-dev
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-gtk2
+	$pkgname-gtk3
+	$pkgname-pulse
+	$pkgname-gstreamer
+	"
 source="https://dev.alpinelinux.org/archive/libcanberra/libcanberra-$pkgver.tar.xz
 	fix-build-with-no-lynx-installed.patch
 	dont-assume-all-GdkDisplays-are-GdkX11Displays.patch
@@ -40,51 +55,39 @@ package() {
 }
 
 gtk2() {
-	pkgdesc="Gtk+ 2.x Bindings for libcanberra"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libcanberra-gtk.so.* \
-		"$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/gtk-2.0 \
-		"$subpkgdir"/usr/lib/
+	pkgdesc="GTK+2.0 bindings for libcanberra"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/lib/libcanberra-gtk.so.*
+	amove usr/lib/gtk-2.0
 }
 
 gtk3() {
-	pkgdesc="Gtk+ 3.x Bindings for libcanberra"
-	mkdir -p "$subpkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules \
-		"$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/share/gnome/autostart \
-		"$subpkgdir"/usr/share/gnome/shutdown \
-		"$subpkgdir"/usr/share/gdm/autostart/LoginWindow
-	mv "$pkgdir"/usr/lib/gtk-3.0 \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libcanberra-gtk3.so.* \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/bin/canberra-gtk-play \
-		"$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/share/gnome/autostart/libcanberra-login-sound.desktop \
-		"$subpkgdir"/usr/share/gnome/autostart
-	mv "$pkgdir"/usr/share/gnome/shutdown/libcanberra-logout-sound.sh \
-		"$subpkgdir"/usr/share/gnome/autostart/
-	mv "$pkgdir"/usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop \
-		"$subpkgdir"/usr/share/gdm/autostart/LoginWindow/
-	mv "$pkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop \
-		"$subpkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules/
+	pkgdesc="GTK+3.0 bindings for libcanberra"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	amove usr/bin/canberra-gtk-play
+	amove usr/lib/gtk-3.0/*
+	amove usr/lib/gnome-settings-daemon-3.0/*
+	amove usr/lib/libcanberra-gtk3.so.*
+	amove usr/share/gdm/*
+	amove usr/share/gnome/*
 }
 
 pulse() {
 	pkgdesc="Pulseaudio backend for libcanberra"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	install_if="$pkgname=$pkgver-r$pkgrel pulseaudio"
-	mkdir -p "$subpkgdir"/usr/lib/libcanberra-$pkgver
-	mv "$pkgdir"/usr/lib/libcanberra-$pkgver/libcanberra-pulse.so \
-		"$subpkgdir"/usr/lib/libcanberra-$pkgver
+
+	amove usr/lib/libcanberra-$pkgver/libcanberra-pulse.so
 }
 
 gstreamer() {
 	pkgdesc="GStreamer backend for libcanberra"
+	depends="$pkgname=$pkgver-r$pkgrel"
 	install_if="$pkgname=$pkgver-r$pkgrel gstreamer"
-	mkdir -p "$subpkgdir"/usr/lib/libcanberra-$pkgver
-	mv "$pkgdir"/usr/lib/libcanberra-$pkgver/libcanberra-gstreamer.so \
-		"$subpkgdir"/usr/lib/libcanberra-$pkgver
+
+	amove usr/lib/libcanberra-$pkgver/libcanberra-gstreamer.so
 }
 
 sha512sums="