upgpkg: lua-cassowary-git 2.3.1.r0.gc022a12-1

upstream release

2 files changed, 31 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f62347159b38..4bdec548ff57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = lua-cassowary-git
 	pkgdesc = The cassowary constraint solver
-	pkgver = 2.2.r30.gdd236e3
+	pkgver = 2.3.1.r0.gc022a12
 	pkgrel = 1
 	url = https://github.com/sile-typesetter/cassowary.lua
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = lua
@@ -12,7 +11,7 @@ pkgbase = lua-cassowary-git
 	makedepends = lua52
 	makedepends = lua51
 	makedepends = luarocks
-	source = git+https://github.com/sile-typesetter/cassowary.lua.git#branch=master
+	source = cassowary.lua.git::git+https://github.com/sile-typesetter/cassowary.lua.git
 	sha256sums = SKIP
 
 pkgname = lua-cassowary-git
@@ -38,4 +37,3 @@ pkgname = lua51-cassowary-git
 	depends = lua51-penlight
 	provides = lua51-cassowary
 	conflicts = lua51-cassowary
-
diff --git a/PKGBUILD b/PKGBUILD
index e3242c1d4bda..f010b34d6be4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,54 +3,54 @@
 _rockname=cassowary
 _project=$_rockname.lua
 pkgname=("lua-$_rockname-git" "lua53-$_rockname-git" "lua52-$_rockname-git" "lua51-$_rockname-git")
-pkgver=2.2.r30.gdd236e3
-_branch='master'
+pkgver=2.3.1.r0.gc022a12
 _rockrel=0
 pkgrel=1
 pkgdesc='The cassowary constraint solver'
-arch=('i686' 'x86_64')
+arch=(any)
 url="https://github.com/sile-typesetter/$_project"
-license=('MIT')
-_lua_deps=('penlight')
-makedepends=('git' 'lua' 'lua53' 'lua52' 'lua51' 'luarocks')
-source=("git+$url.git#branch=$_branch")
+license=(MIT)
+_lua_deps=(penlight)
+makedepends=(git lua lua53 lua52 lua51 luarocks)
+source=("$_project.git::git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_project"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	cd "$_project.git"
+	git describe --always --long --tags --abbrev=7 HEAD |
+		sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 _package_helper() {
-  cd "$_project"
-  luarocks --lua-version="$1" --tree="$pkgdir/usr/" \
-    make --deps-mode=none --no-manifest "$_rockname-scm-$_rockrel.rockspec"
+	cd "$_project.git"
+	luarocks --lua-version="$1" --tree="$pkgdir/usr/" \
+		make --deps-mode=none --no-manifest "$_rockname-scm-$_rockrel.rockspec"
 }
 
 package_lua-cassowary-git() {
-  depends=('lua' "${_lua_deps[@]/#/lua-}")
-  provides=("${pkgname/-git}")
-  conflicts=("${pkgname/-git}")
-  _package_helper 5.4
+	depends=('lua' "${_lua_deps[@]/#/lua-}")
+	provides=("${pkgname/-git}")
+	conflicts=("${pkgname/-git}")
+	_package_helper 5.4
 }
 
 package_lua53-cassowary-git() {
-  depends=('lua53' "${_lua_deps[@]/#/lua53-}")
-  provides=("${pkgname/-git}")
-  conflicts=("${pkgname/-git}")
-  _package_helper 5.3
+	depends=('lua53' "${_lua_deps[@]/#/lua53-}")
+	provides=("${pkgname/-git}")
+	conflicts=("${pkgname/-git}")
+	_package_helper 5.3
 }
 
 package_lua52-cassowary-git() {
-  depends=('lua52' "${_lua_deps[@]/#/lua52-}")
-  provides=("${pkgname/-git}")
-  conflicts=("${pkgname/-git}")
-  _package_helper 5.2
+	depends=('lua52' "${_lua_deps[@]/#/lua52-}")
+	provides=("${pkgname/-git}")
+	conflicts=("${pkgname/-git}")
+	_package_helper 5.2
 }
 
 package_lua51-cassowary-git() {
-  depends=('lua51' "${_lua_deps[@]/#/lua51-}")
-  provides=("${pkgname/-git}")
-  conflicts=("${pkgname/-git}")
-  _package_helper 5.1
+	depends=('lua51' "${_lua_deps[@]/#/lua51-}")
+	provides=("${pkgname/-git}")
+	conflicts=("${pkgname/-git}")
+	_package_helper 5.1
 }