From fc973aed71950a37b43cd006a9f62b8c23373915 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 9 Jan 2020 06:22:25 +0000
Subject: user/*: Modernise / fix syntax / deps

---
 user/java-cacerts/APKBUILD  |  2 --
 user/kacst_fonts/APKBUILD   |  3 +--
 user/kdiagram/APKBUILD      |  5 +----
 user/keepassxc/APKBUILD     | 20 +++++++-------------
 user/keybinder-3.0/APKBUILD |  4 +---
 user/keychain/APKBUILD      |  6 +-----
 6 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/user/java-cacerts/APKBUILD b/user/java-cacerts/APKBUILD
index b096f7795..c8d2dc7e6 100644
--- a/user/java-cacerts/APKBUILD
+++ b/user/java-cacerts/APKBUILD
@@ -11,11 +11,9 @@ depends="p11-kit p11-kit-trust ca-certificates"
 makedepends=""
 subpackages=""
 source="java-cacerts"
-
 builddir="$srcdir"
 
 package() {
-	cd "$builddir"
 	install -D -m755 "$srcdir"/java-cacerts \
 		"$pkgdir"/etc/ca-certificates/update.d/java-cacerts
 	mkdir -p "$pkgdir"/etc/ssl/certs/java
diff --git a/user/kacst_fonts/APKBUILD b/user/kacst_fonts/APKBUILD
index c933369c9..e54b7c35f 100644
--- a/user/kacst_fonts/APKBUILD
+++ b/user/kacst_fonts/APKBUILD
@@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/arabeyes/${pkgname}_$pkgver.tar.bz2"
 builddir="$srcdir"/KacstArabicFonts-$pkgver
 
 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="9db8181a4b9db18f648628c10c4c1228aa38186f7ea414887e66fa430ce441b0d0130dd81955ae664558edd46653a290e053b8b126ce4ff7b6e9e1a7169ba4a8  kacst_fonts_2.0.tar.bz2"
diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD
index 3896e76c4..5c5b7e882 100644
--- a/user/kdiagram/APKBUILD
+++ b/user/kdiagram/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
@@ -26,17 +25,15 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD
index 2e58efa7f..739ee75db 100644
--- a/user/keepassxc/APKBUILD
+++ b/user/keepassxc/APKBUILD
@@ -14,27 +14,21 @@ makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev libsodium-dev
 subpackages="$pkgname-doc"
 source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
 
-prepare() {
-	default_prepare
-	mkdir build
-}
-
 build() {
-	cd "$builddir/build"
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-	make
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir/build"
-	make test
+	make -C build test
 }
 
 package() {
-	cd "$builddir/build"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d  keepassxc-2.4.3-src.tar.xz"
diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD
index 54c82d864..63d1a84ca 100644
--- a/user/keybinder-3.0/APKBUILD
+++ b/user/keybinder-3.0/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="GTK+ library for managing global keybindings"
 url="https://github.com/kupferlauncher/keybinder"
 arch="all"
 license="Public-Domain AND MIT"
+depends=""
 makedepends="gtk+3.0-dev vala gobject-introspection-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$pkgver/keybinder-3.0-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/keychain/APKBUILD b/user/keychain/APKBUILD
index e3dc1306b..114843930 100644
--- a/user/keychain/APKBUILD
+++ b/user/keychain/APKBUILD
@@ -6,22 +6,18 @@ pkgrel=0
 pkgdesc="Agent manager for OpenSSH and GnuPG"
 url="https://funtoo.org/Keychain"
 arch="noarch"
-options="!check" # no tests
+options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends=""
 makedepends="perl"
-install=""
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/funtoo/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	install -Dm755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
 	install -Dm644 "./${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }
-- 
cgit v1.2.3-70-g09d2