main/*: add lua5.4 support for more packages

4 files changed, 18 insertions, 41 deletions

diff --git a/main/lua-alt-getopt/APKBUILD b/main/lua-alt-getopt/APKBUILD
index 3c52faf20bb..c435abc3ba4 100644
--- a/main/lua-alt-getopt/APKBUILD
+++ b/main/lua-alt-getopt/APKBUILD
@@ -1,45 +1,27 @@
 # Maintainer: Natanael Copa <ncopa@alpinlinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-alt-getopt
 pkgver=0.7
-pkgrel=8
+pkgrel=9
 pkgdesc="Lua module for processing options similar to getopt_long(3)"
 url="https://github.com/LuaDist/alt-getopt"
 arch="noarch"
 license="MIT"
-depends=""
-makedepends=
-install=
-subpackages=""
-for _v in $_luaversions; do
-	makedepends="$makedepends lua$_v-dev"
-	subpackages="$subpackages lua$_v-alt-getopt:split_${_v/./_}"
-done
 source="alt-getopt-$pkgver.tar.gz::https://github.com/LuaDist/alt-getopt/archive/$pkgver.tar.gz
 	lua5.2-compat.patch
 	"
+builddir="$srcdir"/alt-getopt-$pkgver
 
-_builddir="$srcdir"/alt-getopt-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-}
+for _v in $_luaversions; do
+	makedepends="$makedepends lua$_v-dev"
+	subpackages="$subpackages lua$_v-alt-getopt:split_${_v/./_}"
+done
 
 package() {
-	cd "$_builddir"
 	for _i in $_luaversions; do
 		mkdir -p "$pkgdir"/usr/share/lua/$_i
 		install -Dm644 alt_getopt.lua \
-			"$pkgdir"/usr/share/lua/$_i/alt_getopt.lua \
-			|| return 1
+			"$pkgdir"/usr/share/lua/$_i/alt_getopt.lua
 	done
 }
 
@@ -51,7 +33,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
@@ -60,5 +42,6 @@ _split() {
 for _v in $_luaversions; do
 	eval "split_${_v/./_}() { _split $_v; }"
 done
+
 sha512sums="8e7d1a2686a320a47199a71d09da1d3fad51bfa086dd6b1a95414325a24c66c4bef9ac9dd1ec9d866248a3b292a47e6c12cef47e88ce79a7f99bc5eaea68afc7  alt-getopt-0.7.tar.gz
 9c4f44c811e1dd6164fb332bb95c23cff63f3347ee2e130b4bac08683a394cd3578425716a7cd49873ee35344d40414f03f5a30130c6a8fa4f94cd78cb0004f9  lua5.2-compat.patch"
diff --git a/main/lua-uuid/APKBUILD b/main/lua-uuid/APKBUILD
index 253204a298c..dd45649bfac 100644
--- a/main/lua-uuid/APKBUILD
+++ b/main/lua-uuid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=lua-uuid
 _realname=uuid
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A pure Lua uuid generator (modified from a Rackspace module)"
 url="https://tieske.github.io/uuid/"
 arch="noarch"
@@ -12,7 +12,7 @@ options="!check"
 source="$pkgname-$pkgver.tar.gz::https://github.com/Tieske/uuid/archive/version_$pkgver.tar.gz"
 builddir="$srcdir/uuid-version_$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
diff --git a/main/lua-yaml/APKBUILD b/main/lua-yaml/APKBUILD
index 928835427c8..a6aa4fbd45e 100644
--- a/main/lua-yaml/APKBUILD
+++ b/main/lua-yaml/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=lua-yaml
 _pkgname=yaml
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="LibYaml binding for Lua"
 url="http://yaml.luaforge.net"
 arch="all"
@@ -14,7 +14,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lubyk/$_pkgname/archive/REL-
 	cmake.patch"
 builddir="$srcdir/$_pkgname-REL-$pkgver"
 
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 for _v in $_luaversions; do
 	makedepends="$makedepends lua$_v-dev"
 	subpackages="$subpackages lua$_v-$_pkgname:_subpackage"
diff --git a/main/sircbot/APKBUILD b/main/sircbot/APKBUILD
index e9328623202..b7562ed1ac7 100644
--- a/main/sircbot/APKBUILD
+++ b/main/sircbot/APKBUILD
@@ -1,17 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-_luaversions="5.1 5.2 5.3"
+_luaversions="5.1 5.2 5.3 5.4"
 pkgname=sircbot
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Minimalistic IRC bot"
 url="https://git.alpinelinux.org/cgit/sircbot/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 pkgusers="sircbot"
 pkggroups="sircbot"
-depends=
-makedepends=""
-subpackages="lua-sircbot:luamod"
+subpackages="lua-sircbot:luamod $pkgname-openrc"
 for _i in $_luaversions; do
 	makedepends="$makedepends lua$_i-dev"
 	subpackages="$subpackages lua$_i-sircbot:split_${_i/./_}"
@@ -23,10 +21,7 @@ source="https://dev.alpinelinux.org/archive/sircbot/sircbot-$pkgver.tar.xz
 	sircbot.confd
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
-
 build() {
-	cd "$builddir"
 	make
 	for i in $_luaversions; do
 		make LUA_VERSION=$i
@@ -34,7 +29,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make install DESTDIR="$pkgdir" prefix=/usr
 	for i in $_luaversions; do
 		make install-lua DESTDIR="$pkgdir" prefix=/usr LUA_VERSION=$i