user/*: Modernise / fix syntax / deps / metadata

33 files changed, 44 insertions, 108 deletions

diff --git a/user/cardo/APKBUILD b/user/cardo/APKBUILD
index 7af7e9f04..9f057c246 100644
--- a/user/cardo/APKBUILD
+++ b/user/cardo/APKBUILD
@@ -15,8 +15,7 @@ source="http://scholarsfonts.net/cardo104.zip"
 builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf
 }
 
 sha512sums="559d91528dfebba1c0668ab0116e7cc8d481c88727cf01848978d920d625ee32c893d6abff3170e5365e136fa6f603c4f34390e17383409bc3db01611c42eefb  cardo104.zip"
diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD
index 9a18b7b29..2f098cba8 100644
--- a/user/catcodec/APKBUILD
+++ b/user/catcodec/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
 source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make prefix=/usr DESTDIR="$pkgdir" install
 }
 
diff --git a/user/cgmanager/APKBUILD b/user/cgmanager/APKBUILD
index 3074679fd..f4cad0309 100644
--- a/user/cgmanager/APKBUILD
+++ b/user/cgmanager/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
 source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/clearsans/APKBUILD b/user/clearsans/APKBUILD
index 2f8f486d0..82c7a7291 100644
--- a/user/clearsans/APKBUILD
+++ b/user/clearsans/APKBUILD
@@ -15,8 +15,7 @@ source="https://01.org/sites/default/files/downloads/clear-sans/clearsans-$pkgve
 builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/TTF/*.ttf
 }
 
 sha512sums="83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d  clearsans-1.00.zip"
diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD
index 4b12785f8..c05fdc470 100644
--- a/user/cloc/APKBUILD
+++ b/user/cloc/APKBUILD
@@ -9,22 +9,20 @@ arch="noarch"
 license="GPL-2.0+"
 depends="perl perl-regexp-common perl-algorithm-diff"
 checkdepends="perl-parallel-forkmanager"
+makedepends=""
 subpackages="$pkgname-doc"
 source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz"
 
 build() {
-	cd Unix
-	make DESTDIR="$pkgdir" doc
+	make DESTDIR="$pkgdir" -C Unix doc
 }
 
 check() {
-	cd Unix
-	make DESTDIR="$pkgdir" test-perl
+	make DESTDIR="$pkgdir" -C Unix test-perl
 }
 
 package() {
-	cd Unix
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C Unix install
 }
 
 sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669  cloc-1.84.tar.gz"
diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD
index 2c5e047e4..c76e42c3c 100644
--- a/user/clucene/APKBUILD
+++ b/user/clucene/APKBUILD
@@ -21,14 +21,12 @@ builddir="$srcdir/$pkgname-core-$pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	# Do not use bundled zlib or boost
 	sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt
 	rm -rf src/ext
 }
 
 build() {
-	cd "$builddir"
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_CONTRIBS_LIB=BOOL:ON \
@@ -39,8 +37,6 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	# clucene is not smart enough to delete files between successive checks,
 	# so let's remove them for it. Otherwise, if check is run a second time
 	# without clearing the files beforehand, a lot of tests will fail.
@@ -56,7 +52,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	make install/fast DESTDIR="$pkgdir"
 	rm -r "$pkgdir"/usr/lib/CLuceneConfig.cmake
 }
diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD
index e24d60c27..962fcf3e7 100644
--- a/user/clutter/APKBUILD
+++ b/user/clutter/APKBUILD
@@ -6,15 +6,15 @@ pkgrel=0
 pkgdesc="OpenGL-based interactive canvas library"
 url="https://gnome.org"
 arch="all"
-options="!check" # testsuite skipped all tests
+options="!check"  # Test suite skipped all tests.
 license="LGPL-2.0+ AND MIT AND LGPL-2.1+ AND GPL-2.0+"
+depends=""
 makedepends="glib-dev mesa-dev cogl-dev cairo-dev pango-dev json-glib-dev
 	atk-dev vala gobject-introspection-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.gnome.org/sources/clutter/1.26/clutter-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/cm-unicode/APKBUILD b/user/cm-unicode/APKBUILD
index 30a09c8a0..26e26d477 100644
--- a/user/cm-unicode/APKBUILD
+++ b/user/cm-unicode/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
 source="https://downloads.sourceforge.net/cm-unicode/cm-unicode-$pkgver-ttf.tar.xz"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
 }
 
 sha512sums="6340b7c6b220c8c887a4b77e77a01a43bedf13d08dd1d62570de70866d0bff908adf3fcb7907149ab2f5ab060650b39eaad3c01c1e8d028bbeb879b058190e70  cm-unicode-0.7.0-ttf.tar.xz"
diff --git a/user/cmus/APKBUILD b/user/cmus/APKBUILD
index 63f7a6758..936cfbff2 100644
--- a/user/cmus/APKBUILD
+++ b/user/cmus/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="An ncurses based music player with plugin support for many formats"
 url="https://cmus.github.io/"
 arch="all"
-options="!check" # no test suite
+options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
 makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev
@@ -14,10 +14,10 @@ makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev
 	opusfile-dev pulseaudio-dev wavpack-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
-	ppc-libatomic.patch"
+	ppc-libatomic.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure prefix=/usr \
 		CONFIG_AAC=y \
 		CONFIG_ALSA=y \
@@ -57,7 +57,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" PREFIX=/usr install
 }
 
diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD
index 900be988e..988e85e8f 100644
--- a/user/cogl/APKBUILD
+++ b/user/cogl/APKBUILD
@@ -6,15 +6,15 @@ pkgrel=0
 pkgdesc="GObject-based GL/GLES abstraction library"
 url="https://gnome.org"
 arch="all"
-options="!check" # broken testsuite, no logs/messages to determine why
+options="!check"  # broken testsuite, no logs/messages to determine why
 license="MIT AND SGI-B-2.0 AND BSD-3-Clause AND Public-Domain AND LGPL-2.0+ AND Apache-2.0"
+depends=""
 makedepends="glib-dev libxcomposite-dev libxrandr-dev mesa-dev cairo-dev
 	pango-dev vala gobject-introspection-dev gdk-pixbuf-dev"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +28,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD
index dc12db220..6becb4de9 100644
--- a/user/comic-neue/APKBUILD
+++ b/user/comic-neue/APKBUILD
@@ -15,8 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p
 builddir="$srcdir/comicneue-$pkgver"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ OTF/*.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf
 }
 
 sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8  comic-neue-2.4.zip"
diff --git a/user/compface/APKBUILD b/user/compface/APKBUILD
index 0c742f166..6cc0b4c03 100644
--- a/user/compface/APKBUILD
+++ b/user/compface/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
 options="!check"  # No test suite.
 license="MIT"
 depends=""
-depends_dev=""
-makedepends="$depends_dev"
+makedepends=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.xemacs.org/pub/xemacs/aux/compface-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install
 }
 
diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD
index 7bf43d6b5..3899919dd 100644
--- a/user/compton-conf/APKBUILD
+++ b/user/compton-conf/APKBUILD
@@ -15,11 +15,9 @@ subpackages=""
 source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	mkdir -p build && cd build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,13 +25,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="76cacb0960112ab3d0b7a05fba3ac2418c2bd37f4273fc20383b49ce035fd045a2a8e8a1ae5a8a5dc116f46ab6ccd7a5764dd2c3ec64822d930c7dd268533db4  compton-conf-0.14.1.tar.xz"
diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD
index 4055055eb..efc38ab5c 100644
--- a/user/confuse/APKBUILD
+++ b/user/confuse/APKBUILD
@@ -4,17 +4,15 @@ pkgname=confuse
 pkgver=3.2.2
 pkgrel=0
 pkgdesc="Small configuration file parser library for C"
-url="https://github.com/martinh/libconfuse"
+url=" "
 arch="all"
-options="!checkroot"
 license="ISC"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
+source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/courier-prime/APKBUILD b/user/courier-prime/APKBUILD
index 94cdce083..950e88c1f 100644
--- a/user/courier-prime/APKBUILD
+++ b/user/courier-prime/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
 source="https://dev.gentoo.org/~jstein/dist/courier-prime-$pkgver.tar.xz"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
 }
 
 sha512sums="fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda  courier-prime-1.203.tar.xz"
diff --git a/user/coverage/APKBUILD b/user/coverage/APKBUILD
index 1cea3561d..adbca0392 100644
--- a/user/coverage/APKBUILD
+++ b/user/coverage/APKBUILD
@@ -8,23 +8,20 @@ url="https://coverage.readthedocs.io/"
 arch="all"
 license="Apache-2.0"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-tox"
+makedepends="python3-dev"
 subpackages=""
-source="https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/c/coverage/coverage-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py check
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix="/usr" --root="$pkgdir"
 }
 
diff --git a/user/cram/APKBUILD b/user/cram/APKBUILD
index 73bb7c8cc..505e64ef8 100644
--- a/user/cram/APKBUILD
+++ b/user/cram/APKBUILD
@@ -8,26 +8,23 @@ url="https://bitheap.org/cram/"
 arch="noarch"
 license="GPL-2.0-only"
 depends="python3"
-makedepends="cmd:which"
 checkdepends="coverage"
+makedepends="cmd:which"
 subpackages=""
 source="https://bitheap.org/cram/cram-$pkgver.tar.gz
 	die-py2-die.patch
 	"
 
 build() {
-	cd "$builddir"
 	make PYTHON=python3
 }
 
 check() {
-	cd "$builddir"
 	# tests are not 100% coverage
 	make PYTHON=python3 check || true
 }
 
 package() {
-	cd "$builddir"
 	# we can't use make because there's no --root option
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
diff --git a/user/ctags/APKBUILD b/user/ctags/APKBUILD
index bdc83ed14..135c0326d 100644
--- a/user/ctags/APKBUILD
+++ b/user/ctags/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="https://prdownloads.sourceforge.net/ctags/ctags-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	install -D -m755 ctags "$pkgdir"/usr/bin/ctags
 	install -D -m644 ctags.1 "$pkgdir"/usr/share/man/man1/ctags.1
 }
diff --git a/user/cve-check-tool/APKBUILD b/user/cve-check-tool/APKBUILD
index 879cdcada..055d49fe2 100644
--- a/user/cve-check-tool/APKBUILD
+++ b/user/cve-check-tool/APKBUILD
@@ -9,9 +9,9 @@ url="https://code.foxkit.us/sroracle/cve-check-tool"
 arch="all"
 license="GPL-2.0+"
 depends=""
-makedepends="bash curl-dev glib-dev gobject-introspection-dev
-	jansson-dev libxml2-dev openssl-dev sqlite-dev"
 checkdepends="check-dev"
+makedepends="autoconf automake bash curl-dev glib-dev gobject-introspection-dev
+	jansson-dev libtool libxml2-dev openssl-dev sqlite-dev"
 subpackages="$pkgname-doc"
 source="https://dev.sick.bike/dist/cve-check-tool-$_pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$_pkgver"
diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD
index 6fd0c0a02..a62b71c5e 100644
--- a/user/ddrescue/APKBUILD
+++ b/user/ddrescue/APKBUILD
@@ -5,13 +5,14 @@ pkgver=1.24
 pkgrel=0
 pkgdesc="Data recovery tool for block devices with errors"
 url="https://www.gnu.org/s/ddrescue/ddrescue.html"
-license="GPL-3.0+"
 arch="all !aarch64"
+license="GPL-3.0+"
+depends=""
+makedepends=""
 subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -20,17 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
-	# XXX: Some tests fail on s390x, but only on builder, so ignore it for now.
-	case "$CARCH" in
-		s390x) make check || true;;
-		*) make check;;
-	esac
+	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD
index 7895b8d1a..0bce275b4 100644
--- a/user/dina/APKBUILD
+++ b/user/dina/APKBUILD
@@ -8,7 +8,7 @@ url="https://www.dcmembers.com/jibsen/download/61/"
 arch="noarch"
 options="!check" # No tests
 license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
 makedepends="bdftopcf"
 source="$pkgname-$pkgver.zip::https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61&refresh=5c64600776bf51550082055"
 builddir="$srcdir/BDF"
diff --git a/user/dmidecode/APKBUILD b/user/dmidecode/APKBUILD
index 811c0a361..0d6ff8ac4 100644
--- a/user/dmidecode/APKBUILD
+++ b/user/dmidecode/APKBUILD
@@ -7,17 +7,16 @@ url="http://www.nongnu.org/dmidecode"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
+depends=""
+makedepends=""
 subpackages="$pkgname-doc"
-source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz
-	"
+source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	make prefix=/usr
 }
 
 package() {
-	cd "$builddir"
 	make prefix=/usr DESTDIR="${pkgdir}" install
 }
 
diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD
index 463e60300..24f2fb23e 100644
--- a/user/docbook2x/APKBUILD
+++ b/user/docbook2x/APKBUILD
@@ -20,7 +20,6 @@ source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz
 builddir="$srcdir/docbook2X-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"/test/refentry
-	make check
+	make -C test/refentry check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/dosfstools/APKBUILD b/user/dosfstools/APKBUILD
index 0ee614c94..a45803e24 100644
--- a/user/dosfstools/APKBUILD
+++ b/user/dosfstools/APKBUILD
@@ -7,13 +7,12 @@ url="https://github.com/dosfstools/dosfstools"
 arch="all"
 license="GPL-3.0+"
 depends=""
-makedepends="linux-headers"
 checkdepends="vim"
+makedepends="linux-headers"
 subpackages="$pkgname-doc"
 source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/dtach/APKBUILD b/user/dtach/APKBUILD
index d94502928..79751667a 100644
--- a/user/dtach/APKBUILD
+++ b/user/dtach/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="dtach-$pkgver.tar.gz::https://github.com/crigler/dtach/archive/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/user/dumb-init/APKBUILD b/user/dumb-init/APKBUILD
index e500cb008..541b964d4 100644
--- a/user/dumb-init/APKBUILD
+++ b/user/dumb-init/APKBUILD
@@ -8,6 +8,8 @@ url="https://github.com/Yelp/dumb-init"
 arch="all"
 options="!check" # Check requires Python 3.7 and will not function correctly within chroots.
 license="MIT"
+depends=""
+makedepends=""
 source="$pkgname-$pkgver.tar.gz::https://github.com/Yelp/$pkgname/archive/v$pkgver.tar.gz"
 
 build() {
diff --git a/user/ebgaramond/APKBUILD b/user/ebgaramond/APKBUILD
index f1f071a67..4db1ce2c0 100644
--- a/user/ebgaramond/APKBUILD
+++ b/user/ebgaramond/APKBUILD
@@ -15,8 +15,7 @@ source="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-$pkgver.zi
 builddir="$srcdir/EBGaramond-0.016"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ otf/*.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/otf/*.otf
 }
 
 sha512sums="f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955  EBGaramond-0.016.zip"
diff --git a/user/eggdbus/APKBUILD b/user/eggdbus/APKBUILD
index ddceb9066..96ba02a34 100644
--- a/user/eggdbus/APKBUILD
+++ b/user/eggdbus/APKBUILD
@@ -7,18 +7,17 @@ pkgdesc="Experimental D-Bus bindings for GObject"
 url="https://cgit.freedesktop.org/~david/eggdbus"
 arch="all"
 license="LGPL-2.0+"
+depends=""
 makedepends="dbus-glib-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/ers-symbols/APKBUILD b/user/ers-symbols/APKBUILD
index 652acc95f..7cf4173e6 100644
--- a/user/ers-symbols/APKBUILD
+++ b/user/ers-symbols/APKBUILD
@@ -15,8 +15,7 @@ source="https://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip"
 builddir="$srcdir"/ersSymbolsVersion0202/ersV2sym
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf
 }
 
 sha512sums="f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717  ers_v220.zip"
diff --git a/user/essays1743/APKBUILD b/user/essays1743/APKBUILD
index 930050ba1..0c0ce7654 100644
--- a/user/essays1743/APKBUILD
+++ b/user/essays1743/APKBUILD
@@ -15,7 +15,6 @@ source="https://www.thibault.org/fonts/essays/essays1743-$pkgver-1.ttc"
 builddir="$srcdir/"
 
 package() {
-	cd "$builddir"
 	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ essays1743-$pkgver-1.ttc
 }
 
diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD
index be9d4e369..0f899072c 100644
--- a/user/ethtool/APKBUILD
+++ b/user/ethtool/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Utility for controlling network drivers and hardware"
 url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
 arch="all"
 license="GPL-2.0-only AND GPL-2.0+"
+depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz"
diff --git a/user/exfat-utils/APKBUILD b/user/exfat-utils/APKBUILD
index 552d1bfe6..cfdabc42c 100644
--- a/user/exfat-utils/APKBUILD
+++ b/user/exfat-utils/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://github.com/relan/exfat/releases/download/v$pkgver/exfat-utils-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libconfig/APKBUILD b/user/libconfig/APKBUILD
index 8f5939f4e..bb85630e1 100644
--- a/user/libconfig/APKBUILD
+++ b/user/libconfig/APKBUILD
@@ -12,13 +12,11 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname++:_cxx"
 source="$pkgname-$pkgver.tar.gz::https://github.com/hyperrealm/$pkgname/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir/" install
 }