Merge branch 'master' into feature/cleanup-gitlab

dev-vcs/gitlab-workhorse/files/fix-Makefile-0.5.4.patch

@@ -1,16 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c2c8c59..419f4d8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
--PREFIX=/usr/local
--VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
-+PREFIX=${DESTDIR}/usr
-+VERSION=0.5.4-$(shell date -u +%Y%m%d.%H%M%S)
- 
- gitlab-workhorse: $(wildcard *.go)
--	go build -ldflags "-X main.Version ${VERSION}" -o gitlab-workhorse
-+	go build -ldflags "-X main.Version=${VERSION}" -o gitlab-workhorse
- 
- install: gitlab-workhorse
- 	install gitlab-workhorse ${PREFIX}/bin/

dev-vcs/gitlab-workhorse/files/fix-Makefile-0.6.2.patch

@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index c81222f..1a90927 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++PREFIX=${DESTDIR}/usr
++VERSION=0.6.2-$(shell date -u +%Y%m%d.%H%M%S)
+ GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
+ 
+ all: gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse

dev-vcs/gitlab-workhorse/files/fix-Makefile-0.6.3.patch

@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index c81222f..1a90927 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++PREFIX=${DESTDIR}/usr
++VERSION=0.6.3-$(shell date -u +%Y%m%d.%H%M%S)
+ GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
+ 
+ all: gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse