update v1.2.6

3 files changed, 16 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca24bb6257e3..98b7e75f3f5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = vale
 	pkgdesc = A customizable, syntax-aware linter for prose.
-	pkgver = 1.0.6
+	pkgver = 1.2.6
 	pkgrel = 1
 	url = https://github.com/errata-ai/vale
 	arch = i686
 	arch = x86_64
 	license = MIT
-	makedepends = go
-	makedepends = ruby
-	makedepends = python-docutils
-	provides = vale
-	options = !emptydirs
-	source = https://github.com/errata-ai/vale/archive/v1.0.6.zip
-	source = enable_local_build.patch
-	sha256sums = 5fb8ceaa69653f902e5c04b38d0c199a1a853364d62075264e75e591df6c7a48
-	sha256sums = 0761d16f111f793d7388da7bb88fa59daa8ac5a51b2b737ad065226f51beec4b
+	makedepends = go-pie
+	makedepends = go-bindata
+	source = https://github.com/errata-ai/vale/archive/v1.2.6.zip
+	sha256sums = 71d4b21d415d3a17aa05f7f2636e9e6c14b508b07f60f9bc56c53aea116c7ea2
 
 pkgname = vale
 
diff --git a/PKGBUILD b/PKGBUILD
index f4d5a705ebc5..8ada64145e07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,33 @@
 # Maintainer: Konstantin Gizdov < arch at kge dot pw >
 pkgname=vale
-pkgver=1.0.6
+pkgver=1.2.6
 pkgrel=1
 pkgdesc="A customizable, syntax-aware linter for prose."
-provides=('vale')
 arch=('i686' 'x86_64')
 url="https://github.com/errata-ai/vale"
 license=('MIT')
-makedepends=('go' 'ruby' 'python-docutils')
-options=('!emptydirs')
-source=("https://github.com/errata-ai/${pkgname}/archive/v${pkgver}.zip"
-        'enable_local_build.patch')
-sha256sums=('5fb8ceaa69653f902e5c04b38d0c199a1a853364d62075264e75e591df6c7a48'
-            '0761d16f111f793d7388da7bb88fa59daa8ac5a51b2b737ad065226f51beec4b')
-
-prepare() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -p1 -i "${srcdir}/enable_local_build.patch"
-}
+makedepends=('go-pie' 'go-bindata')
+source=("${url}/archive/v${pkgver}.zip")
+sha256sums=('71d4b21d415d3a17aa05f7f2636e9e6c14b508b07f60f9bc56c53aea116c7ea2')
 
 build() {
     cd "${srcdir}"
     export GOPATH="${srcdir}/gopath"
-    export RUBY_VER=$(ruby -e 'puts RUBY_VERSION')
-    mkdir -p "${srcdir}/ruby"
-    export HOME="${srcdir}/ruby"
-    export GEM_HOME="${HOME}/.gem/ruby/${RUBY_VER}"
-    export GEM_HOME_OLD="${HOME}/.gem/ruby/2.5.0"  # for some reason is wants 2.5.0 too
-    export PATH="${srcdir}/gopath/bin:${GEM_HOME}/bin:${GEM_HOME_OLD}/bin:$PATH"
+    export PATH="${srcdir}/gopath/bin:$PATH"
     mkdir -p "${srcdir}/gopath/src/github.com/errata-ai/vale"
-    rsync -az "${srcdir}/${pkgname}-${pkgver}/" "${srcdir}/gopath/src/github.com/errata-ai/vale/"
+    cp -r "${srcdir}/${pkgname}-${pkgver}"/* "${srcdir}/gopath/src/github.com/errata-ai/vale/"
     cd "${srcdir}/gopath/src/github.com/errata-ai/vale"
 
     go env
-    export BUNDLE_GEMFILE=$PWD/Gemfile
-    export PATH="${srcdir}/bin:${PATH}"
-    gem install --no-rdoc --no-ri asciidoctor
-    make setup
-
-    make build
+    make LAST_TAG=${pkgver} rules
+    make LAST_TAG=${pkgver} build
 }
 
 package() {
-    # cd "${srcdir}/build"
-    install -Dm755 "${srcdir}/gopath/src/github.com/errata-ai/vale/bin/vale" "${pkgdir}/usr/bin/vale"
+    cd "${srcdir}/gopath/src/github.com/errata-ai/vale"
+    make LAST_TAG=${pkgver} DESTDIR="${pkgdir}" install
+    install -Dm755 "${srcdir}/gopath/bin/vale" "${pkgdir}/usr/bin/vale"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/vale/LICENSE"
     install -d "${pkgdir}/usr/share/vale/styles"
     cp -r "${srcdir}/gopath/src/github.com/errata-ai/vale/styles"/* "${pkgdir}/usr/share/vale/styles/"
-    chmod -R 644 "${pkgdir}/usr/share/vale/styles"/*
-    find "${pkgdir}/usr/share/vale/styles" -type d -exec chmod 755 {} \;
 }
diff --git a/enable_local_build.patch b/enable_local_build.patch
deleted file mode 100644
index 89c37ad920c5..000000000000
--- a/enable_local_build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aur vale-1.0.6-old/Makefile vale-1.0.6-new/Makefile
---- vale-1.0.6-old/Makefile	2018-10-23 18:12:29.833646925 +0100
-+++ vale-1.0.6-new/Makefile	2018-10-23 18:13:54.895016355 +0100
-@@ -5,6 +5,7 @@
- CURR_SHA=$(shell git rev-parse --verify HEAD)
- 
- LDFLAGS=-ldflags "-s -w -X main.version=$(LAST_TAG)"
-+RUBY_CUSTOM_PATH=$(GEM_HOME)/bin
- 
- .PHONY: data test lint ci cross install bump rules setup bench compare release
- 
-@@ -64,8 +65,10 @@
- 	go get github.com/aclements/go-misc/benchmany
- 	go get -u github.com/alecthomas/gometalinter
- 	go get -u github.com/jteeuwen/go-bindata/...
--	bundle install
--	gem specific_install -l https://github.com/jdkato/aruba.git -b d-win-fix
-+	gem install --no-rdoc --no-ri bundle
-+	bundle install --path ${RUBY_CUSTOM_PATH}
-+	gem install --no-rdoc --no-ri specific_install
-+	gem specific_install -l https://github.com/jdkato/aruba.git
- 
- rules:
- 	go-bindata -ignore=\\.DS_Store -pkg="rule" -o rule/rule.go rule/**/*.yml