demlo: Use simple and unified Go PKGBUILD, re-add version number

2 files changed, 31 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 163db9726da6..cd1cc270aad1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun May  1 07:48:54 UTC 2016
+# Tue Jun  7 19:19:45 UTC 2016
 pkgbase = demlo
 	pkgdesc = A dynamic and extensible music library organizer
-	pkgver = 2
-	pkgrel = 2
+	pkgver = 3.0
+	pkgrel = 1
 	url = http://ambrevar.bitbucket.org/demlo/
 	arch = i686
 	arch = x86_64
@@ -13,6 +13,8 @@ pkgbase = demlo
 	depends = lua51
 	depends = taglib
 	optdepends = chromaprint: Internet tagging
+	source = demlo-3.0.tar.bz2::https://bitbucket.org/ambrevar/demlo/get/v3.0.tar.bz2
+	md5sums = 52fcaa90c8ff3c7b635c84f3f1fc4d77
 
 pkgname = demlo
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f61eef2152f..8c601ad3fd30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,35 @@
 # Maintainer: Pierre Neidhardt <ambrevar@gmail.com>
 
-pkgname=demlo
-pkgver=2
-pkgrel=2
+_pkgname=demlo
+pkgname=$_pkgname
+pkgver=3.0
+pkgrel=1
 pkgdesc="A dynamic and extensible music library organizer"
 arch=("i686" "x86_64")
-url="http://ambrevar.bitbucket.org/$pkgname/"
+url="http://ambrevar.bitbucket.org/$_pkgname/"
 license=("MIT")
 depends=("ffmpeg" "lua51" "taglib")
 makedepends=("go")
 optdepends=("chromaprint: Internet tagging")
-_gourl="bitbucket.org/ambrevar/$pkgname"
+source=("$_pkgname-$pkgver.tar.bz2::https://bitbucket.org/ambrevar/$_pkgname/get/v$pkgver.tar.bz2")
+md5sums=("52fcaa90c8ff3c7b635c84f3f1fc4d77")
+_gourl="bitbucket.org/ambrevar/$_pkgname"
+
+prepare() {
+	## Move source extracted folder to its proper location in the GOPATH.
+	cd "$srcdir"
+	rm -rfv "src/$_gourl"
+	mkdir -p "src/bitbucket.org/ambrevar"
+	mv "ambrevar-$_pkgname-b1d0003d6506" "src/$_gourl"
+}
 
 build() {
-	GOPATH="$srcdir" go get -fix -v -x "$_gourl"
+	case "$CARCH" in
+	x86_64) GOARCH=amd64 ;;
+	i686) GOARCH=386 ;;
+	esac
+
+	GOPATH="$srcdir" go get -v -x -ldflags "-X main.version=$pkgver" "$_gourl"
 }
 
 check() {
@@ -22,13 +38,13 @@ check() {
 
 package() {
 	cd "$srcdir"
-	install -Dm755 "bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
-	install -Dm644 "src/$_gourl/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -Dm755 "bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+	install -Dm644 "src/$_gourl/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 
-	install -Dm644 "src/$_gourl/${pkgname}rc" "$pkgdir/usr/share/$pkgname/${pkgname}rc"
+	install -Dm644 "src/$_gourl/${_pkgname}rc" "$pkgdir/usr/share/$_pkgname/${_pkgname}rc"
 
 	cd "src/$_gourl"
 	for i in scripts/*; do
-		install -Dm644 "$i" "$pkgdir/usr/share/$pkgname/$i"
+		install -Dm644 "$i" "$pkgdir/usr/share/$_pkgname/$i"
 	done
 }