user/*: Modernise / fix syntax / metadata

7 files changed, 8 insertions, 11 deletions

diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 9a484828f..efb5baccc 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -7,10 +7,10 @@ url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 arch="all"
 license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT"
 depends="gnu-ghostscript poppler-utils bc ttf-freefont"
+checkdepends="ttf-dejavu"
 makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev
 	tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers
 	coreutils gnutls-dev python3"
-checkdepends="ttf-dejavu"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
 
diff --git a/user/diskdev_cmds/APKBUILD b/user/diskdev_cmds/APKBUILD
index 1b071453c..59e8f58ab 100644
--- a/user/diskdev_cmds/APKBUILD
+++ b/user/diskdev_cmds/APKBUILD
@@ -6,11 +6,10 @@ pkgrel=0
 pkgdesc="HFS+ utilities ported from OS X 10.8.4 (fsck/mkfs)"
 url="https://opensource.apple.com/release/mac-os-x-10411ppc.html"
 arch="all"
+options="!check"  # No test suite.
 license="APSL-2.0"
 depends=""
 makedepends="bsd-compat-headers openssl-dev"
-install=""
-options="!check"
 subpackages="$pkgname-doc"
 source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver.tar.gz
 	linux.patch
@@ -19,12 +18,10 @@ source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver.
 builddir="$srcdir/diskdev_cmds-$pkgver"
 
 build() {
-	cd "$builddir"
 	make -f Makefile.lnx
 }
 
 package() {
-	cd "$builddir"
 	install -D -m755 "$builddir"/fsck_hfs.tproj/fsck_hfs "$pkgdir"/sbin/fsck_hfs
 	install -m755 "$builddir"/newfs_hfs.tproj/newfs_hfs "$pkgdir"/sbin/newfs_hfs
 	ln -s fsck_hfs "$pkgdir"/sbin/fsck.hfs
diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD
index a1db01ae7..87a2da365 100644
--- a/user/emacs/APKBUILD
+++ b/user/emacs/APKBUILD
@@ -4,9 +4,9 @@ pkgname=emacs
 pkgver=26.3
 pkgrel=0
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+url="https://www.gnu.org/software/emacs/"
 arch="all"
 options="!check !dbg"
-url="https://www.gnu.org/software/emacs/"
 license="GPL-3.0+"
 depends="emacs-nox"
 makedepends="autoconf automake linux-headers
@@ -16,7 +16,8 @@ makedepends="autoconf automake linux-headers
 	ncurses-libs gnutls-dev libxaw-dev"
 subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2"
 source="https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz
-	gamedir.patch"
+	gamedir.patch
+	"
 
 prepare() {
 	default_prepare
diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD
index 8244f3306..2ab2f12fc 100644
--- a/user/lua-sec/APKBUILD
+++ b/user/lua-sec/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="TLS/SSL Support for Lua"
 url="https://github.com/brunoos/luasec/wiki"
 arch="all"
-options="!check" # no tests
+options="!check"  # No test suite.
 license="MIT"
 depends="lua5.3 lua-socket"
 makedepends="lua5.3-dev openssl-dev"
diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD
index 645cef44a..7c0197036 100644
--- a/user/lua-socket/APKBUILD
+++ b/user/lua-socket/APKBUILD
@@ -19,19 +19,16 @@ source="luasocket-$_ver.tar.gz::https://github.com/diegonehab/luasocket/archive/
 builddir="$srcdir/$_name-$_ver"
 
 build() {
-	cd "$builddir"
 	make LUAV=""
 }
 
 check() {
-	cd "$builddir"
 	mkdir -p src/socket && cp src/socket-$_ver.so src/socket/core.so
 	mkdir -p src/mime   && cp src/mime-1.0.3.so src/mime/core.so
 	LUA_CPATH=./src/?.so LUA_PATH="./src/?.lua;;" lua test/hello.lua
 }
 
 package() {
-	cd "$builddir"
 	make prefix=/usr DESTDIR="$pkgdir" LUAV="5.3" install-unix
 }
 
diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD
index 5d9ad60cf..cf55cd657 100644
--- a/user/parole/APKBUILD
+++ b/user/parole/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="GStreamer-based media player for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+ AND LGPL-2.1+"
+depends=""
 makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev
 	gst-plugins-base-dev libnotify-dev libice-dev"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/xsv/APKBUILD b/user/xsv/APKBUILD
index dab8647d5..d445d6514 100644
--- a/user/xsv/APKBUILD
+++ b/user/xsv/APKBUILD
@@ -8,6 +8,7 @@ pkgdesc="A fast CSV command line toolkit written in Rust"
 url="https://github.com/BurntSushi/xsv"
 arch="all"
 license="MIT OR Unlicense"
+depends=""
 makedepends="cargo"
 source=""