system/apk-tools: [PD] take for PG, modernise, fix metadata

1 files changed, 16 insertions, 32 deletions

diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD
index 225d4c2f9..2ba1d846b 100644
--- a/system/apk-tools/APKBUILD
+++ b/system/apk-tools/APKBUILD
@@ -1,44 +1,35 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 pkgname=apk-tools
 pkgver=2.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Alpine Package Keeper - package manager for alpine"
-subpackages="$pkgname-static"
-depends=
+url="https://git.alpinelinux.org/cgit/apk-tools/"
+arch="all"
+license="GPL-2.0-only"
+depends="ca-certificates"
 makedepends_build=""
-makedepends_host="zlib-dev libressl libressl-dev linux-headers"
+makedepends_host="zlib-dev openssl openssl-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
-if [ "$CBUILD" = "$CHOST" ]; then
-	subpackages="$subpackages lua5.2-apk:luaapk"
-	makedepends="$makedepends lua5.2-dev"
-fi
+subpackages="$pkgname-static"
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
 	0001-solver-allow-names-with-only-one-provider-to-be-auto.patch
 	openssl-compat.patch
 	"
 
-url="https://git.alpinelinux.org/cgit/apk-tools/"
-arch="all"
-license=GPL2
-
-builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	cd "$builddir"
 	sed -i -e 's:-Werror::' Make.rules
-	echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk || return 1
-	if [ "$CBUILD" = "$CHOST" ]; then
-		echo "LUAAPK=YesPlease" >> config.mk
-	else
-		echo "LUAAPK=" >> config.mk
-	fi
+	echo "FULL_VERSION=$pkgver-r$pkgrel" > config.mk
+	echo "LUAAPK=" >> config.mk
 	echo "export LUAAPK" >> config.mk
 }
 
 build() {
 	cd "$builddir"
-	make || return 1
-	make static || return 1
+	make
+	make static
 }
 
 check() {
@@ -52,8 +43,7 @@ package() {
 	install -d "$pkgdir"/var/lib/apk \
 		"$pkgdir"/var/cache/misc \
 		"$pkgdir"/etc/apk/keys \
-		"$pkgdir"/etc/apk/protected_paths.d \
-		|| return 1
+		"$pkgdir"/etc/apk/protected_paths.d
 	# the shipped README is empty
 	rm -r "$pkgdir"/usr/share/
 }
@@ -75,13 +65,7 @@ static() {
 	${CROSS_COMPILE}strip "$subpkgdir"/sbin/apk.static
 	openssl dgst -sha1 -sign "$privkey" \
 		-out "$subpkgdir"/sbin/apk.static.SIGN.RSA.$keyname \
-		"$subpkgdir"/sbin/apk.static || return 1
-}
-
-luaapk() {
-	pkgdesc="Lua module for apk-tools"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
+		"$subpkgdir"/sbin/apk.static
 }
 
 sha512sums="4ffb8d1716bbb94421b1cc4277beb47d369c429f4c3bf597d08949abb7586d30c4504edf2f775bea3b93614a280c12391b956ca8f914fb0ec27799a4a005a145  apk-tools-2.9.1.tar.xz