main/lua-stdlib-normalize: install into lua/common, remove subpkgs

1 files changed, 6 insertions, 15 deletions

diff --git a/main/lua-stdlib-normalize/APKBUILD b/main/lua-stdlib-normalize/APKBUILD
index 0b8edc4d24..89ee5fa7f1 100644
--- a/main/lua-stdlib-normalize/APKBUILD
+++ b/main/lua-stdlib-normalize/APKBUILD
@@ -3,34 +3,25 @@
 pkgname=lua-stdlib-normalize
 _rockname=std.normalize
 pkgver=2.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Normalized Lua functions"
 url="https://lua-stdlib.github.io/normalize/"
 arch="noarch"
 license="MIT"
-depends="lua"
-subpackages=""
+depends="lua lua-stdlib-debug"
+provides=""
 options="!check"  # FIXME: requires lua-specl that we don't have yet
 source="$pkgname-$pkgver.tar.gz::https://github.com/lua-stdlib/normalize/archive/v$pkgver.tar.gz"
 builddir="$srcdir/normalize-$pkgver"
 
 _luaversions="5.1 5.2 5.3"
 for _v in $_luaversions; do
-	subpackages="$subpackages lua$_v-${pkgname#lua-}:_subpackage"
+	provides="$provides lua$_v-${pkgname#lua-}=$pkgver-r$pkgrel"  # for backward compatibility
 done
 
 package() {
-	mkdir -p "$pkgdir"
-}
-
-_subpackage() {
-	local lver="${subpkgname:3:3}"
-	pkgdesc="$pkgdesc (for Lua $lver)"
-	depends="lua$lver lua$lver-stdlib-debug"
-	install_if="$pkgname=$pkgver-r$pkgrel lua$lver"
-
-	local lmod_dir="$subpkgdir/usr/share/lua/$lver"
-	local rockdir="$subpkgdir/usr/lib/luarocks/rocks-$lver/$_rockname/$pkgver-1"
+	local lmod_dir="$pkgdir/usr/share/lua/common"
+	local rockdir="$pkgdir/usr/lib/luarocks/rocks-common/$_rockname/$pkgver-1"
 
 	mkdir -p "$lmod_dir"
 	cp -r "$builddir"/lib/std "$lmod_dir"/