New maintainer; make package build again

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 39 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c808a5ec2b86..216e478ef8e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 # Generated by mksrcinfo v8
-# Sun Feb 21 13:50:41 UTC 2016
+# Thu Oct 12 14:50:03 UTC 2017
 pkgbase = capnproto-git
-	pkgdesc = Cap'n Proto serialization/RPC system
-	pkgver = r1490.ee64a21
+	pkgdesc = Cap'n Proto serialization/RPC system (git version)
+	pkgver = 0.7.r2236.365de898
 	pkgrel = 1
 	url = http://kentonv.github.io/capnproto/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
-	makedepends = subversion
-	provides = capnproto
+	provides = capnproto=0.7
 	conflicts = capnproto
-	source = git+https://github.com/kentonv/capnproto.git
-	source = gtest::svn+http://googletest.googlecode.com/svn/tags/release-1.7.0
-	md5sums = SKIP
+	source = capnproto::git+https://github.com/kentonv/capnproto.git
+	source = https://github.com/google/googletest/archive/release-1.8.0.tar.gz
 	md5sums = SKIP
+	md5sums = 16877098823401d1bf2ed7891d7dce36
 
 pkgname = capnproto-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..37c524cb7973
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+capnproto/
+capnproto-git-*.tar.xz
+capnproto-git-*.src.tar.gz
+release-*.tar.gz
+pkg/
+src/
+.AURINFO
diff --git a/PKGBUILD b/PKGBUILD
index fa5c51526fe7..bda7a923457e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,50 @@
-# Maintainer: Severen Redwood <severen@shrike.me
-# Contributors: Dave Reisner <dreisner@archlinux.org>
-#               Matthias Blaicher <matthias@blaicher.com>
-# Report all package issues to `https://github.com/SShrike/pkgbuilds`
-
-pkgname=capnproto-git
-pkgver=r1490.ee64a21
+# Maintainer:  Christopher Arndt <aur -at- chrisarndt -dot- de>
+# Contributor: Severen Redwood <severen@shrike.me
+# Contributor: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Matthias Blaicher <matthias@blaicher.com>
+
+_pkgname=capnproto
+_gtest_ver="1.8.0"
+pkgname="${_pkgname}-git"
+pkgver=0.7.r2236.365de898
 pkgrel=1
-pkgdesc="Cap'n Proto serialization/RPC system"
+pkgdesc="Cap'n Proto serialization/RPC system (git version)"
 arch=('i686' 'x86_64')
 url="http://kentonv.github.io/capnproto/"
 license=('MIT')
-makedepends=('git' 'subversion')
-conflicts=('capnproto')
-provides=('capnproto')
-source=("git+https://github.com/kentonv/capnproto.git"
-        "gtest::svn+http://googletest.googlecode.com/svn/tags/release-1.7.0")
+makedepends=('git')
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver/.r*/}")
+source=("${_pkgname}::git+https://github.com/kentonv/${_pkgname}.git"
+        "https://github.com/google/googletest/archive/release-${_gtest_ver}.tar.gz")
 md5sums=('SKIP'
-         'SKIP')
+         '16877098823401d1bf2ed7891d7dce36')
 
 pkgver() {
-  cd "capnproto"
-  echo r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  cd "${srcdir}/${_pkgname}/c++"
+  local ver="$(grep '^set(VERSION' CMakeLists.txt | sed -e 's/set(VERSION \([0-9]\+\.[0-9]\+.*\))/\1/')"
+  echo ${ver/-dev/}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 prepare() {
-  cd "capnproto/c++"
-  ln -s "$srcdir/gtest"
-  autoreconf -i
+  cd "${srcdir}/${_pkgname}/c++"
+  ln -sf "${srcdir}/googletest-release-${_gtest_ver}"
 }
 
 build() {
-  cd "capnproto/c++"
+  cd "${srcdir}/${_pkgname}/c++"
+  autoreconf -i
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "capnproto/c++"
+  cd "${srcdir}/${_pkgname}/c++"
   make check
 }
 
 package() {
-  cd "capnproto/c++"
+  cd "${srcdir}/${_pkgname}/c++"
   make DESTDIR="$pkgdir" install
 
   install -D -m644 "../LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"