diff --git a/dev-go/go-bindata/ChangeLog b/dev-go/go-bindata/ChangeLog
new file mode 100644
index 0000000..d837a20
--- /dev/null
+++ b/dev-go/go-bindata/ChangeLog
@@ -0,0 +1,7 @@
+*go-bindata-3.0.8_alpha (24 Oct 2016)
+
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  +files/0001-github-path.patch, +go-bindata-3.0.8_alpha.ebuild, +metadata.xml:
+  dev-go/go-bindata:  added ebuild for go-bindata, which is simply copied from
+  the mrueg overlay, but references the forked go-bindata of fritteli that has a
+  tag instead of referencing an arbitrary commit hash
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
new file mode 100644
index 0000000..696940c
--- /dev/null
+++ b/dev-go/go-bindata/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-github-path.patch 876 SHA256 668024c830d2459e963f113b556ac18eb7e66ca60c1d91623f6c5ef145352743 SHA512 c25eb5393d202c3b51316b8a7ed45bb37c27612f0849914851b74085e8a123dace9c0cbb694306c2eca05b3d2435ea4ef949d29d27e1ce82a6f6a1ccd80e9965 WHIRLPOOL 541673de305cc5c3d5fbb339ba325a616427218e83ca47db2e4d3ea5a4e8b57ac37fff4bb9e87d6e91245579fd28ee0f25e372752299557f8a969731b194e507
+DIST go-bindata-3.0.8_alpha.tar.gz 17877 SHA256 59fa7f3cae0a06a140e118c899a043f15520f386f9472e800223e43a0f105a82 SHA512 d1ca839960eb3596d3003c56bf4d72ebb7a31992f6e0677448184e3c95b91bdbb7686ceea5bf132299965bf228c5b899d7ddce2ed3065909842b69282f541575 WHIRLPOOL e05734ce514a2b5a5cbeb5c3cd5952a2a1c9c6427ce2f337c2c518f624709008023475788fa1ea6fad69fe6d4909eb8652c9414f98f7a54834d494626a7aef6c
+EBUILD go-bindata-3.0.8_alpha.ebuild 691 SHA256 25cf7c7b5127aad76848c26e16c2ae00582e1dbd55e98d1fe7c13bcd20401b7d SHA512 7fdf31f451cd50378904a1655712ae01bd2a73f1424936b4c4b1f583b1d65576b55263c81eb523a0c39f9b67d3121dd377de723a36660b311184379b413e8b17 WHIRLPOOL 119fa6a1d0cee23de8c7bb2d0fb738e67d3a72518e8b18df6a93aaa813c8605229c4d6a16553449d74f9e331e20601deb856dbc716363848ca440327667f6a33
+MISC ChangeLog 384 SHA256 291af0a791a378ce112ca01f14ecc696e7f0565e0148f60a1346d895eac7a24b SHA512 1abe3ab1f226a2c03be509289d3c2f4e1d2be3334a70b85288a2f9f21f004102d0d8dc65325519ad2719b1919f1d302b2ecac44d4e256561b8b222a125ed5a05 WHIRLPOOL 39a13ef06a98a2477625a00269e5a8fb5f5749015a124eba0c388789f62eef63e66e15205e575cecf74cb63ba9407380a94fb7b1bcf82d351e9f68308e1d135e
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-go/go-bindata/files/0001-github-path.patch b/dev-go/go-bindata/files/0001-github-path.patch
new file mode 100644
index 0000000..ca39cc3
--- /dev/null
+++ b/dev-go/go-bindata/files/0001-github-path.patch
@@ -0,0 +1,26 @@
+diff --git a/src/github.com/fritteli/go-bindata/README.md b/src/github.com/fritteli/go-bindata/README.md
+index bca57f7..ea3a64f 100644
+--- a/src/github.com/fritteli/go-bindata/README.md
++++ b/src/github.com/fritteli/go-bindata/README.md
+@@ -13,7 +13,7 @@ output being generated.
+ 
+ To install the library and command line program, use the following:
+ 
+-	go get -u github.com/jteeuwen/go-bindata/...
++	go get -u github.com/fritteli/go-bindata/...
+ 
+ 
+ ### Usage
+diff --git a/src/github.com/fritteli/go-bindata/go-bindata/main.go b/src/github.com/fritteli/go-bindata/go-bindata/main.go
+index 503a059..5513c99 100644
+--- a/src/github.com/fritteli/go-bindata/go-bindata/main.go
++++ b/src/github.com/fritteli/go-bindata/go-bindata/main.go
+@@ -12,7 +12,7 @@ import (
+ 	"regexp"
+ 	"strings"
+ 
+-	"github.com/jteeuwen/go-bindata"
++	"github.com/fritteli/go-bindata"
+ )
+ 
+ func main() {
diff --git a/dev-go/go-bindata/go-bindata-3.0.8_alpha.ebuild b/dev-go/go-bindata/go-bindata-3.0.8_alpha.ebuild
new file mode 100644
index 0000000..66de97f
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.0.8_alpha.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils golang-build golang-vcs-snapshot
+
+MY_PV="v${PV/_/-}"
+
+EGO_PN="github.com/fritteli/${PN}/..."
+EGIT_COMMIT="a0ff2567cfb70903282db057e799fd826784d41d"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/fritteli/${PN}"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-github-path.patch"
+	eapply_user
+}
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/dev-go/go-bindata/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-go/gox/ChangeLog b/dev-go/gox/ChangeLog
new file mode 100644
index 0000000..7f38890
--- /dev/null
+++ b/dev-go/gox/ChangeLog
@@ -0,0 +1,5 @@
+*gox-0.3.1_alpha (24 Oct 2016)
+
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  +files/0001-github-path.patch, +gox-0.3.1_alpha.ebuild, +metadata.xml:
+  dev-go/gox:  added tagged version of gox
diff --git a/dev-go/gox/Manifest b/dev-go/gox/Manifest
new file mode 100644
index 0000000..8cee3c2
--- /dev/null
+++ b/dev-go/gox/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-github-path.patch 2669 SHA256 4564c5fd1f811c29c9ac54b839cd79abfcc4004ac929d4c954d1415e81f523b8 SHA512 4173bd176f37b5c34580a43378105667c11eb011884ac8acd77355532cb65a7932c6541cc61fe14f8b65126204ab03840023c2553b509b2b739b396574654970 WHIRLPOOL 9afcd6366c277d3073d6c0289d7659eb3a21463c05e0c722f516a3ee4b16250a2283562fbcfb9c5a082436febf3b524d1f21599c2008f4e3b1fe2666c833ba64
+DIST gox-0.3.1_alpha.tar.gz 15776 SHA256 e3088772684ec31b86a3cac8d5c08e0172f702dbae2233552e690128c3434990 SHA512 865921406c7f4d5724697dd9c6a64caeb48e09b274c3fedc43a3644311c8c40d602364b2097016d8334265eed064246e634943702a74dd8d223fe59c156b1ddd WHIRLPOOL 4690a13b6bd45b010cf02b5cddb03107514ba32e56955d14c4ebda882f5755927983cdc7eeb94da2ff0710c67f76cd9eeb97cbe132a3153da4ff8760eb9341f7
+EBUILD gox-0.3.1_alpha.ebuild 669 SHA256 678bd117f74e0c3e12b56ab974175cf8ae78c68ee23664e37abb885ebafd1f6e SHA512 b41a4aca9fae249e26dced4e17cd0b043e6a7582b7dfd4f94f291484fe131fe5b9dd10a54b81d1b365e7cbdb94bd16b729c4d88042889d58d4ef99a239624289 WHIRLPOOL 413d56d6e30513b14bb60d584731101b5d7f05a7a070fe4527f668dac57e6baa5b6eced0d4642f08bf1e4d42b90e5c85507a3bc930eba5e841d1e43ea40f029f
+MISC ChangeLog 199 SHA256 10972e08f881aa004ed3de3bbe91f20e8f6bfdec53a927e320ff762c80d5f729 SHA512 d0dd4510edcc809ce9f80afc8c64e7ffd5f3f4d48dc7b2172ad263f65478a351e53d78db476eda74023dd2cdeb8d89e47fb390b10bec393be576aa3e13246d44 WHIRLPOOL ba94db2c7c997ad4f996475683b76fd7d33dd1720cc2f0f629ea5d421455023f8a245b1a941f5ffffe2024f3d096aa835aae90f5f42c5b5fc9757c5d2dcde47e
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-go/gox/files/0001-github-path.patch b/dev-go/gox/files/0001-github-path.patch
new file mode 100644
index 0000000..52656a3
--- /dev/null
+++ b/dev-go/gox/files/0001-github-path.patch
@@ -0,0 +1,74 @@
+diff --git a/src/github.com/fritteli/gox/README.md b/src/github.com/fritteli/gox/README.md
+index cb3f27d..8eb664b 100644
+--- a/src/github.com/fritteli/gox/README.md
++++ b/src/github.com/fritteli/gox/README.md
+@@ -10,7 +10,7 @@ To install Gox, please use `go get`. We tag versions so feel free to
+ checkout that tag and compile.
+ 
+ ```
+-$ go get github.com/mitchellh/gox
++$ go get github.com/fritteli/gox
+ ...
+ $ gox -h
+ ...
+@@ -27,22 +27,22 @@ by default and build for every platform by default:
+ $ gox
+ Number of parallel builds: 4
+ 
+--->      darwin/386: github.com/mitchellh/gox
+--->    darwin/amd64: github.com/mitchellh/gox
+--->       linux/386: github.com/mitchellh/gox
+--->     linux/amd64: github.com/mitchellh/gox
+--->       linux/arm: github.com/mitchellh/gox
+--->     freebsd/386: github.com/mitchellh/gox
+--->   freebsd/amd64: github.com/mitchellh/gox
+--->     openbsd/386: github.com/mitchellh/gox
+--->   openbsd/amd64: github.com/mitchellh/gox
+--->     windows/386: github.com/mitchellh/gox
+--->   windows/amd64: github.com/mitchellh/gox
+--->     freebsd/arm: github.com/mitchellh/gox
+--->      netbsd/386: github.com/mitchellh/gox
+--->    netbsd/amd64: github.com/mitchellh/gox
+--->      netbsd/arm: github.com/mitchellh/gox
+--->       plan9/386: github.com/mitchellh/gox
++-->      darwin/386: github.com/fritteli/gox
++-->    darwin/amd64: github.com/fritteli/gox
++-->       linux/386: github.com/fritteli/gox
++-->     linux/amd64: github.com/fritteli/gox
++-->       linux/arm: github.com/fritteli/gox
++-->     freebsd/386: github.com/fritteli/gox
++-->   freebsd/amd64: github.com/fritteli/gox
++-->     openbsd/386: github.com/fritteli/gox
++-->   openbsd/amd64: github.com/fritteli/gox
++-->     windows/386: github.com/fritteli/gox
++-->   windows/amd64: github.com/fritteli/gox
++-->     freebsd/arm: github.com/fritteli/gox
++-->      netbsd/386: github.com/fritteli/gox
++-->    netbsd/amd64: github.com/fritteli/gox
++-->      netbsd/arm: github.com/fritteli/gox
++-->       plan9/386: github.com/fritteli/gox
+ ```
+ 
+ Or, if you want to build a package and sub-packages:
+@@ -55,7 +55,7 @@ $ gox ./...
+ Or, if you want to build multiple distinct packages:
+ 
+ ```
+-$ gox github.com/mitchellh/gox github.com/hashicorp/serf
++$ gox github.com/fritteli/gox github.com/hashicorp/serf
+ ...
+ ```
+ 
+diff --git a/src/github.com/fritteli/gox/toolchain.go b/src/github.com/fritteli/gox/toolchain.go
+index b6926ab..e24d448 100644
+--- a/src/github.com/fritteli/gox/toolchain.go
++++ b/src/github.com/fritteli/gox/toolchain.go
+@@ -3,7 +3,7 @@ package main
+ import (
+ 	"bytes"
+ 	"fmt"
+-	"github.com/mitchellh/iochan"
++	"github.com/fritteli/iochan"
+ 	"io"
+ 	"os"
+ 	"os/exec"
diff --git a/dev-go/gox/gox-0.3.1_alpha.ebuild b/dev-go/gox/gox-0.3.1_alpha.ebuild
new file mode 100644
index 0000000..f6be074
--- /dev/null
+++ b/dev-go/gox/gox-0.3.1_alpha.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot eutils
+
+EGO_PN="github.com/fritteli/gox/..."
+MY_PV="v${PV/_/-}"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A dead simple, no frills Go cross compile tool"
+HOMEPAGE="https://github.com/fritteli/gox"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MPL-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+DEPEND="dev-go/iochan"
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-github-path.patch"
+
+	eapply_user
+}
+
+src_install() {
+	mkdir pkg || die
+	golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/gox/metadata.xml b/dev-go/gox/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/dev-go/gox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-go/iochan/ChangeLog b/dev-go/iochan/ChangeLog
new file mode 100644
index 0000000..cc8b020
--- /dev/null
+++ b/dev-go/iochan/ChangeLog
@@ -0,0 +1,5 @@
+*iochan-0.0.1_alpha (24 Oct 2016)
+
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch> +iochan-0.0.1_alpha.ebuild,
+  +metadata.xml:
+  dev-go/iochan:  added tagged version (0.0.1-alpha)
diff --git a/dev-go/iochan/Manifest b/dev-go/iochan/Manifest
new file mode 100644
index 0000000..162e0c6
--- /dev/null
+++ b/dev-go/iochan/Manifest
@@ -0,0 +1,4 @@
+DIST iochan-0.0.1_alpha.tar.gz 1788 SHA256 6b86d3bd86f0b9a7e50ead590c7e400c969a3c77e5e57175919826ba21b705a0 SHA512 d35e1dfb2595da6d4376cb97f330a6b50e6187151d324b7d92256c409294cd6623589ac05f446b8fbc333802616aec3b1f0c267bf24852eef859cb144509c3c9 WHIRLPOOL b60409835b45c2ceb81efb8fb2a2665e588cc7c121cd6ac1fe96655f02bd62940d2eb5d06b202ea5223030df61fa159d197ad06d97480da7e328055ddd726585
+EBUILD iochan-0.0.1_alpha.ebuild 488 SHA256 c15326f3e81a338596a65710f4b063f9b9ca4c1d7429b4384a0ceae9aede6534 SHA512 dcb8f15d08baa777a314df39a3f2ee45dc724713ef1cee6e4413e42a4afe5a4fa3bea84efce18e8073dbd95fa5b74884da1c9e2c5bdd0ecf95ed155a544e907d WHIRLPOOL 61072702066d569074a2ec48ca06a3f3db36190bd5d3f6244c742c47e11c58a002f019ce95699ffc6fdcd1cfdee7383dddf1659bd76975195f87706e54a4b2ca
+MISC ChangeLog 184 SHA256 4e2609ea049116d3b555188f1fb7744348c26d684ef86a9104cfab8423d5695e SHA512 9ddd00a0b0b1394c62f1d132581ceff457c2f62c94af69fa71936cfc89a895eb04cf0272d318fb166f4fc8c077cda7914a29a838d8183eda91c058174ff73ee1 WHIRLPOOL 2c1197d58e38b4c93c23dd88b7b60e50f274b1367596819d0713e51683ebb5cdd76633ebbb48f60719c54f2b06df7cfbed4ebdb49662a318df4daa694bc9bb74
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-go/iochan/iochan-0.0.1_alpha.ebuild b/dev-go/iochan/iochan-0.0.1_alpha.ebuild
new file mode 100644
index 0000000..4a6bef4
--- /dev/null
+++ b/dev-go/iochan/iochan-0.0.1_alpha.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/fritteli/iochan/..."
+MY_PV="v${PV/_/-}"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Go library for turning io.Reader into channels"
+HOMEPAGE="https://github.com/fritteli/iochan"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
diff --git a/dev-go/iochan/metadata.xml b/dev-go/iochan/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/dev-go/iochan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog b/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog
new file mode 100644
index 0000000..dc00eab
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog
@@ -0,0 +1,69 @@
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  gitlab-ci-multi-runner-bin-1.4.1.ebuild,
+  gitlab-ci-multi-runner-bin-1.5.0.ebuild,
+  gitlab-ci-multi-runner-bin-1.6.0.ebuild,
+  gitlab-ci-multi-runner-bin-1.7.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner-bin:  prevent the simultaneous installation of
+  gitlab-ci-multi-runner and gitlab-ci-multi-runner-bin
+
+*gitlab-ci-multi-runner-1.7.0 (23 Oct 2016)
+
+  23 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.7.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  added ebuild for version 1.7.0
+
+  23 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  gitlab-ci-multi-runner-1.6.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  corrected description
+
+*gitlab-ci-multi-runner-1.6.0 (23 Sep 2016)
+
+  23 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.6.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  added ebuild for gitlab-ci-multi-runner-1.6.0
+
+  05 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  fixed gitlab-ci-multi-runner ebuilds for
+  EAPI="6"
+
+  01 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  updated to EAPI="6"
+
+  22 Aug 2016; Manuel Friedli <manuel@fritteli.ch>
+  -gitlab-ci-multi-runner-1.3.2.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  purged all ebuild versions <gitlab-ci-multi-
+  runner-1.4.1
+
+*gitlab-ci-multi-runner-1.5.0 (22 Aug 2016)
+
+  22 Aug 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.5.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  added gitlab-ci-multi-runner-1.5.0. to be
+  used along with gitlab-ce-8.11.0
+
+*gitlab-ci-multi-runner-1.4.1 (26 Jul 2016)
+
+  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.1.4.ebuild,
+  -gitlab-ci-multi-runner-1.3.1.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  - added ebuild for version 1.4.1 - deleted
+  ebuilds for versions <1.3.2
+
+*gitlab-ci-multi-runner-1.3.2 (09 Jul 2016)
+
+  09 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.3.2.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  added ebuild for version 1.3.2 which contains
+  a bugfix for ARM
+
+*gitlab-ci-multi-runner-1.3.1 (26 Jun 2016)
+
+  26 Jun 2016; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-1.3.1.ebuild, -gitlab-ci-multi-runner-1.1.3.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:
+  Added version 1.3.1 and purged old one
+
+  07 Jun 2016; Manuel Friedli <manuel@fritteli.ch> +ChangeLog:
+  Added ChangeLog
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/Manifest b/dev-vcs/gitlab-ci-multi-runner-bin/Manifest
new file mode 100644
index 0000000..74aee89
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/Manifest
@@ -0,0 +1,20 @@
+AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a
+AUX gitlab-ci-multi-runner.init 702 SHA256 7a19a20f0b3138a86d805872706ebc2918b01663cfdb351aa2d2cb89707602e9 SHA512 005e10a1c2974209f74efb5899d8f7627284947b716049a5211a2c5767a43b7a629061d96a6f445646f88cdb4afb9918fc2d154d68fabd4fe8ec4e0b9fd0125f WHIRLPOOL 85100f9a311ce1a39adddc10dee5af7862dceff5ae24e30c2830b74cdf78d74357fc0f0b43010a79909caf31e33439f0facc5dbd8e87b6452180093d1058eb3d
+DIST gitlab-ci-multi-runner-bin-1.4.1-amd64 59770288 SHA256 b6c732e737fab160199cc91ba443c496720b3274e48600adf2a8f3814af9d8ac SHA512 0533bd8382d31d048cee4c37bff1277f30641be021f9c8a0d2d7c40a53839ee08589b77cb40d21a26facd016dbd1816b8a8ff1524f196bebff7851c378384615 WHIRLPOOL 32dae2b897c8656151c82d37141be5cca2f6080ae0de21a10914652d9919900b4fad274d3cdb1c0b075f3634cc24aa51b466420a497c5405c978fa4062c8f0e8
+DIST gitlab-ci-multi-runner-bin-1.4.1-arm 56437360 SHA256 301f4a166b76b44361e566c7806c1b9cf63e4e62e3b621e5c31b0bcc707f674a SHA512 efc062285f862e8b1c4a39454f9f15ca722ed58d82aabbc5f72d8d8c5328adef8eddc98ff8cb2dbb616561b825b619dfc52cc69dfc358fbc6d2f4934f9c9fcfe WHIRLPOOL 682fad03439d1a6570b0bccf694adc577a653917ba0fa0315fbb717d27127995bbb2950eace663cd96ca64234c5ac51ec652f59ebe657ad0183d7b4a74c30f85
+DIST gitlab-ci-multi-runner-bin-1.4.1-x86 56606472 SHA256 6606bf3177a2355916833bd2656fc9d0e46dd0e5b7b149105bd283e2a4a67baf SHA512 8266b110088c2559632ab6f26cf54e19a0458de1f858fe3e986bc9c78fbe592fb1492aa4d5187c934a8b2c1bcac15cf10cd7de1207c76a8d6a5302cb4e2cda92 WHIRLPOOL 1c1dd94a8b2efbf39284a51bc60efc1eb58a17bdc927658153ee505cfb6a9ed0dc2160791cacc72e10beb2155b813e71ebbb82abe54c1dd5566200ef02082e2f
+DIST gitlab-ci-multi-runner-bin-1.5.0-amd64 40162568 SHA256 8068a7c0a149cda3782ea58b29ac1f1dfb7018d2021359b2be6094493a86fbf0 SHA512 e06c2aa44d7c369bfa6315221bac19670c97268f64660a320fa9872f86991c1f3c3ef25a9cd233b5769bbf30e1a4958d347f7bbb991dbf10696666332d763314 WHIRLPOOL 4b9e5e06671955245116693d73e5158c0e6a9455127cf6703222a353467c3c57128df0ad682dc47db37b20f98e2a870b5e32344c69c64f301a4611c451305569
+DIST gitlab-ci-multi-runner-bin-1.5.0-arm 36718736 SHA256 38849b5948d892b505f2d8b01b777ed4b22eea2a6ce91aeaf276c3ad6fcb56cd SHA512 14439be83d1f5cb3a2e2b67421138ef4b6ea2ed6636214f082f4db32786a6707c4299c23410ba6c54e06079358acdf84e3a0ee9c5280c17f06576463607187c4 WHIRLPOOL ca677e0d62323021ec477fa031cc1a8cab76757101abe7033c0c1da632f99d225c622792d07df93b935467a7ed987e2cbe6c4dd00e16f06ad3988d4bd21623d2
+DIST gitlab-ci-multi-runner-bin-1.5.0-x86 36892864 SHA256 029e1a570ff5f5f570d107cb451b2a759829ba64fde6965a1d4abc6135ef63be SHA512 06d55f40e3d43ef3524266fec1c009372bb18850394ec5688979fe6bf33e3bf864aa0582ff0de5eb1e088ce2a24b09bdb6a2772643a15f4d8e994c7f194197a9 WHIRLPOOL 8ede1609492f33599078129a44c28eb58f850da715d091b847a753589a68cfac9f206f9c5e7b78eddad67a834279fbd4cd72a7fb5ea09075aa16729f70edeff2
+DIST gitlab-ci-multi-runner-bin-1.6.0-amd64 81450584 SHA256 09dbfd1770253e4216de45e3de359707b9e48d1cd406fe7a7108f0d46880f9c8 SHA512 03c0f1a364509fceaea7c3250885f1d65349cc7b3b9febcb2b67f300b371fcf307f2e44f8c7da57776c05c57c350685459b0167f9dfe1d239d3c472d674dc35e WHIRLPOOL 80dd59f5343efd4a3f0278e66bb1ec7f9b64ed6c16580a9ea9c0554469bf668a7a1553c70e79ffe25e18fe6bea61d219112509ef30c38dc8cb56c4fccc4e37a4
+DIST gitlab-ci-multi-runner-bin-1.6.0-arm 71394024 SHA256 ce42d293752d2781f1d657da6489ebf6f8df610df72742f144004fd12bf88cac SHA512 d23a95d367a9b68fc456fe67a7f243a824f0d1ddb5015740ede83297d328d31e34203ba4d49bac87a81bdefde1ae9aca401016777aaae33c9a4965441ae05381 WHIRLPOOL 8c0a70aab601d785400d1f0993581f41243ac4c01618cd8ff5dc60229cf2184a76adf7e9a1cc1b6ed99392a1aeb17177909dc78d877f71a4126a0990e57b6b8f
+DIST gitlab-ci-multi-runner-bin-1.6.0-x86 72066176 SHA256 ab59163f79e327a1bf6a6d1469762d1f113484b561c6c4dcc07fda127068d9f4 SHA512 ce9eb72e86bd9a2ccd40be585b8f4645d7eb471a4b35a79b4c91dedb95611162c60f2a5e098774ac0879d1dd97f98431372e47e9c5152971d11591a502b0e96f WHIRLPOOL b05f559e04756f2f7cd05a833dbdabf008a98cf1314a81021c76d1c9c2afd4df7d1d5f4c2a585ef97f72dfeef84f2c01e8a6cabba8b018e1ab99ae7ff106b3f4
+DIST gitlab-ci-multi-runner-bin-1.7.0-amd64 68204551 SHA256 367ed93a9b37026bf1679d43e1d150c7edda151e5c5807e43a0b85706a368de6 SHA512 f516046b29b16ba51e9124aa6e2d97bf549628567cafe3e72c49160945f39ac954a31e7460460b06119b8baa59e3724c515aa6635f8cc7e845cfc4e647ca66bf WHIRLPOOL 25f41cbeff6d441bfd11d6cc2b335d594f67c2f995268fd2a65f2da021792abcb9877adcf8f27d33194ad8dcbcc26d96b3b86d193e448143d717ac6b9dd973c6
+DIST gitlab-ci-multi-runner-bin-1.7.0-arm 64871891 SHA256 b30873ec3fbc1510fdd92e64afb1cd5bc11db295eb5da7d4d4931211a40d4d8d SHA512 0988ef4bbae45e114eed98a6bc47284df26b4d283aeda5ae6be17a79d7bc416e060234e30592c8d44804ee56cbdd45be33777edd4cde4f8a4cc101516aff613c WHIRLPOOL 77fd1538e7e7a1513e2b31ccc9998fb5aea95c974808ca4f56a3e60bcb37f216a37b1ca0ead5d826ccb8712a0554baee300d5fe845bf9fcdd6094be6a0e177ee
+DIST gitlab-ci-multi-runner-bin-1.7.0-x86 64635954 SHA256 4028364f26e9169f04e37beb404aebfaa5f0ad2560e6dccda302f9acd73e47a5 SHA512 56fea1b4b5de617b998c998edeb914eb0500de597fead2c37bd81526b48822c84a49c8263567c2f3ece3d2bab50287162b66fbeec5c0f9e1e2159c115a6c14ed WHIRLPOOL 3238e95cbd742b7057c224fb8d0a7511f7dcb0d1c0b07e446d2f0a4f6c7f4e6646e9b1c54cb14cd29c479efbaf113e5e501da54538983307ab8c3f350a36dac3
+EBUILD gitlab-ci-multi-runner-bin-1.4.1.ebuild 2411 SHA256 03e319b28ffb6553cc5aa4ad867197741426f84912453675adecd8a008969f8c SHA512 f3ba80bea5be8de83cde8ad4d892162f55b20f8e7ab28148b0e6c6fd20d7054e06b256196e52d409cf749fd65b1beaf1f56c1dba541ba5b63b7198bad5ee24d2 WHIRLPOOL 02273bd4cbf5a5f15ede2968390f621752940f0af3d398f39bfd20fa3d004fc3c770a12a841440ee3cd70254c510fd7f17e57171b05913555f79a8a7776dc158
+EBUILD gitlab-ci-multi-runner-bin-1.5.0.ebuild 2411 SHA256 fed2bdcf3a3e22c251e209fe70db415d863b19503a9aae1d83140cee1c7430f6 SHA512 9885ceb82acbf2c3354d42251f83555bee0278b698e064096d462ff8fc469b2afe675c6b1a59b9c3a0d724e087f5c071f466bafb40437ea8783a239b68b5d624 WHIRLPOOL dd31877c8e4e0e5bcb94d1b41d1342f531aad8e2f2fa3fbb25139d5e1f4a406bd212da97d30e8c90645d46a3ddecb07446c527b4ce4e46f1e670f13107fb1640
+EBUILD gitlab-ci-multi-runner-bin-1.6.0.ebuild 2411 SHA256 df591d547119124d7dbb65f02677f2adce9c00f16dcb68c30fbc1c11aadfd82a SHA512 2d48cf26aa255af15c75e055349f38a96de061e4f3e5185e614f1479b4964938e1b9ee491037e1d5f33e2ce900fc9967cc2ce76ec9dd3f0b89b8eb3ee1c012c2 WHIRLPOOL a0e1505951280c1238ff6649bbfb7ebe2e14930057180fe9387354017c44e16b47eb83cb5173a80d13619cf981a5da3c263d9008b9444ba04cd691e5f2ca99d9
+EBUILD gitlab-ci-multi-runner-bin-1.7.0.ebuild 2411 SHA256 cc4d039a20156f466d2b5e8fa332dc623bd948c86601ece073c3700ed12fa6a2 SHA512 4e5740ce6512894a36187f4dc76833daeec18288ad079b5bf434a2bef65ad806e8cb21a00a09d9f7714eb029f726036105c0d12b77ddc8a7f7833c6fc7d1aa40 WHIRLPOOL 855db2c82a377297c81beb10bc4a3c0196cd0ee0ba8cc89d0a9aca9785109af0864afeb18aa5a9ce71e34093235015b7a45d9eaf8f95a21de71a6bade9955ec8
+MISC ChangeLog 2654 SHA256 2131478526b2405d90dce83b6cd5d58f99443e428fb3e648de5284f08df8afd3 SHA512 00025f63e1b7b95249044c6efdc7653fc7b7e45b68da91dcf8a19a8de3d04a3d9672a3afe51fa29e618914765f18cb011964652b8815a968e92a791d3d602265 WHIRLPOOL 0f27eeacce4d0d3637a18fa07dd1958ce0a76a4a4a848f324373fc90e56f13824e8afe0ba5e59aa91e5bdba334af469a13f9b5247fcafbc8db301bfa26a29ffe
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.conf b/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.conf
new file mode 100644
index 0000000..ec740ee
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.conf
@@ -0,0 +1 @@
+LOGFILE=/var/log/gitlab-ci-multi-runner.log
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.init b/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.init
new file mode 100644
index 0000000..b861f14
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/files/gitlab-ci-multi-runner.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 2015-2016 Nicolas Heine
+
+depend() {
+        after sshd
+        need net
+        need localmount
+}
+
+start() {
+        ebegin "Starting gitlab-ci-multi-runner"
+        checkpath -d /var/run
+        checkpath -f -o @USER@ -m640 "${LOGFILE}"
+        start-stop-daemon --start -b -u @USER@ --chdir /opt/gitlab-ci-multi-runner --pidfile /var/run/gitlab-ci-multi-runner.pid -1 "${LOGFILE}" -2 "${LOGFILE}" --make-pidfile \
+                --exec /opt/gitlab-ci-multi-runner/gitlab-ci-multi-runner -- run
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping gitlab-ci-multi-runner"
+        start-stop-daemon --stop --pidfile /var/run/gitlab-ci-multi-runner.pid
+        eend $?
+}
diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild
similarity index 63%
rename from dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild
rename to dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild
index 449c6b0..1016035 100644
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.4.1.ebuild
@@ -6,11 +6,13 @@ EAPI="6"
 
 inherit eutils user
 
-DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.10"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
-SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
-	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
-	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
+MY_PN="gitlab-ci-multi-runner"
+
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.10"
+HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}"
+SRC_URI="x86?     ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 )
+	amd64?    ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 )
+	arm?      ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-arm -> ${P}-arm )"
 
 RESTRICT="mirror"
 
