- bump pkgver

- make runc-git only and optional dep
- use upstream containerd repo
- fix homepage url to current
- various enhancements to modernize build

2 files changed, 23 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a061037dec30..64df00a06659 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
-# Generated by mksrcinfo v8
-# Thu Feb  9 08:00:23 UTC 2017
 pkgbase = containerd-git
-	pkgdesc = A daemon to control runC, built for performance and density
-	pkgver = v0.2.3.r383.g42a17f9
+	pkgdesc = An open and reliable container runtime.
+	pkgver = v1.1.0.rc.2.r0.gf630d5f0
 	pkgrel = 1
-	url = https://containerd.tools/
+	url = https://containerd.io/
 	arch = i686
 	arch = x86_64
-	license = APACHE
+	license = Apache License 2.0
 	makedepends = go
 	makedepends = git
-	depends = glibc
-	depends = runc-git
+	makedepends = btrfs-progs
+	optdepends = runc-git
 	conflicts = containerd
 	replaces = containerd
-	source = git+https://github.com/docker/containerd.git
+	source = containerd::git+https://github.com/containerd/containerd.git
 	md5sums = SKIP
 
 pkgname = containerd-git
diff --git a/PKGBUILD b/PKGBUILD
index 4e1dc3077bae..6ebab1d5db64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
 
 pkgname=containerd-git
 _pkgname=containerd
-pkgver=v0.2.3.r383.g42a17f9
+pkgver=v1.1.0.rc.2.r0.gf630d5f0
 pkgrel=1
-pkgdesc='A daemon to control runC, built for performance and density'
-url='https://containerd.tools/'
+pkgdesc='An open and reliable container runtime.'
+url='https://containerd.io/'
 conflicts=('containerd')
-depends=('glibc' 'runc-git')
-makedepends=('go' 'git')
+optdepends=('runc-git')
+makedepends=('go' 'git' 'btrfs-progs')
 replaces=('containerd')
 arch=('i686' 'x86_64')
-source=("git+https://github.com/docker/containerd.git")
-license=("APACHE")
+source=("containerd::git+https://github.com/containerd/containerd.git")
+license=("Apache License 2.0")
 md5sums=('SKIP')
 
 pkgver() {
@@ -21,15 +21,21 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  mkdir -p "$srcdir/go/src/github.com/containerd"
+  ln -sv "$srcdir/containerd" "$srcdir/go/src/github.com/containerd/containerd"
+  export GOPATH="$srcdir/go"
+}
+
 build() {
-  pushd "$GOPATH/src/github.com/docker/containerd"
-    make setup
+  pushd "$GOPATH/src/github.com/containerd/containerd"
+    go get ./...
     make
   popd
 }
 
 package() {
-  pushd "$GOPATH/src/github.com/docker/containerd/bin"
+  pushd "$GOPATH/src/github.com/containerd/containerd/bin"
     for f in $(find . -type f -print); do
       install -Dm755 "$f" "$pkgdir/usr/bin/$f"
     done