From b9d5b6030b62591fc2a82feed9469f9375f39a17 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 28 Dec 2019 08:56:05 -0600
Subject: user/[various libraries]: Modernise and fix syntax

---
 user/libassuan/APKBUILD   | 3 ---
 user/libatasmart/APKBUILD | 5 +----
 user/libbytesize/APKBUILD | 4 +---
 user/libksba/APKBUILD     | 4 +---
 user/npth/APKBUILD        | 7 +++----
 user/pinentry/APKBUILD    | 5 +----
 6 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'user')

diff --git a/user/libassuan/APKBUILD b/user/libassuan/APKBUILD
index 50c7b4f1f..3ad753051 100644
--- a/user/libassuan/APKBUILD
+++ b/user/libassuan/APKBUILD
@@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -21,12 +20,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libatasmart/APKBUILD b/user/libatasmart/APKBUILD
index fcc9881f6..da594635a 100644
--- a/user/libatasmart/APKBUILD
+++ b/user/libatasmart/APKBUILD
@@ -15,13 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://0pointer.de/public/$pkgname-$pkgver.tar.xz"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,7 +34,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libbytesize/APKBUILD b/user/libbytesize/APKBUILD
index 4db2e8235..c013f2953 100644
--- a/user/libbytesize/APKBUILD
+++ b/user/libbytesize/APKBUILD
@@ -8,13 +8,13 @@ url="https://github.com/storaged-project/libbytesize/"
 arch="all"
 options="!check"  # Requires locale(1).
 license="LGPL-2.1+"
+depends=""
 makedepends="gmp-dev mpfr-dev pcre2-dev python3"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-bytesize:py:noarch"
 source="https://github.com/storaged-project/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
 	no-msgcat.patch"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libksba/APKBUILD b/user/libksba/APKBUILD
index 28f152d7a..6592a21ba 100644
--- a/user/libksba/APKBUILD
+++ b/user/libksba/APKBUILD
@@ -8,12 +8,12 @@ url="https://www.gnupg.org/software/libksba/index.html"
 arch="all"
 # tools are GPL 3, libs are LGPL3/GPL2
 license="(LGPL-3.0+ OR GPL-2.0+) AND GPL-3.0+"
+depends=""
 makedepends="libgpg-error-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,12 +22,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/npth/APKBUILD b/user/npth/APKBUILD
index 7f73efd37..35cb7878d 100644
--- a/user/npth/APKBUILD
+++ b/user/npth/APKBUILD
@@ -6,11 +6,12 @@ pkgdesc="Portable threading library from GNU"
 url="https://www.gnupg.org/software/npth/index.html"
 arch="all"
 license="LGPL-2.1+"
+depends=""
+makedepends=""
 subpackages="$pkgname-dev"
-source="ftp://ftp.gnupg.org/gcrypt/npth/npth-$pkgver.tar.bz2"
+source="https://gnupg.org/ftp/gcrypt/npth/npth-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/pinentry/APKBUILD b/user/pinentry/APKBUILD
index 4bacb46e7..c61f941d6 100644
--- a/user/pinentry/APKBUILD
+++ b/user/pinentry/APKBUILD
@@ -8,14 +8,13 @@ url="https://www.gnupg.org/related_software/pinentry/"
 arch="all"
 license="GPL-2.0+"
 depends=""
-makedepends="gtk+-dev libassuan-dev libcap-dev libgpg-error-dev ncurses-dev
+makedepends="gtk+2.0-dev libassuan-dev libcap-dev libgpg-error-dev ncurses-dev
 	qt5-qtbase-dev"
 subpackages="$pkgname-doc $pkgname-gtk $pkgname-qt5"
 source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
 	pinentry"
 
 build () {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +28,10 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	rm -f "$pkgdir"/usr/bin/pinentry
-- 
cgit v1.2.3-60-g2f50