Update bitw according to the new guidelines

2 files changed, 24 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 877bb6e568d1..3a382312db63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bitw-git
 	pkgdesc = Minimalist BitWarden client with Secret Service API implementation - git version
-	pkgver = r48.781f226
-	pkgrel = 2
+	pkgver = r53.aa676ad
+	pkgrel = 1
 	url = https://github.com/mvdan/bitw
 	arch = x86_64
 	arch = i686
@@ -10,14 +10,8 @@ pkgbase = bitw-git
 	arch = armv7h
 	arch = aarch64
 	license = BSD
-	checkdepends = golang-github-rogpeppe-go-internal>=1.5.0
-	checkdepends = golang-rsc-2fa>=1.1.0
 	makedepends = git
-	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-github-godbus-dbus>=5.0.3
+	makedepends = go>=1.13
 	provides = bitw
 	provides = org.freedesktop.secrets
 	conflicts = bitw
diff --git a/PKGBUILD b/PKGBUILD
index 766bb84692c6..a4dc233a78f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,52 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 _pkgname='bitw'
 pkgname="$_pkgname-git"
-pkgver='r48.781f226'
-pkgrel='2'
+pkgver='r53.aa676ad'
+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>=1.13' 'golang-golang-x-crypto' 'golang-github-google-uuid>=1.1.1' 'golang-github-knq-ini' 'golang-github-godbus-dbus>=5.0.3')
-checkdepends=('golang-github-rogpeppe-go-internal>=1.5.0' 'golang-rsc-2fa>=1.1.0')
+makedepends=('git' 'go>=1.13')
 provides=("$_pkgname" 'org.freedesktop.secrets')
 conflicts=("$_pkgname")
 source=("$pkgname::git+$url")
 sha256sums=('SKIP')
 
-_builddir="$pkgname-build"
-_buildpath="src/mvdan.cc/$_pkgname"
+_sourcedirectory="$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/"
+	mkdir -p "$srcdir/$_bindir/"
 }
 
 pkgver() {
-	cd "$srcdir/$_builddir/$_buildpath/"
+	cd "$srcdir/$_sourcedirectory/"
 	printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
-	go build -v -trimpath -ldflags "-extldflags $LDFLAGS" -o "$srcdir/$_bindir/" "$(echo "$_buildpath" | cut -d '/' -f 2-)/..."
+	cd "$srcdir/$_sourcedirectory/"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	go build -v -o "$srcdir/$_bindir/" './...'
 }
 
 check() {
-	export GOPATH="$srcdir/$_builddir:/usr/share/gocode"
-	go test -v "$srcdir/$_builddir/$_buildpath/..."
+	cd "$srcdir/$_sourcedirectory/"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+	go test -v './...'
 }
 
 package() {
 	cd "$srcdir/"
 	install -Dm755 "$_bindir/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
-	install -Dm644 "$_builddir/$_buildpath/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm644 "$_sourcedirectory/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }