import from community

2 files changed, 43 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8d955f263ea..029eb3b14ca4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = dep
-	pkgdesc = Go dependency tool
-	pkgver = 0.4.1
-	pkgrel = 2
-	url = https://github.com/golang/dep
+	pkgdesc = Go dependency management tool
+	pkgver = 0.5.4
+	pkgrel = 5
+	url = https://golang.github.io/dep/
 	arch = x86_64
-	arch = i686
 	license = BSD
+	checkdepends = mercurial
+	checkdepends = bzr
+	checkdepends = subversion
 	makedepends = go
-	provides = dep
-	options = !strip
-	options = !emptydirs
-	source = dep-0.4.1.tar.gz::https://github.com/golang/dep/archive/v0.4.1.tar.gz
-	sha256sums = df9b050bf4dbb2a8cf04372097a68b04a6ae1986ed7c5086914ac86d74ea9d49
+	makedepends = git
+	optdepends = git: fetch git sources
+	source = dep-0.5.4.tar.gz::https://github.com/golang/dep/archive/v0.5.4.tar.gz
+	sha256sums = 929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a
 
 pkgname = dep
 
diff --git a/PKGBUILD b/PKGBUILD
index fba7d5867434..6375dc8df63a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,43 @@
-# Maintainer: Terin Stock <terinjokes@gmail.com>
-# Contributor: Tom Tobin <archlinux@tomxtobin.com>
+# Maintainer: Morten Linderud <foxboron@archlinux.org>
 
 pkgname=dep
-pkgver=0.4.1
-pkgrel=2
-_commitHash="37d9ea0ac16f0e0a05afc3b60e1ac8c364b6c329"
-_commitDate="2018-01-25"
-pkgdesc="Go dependency tool"
-arch=('x86_64' 'i686')
-url="https://github.com/golang/dep"
+pkgver=0.5.4
+pkgrel=5
+pkgdesc="Go dependency management tool"
+arch=('x86_64')
+url='https://golang.github.io/dep/'
 license=('BSD')
-makedepends=('go')
-options=('!strip' '!emptydirs')
-provides=("dep")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/golang/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('df9b050bf4dbb2a8cf04372097a68b04a6ae1986ed7c5086914ac86d74ea9d49')
+makedepends=('go' 'git')
+optdepends=('git: fetch git sources')
+checkdepends=('mercurial' 'bzr' 'subversion')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/golang/dep/archive/v${pkgver}.tar.gz")
+sha256sums=('929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a')
 
-_importpath='github.com/golang/dep'
-_ldflags="-s -w -X main.buildDate=${_commitDate} -X main.commitHash=${_commitHash} -X main.version=v${pkgver}"
-
-prepare() {
-  if [[ ! -r ${_importpath} ]]; then
-    mkdir -p "src/$(dirname "${_importpath}")"
-    ln -sf  "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/src/${_importpath}"
-  fi
+prepare(){
+  mkdir -p src/github.com/golang
+  ln -rTsf "${pkgname}-${pkgver}" src/github.com/golang/dep
 }
 
-build() {
-  export GOPATH="$srcdir"
-  go install -ldflags="${_ldflags}" "${_importpath}/cmd/dep"
+build(){
+  export GOPATH="${srcdir}"
+  cd src/github.com/golang/dep
+  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 install ./cmd/...
 }
 
-package() {
+# check(){
+#   cd src/github.com/golang/dep
+#   mkdir -p "${srcdir}/build-cache"
+#   DEPCACHEDIR="${srcdir}/build-cache" go test ./...
+# }
+
+package(){
+  install -Dm755 bin/dep "${pkgdir}/usr/bin/dep"
+
   cd "${pkgname}-${pkgver}"
-  install -Dm755 "../bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-# vim:set ts=2 sw=2 et: