From fe565c47e25f421f8a73dbcc893ea7a7d64c5442 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Wed, 11 Oct 2023 22:09:27 +0200
Subject: [PATCH] testing/libguestfs: improve code-style

---
 testing/libguestfs/APKBUILD | 116 ++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 51 deletions(-)

diff --git a/testing/libguestfs/APKBUILD b/testing/libguestfs/APKBUILD
index 6f5db7781e9..d923f0ec0d2 100644
--- a/testing/libguestfs/APKBUILD
+++ b/testing/libguestfs/APKBUILD
@@ -2,65 +2,79 @@
 pkgname=libguestfs
 pkgver=1.44.1
 pkgrel=0
-pkgdesc="tools for accessing and modifying virtual machine disk images"
+pkgdesc="Access and modify virtual machine disk images"
 url="https://libguestfs.org/"
 # only x86_64 is supported unless the qemu-system-x86_64 dependency can be parameterized with $arch
 arch="x86_64"
 # arch="all !s390x" # limited by libvirt-dev
 license="GPL-2.0-or-later"
-depends="cdrkit curl gptfdisk qemu-img qemu-system-x86_64"
+depends="
+	cdrkit
+	curl
+	gptfdisk
+	qemu-img
+	qemu-system-x86_64
+	"
 makedepends="
- autoconf automake libtool
- acl-dev
- augeas-dev
- bash
- bison
- coreutils
- cpio
- file-dev
- flex
- fuse-dev
- gawk
- gettext-dev
- hivex-dev
- jansson-dev
- gperf
- libcap-dev
- libconfig-dev
- libselinux-dev
- libselinux-utils
- libtirpc-dev
- libvirt-dev
- libxml2-dev
- libxml2-utils
- ncurses-dev
- ocaml
- ocaml-findlib
- pcre-dev
- perl
- psmisc
- python3-dev
- qemu-system-aarch64
- qemu-system-arm
- qemu-system-i386
- qemu-system-ppc64
- qemu-system-s390x
- qemu-system-x86_64
- readline-dev
- xz
- xz-dev
-"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-$pkgname:_py"
-source="
- http://download.libguestfs.org/1.44-stable/libguestfs-$pkgver.tar.gz
- https://raw.githubusercontent.com/alpinelinux/aports/3.9-stable/main/kbd/error.h
- ocaml-m4.patch
-"
-options="!check charset.alias" # Test suite does not support Alpine Linux at this moment
+	acl-dev
+	augeas-dev
+	autoconf
+	automake
+	bash
+	bison
+	coreutils
+	cpio
+	file-dev
+	flex
+	fuse-dev
+	gawk
+	gettext-dev
+	gperf
+	hivex-dev
+	jansson-dev
+	libcap-dev
+	libconfig-dev
+	libselinux-dev
+	libselinux-utils
+	libtirpc-dev
+	libtool
+	libvirt-dev
+	libxml2-dev
+	libxml2-utils
+	ncurses-dev
+	ocaml
+	ocaml-findlib
+	pcre-dev
+	perl
+	psmisc
+	python3-dev
+	qemu-system-aarch64
+	qemu-system-arm
+	qemu-system-i386
+	qemu-system-ppc64
+	qemu-system-s390x
+	qemu-system-x86_64
+	readline-dev
+	xz
+	xz-dev
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-lang
+	py3-$pkgname:_py
+	"
+source="http://download.libguestfs.org/1.44-stable/libguestfs-$pkgver.tar.gz
+	https://raw.githubusercontent.com/alpinelinux/aports/3.9-stable/main/kbd/error.h
+	ocaml-m4.patch
+	"
+options="!check charset.alias"  # Test suite does not support Alpine Linux at this moment
 
 prepare() {
 	default_prepare
+
 	autoreconf -vif
+
 	# busybox gzip does not support --best
 	sed -i 's/gzip --best/gzip -9/g' test-data/files/*
 	# musl lacks error.h
@@ -109,8 +123,8 @@ package() {
 
 _py() {
 	pkgdesc="$pkgname - Python 3 bindings"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/python3*
 }
 
 sha512sums="db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33  libguestfs-1.44.1.tar.gz