user/*: Modernise / fix syntax / deps etc

30 files changed, 22 insertions, 103 deletions

diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD
index 12cb97695..27221bbc7 100644
--- a/user/caja-dropbox/APKBUILD
+++ b/user/caja-dropbox/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-dropbox-$pkgver.tar.xz"
 
 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
 	rm "$pkgdir"/usr/lib/caja/extensions-2.0/libcaja-dropbox.a
 }
diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD
index f91fe340d..36d939ae6 100644
--- a/user/caja-extensions/APKBUILD
+++ b/user/caja-extensions/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-extensions-$pkgver.tar.xz"
 
 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/caja/APKBUILD b/user/caja/APKBUILD
index 2335ac681..9bab74a53 100644
--- a/user/caja/APKBUILD
+++ b/user/caja/APKBUILD
@@ -13,10 +13,8 @@ makedepends="gobject-introspection-dev intltool libexif-dev libnotify-dev
 	libxml2-dev mate-desktop-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-$pkgver.tar.xz"
-builddir="$srcdir/caja-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	for i in icons globs globs2 XMLnamespaces magic aliases subclasses types treemagic mime.cache version generic-icons; do
diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD
index befc809fd..48f2ae859 100644
--- a/user/engrampa/APKBUILD
+++ b/user/engrampa/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/engrampa-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD
index 94fe8ad51..82ae71d56 100644
--- a/user/gtksourceview-3.0/APKBUILD
+++ b/user/gtksourceview-3.0/APKBUILD
@@ -8,14 +8,14 @@ url="https://gnome.org"
 arch="all"
 options="!check" # testsuite requires X
 license="LGPL-2.1+"
-makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev"
+depends=""
 checkdepends="libxml2-utils"
+makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-$pkgver.tar.xz"
 builddir="$srcdir/gtksourceview-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/icon-naming-utils/APKBUILD b/user/icon-naming-utils/APKBUILD
index 1d41aef6b..863107041 100644
--- a/user/icon-naming-utils/APKBUILD
+++ b/user/icon-naming-utils/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
 source="http://tango.freedesktop.org/releases/icon-naming-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 pkgconfigdir="/usr/lib/pkgconfig" DESTDIR="$pkgdir" install
 }
 
diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD
index bf5e2904d..cdc3df7ab 100644
--- a/user/json-glib/APKBUILD
+++ b/user/json-glib/APKBUILD
@@ -6,14 +6,14 @@ pkgrel=0
 pkgdesc="GObject-based library for JSON (de)serialization"
 url="https://live.gnome.org/JsonGlib"
 arch="all"
-options="!check" # no tests
+options="!check"  # No test suite.
 license="LGPL-2.1+"
+depends=""
 makedepends="glib-dev gobject-introspection-dev meson ninja"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.gnome.org/sources/json-glib/1.4/json-glib-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
         meson \
                 --prefix=/usr \
                 --sysconfdir=/etc \
@@ -25,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
diff --git a/user/libgxps/APKBUILD b/user/libgxps/APKBUILD
index 5deb16d48..dac605308 100644
--- a/user/libgxps/APKBUILD
+++ b/user/libgxps/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev"
 source="https://ftp.gnome.org/pub/gnome/sources/libgxps/0.3/libgxps-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	meson \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -27,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	ninja -C output test
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD
index ee0936554..c5355c814 100644
--- a/user/libidn2/APKBUILD
+++ b/user/libidn2/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://ftp.gnu.org/gnu/libidn/libidn2-$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/libmateweather/APKBUILD b/user/libmateweather/APKBUILD
index f0fb42c54..e00b69f7b 100644
--- a/user/libmateweather/APKBUILD
+++ b/user/libmateweather/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmateweather-$pkgver.tar.xz"
 
 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/libproxy/APKBUILD b/user/libproxy/APKBUILD
index ffeac9d28..1cdb0c9b5 100644
--- a/user/libproxy/APKBUILD
+++ b/user/libproxy/APKBUILD
@@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$p
 	"
 
 build() {
-	cd "$builddir"
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DLIBEXEC_INSTALL_DIR=lib \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 08c8fccf4..66d49e293 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -7,13 +7,14 @@ pkgdesc="C library for examining the Public Suffix List"
 url="https://rockdaboot.github.io/libpsl"
 arch="all"
 license="MIT AND BSD-3-Clause"
+depends=""
 makedepends="python3 libidn2-dev libunistring-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$pkgver/libpsl-$pkgver.tar.gz
-	use-python3.patch"
+	use-python3.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD
index 3889d221d..5ecf51deb 100644
--- a/user/libsoup/APKBUILD
+++ b/user/libsoup/APKBUILD
@@ -8,6 +8,7 @@ url="https://wiki.gnome.org/Projects/libsoup"
 arch="all"
 options="!check"  # HSTS tests fail because .localdomain names fail to resolve.
 license="LGPL-2.0+ AND LGPL-2.1+"
+depends=""
 makedepends="glib-dev libxml2-dev sqlite-dev libpsl-dev intltool vala-dev
 	gobject-introspection-dev glib-networking meson ninja krb5-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD
index 95faa5539..5eb5e4e81 100644
--- a/user/libwnck/APKBUILD
+++ b/user/libwnck/APKBUILD
@@ -13,27 +13,19 @@ makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev libxres-dev
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz"
 
-prepare() {
-	default_prepare
-	mkdir -p "$builddir"/build
-}
-
 build() {
-	cd "$builddir"/build
 	meson \
 		-Dprefix=/usr \
-		..
-	ninja
+		build .
+	ninja -C build
 }
 
 check() {
-	cd "$builddir"/build
-	ninja test
+	ninja -C build test
 }
 
 package() {
-	cd "$builddir"/build
-	DESTDIR="$pkgdir" ninja install
+	DESTDIR="$pkgdir" ninja -C build install
 }
 
 sha512sums="a939b96feda20b0eba2b87556b97a9ba4b9aaea4c82c0e274a23796a3a9b49cb93be582d79e32a52a87b5ca6e35182a9d617cb802802b3c2ba2bff2b028aa3de  libwnck-3.32.0.tar.xz"
diff --git a/user/libxres/APKBUILD b/user/libxres/APKBUILD
index 9244440c4..9c8914958 100644
--- a/user/libxres/APKBUILD
+++ b/user/libxres/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="X11 X-Resource extension library"
 url="https://www.X.Org/"
 arch="all"
 license="MIT AND X11"
-subpackages="$pkgname-dev $pkgname-doc"
 depends=""
 makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.X.Org/releases/individual/lib/libXres-$pkgver.tar.bz2"
 builddir="$srcdir"/libXres-$pkgver
 
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index 0539df36a..db9f1bfd6 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -9,13 +9,13 @@ arch="all"
 license="GPL-2.0+ AND MIT-advertising AND MIT-CMU"
 depends=""
 makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev
-	libxml2-utils zenity"
+	libxml2-utils startup-notification-dev zenity"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/marco-$pkgver.tar.xz
-	correctly-posix.patch"
+	correctly-posix.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD
index 0b785d711..e47e5b7d3 100644
--- a/user/mate-backgrounds/APKBUILD
+++ b/user/mate-backgrounds/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-backgrounds-$pkgver.tar.xz"
 
 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/mate-calc/APKBUILD b/user/mate-calc/APKBUILD
index 2e640c8c9..7b41ac51b 100644
--- a/user/mate-calc/APKBUILD
+++ b/user/mate-calc/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-calc-$pkgver.tar.xz"
 
 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/mate-common/APKBUILD b/user/mate-common/APKBUILD
index d1186169e..943cf6a49 100644
--- a/user/mate-common/APKBUILD
+++ b/user/mate-common/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://pub.mate-desktop.org/releases/1.22/mate-common-$pkgver.tar.xz"
 
 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/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD
index e56d5bf32..0b5f7655e 100644
--- a/user/mate-desktop/APKBUILD
+++ b/user/mate-desktop/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-desktop-$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/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD
index 7e6aece6f..a2636e0e7 100644
--- a/user/mate-icon-theme/APKBUILD
+++ b/user/mate-icon-theme/APKBUILD
@@ -11,10 +11,8 @@ depends=""
 makedepends="icon-naming-utils-dev intltool"
 subpackages="$pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-icon-theme-$pkgver.tar.xz"
-builddir="$srcdir/mate-icon-theme-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD
index 6b04f7d77..4c0bf55f9 100644
--- a/user/mate-menus/APKBUILD
+++ b/user/mate-menus/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/1.22/mate-menus-$pkgver.tar.xz"
 
 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/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD
index 546c91d54..b303dc7e8 100644
--- a/user/mate-user-guide/APKBUILD
+++ b/user/mate-user-guide/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-user-guide-$pkgver.tar.xz"
 
 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/mozo/APKBUILD b/user/mozo/APKBUILD
index 39e315017..777285dc4 100644
--- a/user/mozo/APKBUILD
+++ b/user/mozo/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mozo-$pkgver.tar.xz"
 
 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/pluma/APKBUILD b/user/pluma/APKBUILD
index 4e0219e7d..0f85b410b 100644
--- a/user/pluma/APKBUILD
+++ b/user/pluma/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pub.mate-desktop.org/releases/${pkgver%.*}/pluma-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD
index 3939f9af3..d5f3e01b3 100644
--- a/user/py3-pycairo/APKBUILD
+++ b/user/py3-pycairo/APKBUILD
@@ -6,15 +6,16 @@ pkgrel=0
 pkgdesc="Python bindings for Cairo"
 url="https://pycairo.readthedocs.io/"
 arch="all"
+options="!check"  # Test suite requires unpackaged py3-flake8.
 license="MIT AND (LGPL-2.1-only OR MPL-1.1)"
 depends=""
+checkdepends="py3-pytest"
 makedepends="python3-dev cairo-dev meson"
 subpackages="$pkgname-dev"
 source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz"
 builddir="$srcdir/pycairo-$pkgver"
 
 build() {
-	cd "$builddir"
 	meson \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -26,11 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
+	ninja -C output test
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD
index 8a1e8f527..f8c355cb8 100644
--- a/user/py3-pygobject/APKBUILD
+++ b/user/py3-pygobject/APKBUILD
@@ -14,17 +14,14 @@ source="https://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject
 builddir="$srcdir/pygobject-$pkgver"
 
 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/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD
index 453dda88c..27ac8da62 100644
--- a/user/xf86-video-dummy/APKBUILD
+++ b/user/xf86-video-dummy/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
 source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.bz2"
 
 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/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD
index 2f18a49bc..1dee09b1e 100644
--- a/user/xorg-gtest/APKBUILD
+++ b/user/xorg-gtest/APKBUILD
@@ -3,13 +3,14 @@
 pkgname=xorg-gtest
 pkgver=0.7.1
 pkgrel=0
-pkgdesc="X extensions to googletest"
+pkgdesc="X11 extensions to Google Test"
 url="https://gitlab.freedesktop.org/xorg/test/xorg-gtest"
 arch="noarch"
 options="!check" # tests require X
 license="MIT AND BSD-3-Clause"
 depends=""
-makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy"
+makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy
+	autoconf automake"
 subpackages="$pkgname-dev"
 source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest-$pkgver/xorg-gtest-xorg-gtest-$pkgver.tar.bz2
 	remove-ridiculous-va_list-hacks.patch
@@ -17,13 +18,11 @@ source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest
 builddir="$srcdir"/$pkgname-$pkgname-$pkgver
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,12 +34,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" make install
 	for i in gtest gtest-spi; do
 		rm "$pkgdir"/usr/include/gtest/"$i".h
diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD
index ddade8630..87343a192 100644
--- a/user/zenity/APKBUILD
+++ b/user/zenity/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.gnome.org/sources/zenity/${pkgver%.*}/zenity-$pkgver.tar.xz"
 
 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
 }