From b260e3f36b115550a5e85f9ab9b7a68443b7fb17 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 28 Mar 2017 11:37:12 +0200
Subject: [PATCH 1/5] Revert "dev-vcs/gitlab-ci-multi-runner:"

This reverts commit 997c30f16a78d2160eee5a70f983e0a13baa07e3.
---
 dev-vcs/gitlab-ci-multi-runner/ChangeLog      |   8 --
 dev-vcs/gitlab-ci-multi-runner/Manifest       |   7 +-
 .../files/0001-fix-Makefile-9.0.0.patch       |  70 -----------
 .../gitlab-ci-multi-runner-9.0.0_rc2.ebuild   | 119 ------------------
 4 files changed, 1 insertion(+), 203 deletions(-)
 delete mode 100644 dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch
 delete mode 100644 dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild

diff --git a/dev-vcs/gitlab-ci-multi-runner/ChangeLog b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
index b256027..7f2a75f 100644
--- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog
+++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
@@ -1,11 +1,3 @@
-*gitlab-ci-multi-runner-9.0.0_rc2 (19 Mar 2017)
-
-  19 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
-  +files/0001-fix-Makefile-9.0.0.patch,
-  +gitlab-ci-multi-runner-9.0.0_rc2.ebuild:
-  dev-vcs/gitlab-ci-multi-runner:   Added preliminary ebuild for gitlab-ci-
-  multi-runner-9.0.0_rc2. It still needs some love and doesn't even compile yet.
-
 *gitlab-ci-multi-runner-1.11.1 (16 Mar 2017)
 
   16 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest
index 3986836..4c3d99a 100644
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@@ -1,7 +1,6 @@
 AUX 0001-fix-Makefile-1.10.4.patch 3308 SHA256 c87a85a704ee054f85343d01e187933e67a6cca989adcf686a6f16a37406340d SHA512 bcd746a39997287334a77847322f11cbdc55c790540061f3bc9d9ac60ddc19683abf431e558c3e1a033f3ac3b5de0404da8ab82d2a3c254a214c1e0e80bfd76d WHIRLPOOL 71ec341a2e79a431062eb99c96bb2c7286858417e62c10082af48d5cd90de88a0eefd91a2bdda351e0bdbceea7452b79e88f83d566a79432c45ceaea5b7476c9
 AUX 0001-fix-Makefile-1.11.1.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7
 AUX 0001-fix-Makefile-1.8.0.patch 3281 SHA256 70db95de830679916f1a0c446a5eb42ebdc77446d2a46e31f919107ea452d0a0 SHA512 d73db4e0122741da7bd7be9fd5a2b36c4aaeb0b3b0789604cefe1e98a613c0e5141299d7764b694080ccd8ff9094e8f0b134c950339e2f4ced31d8851f2fe63f WHIRLPOOL 24a3459cf882281b57bfbfb8471fc0f6ce1d0630ecd360d1fd813663f35a500f9f3cc826b89df0069d62d23f6d8cf0d0405254e967fc4c2eba0abf635f5da29b
-AUX 0001-fix-Makefile-9.0.0.patch 3376 SHA256 1c8123815ed8df86942b4cfd11b8c91e7a08945664e97df11b6f34cc583a093e SHA512 2bb4dd17cd47f85799932e09294244d899361b152ff47b0883c985b989b1c222a0bec8090e7692d1eea0655969883fad400d0c5a68c07dde0cefe67f6775654d WHIRLPOOL da952b735599208091b028aaf3b32077c63e24c4796226975b22aef7c57bb7d1b2872a96b21ce877bdf46b761295b6e602a5eacdb7e3c4e58c07b34801f650e7
 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 662 SHA256 faf47cdc02b78527d98cd044f2d2aed38a44e39fc6aa5ccc6249c6bce7b979b2 SHA512 9a2f6bcac4c1b992aa5f046cc2cf8f379d2b1f5b6d8065793996828be1527fb5e9131b2967131c292003319f2b27c0cb1229a147236279027e11d13f73e9bd76 WHIRLPOOL 7ffb5d25cb5bd66459981fb71a79d4690b1efaff41e5873431b8ec9cae62783c9fb71ea426a0a1d8f0bf9fdd7dbcb569136dc38f7736296565258a0dcfa3536f
@@ -20,14 +19,10 @@ DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374
 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-arm.tar.xz 16002708 SHA256 c4f7297865fafa4e7841e513a26b334cf9f29ad6d7ec4b12381d6031fa6f9648 SHA512 e1d905048bbfb1415f93a443e457ae47cd7f969eeae82f6dc5bcbdce37e2aa4219a97b97080c8b7767523490017cd8ec0fbf681375e27348e87c4d230db844ae WHIRLPOOL 0b76317c29b81dd53c7ae4c2b9f6bcdc7bcb28e6d5101a45f8c4eccf11259e88f2eac7751e84e6f5b3e91298e32980cabd1a1fd07c0cc260dfdde9e479f9c116
 DIST gitlab-ci-multi-runner-1.9.2-prebuilt-x86_64.tar.xz 8717016 SHA256 7d0759dd04f930a231c1a713d8e44a149666112ff1d841c5173847a373496278 SHA512 aaf1b859dd353bca3810ebb85dca0fadbf7f728b262ef00f6a793e9eaf100a05466f26a8bd55acc0270876e5725519941f6086bb375d9f9285fce7f5bf66351c WHIRLPOOL 7e5af9b63feb36ba4e09b12faaa05cb31b453f8f98ded396005429db1f392cb370c75f0c9ddfc07e169cf77f9dceb4abac5abd195a30e2a3ccb03819275f55a5
 DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a7a2d60ad892bf3b39fc48903861b241c7391e920 SHA512 7721cc80cd9abaf5ab44f53836e7718eb2df360cea378f4898ef6e9d6b671a09df1e69b70ac99ed8c6c042af9da6415e614db52b5c1e9476bbfe72e146628f04 WHIRLPOOL accb7458dd7ce1334e66f76ed90d970c5e6974505a2376a3e0c9e42d7169986aa18ed9dc64f11dac1366b42b4efddd18e1baa072d4f56e57d3a6c6300ee1f3bb
-DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-arm.tar.xz 8671408 SHA256 14cb54459f83caf053bcdd5a9299d6fc654d215eab46412b2a351f431861500f SHA512 4bd279f6a7394fa0b2bf6e25e041a8f85e4062242ebc801e06c9e0ee225c9a6ee7be8154f52c13a1058da1ace4e5113cbd6cc26838b0036f55046aaefde8bf64 WHIRLPOOL 408bcf6465a9e72a6946914ca62513fb0e14e248c2bcf95525745bc7fd37615d3a6fa05a766d75d6d03f3dafe779d97c1f19ce7b258b95938d2a9f98a152084c
-DIST gitlab-ci-multi-runner-9.0.0_rc2-prebuilt-x86_64.tar.xz 8317360 SHA256 0e8877cab24e6dc91363950a388a34391f30caffc958416beae8771d72ee4b13 SHA512 b7e31b75cafece202f285927fc9c54a6bfe7ded7cec0febcd0f22f9d7c2097f94f3380a8a860e359ca6f02785f5719d191514ff0090512e5d4a12986d3dc349a WHIRLPOOL 8c104dd91bc6428fb30693401145969df44adf5d28bcf7f658b9d1206d3bcc596e9a71771e0b83fc04caafd9dc642e4547c2e4b51df5e64a4ec99f1d195b3fad
-DIST gitlab-ci-multi-runner-9.0.0_rc2.tar.gz 3140263 SHA256 09f4d370dbcfe9b54acd8679733a4e6cebe43808c205a5159a71a7db372c0f30 SHA512 b4e5aa5784beb5cdcde1b3f8cdcb1aff1171bd3ca4fd76e8fb5059ea62ebbb930c98efc148cb496ddcf635ecfce7bfeefd2c6fb6f33defde3e574a59194c90ab WHIRLPOOL 181ee8c02ef17e2034a0454af37c44198bbc950cf96f61a628a56469e4b375970db55b58c8ed3aeb39e2be75a393e1f923d90389a610b06ed6761dbd7145c33c
 EBUILD gitlab-ci-multi-runner-1.10.4.ebuild 3266 SHA256 403a1b8eafa8bc74582cbdf7cd90b9c18ee72e1a386bae07fecb6adfcd56fece SHA512 802c5fafcdf7b997115bf70c01b168499bfd1b0cf78195a414ccb0ca1c5f58da3eeb5c8eb3d1960b049b0509e92682e13dac7a80549bf5f9f7c818d0f931ffd0 WHIRLPOOL 616be2cfd835f9912f0698321a230b2d242251556a519541dea18b9673f3b84d32d4095104d5620d326dc5db7934a9c222ca1d92cc157bcca341dd5862f03723
 EBUILD gitlab-ci-multi-runner-1.11.1.ebuild 3267 SHA256 a63c1a0112653c298ed03bda0108d013563dbf70399628c48106af4a2564aa66 SHA512 65ca42ea46321ee37fc9e5683c923c0f1f3670d79c1ea9ec3b876de8962ef665c66bf38d19462981f689b3db3b4c46d1bef58dce0bab20c39ad30009db3a6ebe WHIRLPOOL bdf42cc264767ccbbbbda661edb61529d60951f8774a001cfea3900c670ff3310747fa86b1fd588e39d14851d018fa9d5a7fc1973e37e1a7a85489b5d5f69fc5
 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812
 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4
 EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6
-EBUILD gitlab-ci-multi-runner-9.0.0_rc2.ebuild 3314 SHA256 0e608a0925fdca1116eca9fc6355fdc930770223dc1779884b66fb7b55cb0d41 SHA512 03dc52b488b6173e32610c3a8dfeb860edbf9b7336f532f9f8c407889f9e2afdf42a7b336d2b3a173172d6f57c3c5e67a73b10bf171dcf3c05bb5d3c399a25e3 WHIRLPOOL 4fb8d064b6a81b126f558946125e8cb96f2d54a74601819305fa012ace75674292164bd949679509d4bbb3fa9f63819fe76b361db429ebe2ed63efb394dda024
-MISC ChangeLog 1869 SHA256 0548d0cac95fbaddfed475355f791128f07270c8e6812745ad8a4c1360addd7e SHA512 cf5495ad836bd6b623daee529711e98a900f7756857cc55d83c364d3fdd448d0fa880edb94b20a2f9be29f0d39c85ead90452a81a871af2facd1f956cfd16abc WHIRLPOOL 306973a7d309ff80d6a0d0484ae493baebc97b74db6cc02c0a6a6f55f19d4fa2cdf7a6b6664f41c78e9a888bfeda95c884a916dc799b220305a5fe4cafa89795
+MISC ChangeLog 1527 SHA256 f69fb48fa08aff1dc4e751af5dc0035289aaf39c4fb4511b680a938a30bbc311 SHA512 e94da9dd3a9cadf9461e3536a1ea632b16e5704735f30fa47da08652c7bada1d6d0823dde5cdeffeef0787a8ec6a8fe357b841cb4a59e9c345702c113a4a0f10 WHIRLPOOL 50cbf5c714f6a4dc8203a588095e9540157ef3f8d9e406910b93cdc46402bfbdf76a0e5f23e90d4fb25142a222b4c95004c893657d7e73cb3fedeeb0dcd2fe57
 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35
diff --git a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch
deleted file mode 100644
index 53fca69..0000000
--- a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-9.0.0.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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 b300c5e..8b05931 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
--export 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)
-+export 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 ubuntu/yakkety ubuntu/zesty \
--    raspbian/wheezy raspbian/jessie raspbian/stretch raspbian/buster \
--    linuxmint/petra linuxmint/qiana linuxmint/rebecca linuxmint/rafaela linuxmint/rosa linuxmint/sarah linuxmint/serena
--DEB_ARCHS ?= amd64 i386 armel armhf
--RPM_PLATFORMS ?= el/6 el/7 \
--    ol/6 ol/7 \
--    fedora/20 fedora/21 fedora/22 fedora/23 fedora/24 fedora/25
--RPM_ARCHS ?= x86_64 i686 arm armhf
-+DEB_PLATFORMS ?= debian/wheezy
-+DEB_ARCHS ?= amd64
-+RPM_PLATFORMS ?= fedora/25
-+RPM_ARCHS ?= x86_64
- COMMON_PACKAGE_NAMESPACE=$(shell go list ./common)
- 
- # Packages in vendor/ are included in ./...
-@@ -77,7 +68,7 @@ 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/...
-@@ -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/gitlab-ci-multi-runner-9.0.0_rc2.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild
deleted file mode 100644
index 25630d8..0000000
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.0.0_rc2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils golang-build golang-vcs-snapshot user
-
-EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..."
-
-MY_PV="${PV/_/-}"
-MY_PV="v${MY_PV/-rc/-rc.}"
-#MY_BRANCH="9-0-stable" 
-MY_BRANCH="master"
-MY_GIT_HASH="0f9ba5fc"
-
-DESCRIPTION="Official GitLab CI Runner written in Go"
-HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_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/${PVR}"
-IUSE="docker-build"
-
-DEPEND=">=dev-go/gox-0.3.1_alpha
-	>=dev-go/go-bindata-0_pre20151023
-	docker-build? ( >=app-emulation/docker-1.5 )
-	!dev-vcs/gitlab-ci-multi-runner-bin"
-
-RESTRICT="test mirror"
-
-MY_USER="gitlab_ci_multi_runner"
-MY_HOME_DIR="/opt/gitlab-ci-multi-runner"
-
-pkg_setup() {
-	enewgroup ${MY_USER}
-	enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER}
-}
-
-src_prepare() {
-	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-1.11.1.patch"
-	local arch="$(usev amd64)$(usev x86)$(usev arm)$(usev arm64)"
-
-	sed -i -E \
-		-e "s/@@VERSION@@/${MY_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() {
-	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} build
-}
-
-src_install() {
-	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 ${MY_HOME_DIR}
-
-	# here be my home and my castle
-	local conf="/etc/gitlab-runner"
-	diropts -m750
-	dodir ${conf}
-
-	dosym ${conf} ${MY_HOME_DIR}/.gitlab-runner
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${MY_HOME_DIR} ${conf}
-
-	# 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}" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf" "${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."
-}

From ea8632d0d8f24b3ae91b536d28ac7e997d94c96f Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 28 Mar 2017 11:37:25 +0200
Subject: [PATCH 2/5] Revert "dev-go/gax-go:"

This reverts commit 1a82c72d5685bc953610f38a74d5a9400edf6760.
---
 dev-go/gax-go/ChangeLog                   |  6 ------
 dev-go/gax-go/Manifest                    |  4 ----
 dev-go/gax-go/gax-go-0_pre20170306.ebuild | 24 -----------------------
 dev-go/gax-go/metadata.xml                |  8 --------
 4 files changed, 42 deletions(-)
 delete mode 100644 dev-go/gax-go/ChangeLog
 delete mode 100644 dev-go/gax-go/Manifest
 delete mode 100644 dev-go/gax-go/gax-go-0_pre20170306.ebuild
 delete mode 100644 dev-go/gax-go/metadata.xml

diff --git a/dev-go/gax-go/ChangeLog b/dev-go/gax-go/ChangeLog
deleted file mode 100644
index 1547446..0000000
--- a/dev-go/gax-go/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-*gax-go-0_pre20170306 (19 Mar 2017)
-
-  19 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gax-go-0_pre20170306.ebuild,
-  +metadata.xml:
-  dev-go/gax-go:   Added ebuild for gax-go, a dependency of gitlab-ci-multi-
-  runner-9.0.0_rc2
diff --git a/dev-go/gax-go/Manifest b/dev-go/gax-go/Manifest
deleted file mode 100644
index 718752f..0000000
--- a/dev-go/gax-go/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gax-go-0_pre20170306.tar.gz 9958 SHA256 61c9719e97469e24797a3549ad31892a3584253231ee870e314e87d6b549bd75 SHA512 174643d82d8d013d520c2d2c093939f6561948102489d61130521a1763c66831a2b1438ab83a6b2ac86106cef6955d09f17f51a9a71b430fb1f9557ffa54b850 WHIRLPOOL c411aa52762e9a542a983c6317898204041623ccbaab8eef006b771b1cf91ecc2213219ee9ea5b447086feb30d9630633df090bebb2ccb70718485a5c63168ac
-EBUILD gax-go-0_pre20170306.ebuild 595 SHA256 24c5141e6880ac3a5d0fd96838e5aef5e2f3e39604b0d2b923dd72ad5c1435e1 SHA512 4fe31489242ab76af5f364e53ae2cab2537057d113368aeffa5b7ade2aead15e162ff1d475c9da202959d1397657852e5c255b4067dc19459bb22619c8d416d3 WHIRLPOOL a590d470426b565f87fd8598687b1886f40b5469452165bb10b67fc98a3af3e0e162b73b4a3b367eb0c6389d0976338ad05ff94af5c01c9cf7a74a0e0db9a8bd
-MISC ChangeLog 231 SHA256 fc510eaa050bb503a4bf0d0fcc79eb1e3f4e6107418f749562cf9cc43304e86e SHA512 1c000422ab0f73915f3fe64d1c3858e33ddd6fc7ea988a3c14179c50ad1a975cb4b7db3fead8263a61bc49c727bc068a4b5dd4dfedbe2ea6f190a23ff367ed17 WHIRLPOOL 2a6fdedd0735f762c6e231eff505ed57b65ebd025423b99b981ddd552f001ce8678d8a01aa53cb8e129f4e78e7f5bd04703efa0168ab04123e0201a5673ab195
-MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/dev-go/gax-go/gax-go-0_pre20170306.ebuild b/dev-go/gax-go/gax-go-0_pre20170306.ebuild
deleted file mode 100644
index de11df5..0000000
--- a/dev-go/gax-go/gax-go-0_pre20170306.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/googleapis/gax-go/..."
-EGIT_COMMIT="8c5154c0fe5bf18cf649634d4c6df50897a32751"
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm"
-
-DESCRIPTION="Google API Extensions for Go"
-HOMEPAGE="https://github.com/googleapis/gax-go"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="BSD"
-SLOT="0/${PVR}"
-IUSE=""
-DEPEND="
-	dev-go/go-net"
-
-src_install() {
-	golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/gax-go/metadata.xml b/dev-go/gax-go/metadata.xml
deleted file mode 100644
index 67a771c..0000000
--- a/dev-go/gax-go/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>

From 2f8fa80d02e00c8ce5901f2e7a9d5e3839793939 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 28 Mar 2017 14:37:43 +0200
Subject: [PATCH 3/5] www-apps/gitlab-ce:

Added ebuild for Gitlab CE 9.0.0, dropping the ~arm keyword due to the dependency to yarn, which is not available on unstable arm.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 www-apps/gitlab-ce/ChangeLog              |   6 +
 www-apps/gitlab-ce/Manifest               |   4 +-
 www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild | 420 ++++++++++++++++++++++
 3 files changed, 429 insertions(+), 1 deletion(-)
 create mode 100644 www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild

diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index 7b75535..202d72d 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -1,3 +1,9 @@
+*gitlab-ce-9.0.0 (28 Mar 2017)
+
+  28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.0.ebuild:
+  www-apps/gitlab-ce:   Added ebuild for Gitlab CE 9.0.0, dropping the ~arm
+  keyword due to the dependency to yarn, which is not available on unstable arm.
+
   19 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0_rc4.ebuild,
   gitlab-ce-9999.ebuild:
   www-apps/gitlab-ce:  Updated ebuild for gitlab-ce-9999 and also cleaned
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index f28e2a1..dde7db5 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -23,6 +23,7 @@ DIST gitlab-ce-8.16.6.tar.gz 20901900 SHA256 5b88dd855afc44da2b8f059056321fc0dd4
 DIST gitlab-ce-8.17.0.tar.gz 22991847 SHA256 3883c2e505e511f83072f950b9d211783148b97e29f34144e57c8b180d7f4518 SHA512 e0ee1b1ab21a6ad262cccbb2abf544ccb18dafcaf61e83aa02bac0182bdd35a47a725741382876f3bb79f6f42764c59b7a992c16a916a1673a716417b34d8a87 WHIRLPOOL fe3c36e41d0fe3c3420a3e52dc61fc30f424d2832cd82587a6e50b6c6450ee9e99bb2897f87cc949b4663055a35e159cf7b6f471b6aa9046c6bb8b1fae526ab7
 DIST gitlab-ce-8.17.2.tar.gz 22995277 SHA256 6819b8e289b7c23ee1880d935f443bb63896e45f62e2d203dfd87f9b8f90d3ae SHA512 b66b3ee0233641aee27d6cd1748069df8b7a705414f7e5b41875d861f425382f4a7f31639219660db1811fdd0e0655526f7760fb49b4847efb486b37ced11205 WHIRLPOOL ab8c986a08c5cf86b5d4a3a56059827b6c1e561c7c76e72ba3433c589bd3514177019db587eee68aadc1ac0ed8b748e813ccdc2fea3fae9b773979e7829562d0
 DIST gitlab-ce-8.17.3.tar.gz 22821238 SHA256 85299a2e10e57ae988483d1a10503e17703d767f6b757f8b07093f0011c58fe5 SHA512 3d73d2b7d48237777871c0c062e8568e083389fae9ba75a0b648bb96ae638e6f4d1f9f0bddc6ab15c5ba21b5d92da792b0fdb83b94cb89b95824a0c937a32de8 WHIRLPOOL 8532172fd004d9b7831299ebcaa165eabbc732af21ace334f903a894ffd673b078be423f13de1734b1170f5e5c4b104847ae27a11d12802048dab1ba77b755b2
+DIST gitlab-ce-9.0.0.tar.gz 26260333 SHA256 73012a8d31b2d92a49f0957c78525069e11d5d7bf19ca67bcbabd44b37c8c36a SHA512 b8a48bf538691d0bb1b636f4be6b71010583b4784093ec5f5b3196bebeefd9e7fcfc05cfd48523eb2139ff9e0bd458e20e8174d8c8892cb510d55c2fb154ee32 WHIRLPOOL 5d10e6fed7a9de5db7513afaf29940cadf41a37397249a78b2f3dc0aadde25f73e9f4eb3d18f913c8ad13cbdfecec811cf2246c2ef377017dfe3f021b09a2125
 DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea6116157887e8216038d23b69cf7a4d89 SHA512 f4694ebf4ffe38e6c5495f3658eb8003d28b3ac5d67f4533ddc1932afca412a40ea786cd8d99e2891fdf9bacd7b198b29493b97d6d02455d4f4139d4e60a0d63 WHIRLPOOL 81f47820043445e9ff69ae0ad3bcd1e094ab1e3527eec279096ae16a767cec5451b2d94af4dd87cd2939eb2e64368a1a0e543ce40e0e9fd5a716eeef04741c54
 EBUILD gitlab-ce-8.15.4.ebuild 11982 SHA256 db794f18bc0d023a8b6adf49b82c2e37fd38b7206b064a7700289c0cfa16961c SHA512 ca30780d28ffc0242ac5f6ccad178cc44464a81f2d44cb13e53ddf06700d0f39b9fee9b77e356735435079b34090049d50d9019af71e92d6d8faaf3767a39dc5 WHIRLPOOL 42ee8b8e5a2c6fba69ecdbf6e306a87f369fa193f721c73481edc744953bfd210cb4495bc603ba01566efb2b0869ec71284a1f1b1c34d1a124bd08546829ca37
 EBUILD gitlab-ce-8.15.7.ebuild 11982 SHA256 fab225a8a8a9373898b5c604ce41ed65c4648c46131798315df833326b006fb7 SHA512 ea17dc9927336aed09ba21e0e1c9c4df2998f941a05ff30e9ef9951b5318bcdfb1d332fa8d285a27f26356a9fa9a5f72da45882ab8edbfa6046ec96764dae47f WHIRLPOOL d51629d3c67f8be2636a2e5cb4bb4d4a7b0402394f47aaa01fc182c29f1d3ee916a2d5bb8086bbe871f41294e348ec024d81a775ba9c30028d8b97d93d637620
@@ -32,7 +33,8 @@ EBUILD gitlab-ce-8.16.6.ebuild 11982 SHA256 2cc7b8f06153f28ebcc34a5ff8e24be79168
 EBUILD gitlab-ce-8.17.0.ebuild 12831 SHA256 9556fe5712044ebe473b7ff8b847a4daa5ca1818a0ac714f22afc5725199da72 SHA512 4aaa00f4eac87a4bbe598cde792997e25b137eea9fdaf7e7c8394ec5e2abc54302ed5432efe1c7055dc195ca2599f9027463480c943f108bb399daa2eee833f5 WHIRLPOOL aec29db1dc7236f60d2723ec97444fa437a4f8b3092cbf53305f3cddbb6851a40b1a77a306daf4c9780ffe9a8eed760c580371bf95da66b18d884a32c3e48cd5
 EBUILD gitlab-ce-8.17.2.ebuild 12831 SHA256 b57a4f683a5eafaa5d0149b0256833e329a757ad470e24bba163c57ba841eeeb SHA512 ed84da9ab62d0893b36a2ade744248b663634c5b05b8e8b608d064068c31a3d19a0e4917f932a0a2caee48a8f509359e50cc982c43bd5d1d958343ea5c5637d9 WHIRLPOOL dfb96d29b45adf5d03313fd9dd6cbc39c70a1736272867737f0bf8d429510add4e3fcd77b329690b9393cc506c9387f4342bed001c2bda50901ba9480fe241d5
 EBUILD gitlab-ce-8.17.3.ebuild 12928 SHA256 8e79b5c6724ef50b00f1c6eb607af6c4dc44a8ea5a7b2735c016726247043c3e SHA512 7d32ef8db701c1d4570b4071a55e61611f3bbff3f308adee84594c43f4089befc1a8ade8d66f7f36a4f9f6fd0f1f3c8fe6172eda663a5e2bd277646d4e1fdfa7 WHIRLPOOL 36a8c32bddeb51e89da1e314375bec1765e238d4fc1f658a492601b2a46d838993dde921570956e6c43086d9d3e09727b83f99e99168cfe95ef2e4fba6b69e6b
+EBUILD gitlab-ce-9.0.0.ebuild 12928 SHA256 55c3b39745547beac38b04d52b1c41caf2965179fa6d23cb0856f886fbe20431 SHA512 1557d9be66a033e1a9e94eb657342035f47f044cc4defd7eff35701554e47372794de5d7e1d1a94aa7ba7355990845ef8ac779aa449f06276ef52cafc9294d55 WHIRLPOOL e665021ba141205db52a8cf4be5a7f38c897967393a6f122fcbe93789008a991bfd2e6ced57873315434183898f21a5f13dc44a662e5cea309fd2f710895235b
 EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f
 EBUILD gitlab-ce-9999.ebuild 12869 SHA256 4a1e486e7386aa942bbd22c29457850584dab007b64715fc6f316ce5c98fcaf8 SHA512 ed66b809ca6e04956a9d4f5ef027aa9e174bad5cd80131a30fc34a1011f0221483b6fb52e893394b429d70919fc65496711a9c700c630c2ff31665827912df82 WHIRLPOOL b1b2582dcb1f600f199216c1bb532eac524ff3cce594e052039be29547164557997c65573f943c00240ab0986b0f1c1315602c3a65a0986e9f64a2df1827288e
-MISC ChangeLog 15202 SHA256 7c046e4a1eb5758af274515808d274d4bc661347a0816c4eba2d0aa2f37ca6c3 SHA512 f0010ab40b1aa883dda0276e9ed056e8db3a57a51ed5dc9b9072668fead23750f80ed8e9e1518550f3d1d0b1c25908bd73a2fd5440ed15217bc916ad72ba5b4c WHIRLPOOL 7bd06cafa247df448c64bc6f3b02f2c63cb825aa6a2347bef18112f91c007a13457678bf829ac90f5a031af8a329a935459554a87ea9b0fb92631f6c2606dda6
+MISC ChangeLog 15468 SHA256 9b1d58203f8bed64a16e907729532cfa77161c49e3bb0738fe6f658e1366de86 SHA512 9f5197f4738b168864932ea485e2cb7231eb7666c66a7cd9062bcb2e7e13d929c2c9fefbcca4c87554da537d2001419519836517ebf7ab895e799e8b8acf40e4 WHIRLPOOL e2cb644de2d3928ac354fbbb0e4b72a01133c491fcc4b8f85054c359f5ce4a26d4e67db4d91ddcd4212acefddb8d9d1a8ec423f4d009f0ea07013a7ced846b3e
 MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
new file mode 100644
index 0000000..54a483a
--- /dev/null
+++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Maintainer notes:
+# - This ebuild uses Bundler to download and install all gems in deployment mode
+#   (i.e. into isolated directory inside application). That's not Gentoo way how
+#   it should be done, but GitLab has too many dependencies that it will be too
+#   difficult to maintain them via ebuilds.
+#
+
+USE_RUBY="ruby21 ruby23"
+
+inherit eutils ruby-ng user systemd
+
+MY_PV="v${PV/_/-}"
+MY_GIT_COMMIT="cf020e66dff606f6ea2d2dbaeb7bef43d446c536"
+
+GITLAB_PAGES_VERSION="0.4.0"
+GITLAB_SHELL_VERSION="5.0.0"
+GITLAB_WORKHORSE_VERSION="1.4.1"
+
+DESCRIPTION="GitLab is a free project and repository management application"
+HOMEPAGE="https://about.gitlab.com/"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
+RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm64"
+IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries"
+
+## Gems dependencies:
+#   charlock_holmes     dev-libs/icu
+#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
+#   rugged              dev-util/cmake, virtual/pkgconfig
+#   json                dev-util/ragel
+#   pygments.rb         python 2.7+
+#   execjs              net-libs/nodejs, or any other JS runtime
+#   pg                  dev-db/postgresql
+#   mysql               virtual/mysql
+#
+GEMS_DEPEND="
+	dev-libs/icu
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-util/ragel
+	>=net-libs/nodejs-4.3.0
+	>=sys-apps/yarn-0.17.0
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	mysql? ( virtual/mysql )
+	kerberos? ( virtual/krb5 )"
+CDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig"
+COMMON_DEPEND="
+	${GEMS_DEPEND}
+	~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION}
+	>=dev-vcs/git-2.8.4
+	~dev-vcs/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
+	kerberos? ( !app-crypt/heimdal )
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
+	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )"
+DEPEND="
+	${CDEPEND}
+	${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-db/redis-2.8
+	virtual/mta
+	systemd? ( sys-apps/systemd:0= )"
+# required bundler >= 1.14.2
+ruby_add_bdepend "
+	virtual/rubygems
+	>=dev-ruby/bundler-1.13.7"
+
+#
+# fix-sendmail-config:
+#     Fix default settings to work with ssmtp that doesn't know '-t' argument.
+# fix-redis-config-path:
+#     Point to the absolute location of redis_config.rb
+#
+RUBY_PATCHES=(
+	"01-${PN}-8.7.5-fix-sendmail-config.patch"
+	"02-${PN}-9.0.0-fix-redis-config-path.patch"
+	"03-${PN}-8.17.0-database.yml.patch"
+	"04-${PN}-8.12.7-fix-check-task.patch"
+	"05-${PN}-9.0.0-replace-sys-filesystem.patch"
+	"06-${PN}-8.17.0-fix-webpack-config.patch"
+)
+
+MY_NAME="gitlab"
+MY_USER="git"    # should be same as in gitlab-shell
+
+DEST_DIR="/opt/${MY_NAME}"
+CONF_DIR="/etc/${MY_NAME}"
+LOGS_DIR="/var/log/${MY_NAME}"
+TEMP_DIR="/var/tmp/${MY_NAME}"
+
+all_ruby_prepare() {
+	# fix paths
+	local satellites_path="${TEMP_DIR}/repo_satellites"
+	local repos_path=/var/lib/git/repositories
+	local shell_path=/usr/share/gitlab-shell
+	sed -i -E \
+		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
+		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
+		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
+		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
+		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
+
+	local run_path=/run/${MY_NAME}
+	sed -i -E \
+		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
+		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
+		-e "s|/home/git/gitlab|${DEST_DIR}|" \
+		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
+
+	sed -i \
+		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
+		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
+
+	# modify default database settings for PostgreSQL
+	sed -i -E \
+		-e 's|(username:).*|\1 gitlab|' \
+		-e 's|(password:).*|\1 gitlab|' \
+		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
+		config/database.yml.postgresql \
+		|| die "failed to filter database.yml.postgresql"
+
+	# rename config files
+	mv config/gitlab.yml.example config/gitlab.yml
+	mv config/unicorn.rb.example config/unicorn.rb
+
+	local dbconf=config/database.yml
+	if use postgres && ! use mysql; then
+		mv ${dbconf}.postgresql ${dbconf}
+		rm ${dbconf}.mysql
+	elif use mysql && ! use postgres; then
+		mv ${dbconf}.mysql ${dbconf}
+		rm ${dbconf}.postgresql
+	fi
+
+	# remove useless files
+	rm -r lib/support/{deploy,init.d}
+	use unicorn || rm config/unicorn.rb
+}
+
+all_ruby_install() {
+	local dest=${DEST_DIR}
+	local conf=${CONF_DIR}
+	local logs=${LOGS_DIR}
+	local temp=${TEMP_DIR}
+
+	# prepare directories
+	diropts -m750
+	dodir ${logs} ${temp}
+
+	diropts -m755
+	dodir ${conf} ${dest}/public/uploads
+
+	dosym ${temp} ${dest}/tmp
+	dosym ${logs} ${dest}/log
+
+	# install configs
+	insinto ${conf}
+	doins -r config/*
+	dosym ${conf} ${dest}/config
+
+	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
+
+	# remove needless dirs
+	rm -Rf config tmp log
+
+	# install the rest files
+	# using cp 'cause doins is slow
+	cp -Rl * "${D}/${dest}"/
+
+	# install logrotate config
+	dodir /etc/logrotate.d
+	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
+		${logs}/*.log {
+		    missingok
+		    delaycompress
+		    compress
+		    copytruncate
+		}
+	EOF
+
+	## Install gems via bundler ##
+
+	cd "${D}/${dest}"
+
+	local without="development test aws"
+	local flag; for flag in mysql postgres unicorn kerberos; do
+		without+="$(use $flag || echo ' '$flag)"
+	done
+	local bundle_args="--deployment ${without:+--without ${without}}"
+
+	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
+
+	einfo "Running bundle install ${bundle_args} ..."
+	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
+
+	einfo "Cleaning old gems ..."
+	${RUBY} /usr/bin/bundle clean
+
+	# clean gems cache
+	rm -Rf vendor/bundle/ruby/*/cache
+	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
+
+	## RC script ##
+
+	if use systemd ; then
+		ewarn "Beware: systemd support has not been tested, use at your own risk!"
+		systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service"
+		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
+		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
+		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
+		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
+	else
+		local rcscript=gitlab-8.13.3-sidekiq.init
+		use unicorn && rcscript=gitlab-8.13.3-unicorn.init
+
+		cp "${FILESDIR}/${rcscript}" "${T}" || die
+		sed -i \
+			-e "s|@USER@|${MY_USER}|" \
+			-e "s|@GITLAB_BASE@|${dest}|" \
+			-e "s|@LOGS_DIR@|${logs}|" \
+			"${T}/${rcscript}" \
+			|| die "failed to filter ${rcscript}"
+
+		newinitd "${T}/${rcscript}" "${MY_NAME}"
+	fi
+
+	# fix permissions
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
+}
+
+pkg_postinst() {
+	elog "If this is an update from a previous version, stop your GitLab"
+	elog "instance and issue the following command to perform all required"
+	elog "migrations:"
+	elog "       emerge --config \"=${CATEGORY}/${PF}\""
+	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
+	elog "before running the config phase. Run these commands (as root):"
+	elog
+	elog "    cd /opt/gitlab"
+	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
+	elog
+	elog "If this was a fresh install, follow these steps:"
+	elog
+	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
+	elog
+	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
+	elog "   for \"production\" environment."
+	elog
+	elog "3. Then you should create a database for your GitLab instance, if you"
+	elog "   haven't done so already."
+	elog
+	if use postgres; then
+		elog "If you have local PostgreSQL running, just copy&run:"
+		elog "      su postgres"
+		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
+		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
+		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
+		elog "  Note: You should change your password to something more random..."
+		elog
+	fi
+	elog "4. Finally execute the following command to initialize the environment:"
+	elog "       emerge --config \"=${CATEGORY}/${PF}\""
+	elog "   Note: Do not forget to start Redis server first!"
+	elog
+	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
+	elog "you can't login after the upgrade, be sure to read the section about the"
+	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
+	elog "http://goo.gl/5XGRGv."
+	if use postgres; then
+		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
+		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
+		elog "super user for *every* GitLab database:"
+		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+		elog "For details, see the documentation at the GitLab website."
+	fi
+}
+
+pkg_config() {
+	einfo "Checking configuration files"
+
+	if [ ! -r "${CONF_DIR}/database.yml" ]; then
+		eerror "Copy ${CONF_DIR}/database.yml.* to"
+		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
+		eerror "database settings for \"production\" environment."; die
+	fi
+
+	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
+	local git_home="$(egethome ${MY_USER})"
+
+	# configure Git global settings
+	if [ ! -e "${git_home}/.gitconfig" ]; then
+		einfo "Setting git user"
+		su -l ${MY_USER} -c "
+			git config --global user.email '${email_from}';
+			git config --global user.name 'GitLab'" \
+			|| die "failed to setup git name and email"
+	fi
+
+	su -l ${MY_USER} -c "git config --global repack.writeBitmaps true"
+
+	# determine whether this is an update or a fresh install. we do this by
+	# checking whether the ${DEST_DIR}/.git directory exists or not
+	# 
+	if [ -d "${DEST_DIR}/.git" ]; then
+		local update=true
+	else
+		local update=false
+	fi
+
+	## Initialize app ##
+
+	local RAILS_ENV="production"
+	local RUBY=${RUBY:-/usr/bin/ruby}
+	local BUNDLE="${RUBY} /usr/bin/bundle"
+
+	# FIXME: this line existed in older ebuilds, but the variable is
+	# never used. what was it for!?
+	# local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
+
+	if [ "${update}" = 'true' ]; then
+		einfo "Migrating database ..."
+		exec_rake db:migrate
+
+		# https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
+		einfo "Migrating iids ..."
+		exec_rake migrate_iids
+
+		einfo "Installing npm modules ..."
+		exec_npm install
+
+		einfo "Cleaning old precompiled assets ..."
+		exec_rake gitlab:assets:clean
+
+		einfo "Cleaning cache ..."
+		exec_rake cache:clear
+	else
+		# create dummy git repo as workaround for
+		# https://github.com/bundler/bundler/issues/2039
+		einfo "Initializing dummy git repository to avoid false errors from bundler"
+		su -l ${MY_USER} -c "
+			cd ${DEST_DIR}
+			git init
+			git add README.md
+			git commit -m 'Dummy repository'" >/dev/null
+
+		einfo "Initializing database ..."
+		exec_rake gitlab:setup
+
+		einfo "Installing npm modules ..."
+		exec_npm install
+	fi
+
+	einfo "Precompiling assests ..."
+	exec_rake gitlab:assets:compile
+
+	if [ "${update}" = 'true' ]; then
+		ewarn
+		ewarn "This configuration script runs only common migration tasks."
+		ewarn "Please read guides on"
+		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
+		ewarn "for any additional migration tasks specific to your previous GitLab"
+		ewarn "version."
+		if use mysql ; then
+			ewarn "PLEASE also read this document about needed migrations on MySQL:"
+			ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
+		fi
+	fi
+	elog
+	elog "If you want to make sure that the install/upgrade was successful, start"
+	elog "Gitlab now and then run these commands (as root):"
+	elog
+	elog "    cd /opt/gitlab"
+	elog "    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production"
+	elog "    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production"
+	elog
+	if ! use systemd ; then
+		elog "You may also run"
+		elog "    /etc/init.d/gitlab check"
+		elog " for convenience."
+	fi
+}
+
+ryaml() {
+	ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
+}
+
+exec_rake() {
+	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}"
+
+	echo "   ${command}"
+	su -l ${MY_USER} -c "
+		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
+		cd ${DEST_DIR}
+		${command}" \
+		|| die "failed to run rake $@"
+}
+
+exec_npm() {
+	local command="npm $@ --${RAILS_ENV}"
+
+	echo "   ${command}"
+	su -l ${MY_USER} -c "
+		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
+		cd ${DEST_DIR}
+		${command}" \
+		|| die "failed to run npm $@"
+}

From 0996deb7ff3ffd1434df57cf54ba5e52a36530fc Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 28 Mar 2017 17:11:38 +0200
Subject: [PATCH 4/5] www-apps/gitlab-ce: Fixed the latest ebuild to use yarn
 instead of npm.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 www-apps/gitlab-ce/ChangeLog              |  4 ++++
 www-apps/gitlab-ce/Manifest               |  6 +++---
 www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild | 10 +++++-----
 www-apps/gitlab-ce/gitlab-ce-9999.ebuild  | 10 +++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index 4ecb9d0..c4c1125 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -1,3 +1,7 @@
+  28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0.ebuild,
+  gitlab-ce-9999.ebuild:
+  www-apps/gitlab-ce:  Fixed the latest ebuild to use yarn instead of npm.
+
 *gitlab-ce-9.0.0 (28 Mar 2017)
 
   28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.0.ebuild:
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index ad2f9bc..c4994cf 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -23,8 +23,8 @@ DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea
 EBUILD gitlab-ce-8.15.8.ebuild 11982 SHA256 755bfd6fa532a308d3f458db1456f8de4f2c5f599ab76c18653aad9e038d0697 SHA512 9aa439da7dc61687f1cdce5ff693dd1c8c4edc54aaed288ad0368aa1b64d577a7f3752dee149c200c4d98b43a6347c77251cac9f6d3316b5a6d799a17c3ed583 WHIRLPOOL 02393bfd983341632663096e8b293e3611ac5328a58a50a1c7e800e348e866f37aff53ebe447507a84d5966e019265fde94a30716f43b50228437e04abcd932c
 EBUILD gitlab-ce-8.16.8.ebuild 11982 SHA256 31537d4a6aeb9ff14ab14c9a27dca51a056e94ee75506ad855a1289f32468694 SHA512 01d536fcfb53a7b39943314a34eeeb9c5b5660604a2fb1a1c2dcd1d7e87d19ab0bbc5bc650feaa1db812047c3783a324d7c8a8bce7dd7381033c3d1ca2e64828 WHIRLPOOL 0f3402e30164ee6d5058c51554cc916d91d5975f438074e3193bf3bdb4e323bca4279c19f00cd7bacd01c2eb6cf13e41a0badabd958e9be58d319224f53403b0
 EBUILD gitlab-ce-8.17.4.ebuild 12928 SHA256 f748d42058293ba4f593fbb36be34ecde332d896d04c610fd3b7e91288c18fbb SHA512 3c2736f9b7df066bb105faffef6ce2b6276fe60a686a7462c630a1b7c7c0296d94e33c7ea25a9f24aa814628f318e2430a3e5ca149783c86ef3fb1132dd01877 WHIRLPOOL cd629ba993df3eaef9c9ec1bf1649aa4cfea5f3787d2207a7016c092bff67175d79c6782d643d4c80b3b5971a98858feaa279a184abc4fd936c7e5c8b291dd28
-EBUILD gitlab-ce-9.0.0.ebuild 12928 SHA256 55c3b39745547beac38b04d52b1c41caf2965179fa6d23cb0856f886fbe20431 SHA512 1557d9be66a033e1a9e94eb657342035f47f044cc4defd7eff35701554e47372794de5d7e1d1a94aa7ba7355990845ef8ac779aa449f06276ef52cafc9294d55 WHIRLPOOL e665021ba141205db52a8cf4be5a7f38c897967393a6f122fcbe93789008a991bfd2e6ced57873315434183898f21a5f13dc44a662e5cea309fd2f710895235b
+EBUILD gitlab-ce-9.0.0.ebuild 12933 SHA256 3c0c771e6ece33f3a47f58ebedfaff6b95f603b55916f4424db8617ba0f3774d SHA512 7ba12701c1b3b5e278912e3442024deed208e74bf87e5d49a497404c56bc13a3c5aa0848d9cdba14d8d6393808c9eac7b3b6bd56a564702130e86a7b69e14d7d WHIRLPOOL 169964b11c6e0473276422ff85557669f383506edaa55a8713f35b0bef588b60aae4eac30c1e36313c5b37681f48184b013ff9e647f603b0d8f46475b28091cb
 EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f
-EBUILD gitlab-ce-9999.ebuild 12869 SHA256 4a1e486e7386aa942bbd22c29457850584dab007b64715fc6f316ce5c98fcaf8 SHA512 ed66b809ca6e04956a9d4f5ef027aa9e174bad5cd80131a30fc34a1011f0221483b6fb52e893394b429d70919fc65496711a9c700c630c2ff31665827912df82 WHIRLPOOL b1b2582dcb1f600f199216c1bb532eac524ff3cce594e052039be29547164557997c65573f943c00240ab0986b0f1c1315602c3a65a0986e9f64a2df1827288e
-MISC ChangeLog 16217 SHA256 0c9f7b191006123750250bbaa1ee8eed779e4074051fb4b5b29de3cb0c2ef5d2 SHA512 cd1b669ed6bb3c3cd6f44343481d09c2ad4d8df5ab0217676ff49408a46e3b20ff746af78dc647c374c4d5d88f876c2eceb7444f83269fa027a6c40ec7698c9d WHIRLPOOL 94c4744827a3dba8175139cd1d9566ed264619be9f601208b4dec39cf8f2f33a4bd36507263eac7efb2a454cd197bc7ee801090b5cdd423a4aaecf3ee0443579
+EBUILD gitlab-ce-9999.ebuild 12874 SHA256 2c84abbccdfdbb2106d74acfca95509cd667e44b3d55a8058e5e12faff14ff8e SHA512 bfa9273ff0aabddb67d0739915c76bd133c2a08f1f24526f6f5de4ab59cca270e91e30a749fb6593b0604c9e4361639245216315a90ae4801b9aca66ef8f9cda WHIRLPOOL 09f779717a401f4e36d38de2cfd07e6228167fcb69ece26803ed3917e64a70502027d0b7ac3997bea9cfffb4e5bee24381e24cf257f3ad8521d5e0f611324fec
+MISC ChangeLog 16393 SHA256 c4a26554577cdca8b797319976c07964948f130c8f00fd8fb449053091fe11ea SHA512 8164411d5e4ce7f9a5189baf6d54875b444434d3ff7e5e4d780d94542fe9226a4e869a4b9a031d7f546c9b11bb5d7113e95fffc9b12065c222cd4946407bbb1b WHIRLPOOL 816884945be28eaec22d944b514d96c0f0653f6f607cbe3d2c71b2be1b11852c2c68e9f25742ced0ea1f7d49a06eb0bb5302b3c8763b26f65edb85d56ebb0c04
 MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
index 54a483a..b2ee0a3 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
@@ -339,7 +339,7 @@ pkg_config() {
 		exec_rake migrate_iids
 
 		einfo "Installing npm modules ..."
-		exec_npm install
+		exec_yarn install
 
 		einfo "Cleaning old precompiled assets ..."
 		exec_rake gitlab:assets:clean
@@ -360,7 +360,7 @@ pkg_config() {
 		exec_rake gitlab:setup
 
 		einfo "Installing npm modules ..."
-		exec_npm install
+		exec_yarn install
 	fi
 
 	einfo "Precompiling assests ..."
@@ -408,13 +408,13 @@ exec_rake() {
 		|| die "failed to run rake $@"
 }
 
-exec_npm() {
-	local command="npm $@ --${RAILS_ENV}"
+exec_yarn() {
+	local command="yarn $@ --${RAILS_ENV}"
 
 	echo "   ${command}"
 	su -l ${MY_USER} -c "
 		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
 		cd ${DEST_DIR}
 		${command}" \
-		|| die "failed to run npm $@"
+		|| die "failed to run yarn $@"
 }
diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
index a150c0c..0bc9693 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@@ -343,7 +343,7 @@ pkg_config() {
 		exec_rake migrate_iids
 
 		einfo "Installing npm modules ..."
-		exec_npm install
+		exec_yarn install
 
 		einfo "Cleaning old precompiled assets ..."
 		exec_rake gitlab:assets:clean
@@ -364,7 +364,7 @@ pkg_config() {
 		exec_rake gitlab:setup
 
 		einfo "Installing npm modules ..."
-		exec_npm install
+		exec_yarn install
 	fi
 
 	einfo "Precompiling assests ..."
@@ -412,13 +412,13 @@ exec_rake() {
 		|| die "failed to run rake $@"
 }
 
-exec_npm() {
-	local command="npm $@ --${RAILS_ENV}"
+exec_yarn() {
+	local command="yarn $@ --${RAILS_ENV}"
 
 	echo "   ${command}"
 	su -l ${MY_USER} -c "
 		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
 		cd ${DEST_DIR}
 		${command}" \
-		|| die "failed to run npm $@"
+		|| die "failed to run yarn $@"
 }

From 812abee2fe09f470588c49d96baf0262fd431a83 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Tue, 28 Mar 2017 17:20:32 +0200
Subject: [PATCH 5/5] www-apps/gitlab-ce:

Moved warning about MySQL migrations to the postinst phase, as the config phase might fail when the database is not updated. So the message must be displayed earlier.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 www-apps/gitlab-ce/ChangeLog              | 6 ++++++
 www-apps/gitlab-ce/Manifest               | 6 +++---
 www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild | 9 +++++----
 www-apps/gitlab-ce/gitlab-ce-9999.ebuild  | 9 +++++----
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index c4c1125..f03c9a7 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -1,3 +1,9 @@
+  28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0.ebuild,
+  gitlab-ce-9999.ebuild:
+  www-apps/gitlab-ce:   Moved warning about MySQL migrations to the postinst
+  phase, as the config phase might fail when the database is not updated. So the
+  message must be displayed earlier.
+
   28 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.0.ebuild,
   gitlab-ce-9999.ebuild:
   www-apps/gitlab-ce:  Fixed the latest ebuild to use yarn instead of npm.
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index c4994cf..5702502 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -23,8 +23,8 @@ DIST gitlab-ce-9.0.0_rc4.tar.gz 26270878 SHA256 f47ddcf6f4f0336228dd1ef03085c9ea
 EBUILD gitlab-ce-8.15.8.ebuild 11982 SHA256 755bfd6fa532a308d3f458db1456f8de4f2c5f599ab76c18653aad9e038d0697 SHA512 9aa439da7dc61687f1cdce5ff693dd1c8c4edc54aaed288ad0368aa1b64d577a7f3752dee149c200c4d98b43a6347c77251cac9f6d3316b5a6d799a17c3ed583 WHIRLPOOL 02393bfd983341632663096e8b293e3611ac5328a58a50a1c7e800e348e866f37aff53ebe447507a84d5966e019265fde94a30716f43b50228437e04abcd932c
 EBUILD gitlab-ce-8.16.8.ebuild 11982 SHA256 31537d4a6aeb9ff14ab14c9a27dca51a056e94ee75506ad855a1289f32468694 SHA512 01d536fcfb53a7b39943314a34eeeb9c5b5660604a2fb1a1c2dcd1d7e87d19ab0bbc5bc650feaa1db812047c3783a324d7c8a8bce7dd7381033c3d1ca2e64828 WHIRLPOOL 0f3402e30164ee6d5058c51554cc916d91d5975f438074e3193bf3bdb4e323bca4279c19f00cd7bacd01c2eb6cf13e41a0badabd958e9be58d319224f53403b0
 EBUILD gitlab-ce-8.17.4.ebuild 12928 SHA256 f748d42058293ba4f593fbb36be34ecde332d896d04c610fd3b7e91288c18fbb SHA512 3c2736f9b7df066bb105faffef6ce2b6276fe60a686a7462c630a1b7c7c0296d94e33c7ea25a9f24aa814628f318e2430a3e5ca149783c86ef3fb1132dd01877 WHIRLPOOL cd629ba993df3eaef9c9ec1bf1649aa4cfea5f3787d2207a7016c092bff67175d79c6782d643d4c80b3b5971a98858feaa279a184abc4fd936c7e5c8b291dd28
-EBUILD gitlab-ce-9.0.0.ebuild 12933 SHA256 3c0c771e6ece33f3a47f58ebedfaff6b95f603b55916f4424db8617ba0f3774d SHA512 7ba12701c1b3b5e278912e3442024deed208e74bf87e5d49a497404c56bc13a3c5aa0848d9cdba14d8d6393808c9eac7b3b6bd56a564702130e86a7b69e14d7d WHIRLPOOL 169964b11c6e0473276422ff85557669f383506edaa55a8713f35b0bef588b60aae4eac30c1e36313c5b37681f48184b013ff9e647f603b0d8f46475b28091cb
+EBUILD gitlab-ce-9.0.0.ebuild 13008 SHA256 3b390e22aa0eda10dafe4c37cc4ccb2ff7e9b4cbbeeba6a64df7255e3440daf6 SHA512 d9f659414d380af24f4fb871f3c50062056b2aebef8f8fae7203b49a9102e55acc6c4be0840575de0953317d3a4fe6b4a4603121072b59cb0459927236cd9434 WHIRLPOOL 667ac5e2ba8ac7406dbd30e84ae13370eb3b55855e0319073d9295b9d8fbaa5f1e4f47b8ed2603394d77744d797512c653894c55a55ae676b87938d122fcdb5a
 EBUILD gitlab-ce-9.0.0_rc4.ebuild 12910 SHA256 8851160b4454845fb33ce0b9a9dd3e070bed07d3a0e5c5f753c77b0ef301ded0 SHA512 9d109a3ea8fa7a7bb33440b4b21bf988745c4eefb62b834ad88825f3ffa28881eceaf402ec09241b74d91e778258c1a18daae6c86254625af4f54bf6189b32f2 WHIRLPOOL 67aa480b4cf1209a3d7af3bffb1f7f774bf2c6d18bf40960478e13459813ebb9472adc5aec3b84252157b0c3e74f9e7f74cb0d57395983c02ba4c976ffae106f
-EBUILD gitlab-ce-9999.ebuild 12874 SHA256 2c84abbccdfdbb2106d74acfca95509cd667e44b3d55a8058e5e12faff14ff8e SHA512 bfa9273ff0aabddb67d0739915c76bd133c2a08f1f24526f6f5de4ab59cca270e91e30a749fb6593b0604c9e4361639245216315a90ae4801b9aca66ef8f9cda WHIRLPOOL 09f779717a401f4e36d38de2cfd07e6228167fcb69ece26803ed3917e64a70502027d0b7ac3997bea9cfffb4e5bee24381e24cf257f3ad8521d5e0f611324fec
-MISC ChangeLog 16393 SHA256 c4a26554577cdca8b797319976c07964948f130c8f00fd8fb449053091fe11ea SHA512 8164411d5e4ce7f9a5189baf6d54875b444434d3ff7e5e4d780d94542fe9226a4e869a4b9a031d7f546c9b11bb5d7113e95fffc9b12065c222cd4946407bbb1b WHIRLPOOL 816884945be28eaec22d944b514d96c0f0653f6f607cbe3d2c71b2be1b11852c2c68e9f25742ced0ea1f7d49a06eb0bb5302b3c8763b26f65edb85d56ebb0c04
+EBUILD gitlab-ce-9999.ebuild 12949 SHA256 29d8125cbb7bd6d80623f54e1de2c18f7fde2301f5b94238853e2d717f920ad8 SHA512 c537716f9288e09c79508db89d21641424e36f491914aef8102734e8edd12a239f0b839d1ecfdaaf28b6bd19dd324479da3478db74611f97d875b6d5156cbac9 WHIRLPOOL 0a8403ad5f4284e5ec742eec5b6b83124f4a218adacee63cd413e3889934d1511f229d42502d50977cb2b9881f86c0e73e57c4a5421b119c5c44f56f9f8f3a92
+MISC ChangeLog 16689 SHA256 2d5d8b27ed34fa65b56108d2376b4bab7bf363831ade050675139e59b3b41652 SHA512 c2e27a088aa56a1a0cd0697449676b265eb43cd6b914c01913bc747384aa7dfa4ef90499333e257282d8c500cd1fc7e9bcfe85aed381dda315db17fe849f52b2 WHIRLPOOL 80c5160dc809f4f71a9c8c09a34ab5e69947889afce6d965969309b1a5e14de935521f4e277dfcc4e5c7a7abf37793d365ba537e9cc699f94152c5801f928dbf
 MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e
diff --git a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
index b2ee0a3..cab2e3a 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.0.0.ebuild
@@ -286,6 +286,11 @@ pkg_postinst() {
 		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 		elog "For details, see the documentation at the GitLab website."
 	fi
+	if use mysql ; then
+		ewarn "PLEASE also read this document about needed migrations on MySQL:"
+		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
+		ewarn "Failing to follow those instructions may make the config phase fail!"
+	fi
 }
 
 pkg_config() {
@@ -373,10 +378,6 @@ pkg_config() {
 		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
 		ewarn "for any additional migration tasks specific to your previous GitLab"
 		ewarn "version."
-		if use mysql ; then
-			ewarn "PLEASE also read this document about needed migrations on MySQL:"
-			ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
-		fi
 	fi
 	elog
 	elog "If you want to make sure that the install/upgrade was successful, start"
diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
index 0bc9693..bd03211 100644
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@@ -290,6 +290,11 @@ pkg_postinst() {
 		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 		elog "For details, see the documentation at the GitLab website."
 	fi
+	if use mysql ; then
+		ewarn "PLEASE also read this document about needed migrations on MySQL:"
+		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
+		ewarn "Failing to follow those instructions may make the config phase fail!"
+	fi
 }
 
 pkg_config() {
@@ -377,10 +382,6 @@ pkg_config() {
 		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
 		ewarn "for any additional migration tasks specific to your previous GitLab"
 		ewarn "version."
-		if use mysql ; then
-			ewarn "PLEASE also read this document about needed migrations on MySQL:"
-			ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
-		fi
 	fi
 	elog
 	elog "If you want to make sure that the install/upgrade was successful, start"