@@ -18,18 +20,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 
-DEPEND="dev-vcs/git"
+DEPEND="dev-vcs/git
+	!dev-vcs/gitlab-ci-multi-runner"
 RDEPEND="${DEPEND}
 	net-libs/nodejs
 	virtual/mta"
 
-MY_NAME="${PN}"
 MY_USER="gitlab_ci_multi_runner"
 
-DEST_DIR="/opt/${MY_NAME}"
-LOGS_DIR="/var/log/${MY_NAME}"
-TEMP_DIR="/var/tmp/${MY_NAME}"
-RUN_DIR="/run/${MY_NAME}"
+DEST_DIR="/opt/${MY_PN}"
+LOGS_DIR="/var/log/${MY_PN}"
+TEMP_DIR="/var/tmp/${MY_PN}"
+RUN_DIR="/run/${MY_PN}"
 
 pkg_setup() {
 	enewgroup ${MY_USER}
@@ -39,11 +41,11 @@ pkg_setup() {
 src_unpack() {
 	local a="$(usev amd64)$(usev arm)$(usev x86)"
 	mkdir -p "${S}"
-	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${MY_PN}"
 }
 
 src_prepare() {
-	chmod +x "${S}/${PN}"
+	chmod +x "${S}/${MY_PN}"
 	eapply_user
 }
 
@@ -60,7 +62,7 @@ src_install() {
 	dodir ${dest}
 
 	exeinto ${dest}
-	doexe "${S}/${PN}"
+	doexe "${S}/${MY_PN}"
 
 	diropts -m750
 	dodir ${conf}
@@ -72,7 +74,7 @@ src_install() {
 
 	## RC script ##
 
-	local rcscript="${MY_NAME}.init"
+	local rcscript="${MY_PN}.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
@@ -80,8 +82,8 @@ src_install() {
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 
-	newinitd "${T}/${rcscript}" "${MY_NAME}"
-	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
+	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.5.0.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild
similarity index 63%
rename from dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.5.0.ebuild
rename to dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild
index 480c4c1..8b94bfd 100644
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.5.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.5.0.ebuild
@@ -6,11 +6,13 @@ EAPI="6"
 
 inherit eutils user
 
-DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.11"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
-SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
-	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
-	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
+MY_PN="gitlab-ci-multi-runner"
+
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.11"
+HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}"
+SRC_URI="x86?     ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 )
+	amd64?    ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 )
+	arm?      ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-arm -> ${P}-arm )"
 
 RESTRICT="mirror"
 
@@ -18,18 +20,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 
-DEPEND="dev-vcs/git"
+DEPEND="dev-vcs/git
+	!dev-vcs/gitlab-ci-multi-runner"
 RDEPEND="${DEPEND}
 	net-libs/nodejs
 	virtual/mta"
 
-MY_NAME="${PN}"
 MY_USER="gitlab_ci_multi_runner"
 
-DEST_DIR="/opt/${MY_NAME}"
-LOGS_DIR="/var/log/${MY_NAME}"
-TEMP_DIR="/var/tmp/${MY_NAME}"
-RUN_DIR="/run/${MY_NAME}"
+DEST_DIR="/opt/${MY_PN}"
+LOGS_DIR="/var/log/${MY_PN}"
+TEMP_DIR="/var/tmp/${MY_PN}"
+RUN_DIR="/run/${MY_PN}"
 
 pkg_setup() {
 	enewgroup ${MY_USER}
@@ -39,11 +41,11 @@ pkg_setup() {
 src_unpack() {
 	local a="$(usev amd64)$(usev arm)$(usev x86)"
 	mkdir -p "${S}"
-	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${MY_PN}"
 }
 
 src_prepare() {
-	chmod +x "${S}/${PN}"
+	chmod +x "${S}/${MY_PN}"
 	eapply_user
 }
 
@@ -60,7 +62,7 @@ src_install() {
 	dodir ${dest}
 
 	exeinto ${dest}
-	doexe "${S}/${PN}"
+	doexe "${S}/${MY_PN}"
 
 	diropts -m750
 	dodir ${conf}
@@ -72,7 +74,7 @@ src_install() {
 
 	## RC script ##
 
-	local rcscript="${MY_NAME}.init"
+	local rcscript="${MY_PN}.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
@@ -80,8 +82,8 @@ src_install() {
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 
-	newinitd "${T}/${rcscript}" "${MY_NAME}"
-	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
+	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.6.0.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.6.0.ebuild
similarity index 63%
rename from dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.6.0.ebuild
rename to dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.6.0.ebuild
index e1d4ee9..91d6152 100644
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.6.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.6.0.ebuild
@@ -6,11 +6,13 @@ EAPI="6"
 
 inherit eutils user
 
-DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.12"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
-SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
-	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
-	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
+MY_PN="gitlab-ci-multi-runner"
+
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.12"
+HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}"
+SRC_URI="x86?     ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 )
+	amd64?    ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 )
+	arm?      ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-arm -> ${P}-arm )"
 
 RESTRICT="mirror"
 
@@ -18,18 +20,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 
-DEPEND="dev-vcs/git"
+DEPEND="dev-vcs/git
+	!dev-vcs/gitlab-ci-multi-runner"
 RDEPEND="${DEPEND}
 	net-libs/nodejs
 	virtual/mta"
 
-MY_NAME="${PN}"
 MY_USER="gitlab_ci_multi_runner"
 
-DEST_DIR="/opt/${MY_NAME}"
-LOGS_DIR="/var/log/${MY_NAME}"
-TEMP_DIR="/var/tmp/${MY_NAME}"
-RUN_DIR="/run/${MY_NAME}"
+DEST_DIR="/opt/${MY_PN}"
+LOGS_DIR="/var/log/${MY_PN}"
+TEMP_DIR="/var/tmp/${MY_PN}"
+RUN_DIR="/run/${MY_PN}"
 
 pkg_setup() {
 	enewgroup ${MY_USER}
@@ -39,11 +41,11 @@ pkg_setup() {
 src_unpack() {
 	local a="$(usev amd64)$(usev arm)$(usev x86)"
 	mkdir -p "${S}"
-	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${MY_PN}"
 }
 
 src_prepare() {
-	chmod +x "${S}/${PN}"
+	chmod +x "${S}/${MY_PN}"
 	eapply_user
 }
 
@@ -60,7 +62,7 @@ src_install() {
 	dodir ${dest}
 
 	exeinto ${dest}
-	doexe "${S}/${PN}"
+	doexe "${S}/${MY_PN}"
 
 	diropts -m750
 	dodir ${conf}
@@ -72,7 +74,7 @@ src_install() {
 
 	## RC script ##
 
-	local rcscript="${MY_NAME}.init"
+	local rcscript="${MY_PN}.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
@@ -80,8 +82,8 @@ src_install() {
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 
-	newinitd "${T}/${rcscript}" "${MY_NAME}"
-	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
+	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.7.0.ebuild b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.7.0.ebuild
new file mode 100644
index 0000000..cfbb3ff
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.7.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils user
+
+MY_PN="gitlab-ci-multi-runner"
+
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.13"
+HOMEPAGE="https://gitlab.com/gitlab-org/${MY_PN}"
+SRC_URI="x86?     ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-386 -> ${P}-x86 )
+	amd64?    ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-amd64 -> ${P}-amd64 )
+	arm?      ( https://${MY_PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${MY_PN}-linux-arm -> ${P}-arm )"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+
+DEPEND="dev-vcs/git
+	!dev-vcs/gitlab-ci-multi-runner"
+RDEPEND="${DEPEND}
+	net-libs/nodejs
+	virtual/mta"
+
+MY_USER="gitlab_ci_multi_runner"
+
+DEST_DIR="/opt/${MY_PN}"
+LOGS_DIR="/var/log/${MY_PN}"
+TEMP_DIR="/var/tmp/${MY_PN}"
+RUN_DIR="/run/${MY_PN}"
+
+pkg_setup() {
+	enewgroup ${MY_USER}
+	enewuser ${MY_USER} -1 /bin/bash ${DEST_DIR} ${MY_USER}
+}
+
+src_unpack() {
+	local a="$(usev amd64)$(usev arm)$(usev x86)"
+	mkdir -p "${S}"
+	cp "${DISTDIR}/${P}-${a}" "${S}/${MY_PN}"
+}
+
+src_prepare() {
+	chmod +x "${S}/${MY_PN}"
+	eapply_user
+}
+
+src_compile() {
+	# nothing to compile, binary all-in-one goodness! (?)
+	:
+}
+
+src_install() {
+	local dest=${DEST_DIR}
+	local conf="/etc/gitlab-runner"
+
+	diropts -m755
+	dodir ${dest}
+
+	exeinto ${dest}
+	doexe "${S}/${MY_PN}"
+
+	diropts -m750
+	dodir ${conf}
+
+	dosym ${conf} ${dest}/.gitlab-runner
+
+	# fix permissions
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${conf}
+
+	## RC script ##
+
+	local rcscript="${MY_PN}.init"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
+}
+
+pkg_postinst() {
+	elog
+	elog "If this is a fresh install of GitLab CI Multi Runner, please configure it"
+	elog "with the following command:"
+	elog "        emerge --config \"=${CATEGORY}/${PF}\""
+}
+
+pkg_config() {
+	einfo "You need to register the runner with your GitLab CI instance. Please"
+	einfo "Follow the instructions at"
+	einfo
+	einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md"
+	einfo
+	einfo "Perhaps I'll improve the ebuild later ... kthxbye."
+}
diff --git a/dev-vcs/gitlab-ci-multi-runner-bin/metadata.xml b/dev-vcs/gitlab-ci-multi-runner-bin/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
index 962c3d9..7ba8ed6 100644
--- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog
+++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
@@ -1,61 +1,12 @@
-*gitlab-ci-multi-runner-1.7.0 (23 Oct 2016)
+  25 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  files/gitlab-ci-multi-runner.init, gitlab-ci-multi-runner-1.7.0.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  install init script, set up required
+  directories ... taken from gitlab-ci-multi-runner-bin
 
-  23 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.7.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  added ebuild for version 1.7.0
-
-  23 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
-  gitlab-ci-multi-runner-1.6.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  corrected description
-
-*gitlab-ci-multi-runner-1.6.0 (23 Sep 2016)
-
-  23 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.6.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  added ebuild for gitlab-ci-multi-runner-1.6.0
-
-  05 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
-  gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  fixed gitlab-ci-multi-runner ebuilds for
-  EAPI="6"
-
-  01 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
-  gitlab-ci-multi-runner-1.4.1.ebuild, gitlab-ci-multi-runner-1.5.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  updated to EAPI="6"
-
-  22 Aug 2016; Manuel Friedli <manuel@fritteli.ch>
-  -gitlab-ci-multi-runner-1.3.2.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  purged all ebuild versions <gitlab-ci-multi-
-  runner-1.4.1
-
-*gitlab-ci-multi-runner-1.5.0 (22 Aug 2016)
-
-  22 Aug 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.5.0.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  added gitlab-ci-multi-runner-1.5.0. to be
-  used along with gitlab-ce-8.11.0
-
-*gitlab-ci-multi-runner-1.4.1 (26 Jul 2016)
-
-  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.1.4.ebuild,
-  -gitlab-ci-multi-runner-1.3.1.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  - added ebuild for version 1.4.1 - deleted
-  ebuilds for versions <1.3.2
-
-*gitlab-ci-multi-runner-1.3.2 (09 Jul 2016)
-
-  09 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.3.2.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:  added ebuild for version 1.3.2 which contains
-  a bugfix for ARM
-
-*gitlab-ci-multi-runner-1.3.1 (26 Jun 2016)
-
-  26 Jun 2016; Manuel Friedli <manuel@fritteli.ch>
-  +gitlab-ci-multi-runner-1.3.1.ebuild, -gitlab-ci-multi-runner-1.1.3.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:
-  Added version 1.3.1 and purged old one
-
-  07 Jun 2016; Manuel Friedli <manuel@fritteli.ch> +ChangeLog:
-  Added ChangeLog
+  24 Oct 2016; Manuel Friedli <manuel@fritteli.ch>
+  +files/0001-fix-Makefile.patch, -ChangeLog,
+  -gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.5.0.ebuild,
+  -gitlab-ci-multi-runner-1.6.0.ebuild, files/gitlab-ci-multi-runner.init,
+  gitlab-ci-multi-runner-1.7.0.ebuild, metadata.xml:
+  dev-vcs/gitlab-ci-multi-runner:  added source version of gitlab-ci-multi-
+  runner; mostly copied from the mrueg overlay, but with some additional patches
diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest
index 4984067..37ffcca 100644
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@@ -1,20 +1,9 @@
+AUX 0001-fix-Makefile.patch 3401 SHA256 d764379ad6b027eaab6e6f8a3874befad9567e5114caa247843d9abad29bf10e SHA512 12a44684aa05df41dea29e66bf42ec6a6b40f06b1a9c8a2682c5ce7a62264b1135df3a69f98cd9bf10bc05da062c61cfa02f803226d022ed9ebaf0bf6469449b WHIRLPOOL cdab4d9382f522ef136e77eeb38c7532172bc538e95254c4e57dfdf9b277d10f469211350994a228529142dc07d04f1df89a81acac01665ca2c9c9961f7da65a
 AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a
-AUX gitlab-ci-multi-runner.init 697 SHA256 4190607f9d9958b103f3a2ede2bbaa836b7498f89bdb6cd3fb5a5099db4e2521 SHA512 f683e6fe35a5b91142779fe78ef0cd06421d2c9b2e07cb48eb42fa8a373cf837ea56101804866ff73e28f1a4a4d683054e30265f82aec54b525e6dfb0936a025 WHIRLPOOL e819926ce3f81b26322d61c6bb1bba9c23afe9b8e01c3eb5ebc03ba32aedbf9ad25ac21704ae4e3690571b3bf1d5ffe87ed04cf7dd22fe63e2080cc84f36edaf
-DIST gitlab-ci-multi-runner-1.4.1-amd64 59770288 SHA256 8efbffac459fab6bc0532ba09d527e5a93d1da521fd90b1ff6408a714fcc8261 SHA512 33d8a509def74caa937fbfb69dc4aae50266e1ffd83bcddd2e358649010602108bc99647192fd64e8bbd1892a18f27b69b704ea1b4fc6622ec0d8ee4fdd564c0 WHIRLPOOL 6fae8f2a04aa3a74506746906e91300e05ea3ca31cdf8a4fc8e092328277975832f80a56eee1e26359dd510ed135fd756fd11b3ad75e23284c92388c162f388a
-DIST gitlab-ci-multi-runner-1.4.1-arm 56437360 SHA256 8f029a87d1ac1e1fc0f53249e8c8d9fc8f8c5191609a74521fdf626d6a9aec1e SHA512 9fbb8fd89a25e7f51354ec5d55bc4e1a60a166c39849ea4fa54435dbc48135ac8720a6f0cea2645fb449ceff5e74cfb402f33bb6aa75189eeeceb7a60abfba29 WHIRLPOOL 764c516580dec2bddfbcd270c4234f164256ab5801608875a9edbe59852e679c7f285a7ef09748662900add74fde6ebeeb2842e34cb208cd5858eed6dc60b1ec
-DIST gitlab-ci-multi-runner-1.4.1-x86 56606472 SHA256 c4c1d15912a48a6de66a0093ad3db7a50e7c28c64dc250a328de3a120fa36baf SHA512 f394834d78cf743fa80d219b92e071a450f055d2eca38486f5b9aecf85e3daba10e370a14ac9bdb847fcea63b80101f98ed75b9f741944eadd14e0a9f2faa388 WHIRLPOOL 793e873eac8a85de75e4dc54456a21f9c235d5c83a6d19b039c4112f5d145ca373d8c4fc70b9bae9c137bb30fbe5ebaae81b7f03a904d634ede242829c482ba4
-DIST gitlab-ci-multi-runner-1.5.0-amd64 40162568 SHA256 8068a7c0a149cda3782ea58b29ac1f1dfb7018d2021359b2be6094493a86fbf0 SHA512 e06c2aa44d7c369bfa6315221bac19670c97268f64660a320fa9872f86991c1f3c3ef25a9cd233b5769bbf30e1a4958d347f7bbb991dbf10696666332d763314 WHIRLPOOL 4b9e5e06671955245116693d73e5158c0e6a9455127cf6703222a353467c3c57128df0ad682dc47db37b20f98e2a870b5e32344c69c64f301a4611c451305569
-DIST gitlab-ci-multi-runner-1.5.0-arm 36718736 SHA256 38849b5948d892b505f2d8b01b777ed4b22eea2a6ce91aeaf276c3ad6fcb56cd SHA512 14439be83d1f5cb3a2e2b67421138ef4b6ea2ed6636214f082f4db32786a6707c4299c23410ba6c54e06079358acdf84e3a0ee9c5280c17f06576463607187c4 WHIRLPOOL ca677e0d62323021ec477fa031cc1a8cab76757101abe7033c0c1da632f99d225c622792d07df93b935467a7ed987e2cbe6c4dd00e16f06ad3988d4bd21623d2
-DIST gitlab-ci-multi-runner-1.5.0-x86 36892864 SHA256 029e1a570ff5f5f570d107cb451b2a759829ba64fde6965a1d4abc6135ef63be SHA512 06d55f40e3d43ef3524266fec1c009372bb18850394ec5688979fe6bf33e3bf864aa0582ff0de5eb1e088ce2a24b09bdb6a2772643a15f4d8e994c7f194197a9 WHIRLPOOL 8ede1609492f33599078129a44c28eb58f850da715d091b847a753589a68cfac9f206f9c5e7b78eddad67a834279fbd4cd72a7fb5ea09075aa16729f70edeff2
-DIST gitlab-ci-multi-runner-1.6.0-amd64 81450584 SHA256 09dbfd1770253e4216de45e3de359707b9e48d1cd406fe7a7108f0d46880f9c8 SHA512 03c0f1a364509fceaea7c3250885f1d65349cc7b3b9febcb2b67f300b371fcf307f2e44f8c7da57776c05c57c350685459b0167f9dfe1d239d3c472d674dc35e WHIRLPOOL 80dd59f5343efd4a3f0278e66bb1ec7f9b64ed6c16580a9ea9c0554469bf668a7a1553c70e79ffe25e18fe6bea61d219112509ef30c38dc8cb56c4fccc4e37a4
-DIST gitlab-ci-multi-runner-1.6.0-arm 71394024 SHA256 ce42d293752d2781f1d657da6489ebf6f8df610df72742f144004fd12bf88cac SHA512 d23a95d367a9b68fc456fe67a7f243a824f0d1ddb5015740ede83297d328d31e34203ba4d49bac87a81bdefde1ae9aca401016777aaae33c9a4965441ae05381 WHIRLPOOL 8c0a70aab601d785400d1f0993581f41243ac4c01618cd8ff5dc60229cf2184a76adf7e9a1cc1b6ed99392a1aeb17177909dc78d877f71a4126a0990e57b6b8f
-DIST gitlab-ci-multi-runner-1.6.0-x86 72066176 SHA256 ab59163f79e327a1bf6a6d1469762d1f113484b561c6c4dcc07fda127068d9f4 SHA512 ce9eb72e86bd9a2ccd40be585b8f4645d7eb471a4b35a79b4c91dedb95611162c60f2a5e098774ac0879d1dd97f98431372e47e9c5152971d11591a502b0e96f WHIRLPOOL b05f559e04756f2f7cd05a833dbdabf008a98cf1314a81021c76d1c9c2afd4df7d1d5f4c2a585ef97f72dfeef84f2c01e8a6cabba8b018e1ab99ae7ff106b3f4
-DIST gitlab-ci-multi-runner-1.7.0-amd64 68204551 SHA256 367ed93a9b37026bf1679d43e1d150c7edda151e5c5807e43a0b85706a368de6 SHA512 f516046b29b16ba51e9124aa6e2d97bf549628567cafe3e72c49160945f39ac954a31e7460460b06119b8baa59e3724c515aa6635f8cc7e845cfc4e647ca66bf WHIRLPOOL 25f41cbeff6d441bfd11d6cc2b335d594f67c2f995268fd2a65f2da021792abcb9877adcf8f27d33194ad8dcbcc26d96b3b86d193e448143d717ac6b9dd973c6
-DIST gitlab-ci-multi-runner-1.7.0-arm 64871891 SHA256 b30873ec3fbc1510fdd92e64afb1cd5bc11db295eb5da7d4d4931211a40d4d8d SHA512 0988ef4bbae45e114eed98a6bc47284df26b4d283aeda5ae6be17a79d7bc416e060234e30592c8d44804ee56cbdd45be33777edd4cde4f8a4cc101516aff613c WHIRLPOOL 77fd1538e7e7a1513e2b31ccc9998fb5aea95c974808ca4f56a3e60bcb37f216a37b1ca0ead5d826ccb8712a0554baee300d5fe845bf9fcdd6094be6a0e177ee
-DIST gitlab-ci-multi-runner-1.7.0-x86 64635954 SHA256 4028364f26e9169f04e37beb404aebfaa5f0ad2560e6dccda302f9acd73e47a5 SHA512 56fea1b4b5de617b998c998edeb914eb0500de597fead2c37bd81526b48822c84a49c8263567c2f3ece3d2bab50287162b66fbeec5c0f9e1e2159c115a6c14ed WHIRLPOOL 3238e95cbd742b7057c224fb8d0a7511f7dcb0d1c0b07e446d2f0a4f6c7f4e6646e9b1c54cb14cd29c479efbaf113e5e501da54538983307ab8c3f350a36dac3
-EBUILD gitlab-ci-multi-runner-1.4.1.ebuild 2355 SHA256 c911b16ed3d1ff2ade77818f80e5e307f539a0dfad4647f6d2e242e970ca9bc2 SHA512 dd3b949a6494868e584655ede760a92e4a1084cb611b32c26c7850cc9c025860ac8814d94be58e43789137e5451cf633146d302d31c20a683cc7a2760ff84635 WHIRLPOOL bb1ee49e3ca9cc400dc1e11232f45acc51e9f47384742745ea01a709ae3e39f21b497948ef9a43ab5803e43c3c59c6770eba1169ef059d672296c3d9183f3da6
-EBUILD gitlab-ci-multi-runner-1.5.0.ebuild 2355 SHA256 ad37bca040f73fffda558d935f2cb1204c7c3d467c8c07f11d225bef813a4cb6 SHA512 87673b36f8a2c9fa872e5a55955c30c84c7664b2f2a3a9e3c293782747e71808651916e2dc8ce2c9f7aab319c06b5f2703c505e33303eebb2f3aec4369426415 WHIRLPOOL 3b000513d51581fa400699625e4dd3c949516df0cebdcb57b7c86ab9fdc01c0947934c7205ef31a8245fa1b8aaa7805211d5fbe4e5fc930f0de62c11e2dfe6f8
-EBUILD gitlab-ci-multi-runner-1.6.0.ebuild 2355 SHA256 d7afebafb33a353927ec7ea9eb45dfa0e55481ea84f8ebc1dccb735769225a0e SHA512 ba76ee30891ad1f6bce1c7f7982a9b6f3a5dfb1b6747c32703d3980a6f5966c6185a16f4bc4cf545a88fa962e64f91dfae26c7a8537bb8b79e3328313d9e42b6 WHIRLPOOL 292337cc95bb7376a2a88d8cf0056b2eaf807b784d3a81c22235680fafaf69b642a838d2a2d87826093d94c5399c79e0d5cda4afb101725927da51e55c18f63e
-EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 2355 SHA256 d7afebafb33a353927ec7ea9eb45dfa0e55481ea84f8ebc1dccb735769225a0e SHA512 ba76ee30891ad1f6bce1c7f7982a9b6f3a5dfb1b6747c32703d3980a6f5966c6185a16f4bc4cf545a88fa962e64f91dfae26c7a8537bb8b79e3328313d9e42b6 WHIRLPOOL 292337cc95bb7376a2a88d8cf0056b2eaf807b784d3a81c22235680fafaf69b642a838d2a2d87826093d94c5399c79e0d5cda4afb101725927da51e55c18f63e
-MISC ChangeLog 2294 SHA256 d449d54ce814dc2fcfb5efab396ebd907f591036e2033db4e27ba5fb5aa555e4 SHA512 0c6e692dc0495aaefcfdbe1c5d4a99679af5b389a51985732f4285d698584f07398db7b6847526ecd2c01feabae6d4c88820c49105f8d77d72cd3aade5e40b61 WHIRLPOOL 53d6c347f27b7a6c634bf34e07fc1fbc9b637ab2b117fbdd6069b42b0f7955a1157011954bbfba368a6c830fd231dcc1ace542499e56cc5c2b98c224d94d41e5
-MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
+AUX gitlab-ci-multi-runner.init 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f
+DIST gitlab-ci-multi-runner-1.7.0-prebuilt-arm.tar.xz 9331496 SHA256 11431f2db5809829fe652c337b05cad9ccba837491c44c6fa0bb3ae0c9be6f49 SHA512 61b3fe3559b18f55be1148ab77232d6b505949ec965622fefa92fff07ffcee74ee2516c065ae4af3074f407c4ee77ba45d3cf4dc37f893c2e6322a911ffaef0b WHIRLPOOL 4d4a7696bf7ff462442f7dcbff4c7e0d49160b87dbfefe7d5c1a60184eba021a83ebfc54859dcc8beedc6e10fbab88bdfb374be06ab7791e2b374a52d05c3563
+DIST gitlab-ci-multi-runner-1.7.0-prebuilt-x86_64.tar.xz 8370352 SHA256 e50ba210ccdde7635d1d8621de1f8bad2c4765495d4ce0f6385e776e569d80e1 SHA512 c62060a6f8314f308e12840506ec074c685b9962235ead8a2454b7e628060028274374b11d5da94ebda3ff802e6d3c377dc3e1e9d190d4ea0638722a98661c7c WHIRLPOOL 39727f719fd4394793601b6c521fa97a7c7333ba52aa0efb83348c5c366f180d8e60236349efa0400b346bfa8d1e75770f8c08b124d6107981c2967cca730882
+DIST gitlab-ci-multi-runner-1.7.0.tar.gz 3527772 SHA256 ffcc18bfc54d4e2846bbfb21e72798c90ca5af214ac606ea07fbbeec24bb155f SHA512 06289c910f599ce180d62bad2e36cf4ac0f261f740c7ae3d4baf42aa4926b9dd2229b8c25ce8191613957017e1b1af4cdde76512eff2460f4a3db7f085a0e2a1 WHIRLPOOL 17d1259123bd0e8275f72453ba89e59f557e568b6698a0f61a511217b22a28d60350925928275072b1599cf4cf841d3f720eebd7a4e409627ad9257e8e2829f8
+EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812
+MISC ChangeLog 714 SHA256 0f25cf56f039852a47fc1a86f09bf43e24295913799be6ee747946c3e5f19b48 SHA512 2f905e4bb1ae863e77e5a5ff95049a276faa1dfe15a2751a7fce583fa5e18a23995df6a38ded969ce444e110bffbfb320027ba2ac5d35d43908e11627b42224e WHIRLPOOL 7e3de88c9e79cd0aa141e6075a5e88ccf79392b5651d51f829efb59be7aecf8c32594ad319bef8e43ca7ff36a5189a197464ac940125d94f6ede25d3fe65b55c
+MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35
diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch
new file mode 100644
index 0000000..9a5fc61
--- /dev/null
+++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile.patch
@@ -0,0 +1,74 @@
+diff --git a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile
+index af9470e..d615542 100644
+--- a/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile
++++ b/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/Makefile
+@@ -1,30 +1,21 @@
+ NAME ?= gitlab-ci-multi-runner
+ PACKAGE_NAME ?= $(NAME)
+ PACKAGE_CONFLICT ?= $(PACKAGE_NAME)-beta
+-VERSION := $(shell ./ci/version)
+-REVISION := $(shell git rev-parse --short HEAD || echo unknown)
+-BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1)
++VERSION := @@VERSION@@
++REVISION := @@REVISION@@
++BRANCH := @@BRANCH@@
+ BUILT := $(shell date +%Y-%m-%dT%H:%M:%S%:z)
+ 
+-LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1)
+-export IS_LATEST :=
+-ifeq ($(shell git describe --exact-match --match $(LATEST_STABLE_TAG) >/dev/null 2>&1; echo $$?), 0)
+ export IS_LATEST := true
+-endif
+ 
+ PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner
+ PACKAGE_CLOUD_URL ?= https://packagecloud.io/
+-BUILD_PLATFORMS ?= -os '!netbsd' -os '!openbsd'
++BUILD_PLATFORMS ?= -osarch '@@OSARCH@@'
+ S3_UPLOAD_PATH ?= master
+-DEB_PLATFORMS ?= debian/wheezy debian/jessie debian/stretch debian/buster \
+-    ubuntu/precise ubuntu/trusty ubuntu/utopic ubuntu/vivid ubuntu/wily ubuntu/xenial \
+-    raspbian/wheezy raspbian/jessie raspbian/stretch raspbian/buster \
+-    linuxmint/petra linuxmint/qiana linuxmint/rebecca linuxmint/rafaela linuxmint/rosa
+-DEB_ARCHS ?= amd64 i386 armel armhf
+-RPM_PLATFORMS ?= el/6 el/7 \
+-    ol/6 ol/7 \
+-    fedora/20 fedora/21 fedora/22 fedora/23
+-RPM_ARCHS ?= x86_64 i686 arm armhf
++DEB_PLATFORMS ?= debian/wheezy
++DEB_ARCHS ?= amd64
++RPM_PLATFORMS ?= fedora/23
++RPM_ARCHS ?= x86_64
+ COMMON_PACKAGE_NAMESPACE=$(shell go list ./common)
+ 
+ # Packages in vendor/ are included in ./...
+@@ -77,10 +68,10 @@ verify: fmt vet lint complexity test
+ deps:
+ 	# Installing dependencies...
+ 	go get -u github.com/golang/lint/golint
+-	go get github.com/mitchellh/gox
++	go get github.com/fritteli/gox
+ 	go get golang.org/x/tools/cmd/cover
+ 	go get github.com/fzipp/gocyclo
+-	go get -u github.com/jteeuwen/go-bindata/...
++	go get -u github.com/fritteli/go-bindata/...
+ 	go install cmd/vet
+ 
+ out/docker/prebuilt-x86_64.tar.xz: $(GO_FILES)
+@@ -108,7 +99,7 @@ else
+ 	$(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.xz)
+ 	$(warning =============================================)
+ 	curl -o out/docker/prebuilt-x86_64.tar.xz \
+-		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz
++		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-x86_64.tar.xz
+ endif
+ 
+ out/docker/prebuilt-arm.tar.xz: $(GO_FILES)
+@@ -136,7 +127,7 @@ else
+ 	$(warning WARNING: and remove out/docker/prebuilt-arm.tar.xz)
+ 	$(warning =============================================)
+ 	curl -o out/docker/prebuilt-arm.tar.xz \
+-		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz
++		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/$(VERSION)/docker/prebuilt-arm.tar.xz
+ endif
+ 
+ executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.xz out/docker/prebuilt-arm.tar.xz
diff --git a/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init b/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init
index e1c2471..78db655 100644
--- a/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init
+++ b/dev-vcs/gitlab-ci-multi-runner/files/gitlab-ci-multi-runner.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2015 Nicolas Heine
+# Copyright 2015-2016 Nicolas Heine
 
 depend() {
         after sshd
@@ -11,8 +11,8 @@ start() {
         ebegin "Starting gitlab-ci-multi-runner"
         checkpath -d /var/run
         checkpath -f -o @USER@ -m640 "${LOGFILE}"
-        start-stop-daemon --start -b -u @USER@ --chdir /opt/gitlab-ci-multi-runner --pidfile /var/run/gitlab-ci-multi-runner.pid -1 "${LOGFILE}" -2 "${LOGFILE}" --make-pidfile \
-                --exec /opt/gitlab-ci-multi-runner/gitlab-ci-multi-runner -- run
+        start-stop-daemon --start -b -u @USER@ --chdir @HOME@ --pidfile /var/run/gitlab-ci-multi-runner.pid -1 "${LOGFILE}" -2 "${LOGFILE}" --make-pidfile \
+                --exec /usr/bin/gitlab-ci-multi-runner -- run
         eend $?
 }
 
diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild
index e1d4ee9..8fa5582 100644
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.7.0.ebuild
@@ -2,86 +2,102 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
+inherit eutils golang-build golang-vcs-snapshot user
 
-inherit eutils user
+EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..."
 
-DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.12"
+MY_PV="v${PV/_/-}"
+MY_BRANCH="1-7-stable"
+MY_GIT_HASH="c66b00d"
+
+DESCRIPTION="Official GitLab CI Runner written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
-SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
-	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
-	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
-
-RESTRICT="mirror"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz
+	!docker-build? (
+		https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz
+		https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz
+	)"
 
+KEYWORDS="~amd64"
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+SLOT="0/${PVR}"
+IUSE="docker-build"
 
-DEPEND="dev-vcs/git"
-RDEPEND="${DEPEND}
-	net-libs/nodejs
-	virtual/mta"
+DEPEND=">=dev-go/gox-0.3.1_alpha
+	>=dev-go/go-bindata-3.0.8_alpha
+	docker-build? ( >=app-emulation/docker-1.5 )
+	!dev-vcs/gitlab-ci-multi-runner-bin"
+
+RESTRICT="test"
 
-MY_NAME="${PN}"
 MY_USER="gitlab_ci_multi_runner"
-
-DEST_DIR="/opt/${MY_NAME}"
-LOGS_DIR="/var/log/${MY_NAME}"
-TEMP_DIR="/var/tmp/${MY_NAME}"
-RUN_DIR="/run/${MY_NAME}"
+MY_HOME_DIR="/opt/gitlab-ci-multi-runner"
 
 pkg_setup() {
 	enewgroup ${MY_USER}
-	enewuser ${MY_USER} -1 /bin/bash ${DEST_DIR} ${MY_USER}
-}
-
-src_unpack() {
-	local a="$(usev amd64)$(usev arm)$(usev x86)"
-	mkdir -p "${S}"
-	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
+	enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER}
 }
 
 src_prepare() {
-	chmod +x "${S}/${PN}"
+	if ! use docker-build; then
+		mkdir -p src/${EGO_PN%/*}/out/docker || die
+		cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-x86_64.tar.xz || die
+		cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz src/${EGO_PN%/*}/out/docker/prebuilt-arm.tar.xz || die
+	else
+		einfo "You need to have docker running on your system during build time"
+		einfo "$(docker info)"
+	fi
+
+	epatch "${FILESDIR}/0001-fix-Makefile.patch"
+	local arch="$(usev amd64)$(usev x86)$(usev arm)$(usev arm64)"
+
+	sed -i -E \
+		-e "s/@@VERSION@@/v${PV/_/-}/" \
+		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
+		-e "s/@@BRANCH@@/${MY_BRANCH}/" \
+		-e "s|@@OSARCH@@|linux/${arch}|" \
+		src/gitlab.com/gitlab-org/${PN}/Makefile
+
 	eapply_user
 }
 
 src_compile() {
-	# nothing to compile, binary all-in-one goodness! (?)
-	:
+	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build
 }
 
 src_install() {
-	local dest=${DEST_DIR}
-	local conf="/etc/gitlab-runner"
+	golang-build_src_install
+	dobin bin/*
+	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG.md
 
+	# set up dirs
+	# here be the builds
 	diropts -m755
-	dodir ${dest}
-
-	exeinto ${dest}
-	doexe "${S}/${PN}"
+	dodir ${MY_HOME_DIR}
 
+	# here be my home and my castle
+	local conf="/etc/gitlab-runner"
 	diropts -m750
 	dodir ${conf}
 
-	dosym ${conf} ${dest}/.gitlab-runner
+	dosym ${conf} ${MY_HOME_DIR}/.gitlab-runner
 
 	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${conf}
+	fowners -R ${MY_USER}:${MY_USER} ${MY_HOME_DIR} ${conf}
 
-	## RC script ##
-
-	local rcscript="${MY_NAME}.init"
+	# rc script
+	local rcscript="${PN}.init"
 
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|" \
+		-e "s|@HOME@|${MY_HOME_DIR}|" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 
-	newinitd "${T}/${rcscript}" "${MY_NAME}"
-	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
+	newinitd "${T}/${rcscript}" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/gitlab-ci-multi-runner/metadata.xml b/dev-vcs/gitlab-ci-multi-runner/metadata.xml
index 67a771c..d2bcf7b 100644
--- a/dev-vcs/gitlab-ci-multi-runner/metadata.xml
+++ b/dev-vcs/gitlab-ci-multi-runner/metadata.xml
@@ -5,4 +5,7 @@
 		<email>manuel@fritteli.ch</email>
 		<name>Manuel Friedli</name>
 	</maintainer>
+	<use>
+		<flag name="docker-build">Use docker to build the images</flag>
+	</use>
 </pkgmetadata>
diff --git a/metadata/news/2016-10-25-gitlab-ci-binary/2016-10-25-gitlab-ci-binary.txt b/metadata/news/2016-10-25-gitlab-ci-binary/2016-10-25-gitlab-ci-binary.txt
new file mode 100644
index 0000000..d4a15f3
--- /dev/null
+++ b/metadata/news/2016-10-25-gitlab-ci-binary/2016-10-25-gitlab-ci-binary.txt
@@ -0,0 +1,24 @@
+Title: Rename gitlab-ci-multi-runner to gitlab-ci-multi-runner-bin
+Author: Manuel Friedli <manuel@fritteli.ch>
+Content-Type: text/plain
+Posted: 2016-10-25
+Revision: 1
+News-Item-Format: 1.0
+Display-If-Installed: dev-vcs/gitlab-ci-multi-runner
+Display-If-Installed: dev-vcs/gitlab-ci-multi-runner-bin
+
+The dev-vcs/gitlab-ci-multi-runner ebuild downloads the precompiled
+binary and installs it. That's not the Gentoo Way Of Life. Therefore,
+the existing ebuild is renamed to
+
+    dev-vcs/gitlab-ci-multi-runner-bin
+
+and a new source based ebuild is introduced. The new ebuild will be
+named
+
+    dev-vcs/gitlab-ci-multi-runner
+
+so don't be confused.
+
+Cheers,
+fritteli.
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
new file mode 100644
index 0000000..9f50186
--- /dev/null
+++ b/profiles/updates/4Q-2016
@@ -0,0 +1 @@
+move dev-vcs/gitlab-ci-multi-runner dev-vcs/gitlab-ci-multi-runner-bin