From c064a98cefcc1443e5c48ac6521669ca1f147269 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 1 Jul 2020 04:48:35 +0200
Subject: [PATCH] luaposix: add 5.4, rename packages for consistency

---
 srcpkgs/lua51-luaposix                        |  1 +
 srcpkgs/lua52-luaposix                        |  1 +
 srcpkgs/lua53-luaposix                        |  1 +
 srcpkgs/{luaposix => lua54-luaposix}/template | 62 ++++++++++++++-----
 srcpkgs/luaposix                              |  1 +
 srcpkgs/luaposix51                            |  2 +-
 srcpkgs/luaposix52                            |  2 +-
 7 files changed, 53 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/lua51-luaposix
 create mode 120000 srcpkgs/lua52-luaposix
 create mode 120000 srcpkgs/lua53-luaposix
 rename srcpkgs/{luaposix => lua54-luaposix}/template (51%)
 create mode 120000 srcpkgs/luaposix

diff --git a/srcpkgs/lua51-luaposix b/srcpkgs/lua51-luaposix
new file mode 120000
index 00000000000..18904ae814f
--- /dev/null
+++ b/srcpkgs/lua51-luaposix
@@ -0,0 +1 @@
+lua54-luaposix
\ No newline at end of file
diff --git a/srcpkgs/lua52-luaposix b/srcpkgs/lua52-luaposix
new file mode 120000
index 00000000000..18904ae814f
--- /dev/null
+++ b/srcpkgs/lua52-luaposix
@@ -0,0 +1 @@
+lua54-luaposix
\ No newline at end of file
diff --git a/srcpkgs/lua53-luaposix b/srcpkgs/lua53-luaposix
new file mode 120000
index 00000000000..18904ae814f
--- /dev/null
+++ b/srcpkgs/lua53-luaposix
@@ -0,0 +1 @@
+lua54-luaposix
\ No newline at end of file
diff --git a/srcpkgs/luaposix/template b/srcpkgs/lua54-luaposix/template
similarity index 51%
rename from srcpkgs/luaposix/template
rename to srcpkgs/lua54-luaposix/template
index 0fbd9385409..f5fb76ff686 100644
--- a/srcpkgs/luaposix/template
+++ b/srcpkgs/lua54-luaposix/template
@@ -1,12 +1,13 @@
-# Template file for 'luaposix'
-pkgname=luaposix
+# Template file for 'lua54-luaposix'
+pkgname=lua54-luaposix
 version=34.1.1
-revision=1
+revision=2
 wrksrc="luaposix-release-v${version}"
-hostmakedepends="lua51-devel lua52-devel lua-devel"
-makedepends="lua51-devel lua52-devel lua-devel"
-depends="lua lua-stdlib-normalize"
-short_desc="POSIX library for Lua programming language"
+hostmakedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
+depends="lua54 lua54-stdlib-normalize"
+_desc="POSIX library for Lua programming language"
+short_desc="${_desc} (5.4.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://luaforge.net/projects/luaposix/"
@@ -20,10 +21,11 @@ post_extract() {
 	mv * lua5.1 || true
 	cp -a lua5.1 lua5.2
 	cp -a lua5.1 lua5.3
+	cp -a lua5.1 lua5.4
 }
 
 do_build() {
-	for _lua_version in 5.1 5.2 5.3; do
+	for _lua_version in 5.1 5.2 5.3 5.4; do
 		pushd lua${_lua_version}
 		lua${_lua_version} build-aux/luke  version=${version} PREFIX=/usr \
 			LUA_INCDIR="${XBPS_CROSS_BASE}/usr/include/lua${_lua_version}" \
@@ -33,7 +35,7 @@ do_build() {
 }
 
 do_install() {
-	for _lua_version in 5.1 5.2 5.3; do
+	for _lua_version in 5.1 5.2 5.3 5.4; do
 		pushd lua${_lua_version}
 		lua${_lua_version} build-aux/luke PREFIX="${DESTDIR}/usr" install
 		popd
@@ -41,14 +43,14 @@ do_install() {
 }
 
 post_install() {
-	vlicense lua5.3/LICENSE
+	vlicense lua5.4/LICENSE
 	vmkdir usr/share/doc/$pkgname
-	vcopy "lua5.3/doc/*" usr/share/doc/$pkgname
+	vcopy "lua5.4/doc/*" usr/share/doc/$pkgname
 }
 
-luaposix51_package() {
+lua51-luaposix_package() {
 	depends="lua51 lua51-stdlib-normalize lua51-bitlib"
-	short_desc="${short_desc} - Lua 5.1"
+	short_desc="${_desc} (5.1.x)"
 	pkg_install() {
 		vlicense "${wrksrc}/lua5.1/LICENSE"
 		vmove usr/lib/lua/5.1
@@ -58,9 +60,9 @@ luaposix51_package() {
 	}
 }
 
-luaposix52_package() {
-	short_desc="${short_desc} - Lua 5.2"
+lua52-luaposix_package() {
 	depends="lua52 lua52-stdlib-normalize"
+	short_desc="${_desc} (5.2.x)"
 	pkg_install() {
 		vlicense "${wrksrc}/lua5.2/LICENSE"
 		vmove usr/lib/lua/5.2
@@ -69,3 +71,33 @@ luaposix52_package() {
 		vcopy "${wrksrc}/lua5.2/doc/*" usr/share/doc/$pkgname
 	}
 }
+
+lua53-luaposix_package() {
+	depends="lua53 lua53-stdlib-normalize"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vlicense "${wrksrc}/lua5.3/LICENSE"
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+		vmkdir usr/share/doc/$pkgname
+		vcopy "${wrksrc}/lua5.3/doc/*" usr/share/doc/$pkgname
+	}
+}
+
+luaposix51_package() {
+	depends="lua51-luaposix>=${version}_${revision}"
+	short_desc+="${_desc} (5.1.x) (transitional dummy package)"
+	build_style=meta
+}
+
+luaposix52_package() {
+	depends="lua52-luaposix>=${version}_${revision}"
+	short_desc+="${_desc} (5.2.x) (transitional dummy package)"
+	build_style=meta
+}
+
+luaposix_package() {
+	depends="lua53-luaposix>=${version}_${revision}"
+	short_desc+="${_desc} (5.3.x) (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/luaposix b/srcpkgs/luaposix
new file mode 120000
index 00000000000..18904ae814f
--- /dev/null
+++ b/srcpkgs/luaposix
@@ -0,0 +1 @@
+lua54-luaposix
\ No newline at end of file
diff --git a/srcpkgs/luaposix51 b/srcpkgs/luaposix51
index 4789a96bd38..18904ae814f 120000
--- a/srcpkgs/luaposix51
+++ b/srcpkgs/luaposix51
@@ -1 +1 @@
-luaposix
\ No newline at end of file
+lua54-luaposix
\ No newline at end of file
diff --git a/srcpkgs/luaposix52 b/srcpkgs/luaposix52
index 4789a96bd38..18904ae814f 120000
--- a/srcpkgs/luaposix52
+++ b/srcpkgs/luaposix52
@@ -1 +1 @@
-luaposix
\ No newline at end of file
+lua54-luaposix
\ No newline at end of file