Updated bitw-git to use packaged dependencies

2 files changed, 37 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ae2f6a08f34..ac80c82040d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitw-git
 	pkgdesc = Minimalist BitWarden client with Secret Service API implementation - git version
-	pkgver = r46.17ac675
-	pkgrel = 3
+	pkgver = r47.58fe31f
+	pkgrel = 1
 	url = https://github.com/mvdan/bitw
 	arch = x86_64
 	arch = i686
@@ -10,8 +10,14 @@ pkgbase = bitw-git
 	arch = armv7h
 	arch = aarch64
 	license = BSD
+	checkdepends = golang-github-rogpeppe-go-internal>=1.5.0
 	makedepends = git
-	makedepends = go-pie
+	makedepends = go-pie>=1.13
+	makedepends = golang-golang-x-crypto
+	makedepends = golang-github-google-uuid>=1.1.1
+	makedepends = golang-github-knq-ini
+	makedepends = golang-rsc-2fa>=1.1.0
+	makedepends = golang-github-godbus-dbus>=5.0.3
 	provides = bitw
 	provides = org.freedesktop.secrets
 	conflicts = bitw
diff --git a/PKGBUILD b/PKGBUILD
index acd953d722a9..f741acd31d31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,50 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 _pkgname='bitw'
 pkgname="$_pkgname-git"
-pkgver='r46.17ac675'
-pkgrel='3'
+pkgver='r47.58fe31f'
+pkgrel='1'
 pkgdesc='Minimalist BitWarden client with Secret Service API implementation - git version'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://github.com/mvdan/$_pkgname"
 license=('BSD')
-makedepends=('git' 'go-pie')
+makedepends=('git' 'go-pie>=1.13' 'golang-golang-x-crypto' 'golang-github-google-uuid>=1.1.1' 'golang-github-knq-ini' 'golang-rsc-2fa>=1.1.0' 'golang-github-godbus-dbus>=5.0.3')
+checkdepends=('golang-github-rogpeppe-go-internal>=1.5.0')
 provides=("$_pkgname" 'org.freedesktop.secrets')
 conflicts=("$_pkgname")
 source=("$pkgname::git+$url")
 sha256sums=('SKIP')
 
-_sourcedirectory="$pkgname"
+_builddir="$pkgname-build"
+_buildpath="src/mvdan.cc/$_pkgname"
+_bindir="$pkgname-bin"
+
+prepare() {
+	cd "$srcdir/"
+
+	mkdir -p "$_builddir/$(echo "$_buildpath" | rev | cut -d '/' -f 2- | rev)/"
+	mv "$pkgname/" "$_builddir/$_buildpath/"
+	rm -r "$_builddir/$_buildpath/go."{mod,sum}
+
+	mkdir -p "$_bindir/"
+}
 
 pkgver() {
-	cd "$srcdir/$_sourcedirectory/"
+	cd "$srcdir/$_builddir/$_buildpath/"
 	printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir/$_sourcedirectory/"
-	export GOPATH="$srcdir/$_sourcedirectory-gopath"
-	go build -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-extldflags $LDFLAGS" -o "$_pkgname" .
+	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
+	go build -v -trimpath -ldflags "-extldflags $LDFLAGS" -o "$srcdir/$_bindir/" "$(echo "$_buildpath" | cut -d '/' -f 2-)/..."
+}
+
+check() {
+	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
+	go test -v "$srcdir/$_builddir/$_buildpath/..."
 }
 
 package() {
-	cd "$srcdir/$_sourcedirectory/"
-	install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-	install -Dm644 'LICENSE' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	go clean -modcache
+	cd "$srcdir/"
+	install -Dm755 "$_bindir/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+	install -Dm644 "$_builddir/$_buildpath/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }