upgpkg: lua-pegdebug 0.41-5

2 files changed, 26 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35103576c006..60d3e6be2821 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,23 @@
 pkgbase = lua-pegdebug
 	pkgdesc = Trace debugger for LPeg rules and captures
 	pkgver = 0.41
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/pkulchenko/PegDebug
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = lua
-	makedepends = lua53
-	makedepends = lua52
 	makedepends = lua51
+	makedepends = lua52
+	makedepends = lua53
 	makedepends = luarocks
-	source = pegdebug-0.41.tar.gz::https://github.com/pkulchenko/PegDebug/archive/0.41.tar.gz
+	source = https://github.com/pkulchenko/PegDebug/archive/0.41/PegDebug-0.41.tar.gz
 	sha256sums = 0ba8c5ee25cf24e011b29d40cfa5577b19cb4d9d8a086e9238187e7831fb39d1
 
 pkgname = lua-pegdebug
-	depends = lua
-	depends = lua-lpeg
 
 pkgname = lua53-pegdebug
-	depends = lua53
-	depends = lua53-lpeg
 
 pkgname = lua52-pegdebug
-	depends = lua52
-	depends = lua52-lpeg
 
 pkgname = lua51-pegdebug
-	depends = lua51
-	depends = lua51-lpeg
-
diff --git a/PKGBUILD b/PKGBUILD
index b9c9010571ea..f764ff023dd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,38 +5,40 @@ _pkgname=PegDebug
 pkgname=("lua-$_rockname" "lua53-$_rockname" "lua52-$_rockname" "lua51-$_rockname")
 pkgver=0.41
 _rockrel=1
-pkgrel=4
+pkgrel=5
 pkgdesc='Trace debugger for LPeg rules and captures'
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="https://github.com/pkulchenko/$_pkgname"
-license=('MIT')
-_lua_deps=('lpeg')
-makedepends=('lua' 'lua53' 'lua52' 'lua51' 'luarocks')
-source=("$_rockname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
+license=(MIT)
+_luadeps=(lpeg)
+makedepends=(lua
+             lua51
+             lua52
+             lua53
+             luarocks)
+_archive="$_pkgname-$pkgver"
+source=("$url/archive/$pkgver/$_archive.tar.gz")
 sha256sums=('0ba8c5ee25cf24e011b29d40cfa5577b19cb4d9d8a086e9238187e7831fb39d1')
 
-_package_helper() {
-  cd "$_pkgname-$pkgver"
-  luarocks --lua-version="$1" --tree="$pkgdir/usr/" \
-    make --deps-mode=none --no-manifest "misc/$_rockname-$pkgver-$_rockrel.rockspec"
+_package() {
+	cd "$_archive"
+	depends=("${pkgname%-*}" "${_luadeps[@]/#/${pkgname%-*}-}")
+	luarocks --lua-version "$1" --tree "$pkgdir/usr/" \
+		make --deps-mode none --no-manifest -- "misc/$_rockname-$pkgver-$_rockrel.rockspec"
 }
 
 package_lua-pegdebug() {
-  depends+=('lua' "${_lua_deps[@]/#/lua-}")
-  _package_helper 5.4
+	_package 5.4
 }
 
-package_lua53-pegdebug() {
-  depends+=('lua53' "${_lua_deps[@]/#/lua53-}")
-  _package_helper 5.3
+package_lua51-pegdebug() {
+	_package 5.1
 }
 
 package_lua52-pegdebug() {
-  depends+=('lua52' "${_lua_deps[@]/#/lua52-}")
-  _package_helper 5.2
+	_package 5.2
 }
 
-package_lua51-pegdebug() {
-  depends+=('lua51' "${_lua_deps[@]/#/lua51-}")
-  _package_helper 5.1
+package_lua53-pegdebug() {
+	_package 5.3
 }