From da80ad41c96483bd9df5bb865084ba8541d57393 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 1 Jul 2020 00:29:17 +0200
Subject: [PATCH] lua-lpeg: add 5.4 support, rename to lua54-lpeg

---
 srcpkgs/lua-lpeg                          |  1 +
 srcpkgs/lua51-lpeg                        |  2 +-
 srcpkgs/lua52-lpeg                        |  2 +-
 srcpkgs/lua53-lpeg                        |  1 +
 srcpkgs/{lua-lpeg => lua54-lpeg}/template | 45 ++++++++++++++++++-----
 srcpkgs/{lua-lpeg => lua54-lpeg}/update   |  0
 6 files changed, 39 insertions(+), 12 deletions(-)
 create mode 120000 srcpkgs/lua-lpeg
 create mode 120000 srcpkgs/lua53-lpeg
 rename srcpkgs/{lua-lpeg => lua54-lpeg}/template (62%)
 rename srcpkgs/{lua-lpeg => lua54-lpeg}/update (100%)

diff --git a/srcpkgs/lua-lpeg b/srcpkgs/lua-lpeg
new file mode 120000
index 0000000000..0fe4aab7f3
--- /dev/null
+++ b/srcpkgs/lua-lpeg
@@ -0,0 +1 @@
+lua54-lpeg
\ No newline at end of file
diff --git a/srcpkgs/lua51-lpeg b/srcpkgs/lua51-lpeg
index 2e6f1b22b2..0fe4aab7f3 120000
--- a/srcpkgs/lua51-lpeg
+++ b/srcpkgs/lua51-lpeg
@@ -1 +1 @@
-lua-lpeg
\ No newline at end of file
+lua54-lpeg
\ No newline at end of file
diff --git a/srcpkgs/lua52-lpeg b/srcpkgs/lua52-lpeg
index 2e6f1b22b2..0fe4aab7f3 120000
--- a/srcpkgs/lua52-lpeg
+++ b/srcpkgs/lua52-lpeg
@@ -1 +1 @@
-lua-lpeg
\ No newline at end of file
+lua54-lpeg
\ No newline at end of file
diff --git a/srcpkgs/lua53-lpeg b/srcpkgs/lua53-lpeg
new file mode 120000
index 0000000000..0fe4aab7f3
--- /dev/null
+++ b/srcpkgs/lua53-lpeg
@@ -0,0 +1 @@
+lua54-lpeg
\ No newline at end of file
diff --git a/srcpkgs/lua-lpeg/template b/srcpkgs/lua54-lpeg/template
similarity index 62%
rename from srcpkgs/lua-lpeg/template
rename to srcpkgs/lua54-lpeg/template
index 177f27cc1d..dd13eb5901 100644
--- a/srcpkgs/lua-lpeg/template
+++ b/srcpkgs/lua54-lpeg/template
@@ -1,17 +1,17 @@
-# Template file for 'lua-lpeg'
-pkgname=lua-lpeg
+# Template file for 'lua54-lpeg'
+pkgname=lua54-lpeg
 version=1.0.2
-revision=1
-wrksrc="${pkgname#lua-}-${version}"
-hostmakedepends="lua lua51 lua52"
-makedepends="lua-devel lua51-devel lua52-devel"
-depends="lua>=5.3"
+revision=2
+wrksrc="lpeg-${version}"
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel"
+depends="lua>=5.4"
 _desc="Pattern-matching library for Lua based on Parsing Expression Grammars"
-short_desc="${_desc} (5.3.x)"
+short_desc="${_desc} (5.4.x)"
 maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="MIT"
 homepage="http://www.inf.puc-rio.br/~roberto/lpeg/"
-distfiles="${homepage}/${pkgname#lua-}-${version}.tar.gz"
+distfiles="${homepage}/lpeg-${version}.tar.gz"
 checksum=48d66576051b6c78388faad09b70493093264588fcd0f258ddaab1cdd4a15ffe
 
 post_extract() {
@@ -19,6 +19,7 @@ post_extract() {
 	mv * lua51 || true
 	cp -a lua51 lua52
 	cp -a lua51 lua53
+	cp -a lua51 lua54
 }
 
 do_build() {
@@ -33,6 +34,10 @@ do_build() {
 	cd ${wrksrc}/lua53
 	make CC=$CC DLLFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -fPIC" \
 		LUADIR="${XBPS_CROSS_BASE}/usr/include/lua5.3" ${makejobs}
+
+	cd ${wrksrc}/lua54
+	make CC=$CC DLLFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.4 -fPIC" \
+		LUADIR="${XBPS_CROSS_BASE}/usr/include/lua5.4" ${makejobs}
 }
 
 do_install() {
@@ -47,6 +52,10 @@ do_install() {
 	cd ${wrksrc}/lua53
 	vinstall lpeg.so 755 usr/lib/lua/5.3/
 	vinstall re.lua 644 usr/share/lua/5.3/
+
+	cd ${wrksrc}/lua54
+	vinstall lpeg.so 755 usr/lib/lua/5.4/
+	vinstall re.lua 644 usr/share/lua/5.4/
 	vlicense lpeg.html
 }
 
@@ -56,7 +65,7 @@ lua51-lpeg_package() {
 	pkg_install() {
 		vmove usr/lib/lua/5.1
 		vmove usr/share/lua/5.1
-		vlicense ${wrksrc}/lua52/lpeg.html
+		vlicense ${wrksrc}/lua51/lpeg.html
 	}
 }
 
@@ -69,3 +78,19 @@ lua52-lpeg_package() {
 		vlicense ${wrksrc}/lua52/lpeg.html
 	}
 }
+
+lua53-lpeg_package() {
+	depends="lua53"
+	short_desc="${_desc} (5.3.x)"
+	pkg_install() {
+		vmove usr/lib/lua/5.3
+		vmove usr/share/lua/5.3
+		vlicense ${wrksrc}/lua53/lpeg.html
+	}
+}
+
+lua-lpeg_package() {
+	depends="lua53-lpeg>=${version}_${revision}"
+	short_desc+="${_desc} (5.3.x) (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/lua-lpeg/update b/srcpkgs/lua54-lpeg/update
similarity index 100%
rename from srcpkgs/lua-lpeg/update
rename to srcpkgs/lua54-lpeg/update