Get -git building again

Change-Id: I159550c1f31a379e5473eb37dd544609ab5aa6f8

2 files changed, 22 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34e8788e8351..03fdfcd68ce1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec 17 01:55:28 UTC 2015
+# Fri Jun  1 18:51:54 UTC 2018
 pkgbase = qpm-git
 	pkgdesc = Qt Package Manager
-	pkgver = v0.10.0.r4.gc554ebe
+	pkgver = v0.11.0.r2.g7c41bcc
 	pkgrel = 1
 	url = http://qpm.io
 	arch = x86_64
@@ -10,8 +10,8 @@ pkgbase = qpm-git
 	license = LGPL
 	makedepends = go
 	makedepends = git
-	provides = qpm
-	source = git://github.com/Cutehacks/qpm
+	provides = qpm-git
+	source = qpm.io::git://github.com/Cutehacks/qpm
 	sha256sums = SKIP
 
 pkgname = qpm-git
diff --git a/PKGBUILD b/PKGBUILD
index d8831612681d..b56e2cad072f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,42 +4,43 @@
 # For improvements/fixes to this package, please send a pull request:
 # https://github.com/Cutehacks/qpm
 
-_pkgname=qpm
-pkgname=${_pkgname}-git
-pkgver=v0.10.0.r4.gc554ebe
+pkgname=qpm-git
+pkgver=v0.11.0.r2.g7c41bcc
 pkgrel=1
 pkgdesc='Qt Package Manager'
 arch=('x86_64' 'i686')
 url='http://qpm.io'
 license=('LGPL')
-provides=('qpm')
+provides=('qpm-git')
 makedepends=('go' 'git')
-source=("git://github.com/Cutehacks/qpm")
+source=("qpm.io::git://github.com/Cutehacks/qpm")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_pkgname"
+  local _qpm_dir="${srcdir}/qpm.io"
+  cd ${_qpm_dir}
 
   git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
-  cd "$_pkgname"
+prepare() {
+  local _qpm_dir="${srcdir}/qpm.io"
+  cd ${_qpm_dir}
 
   git submodule init
   git submodule update
+}
 
-  export GOPATH=${PWD}
-  export PATH=${GOPATH}/bin:${PATH}
+build() {
+  local _qpm_dir="${srcdir}/qpm.io"
+  cd $_qpm_dir
+  local git_sha1=$(git rev-parse HEAD | cut -c1-8)
 
-  go build qpm.io/qpm
+  cd ${startdir}
+  export GOPATH="$startdir"
+  go build -ldflags "-X qpm.io/qpm/core.Version=${pkgver} -X qpm.io/qpm/core.Build=${git_sha1}" qpm.io/qpm
 }
 
 package() {
-  cd "$_pkgname"
-  
-  local installdir=${pkgdir}/usr/bin
-  
-  mkdir -p ${installdir}
-  cp qpm ${installdir}
+  install -Dm755 "${startdir}/qpm" "${pkgdir}/usr/bin/${pkgname}"
 }