Adopt, overhaul packaging to work with current Luarocks

2 files changed, 31 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2bc2c63629e..6e2ac0641aaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,27 @@
-# Generated by mksrcinfo v8
-# Sun Jan 27 23:30:15 UTC 2019
 pkgbase = lua-copas
-	pkgdesc = Copas is a dispatcher based on coroutines that can be used by TCP/IP servers.
+	pkgdesc = A dispatcher based on coroutines that can be used by TCP/IP servers
 	pkgver = 2.0.2
 	pkgrel = 1
-	url = http://keplerproject.github.io/copas
-	arch = i686
+	url = https://keplerproject.github.io/copas
 	arch = x86_64
+	arch = i686
 	license = MIT
+	makedepends = luarocks
 	source = copas-2.0.2.tar.gz::https://github.com/keplerproject/copas/archive/2.0.2.tar.gz
-	md5sums = dfb5969f077b4bf9a222a3c532400b45
+	sha256sums = 1469eaf987513f5a9a0bee345c040c8fa30ca6194bc75ad78171362f9904cf3e
 
 pkgname = lua-copas
 	depends = lua
 	depends = lua-socket
 	depends = lua-coxpcall
-	depends = luarocks
-
-pkgname = lua51-copas
-	depends = lua51
-	depends = lua51-socket
-	depends = lua51-coxpcall
-	depends = luarocks5.1
 
 pkgname = lua52-copas
 	depends = lua52
 	depends = lua52-socket
 	depends = lua52-coxpcall
-	depends = luarocks5.2
+
+pkgname = lua51-copas
+	depends = lua51
+	depends = lua51-socket
+	depends = lua51-coxpcall
 
diff --git a/PKGBUILD b/PKGBUILD
index ce9d14359f20..2595747c8500 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,38 @@
 # Maintainer: Stephen Smith <stephen304@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 
-pkgname=('lua-copas' 'lua51-copas' 'lua52-copas')
-pkgbase=lua-copas
 _rockname=copas
+pkgname=("lua-$_rockname" "lua52-$_rockname" "lua51-$_rockname")
 pkgver=2.0.2
+_rockrel=1
 pkgrel=1
-pkgdesc="Copas is a dispatcher based on coroutines that can be used by TCP/IP servers."
-arch=('i686' 'x86_64')
-url="http://keplerproject.github.io/copas"
+pkgdesc='A dispatcher based on coroutines that can be used by TCP/IP servers'
+arch=('x86_64' 'i686')
+url="https://keplerproject.github.io/$_rockname"
 license=('MIT')
-source=("${_rockname}-${pkgver}.tar.gz::https://github.com/keplerproject/${_rockname}/archive/${pkgver}.tar.gz")
-md5sums=('dfb5969f077b4bf9a222a3c532400b45')
+_lua_deps=('socket' 'coxpcall')
+makedepends=('luarocks')
+source=("$_rockname-$pkgver.tar.gz::https://github.com/keplerproject/$_rockname/archive/$pkgver.tar.gz")
+sha256sums=('1469eaf987513f5a9a0bee345c040c8fa30ca6194bc75ad78171362f9904cf3e')
 
 _package_helper() {
-  _lua_ver=$1
-
-  mkdir -p "$_lua_ver"
   cd "$_rockname-$pkgver"
-  luarocks-${_lua_ver} make --pack-binary-rock --deps-mode=none "rockspec/$_rockname-$pkgver-1.rockspec"
-  mv *.rock ../${_lua_ver}/
-  luarocks-${_lua_ver} install --tree="$pkgdir/usr/" --deps-mode=none ../${_lua_ver}/*.rock
-  find "$pkgdir/usr" -name manifest -delete
+  luarocks --lua-version="$1" --tree="$pkgdir/usr/" \
+    make --deps-mode=none --no-manifest \
+    "rockspec/$_rockname-$pkgver-$_rockrel.rockspec"
 }
 
-package_lua51-copas() {
-  depends=('lua51' 'lua51-socket' 'lua51-coxpcall' 'luarocks5.1')
-
-  _package_helper "5.1"
+package_lua-copas() {
+  depends+=('lua' "${_lua_deps[@]/#/lua-}")
+  _package_helper 5.3
 }
 
 package_lua52-copas() {
-  depends=('lua52' 'lua52-socket' 'lua52-coxpcall' 'luarocks5.2')
-
-  _package_helper "5.2"
+  depends+=('lua52' "${_lua_deps[@]/#/lua52-}")
+  _package_helper 5.2
 }
 
-package_lua-copas() {
-  depends=('lua' 'lua-socket' 'lua-coxpcall' 'luarocks')
-
-  _package_helper "5.3"
+package_lua51-copas() {
+  depends+=('lua51' "${_lua_deps[@]/#/lua51-}")
+  _package_helper 5.1
 }