lua: rename to lua53, add transitional pkgs, adopt, fix pkg-config

common/shlibs

@@ -867,7 +867,7 @@ libgslcblas.so.0 gsl-1.15_1
 libgsl.so.25 gsl-2.6_1
 liblua5.1.so.5.1 lua51-5.1.5_1
 liblua5.2.so.5.2 lua52-5.2.4_2
-liblua5.3.so.5.3 lua-5.3.1_2
+liblua5.3.so.5.3 lua53-5.3.5_4
 libburn.so.4 libburn-0.7.2_1
 libKF5Auth.so.5 kauth-5.26.0_1
 libKF5AuthCore.so.5 kauth-5.56.0_1

srcpkgs/lua

@@ -0,0 +1 @@
+lua53

srcpkgs/lua-devel

@@ -1 +1 @@
-lua
+lua53

srcpkgs/lua53-devel

@@ -0,0 +1 @@
+lua53

srcpkgs/lua53/files/lua.pc

@@ -10,11 +10,12 @@ INSTALL_LMOD=${prefix}/share/lua/${V}
 INSTALL_CMOD=${prefix}/lib/lua/${V}
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/include/lua${V}
 
 Name: Lua
 Description: An Extensible Extension Language
 Version: ${R}
 Requires: 
-Libs: -L${libdir} -llua -lm
+Libs: -L${libdir} -llua${V}
+Libs.private: -lm -ldl
 Cflags: -I${includedir}

srcpkgs/lua53/template

@@ -1,10 +1,11 @@
-# Template file for 'lua'
+# Template file for 'lua53'
-pkgname=lua
+pkgname=lua53
 version=5.3.5
-revision=3
+revision=4
+wrksrc=lua-${version}
 makedepends="ncurses-devel readline-devel"
-short_desc="Powerful, fast, lightweight, embeddable scripting language"
+short_desc="Powerful, fast, lightweight, embeddable scripting language (5.3.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="q66 <daniel@octaforge.org>"
 license="MIT"
 homepage="https://www.lua.org"
 distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz"
@@ -19,8 +20,8 @@ alternatives="
 "
 
 pre_build() {
-	# Lua 5.3.4 has wrong release version in its Makefile. Fix it.
+	# 5.3.5 has 5.3.4 in the Makefile
-	sed "s/^R= \$V.4/R= \$V.5/" -i Makefile
+	vsed "s/^R= \$V.4/R= \$V.5/" -i Makefile
 }
 
 do_build() {
@@ -41,8 +42,6 @@ do_install() {
 
 	sed ${FILESDIR}/lua.pc \
 		-e "s;%VER%;${version%.*};g;s;%REL%;${version};g" \
-		-e "s;llua;llua5.3;" \
-		-e "s;/include;/include/lua5.3;" \
 		> lua5.3.pc
 
 	vinstall lua5.3.pc 644 usr/lib/pkgconfig
@@ -59,8 +58,8 @@ do_install() {
 	mv ${DESTDIR}/usr/share/man/man1/luac{,5.3}.1
 }
 
-lua-devel_package() {
+lua53-devel_package() {
-	depends="${makedepends} lua>=${version}_${revision}"
+	depends="${makedepends} lua53>=${version}_${revision}"
 	short_desc+=" - development files"
 	alternatives="
 	 lua-devel:lua:/usr/include/lua5.3
@@ -81,3 +80,15 @@ lua-devel_package() {
 		vmove usr/share/doc
 	}
 }
+
+lua_package() {
+	depends="lua53>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
+
+lua-devel_package() {
+	depends="lua53-devel>=${version}_${revision}"
+	short_desc+=" - development files (transitional dummy package)"
+	build_style=meta
+}