Merge branch 'master' into duplicati-20161103

2017-05-30 10:53:27 +02:00 · 2017-05-30 10:53:27 +02:00 · 39ad09f36f
commit 39ad09f36f
parent 83e9e4edb9 3a9d9dafd0
81 changed files with 3882 additions and 932 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 *~
 .public/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,3 +1,20 @@
 stages:
  - check
  - deploy
 Repoman:
  stage: check
  script:
    - repoman -x -p
 pages:
  stage: deploy
  only:
    - master
  script:
    - chmod +x .gitlab-pages-generator.sh
    - ./.gitlab-pages-generator.sh . .public
    - mv .public public
  artifacts:
    paths:
      - public
--- a/.gitlab-pages-generator.sh
+++ b/.gitlab-pages-generator.sh
@ -0,0 +1,104 @@
 #!/bin/sh
 ROOT=$(realpath "${1:-.}")
 TARGET=$(realpath "${2:-.public}")
 declare -a PARTS=()
 function createDir() {
 	mkdir -p "${1}"
 }
 function createDirInTarget() {
 	local dirpart="${1}"
 	local destinationdirectory=${dirpart/${ROOT}/${TARGET}}
 	echo $destinationdirectory
 }
 function writeHTMLHeader() {
 	local targetfile="${1}"
 	local currentdir="${2}"
 	cat <<EOHEAD > "${targetfile}"
 <!DOCTYPE html>
 <html>
 <head>
 	<meta charset="UTF-8">
 	<title>gentoo-overlay/${currentdir}</title>
 </head>
 <body>
 	<h1>gentoo-overlay/${currentdir}</h1>
 	<ul>
 EOHEAD
 }
 function writeHTMLFooter() {
 	local targetfile="${1}"
 	cat <<EOFOOT >> "${targetfile}"
 	</ul>
 </body>
 </html>
 EOFOOT
 }
 function writeHTMLFileentry() {
 	local targetfile="${1}"
 	local filename="${2}"
 	cat <<EOFILE >> "${targetfile}"
 		<li><a href="${filename}">${filename}</a></li>
 EOFILE
 }
 function pushPart() {
 	local part="${1}"
 	PARTS=("${PARTS[@]}" "${part}")	
 }
 function popPart() {
 	local index=$(expr ${#PARTS[@]} - 1)
 	unset PARTS[${index}]
 }
 function renderParts() {
 	local IFS="/"
 	echo "${PARTS[*]}"
 }
 function renderTargetPath() {
 	local parts=$(renderParts)
 	echo "${TARGET}${parts:+/}${parts}"
 }
 function renderTargetFilename() {
 	local targetPath=$(renderTargetPath)
 	echo "${targetPath}/index.html"
 }
 function processDir() {
 	local dir="${1}"
 	cd "${dir}"
 	local realpath=$(realpath .)
 	local files=$(ls)
 	local parts=$(renderParts)
 	local targetPath=$(renderTargetPath)
 	local targetFilename=$(renderTargetFilename)
 	mkdir -p "${targetPath}"
 	writeHTMLHeader "${targetFilename}" "${parts}"
 	writeHTMLFileentry "${targetFilename}" ".."
 	for f in ${files} ; do
 		if [ -f "${f}" ] ;then
 			cp "${f}" "${targetPath}"
 			writeHTMLFileentry "${targetFilename}" "${f}"
 		elif [ -d "${f}" ] ; then
 			writeHTMLFileentry "${targetFilename}" "${f}/"
 			pushPart "${f}"
 			processDir "${f}"
 			popPart
 		else
 			echo "Unknown: ${f}"
 		fi
 	done
 	writeHTMLFooter "${targetFilename}"
 	cd ..
 }
 processDir "${ROOT}"
--- a/README.md
+++ b/README.md
@ -5,12 +5,28 @@ Gentoo overlay with some ebuilds that I found either outdated or missing in the
 Build status of the [master branch](https://gittr.ch/linux/gentoo-overlay/tree/master), as seen by `repoman -p -x`: [![build status](https://gittr.ch/ci/projects/10/status.png?ref=master)](https://gittr.ch/ci/projects/10?ref=master)
 Using with plain (recent) Portage
 ---------------------------------
 Create a new config file under `/etc/portage/repos.conf/fritteli.conf` with the following contents:
 	[fritteli]
 	auto-sync = yes
 	location = /usr/local/portage/overlays/fritteli
 	sync-type = git
 	sync-uri = https://gittr.ch/linux/gentoo-overlay.git
 You may adapt the `location` attribute to your system's own setup.
 If you prefer to use the overlay hostet at GitHub (which tends to be more stable but less up-to-date than the one hosted at gittr.ch), you may use `https://github.com/fritteli/gentoo-overlay.git` for the `sync-uri`.
 Using with Layman
 -----------------
-Use layman to easily install and update overlays over time.
+You may also use `layman` to manage this overlay, although that requires some more setup and manual sync'ing.
-If you haven't used layman yet, just run these commands:
+If you haven't used layman yet, just installing running these commands:
 	USE=git emerge -va layman
 	echo PORTDIR_OVERLAY=\"\" > /var/lib/layman/make.conf
--- a/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/ChangeLog
@ -1,3 +1,12 @@
 *gitlab-ci-multi-runner-bin-1.8.0 (23 Nov 2016)
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
  +gitlab-ci-multi-runner-bin-1.8.0.ebuild,
  -gitlab-ci-multi-runner-bin-1.4.1.ebuild,
  -gitlab-ci-multi-runner-bin-1.5.0.ebuild:
  dev-vcs/gitlab-ci-multi-runner-bin:  added ebuild for gitlab-ci-multi-
  runner-1.8.0 and pruned old ones
  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,
--- a/dev-vcs/gitlab-ci-multi-runner-bin/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/Manifest
@ -1,20 +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
+DIST gitlab-ci-multi-runner-bin-1.8.0-amd64 69057552 SHA256 851e5b438d0b04a633623437794c8bb019bb163cba067cf2f60801948937d6c7 SHA512 60fb2440f5e256f4a7d3ab6d3c5731f33328782ba73957107bd122372b59d2c6e1e7511ca8f6c149985bb1d43cf02803c60022ffbb74d5d173033caebe3103a0 WHIRLPOOL 93c007f122bfcbe8c4f8385a5af79b3a2d028136e6c2187f6b7461ece4aef4c60bbee4ef4121bc8b692195674727719543c081875bd1b00f51a2898d464409d9
-EBUILD gitlab-ci-multi-runner-bin-1.5.0.ebuild 2411 SHA256 fed2bdcf3a3e22c251e209fe70db415d863b19503a9aae1d83140cee1c7430f6 SHA512 9885ceb82acbf2c3354d42251f83555bee0278b698e064096d462ff8fc469b2afe675c6b1a59b9c3a0d724e087f5c071f466bafb40437ea8783a239b68b5d624 WHIRLPOOL dd31877c8e4e0e5bcb94d1b41d1342f531aad8e2f2fa3fbb25139d5e1f4a406bd212da97d30e8c90645d46a3ddecb07446c527b4ce4e46f1e670f13107fb1640
+DIST gitlab-ci-multi-runner-bin-1.8.0-arm 65672013 SHA256 a9047148ea205225a88a1026f51dfb565bed69cfafd3123beaa1955b169bd193 SHA512 2156bda5fe3818f024059bfd2d735c20398f6c386198ec0edb6ee83ee0439c3e03cdfbd9bf6bb19b446d2dbc28f553f404be3d3df1703b5f95c2f3d000fd16e8 WHIRLPOOL 0a831afefe3453b75f97248ebab197f633a97232abc8699b5120afd0aca327ef3733b8709feb0fb5108cafb7cc4b9c16649c38a0ca90978d099343ae077a5289
 DIST gitlab-ci-multi-runner-bin-1.8.0-x86 65431904 SHA256 88644de0441f33d410928b1aecb0db04dd77ad0870406caec98d3034cbe4cd3f SHA512 f3e6fca39a6146adcf1be72628d47370394dd62097e5b917ee4b8715248b057b20906d032efbf7988127dee5d75b4a0887750e3755a5123e35fabb520297ef13 WHIRLPOOL 2eb8c072263f182912d342b8cacd99aca3e9fe048d05d25275a3fd396603c89a7ce4a7edf97a2552fe2bae2c08647444d4702bbda1296878e3f062338e96500c
 DIST gitlab-ci-multi-runner-bin-9.2.0-amd64 70053912 SHA256 bc84cee7cfccc3b5ae0ed9737fd2e89e9aa1c358b0a69b20261f6ac55fe4d696 SHA512 efb52bb7a6014df32fd4ef1bef218c243e09a931fa6938fb5331fc166b93d0d83a636f804370c9dd4c7b9c81c71150bee49d9081df8bdd69e667079ebed66a69 WHIRLPOOL 96332aa68c80990b5ce26ab6dfbf43515efbccc3a75ccb3a17491e02c3553ce2baf962d45b83e9b6e1875b4ad098ce75e34e841ffdf1e0181ff755319f352497
 DIST gitlab-ci-multi-runner-bin-9.2.0-arm 66560073 SHA256 ccc67dde278d1ded1c4aa6785de8ef1429b971ba9fb955109c8d9cd9d8ce862f SHA512 878ed2efb619ca43e03319a77b35bc79842eb8f62e3e1cf4bb51b0e9256a44ff44112557ad14467e24b41280d67c96b78f381e5d194dd5404911b1122c13d70d WHIRLPOOL 84ee58bb7e54491af55754beb0e0b398b5d546de5f8f48e38f3837b1c92cdbc4e1268a824bbf08c2cac36d85f344a0f96b2ed256bd5d51e99edc807a9c41154e
 DIST gitlab-ci-multi-runner-bin-9.2.0-x86 66332255 SHA256 ec03950240611049bb8537c93fe82459d70a2b20642b4f56f615a72eb2cd501c SHA512 e7c7d6d6888d4b99204a9a9f0c9bb8b454cfd90ebf22e1909b97bd1d32c2282f8ca06a679078bb6b6b4fdb024a015411d62823a1f4f4eed931d7c884ed584e70 WHIRLPOOL f28d0596c38cda742ac300ed0d372220f9c58b235accab4c4a9686fd43905f46c9549c14a76c571fe6a94dc8190aaf57b3fe8513e95091a7daebeb43bc63cc30
 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
+EBUILD gitlab-ci-multi-runner-bin-1.8.0.ebuild 2411 SHA256 b40c9371273c2be43a7b1d93d125791afaf6c9cce21bf24fa926f95b73842d2f SHA512 117b6c5ea58d546356bc334e7eca3fbdd65954cb61573e6422753742083ea3e949513fbe161ed2e5c0dd73e94876a4bf7977b00dd7d9a87efc4988a83f3b7efb WHIRLPOOL 4b5196976691b1b5feedaef59be60f0e246bdfd237cce269d5ac1f2879bc82341ee3761a512f403fd19737143dd884d4985955e023b8df87bad0f31fe861d1d1
 EBUILD gitlab-ci-multi-runner-bin-9.2.0.ebuild 2412 SHA256 3efc6598f7d66a5796629fb8661c0b88bc6eefeaf243b0e70814d6e6d88f5771 SHA512 e4b356f6c6156ddec8cf4e64f33ca77b3dff5c064ca5ef666e999d190f5e57839c4c8a3e520b0148da1914ce2b9ff30c45807c4a00e1861d79fbe39304cc7aaa WHIRLPOOL 4ce43a7bb3427119458fa4f077300d4eccf99c5a773858e2441523b47ed1a38fe01129f50f4c445fa385ebdac8fb771aa7bfeb97aa3083da2628181445d81631
 MISC ChangeLog 2995 SHA256 28132dae936efd153b5923e389f7cc3a9b3397bb84a09db4a7ee67f4550653f6 SHA512 cfcd1448295615bfca384461c3601c2de5308c12ff1ba544821af5f878d2e58da4b7c5ab73da448af8ea5e9b6f08a8b7d71e9db329ebfbe2744b1ed01be2051d WHIRLPOOL 7b932135c6c51547b3423bec14b40900c033e37f302c184817fb93223cacde74737d08ce1d6450ffa8f07c2a378b4e4e80fecdd9e218142a764ad80b2011a1c7
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.8.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-1.8.0.ebuild
@ -8,7 +8,7 @@ inherit eutils user
 MY_PN="gitlab-ci-multi-runner"
-DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.10"
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.14"
 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 )
--- a/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-9.2.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner-bin/gitlab-ci-multi-runner-bin-9.2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -8,7 +8,7 @@ inherit eutils user
 MY_PN="gitlab-ci-multi-runner"
-DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.11"
+DESCRIPTION="Binary version of GitLab CI Multi Runner, the build processor for GitLab 8.14+"
 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 )
--- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog
+++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
@ -1,3 +1,23 @@
 *gitlab-ci-multi-runner-1.11.1 (16 Mar 2017)
  16 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile-1.11.1.patch, +gitlab-ci-multi-runner-1.11.1.ebuild:
  dev-vcs/gitlab-ci-multi-runner:   Added ebuild for gitlab-ci-multi-
  runner-1.11.1
 *gitlab-ci-multi-runner-1.10.4 (15 Feb 2017)
  15 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile-1.10.4.patch, +gitlab-ci-multi-runner-1.10.4.ebuild,
  gitlab-ci-multi-runner-1.9.2.ebuild:
  dev-vcs/gitlab-ci-multi-runner:  added ebuild for gitlab-ci-runner-1.10.4
 *gitlab-ci-multi-runner-1.8.0 (23 Nov 2016)
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile-1.8.0.patch, +gitlab-ci-multi-runner-1.8.0.ebuild:
  dev-vcs/gitlab-ci-multi-runner:  added ebuild for gitlab-ci-multi-runner-1.8.0
  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
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@ -1,9 +1,28 @@
 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.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
 DIST gitlab-ci-multi-runner-1.10.4-prebuilt-arm.tar.xz 8698116 SHA256 f3622932cc0e1013e9b999df68f00e6cfde148f56590cc2336806c9136b94dd3 SHA512 8ff0967105a0cd7d5041823b677a1bb990620c7cfe40975768691b738e37f72394323616c1783add5622696e645916caed18722d6b242974f49ee3da658bee8a WHIRLPOOL 7b76346e3de324bdc647e07cdfb2041af2574d1c4f885783661d5931a7bfc5864424f9f279cb3e3ca391194a2dd6a529a57ec2de831b06ed56d929fdb45c2d7c
 DIST gitlab-ci-multi-runner-1.10.4-prebuilt-x86_64.tar.xz 8340744 SHA256 b3104c5fe3406e544a4cc1b0735c6bf6b66a8d09e8691efbcdd336061f534a33 SHA512 277576ef1a3bbe55f9fa67ea0c957ab1cd3d19ed402efb1124cc0784ab070606e5db973bbaeeee9208ee1f7d9334ff9e3edccc7efcd9a25ac4ae28fe3434b2d1 WHIRLPOOL 47bd79a33bb23d522dd51171a2701acbd6634ffbab885aa65e2f638a91e55f61496eb489280666492569c121adc99bcfc78cb2bc3da5c7812fe4337b40368797
 DIST gitlab-ci-multi-runner-1.10.4.tar.gz 3571099 SHA256 91c1ad64bff9e727ede5d18590082eb57113634aa9cf55a4a1a205e6f28d7f3f SHA512 d47fd24e87afd4c261e526dccc97aaa6d6ac1a5744df85ad44752f49c8f72af59cedc0c6c24a19fcb9bbf8b8703261ecf9568fe69d3ca3012142f46ce8e82d86 WHIRLPOOL 69d6972bfaf97b76de86a853927f8e47ec2108d4c698c964d5908aa04b9981ceba634745122d94a7a4913254660285bc985ab973c306f289109019f6f0219b56
 DIST gitlab-ci-multi-runner-1.11.1-prebuilt-arm.tar.xz 8697772 SHA256 fc0bfbd4f5289b738ce73a27e6ab65687187c01b2709d6c50dd92c868f500d5b SHA512 d582da82223a7161a91da5934004e7fea25a7856a5bf5590e19cc86b6f39017c2c2a7ab80f9bbdb9ef9fa8726861c18312d97fe5e6f8d0a183fac7e23dfb7e31 WHIRLPOOL e6be040a24fc8fa4bb87e6b09cd34d655eac5e93d882c0170988c8b8e8409cf28915ad1b0211b75f678d392450c59074d34ef2ef069b0fc2d59accb7af0e58ab
 DIST gitlab-ci-multi-runner-1.11.1-prebuilt-x86_64.tar.xz 8341536 SHA256 1581e1534e80e8fa72ede15171269728f8123a18a0654975a7cf44daf8e650b9 SHA512 096cfd4966c42c7102d7970e30aa22f4b6059b846013d10ccc8bc9aa118cf66033eda3f668af72414bdfea951e5e995bda48cd36356a3669ed792c0c28ee229b WHIRLPOOL 6bc6000ff709d3a1d3bf3bb654da908831c303a451ea109ced17e8100202a7918f112af955c9f992fde74b2e8c8cc1307cd17914528695bd88eb988dce58e31e
 DIST gitlab-ci-multi-runner-1.11.1.tar.gz 3573032 SHA256 718bf17ff50f526c692c682fa26a48bf4f65d379c27abe6049944ac016a13c95 SHA512 9fedf74bb963f365d650b1470ed9e8d191744b72f1e187eb43b465e784abe8446b7e9975443e3b5a417ca803af4a97bfde471ebace86646ed22af9dae64f8728 WHIRLPOOL 89381abc8ce81ac0320700c8f994dc4a2f38c992c72d15b447a7fc2e8031047aba8894bc1e527d83aa2b04cc0dd1749234d353a7c1a40603f422c0884aba2af7
 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
 DIST gitlab-ci-multi-runner-1.8.0-prebuilt-arm.tar.xz 9502124 SHA256 78a4cee8b91e7a13568104da7c39d526f08f26d946b59cca7bb94b9dc9f87be7 SHA512 2fab0a4088b67ff3be67734f5abfe67301c3ced9d7cf952b4fb71322395f582604aeb28ad3d6338d4890d7b743f76a6d7a297f7435f83778843d4eda02b90e36 WHIRLPOOL c7025ba1d0181388d92c07c2ed67befec2982fbfa74c112b7dbfacd23a0052fe99e6555a926c1cc99d638c0a00c1385bff9d5637624ca26f62891f213e62d8fb
 DIST gitlab-ci-multi-runner-1.8.0-prebuilt-x86_64.tar.xz 8560472 SHA256 9588eb55ade4e323bd5bfeffd3bfc119659d0c2075e18c5bb003a4d79b834839 SHA512 2406ea113cf9d08ccafebc7c79cd42adba5f35a5ccfb282856b7e6c187402d9ef41ceaac973133579afd52933ff7a59bea4e57820f1374f33c748f636701f77e WHIRLPOOL 93d20c9d5660d3c00cc45063cb49d14a2442328d6782e4abe0b1a1fca5d1e612d27e1c88eb834cd12bb745e7d94121e922199fb77dce287f68bcda6c1a8f44c0
 DIST gitlab-ci-multi-runner-1.8.0.tar.gz 3541906 SHA256 0636134f34fd03b1e1407374725ff21f49cb2869f4c5b897bb52e40bdc5aa0ba SHA512 1fb20e359ada1612d6f6120061e62af31410f445d789104f958f3561c8a6479048dedda2338cf01a10197a42da708c31ce3174d1218f94f9f9c88c0dd7d0f29f WHIRLPOOL bb4b22ef4862e0251125e2354342ddeaa0b680662c4c8ec1ce8d223155976ae71a7c6b135774de74294493259a3f2758bb0a78f5f27818569ff7e98ccf8ca966
 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
 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
-MISC ChangeLog 714 SHA256 0f25cf56f039852a47fc1a86f09bf43e24295913799be6ee747946c3e5f19b48 SHA512 2f905e4bb1ae863e77e5a5ff95049a276faa1dfe15a2751a7fce583fa5e18a23995df6a38ded969ce444e110bffbfb320027ba2ac5d35d43908e11627b42224e WHIRLPOOL 7e3de88c9e79cd0aa141e6075a5e88ccf79392b5651d51f829efb59be7aecf8c32594ad319bef8e43ca7ff36a5189a197464ac940125d94f6ede25d3fe65b55c
+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
 MISC ChangeLog 1527 SHA256 f69fb48fa08aff1dc4e751af5dc0035289aaf39c4fb4511b680a938a30bbc311 SHA512 e94da9dd3a9cadf9461e3536a1ea632b16e5704735f30fa47da08652c7bada1d6d0823dde5cdeffeef0787a8ec6a8fe357b841cb4a59e9c345702c113a4a0f10 WHIRLPOOL 50cbf5c714f6a4dc8203a588095e9540157ef3f8d9e406910b93cdc46402bfbdf76a0e5f23e90d4fb25142a222b4c95004c893657d7e73cb3fedeeb0dcd2fe57
 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35
--- a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.10.4.patch
+++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.10.4.patch
@ -0,0 +1,70 @@
 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 7f51066..a0e8211 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 \
 -    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,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
--- a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.11.1.patch
+++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.11.1.patch
@ -0,0 +1,70 @@
 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
--- a/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch
+++ b/dev-vcs/gitlab-ci-multi-runner/files/0001-fix-Makefile-1.8.0.patch
@ -0,0 +1,70 @@
 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..099df3e 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,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
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.10.4.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.10.4.ebuild
@ -0,0 +1,117 @@
 # 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="v${PV/_/-}"
 MY_BRANCH="1-10-stable"
 MY_GIT_HASH="b32125f"
 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=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/${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-${PV}.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() {
 	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."
 }
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.11.1.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.11.1.ebuild
@ -0,0 +1,117 @@
 # 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="v${PV/_/-}"
 MY_BRANCH="1-11-stable"
 MY_GIT_HASH="a67a225"
 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=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/${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@@/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() {
 	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."
 }
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.8.0.ebuild
@ -0,0 +1,117 @@
 # 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 user
 EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner/..."
 MY_PV="v${PV/_/-}"
 MY_BRANCH="1-8-stable"
 MY_GIT_HASH="734bc5d"
 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=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/${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"
 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.8.0.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() {
 	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."
 }
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.9.2.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.9.2.ebuild
@ -0,0 +1,117 @@
 # 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="v${PV/_/-}"
 MY_BRANCH="1-9-stable"
 MY_GIT_HASH="ade6572"
 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=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/${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"
 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.8.0.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() {
 	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."
 }
--- a/dev-vcs/gitlab-shell/ChangeLog
+++ b/dev-vcs/gitlab-shell/ChangeLog
@ -1,3 +1,23 @@
 *gitlab-shell-5.0.0 (13 Mar 2017)
  13 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-5.0.0.ebuild:
  dev-vcs/gitlab-shell:   added ebuild for gitlab-shell-5.0.0; support for git-
  annex has been removed.
  14 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  -files/gitlab-shell-3.2.0-config-paths.patch, -gitlab-shell-4.0.3.ebuild:
  dev-vcs/gitlab-shell: deleted old ebuild
 *gitlab-shell-4.0.3 (12 Dec 2016)
  12 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-4.0.3.ebuild:
  dev-vcs/gitlab-shell:  added ebuild for gitlab-shell-4.0.3, a dependency of
  gitlab-ce-8.14.4
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch> -gitlab-shell-3.5.0.ebuild,
  -gitlab-shell-3.6.1.ebuild:
  dev-vcs/gitlab-shell:  pruned old ebuilds
 *gitlab-shell-4.0.0 (11 Nov 2016)
  11 Nov 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-4.0.0.ebuild:
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@ -1,11 +1,13 @@
-AUX gitlab-shell-3.2.0-config-paths.patch 1826 SHA256 c83db7c37dcac577ce499eab4bb0168253f49d303ba1991fdec90d13cc3fe37a SHA512 7524b6b8cd7cd141a56c468efa303b1d21576ac9e03cb866cbf9dcac34e1b8d4f356333737050e2e5dfeb0f0ad904b3f548c40e1209c1f35054ed2027b1d8271 WHIRLPOOL fdbd2dfe43ff4a2af97227fbf8c4589ca3734ebf0320b7e9c5e8ea39882c49d45815a0ee3c765a141affacbe48f4063987b9664a918e0e216b49ca46a475cc5f
+AUX gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4
-DIST gitlab-shell-3.5.0.tar.gz 73374 SHA256 6591b768a4f51c535e97e5632518583f6559a4202f4219739ad01a27161687ef SHA512 b5935c6f9b19bab1716901c8015e107f7fbc545646d5e35a6a943e1692d3ddd61efeb862f4d59efe75eda9c1117adf9d90b50f572ab0a69199069d1fc52e8718 WHIRLPOOL 938c600d0810867fc9aef62a286b05dc34bf52352612530d459614483e3c37b3cef6ee5b2dc11f7b041218cbe569d11f4f5f0240b9c28e613bd762c06786772e
+DIST gitlab-shell-4.1.1.tar.gz 78829 SHA256 61f684b4528b0b789aad80efbfd8f9870d113f6e2794e589e0db9e74e6737e1d SHA512 17b929da1c6148a9af2787ca4a18081e3108622a40c6fb3f02f36f4ba41f2a1d61cf83509ace849093334af8f4ad74d8a36393bf9fca7ab21163d2f48b499879 WHIRLPOOL cfd258e93abeae4a33c1578114d56186c81a7c5894a3ccb9b690dd9a78051746916f3bac2b7146b8378534d5e177ba4cacb4c2011b64011328b056d4d397967e
-DIST gitlab-shell-3.6.1.tar.gz 74806 SHA256 180dcce14e9caa9c7f09eefdb2e10189318a0f994c4931fae2acebd92e9e4fa3 SHA512 6f54b0a9ddccabb3971c48301292835ecf953e0a9bb3b9d1d78af416a42e3d2883a157ab02990e748b0e6b02805864c314fe9cd538834ab831f565f0c573ed3a WHIRLPOOL 1219213217d5ec280ee521c4f64328634402c795a4fbd10beac3481f4e622faf03859589ee641bbd34647b057c77bdef0d7e1a2906375c3de21cd6b4739a7826
+DIST gitlab-shell-5.0.0.tar.gz 78585 SHA256 7611fdf0b64592365bdb6ba442a4263d129b05c280d5105ea641baec7a0b45ab SHA512 84c86c42e0ff6029ddcdd9a93410b261f4f5a1e8cdb0fd114db2eab56b1fc63f4f8ed6d0cc0c6016d0f02413d6d213aab7a995adadb186c0dfe49e49b762e904 WHIRLPOOL ddaf25f837dbbdbfd6578062b89a8102ffbe0dc88f51890a38f59add61653368b0ad0ea146a8a7eac52fa482f7316aae712f53075f750db02fa8e8ce370f76e6
-DIST gitlab-shell-3.6.6.tar.gz 77199 SHA256 db3f54b561bb81059256c634967b181707e11cc25e30b0fa76eb034718d0eaf9 SHA512 d1d15687169f7b151caf3b371d6570099129a2a69d7732e6be7337f70aaef7e36c87e8aa5140e9697c7be36185743bb939d862790b440fc18d7a864d570fcb6b WHIRLPOOL 4161901369cc12a89fb89c41bd98cfc2cfdeb5aac6d317597ae11f10bcd401e4c18148ce9a20f5e967a6fb11559f33aa72c82dff1a52764c5a19bcd0f06250c1
+DIST gitlab-shell-5.0.2.tar.gz 79009 SHA256 bb5125f12f2f3fbbb93aa78f6810cd62f97bda564d01112a831bf41d4e42ef34 SHA512 c960e1e2c3c9f35927255442f4e20b82af8881d123c3edeffe7ebdc6523fe2456ae1e7149527255eb5e3d2d369b4f70b7c902314d881a20b893fea9fac968f73 WHIRLPOOL dc5be75f111074c8e9f018533ddcef64edcded4c5f3003a3f7297d9153469894f4c8a3e387419055a3e51732daa9db8a3b936984a24f3b4d1a9e0cbc968a7119
-DIST gitlab-shell-4.0.0.tar.gz 76582 SHA256 2d8d5e31eac5007a70720465d71c6cee74428a71c2fda7e21ca8393bc8c8966f SHA512 dd44528dc2914025e850b7172df1c5e0b39f8c1764adeea62a824643723c3264c462006ddf0cc6f4519d0caf0c39e6cee601f9f7988eb54138118176178045e4 WHIRLPOOL 462886da23a1723049914759f0b315d39c42488e55dfab4debae57c7b20878a421dac36a77d5e82603119e4eb142c83dbf18e28213670abd81396de1d0c683cf
+DIST gitlab-shell-5.0.3.tar.gz 625499 SHA256 41d78fa416170dbf052c59223ae7c6a3b882f789c36ca932d2e36b610e8b0161 SHA512 55354926c4504d196ccf0f269ec93484a18f4915bfbe292c9dcfa43c33ff8310cf5c1d126943d6c7e54f3f77317d9229666887fb825de404b7be0dea24f49a64 WHIRLPOOL 80fe5dcbc00fc2460731dbf3c604ca1646e9be61d1d53c88a53d48d16f97e6ee032fe210bc7a04c4bac1b726542f0eb645c15ec186a1de16256605ff320fdc0b
-EBUILD gitlab-shell-3.5.0.ebuild 3653 SHA256 3b73797e283ff4ec30c87d50a54a80cf6895c0c03dedc3ff34087b3037dd9fd5 SHA512 cc235d625f1eabac09822fbca06b706886601e550958338ea5ee7ccfdbbb85e2d96bb348b4ccce532c92d18389c63ddb78bcd77e407f789127fbb3d9ac32d0d9 WHIRLPOOL 4a8bb0ee8a1b547bb8517c300806457187a8fd1855b223cf079784733fdef55e2dd5fa9998da9523bcd3b021aa10d45cc74445bae5bd8f853e3355d6a1d6417a
+DIST gitlab-shell-5.0.4.tar.gz 626142 SHA256 9947c9cf7e7f2e1c2af696cf4610c6e2ad256dcae42e95cc0c8dc387ad5d07e3 SHA512 2718e99a43ad934dfb6d8b3df47bab0b957fa362c84510434fdd07ed994bf53ab059569ff0da106c8bd5ebc49cc460694ad5fb2fec57f0fb0cbb297609a00d97 WHIRLPOOL 6666d2dcb06c156686080b6a0f489ef03d331bc8f20eeb996fe5ce51aeb25d2f334002c15e235c1ad21d808eee8617aa178a5ad974ea99ec8f89bd2478f7f9eb
-EBUILD gitlab-shell-3.6.1.ebuild 3653 SHA256 c36f3fcec5b4f954c404e4f41a773461971116d7ad2bd484b05ef479c4915ad2 SHA512 fedce05647f773f5a7e54fd8764f8934666a51d9b5e8a5e93201bd504a042ade828cbb0043817b8552bdb4d1cdee6fd2404b17c4e9a7ed3ce75fc41e79c866fd WHIRLPOOL 4853bcfb4dfe1dd152645ce4d572797ba158d5edf53349f3d66489009b10ec2cd7a598beef46bc9b1e104891a3071e1cb9b67471e284b626023a9e1b46b559a8
+EBUILD gitlab-shell-4.1.1.ebuild 3653 SHA256 06702f4658b8ac1bada6b322b833f65270656730417d8c9bb000ab1fb23af8f0 SHA512 dc63160d98dabfcbaa9982fe841fd581a1b1b2a968e7c7bd1ee336e449214fa89da33477f0d4744941ee3ecb8688386883a5923e78025bdcfd1556e68ea7371c WHIRLPOOL cd59e133d1d02f082f10312b358c6c8718898aa008a967fc85934656500ceefc44a6affae286123c481aa902fa51cdb7e7f98788057fdd08304ed99f643ef27c
-EBUILD gitlab-shell-3.6.6.ebuild 3653 SHA256 49c383d1d5895069a6783e44d492935879801efd95f57548a81e10df48339038 SHA512 4e6dd5c34a56ed0e1fc45819c93239c61d900304cc8df20855f4e71e4fab234b5e81612f256155022f362f4f9a0959531a3999eb7ece9013914129e4343795cf WHIRLPOOL 92d40a6cb8dd19a42093a746e29ead878eeb9b0c741e23ca3e6213c0a14b820584633db8f2d5ac60cd28da15546232de417db72ccdf8608bc49ac333107f7193
+EBUILD gitlab-shell-5.0.0.ebuild 3653 SHA256 47e19d88939c146c5a7826ca538dba2caee3bc32944eab5b80d54ddbd4c196fc SHA512 1765624d95c14e2888f3e12be05ee727bae036265fc3c9bcfe17b509c0656de72728dcb580952d2a666b3fc99c3640f43862a9ea449599aeaa7cdb2509406347 WHIRLPOOL 2b935404098f288e729c3957007cc663afc3e76a4e04f536d5c7373cbae6857abb5a5cbd2d226355777e4af954a032e9b17211657d83a71bd2eef847028aea64
-EBUILD gitlab-shell-4.0.0.ebuild 3653 SHA256 1413668c9a75cc89b4043e497b9339639bcfce942486d8dada512968c53633b9 SHA512 0f825e5812084601b56f790d880da266986717cd2a35a4033cb75710b3cae624fe5015412a0674dab3c2099eaf29a956af19ffcc6d671bcddf72dfb8507f47e1 WHIRLPOOL dff4dc61e0f568767e25e865546a57018f82b2f28c5bc974df263021d19c0cf194a269b21b8422878e09cb3fd8c7cb34600e005c49dacde0c56df1701bb5e64c
+EBUILD gitlab-shell-5.0.2.ebuild 3653 SHA256 9ed7d4b6dc1ca2d6ee0c928cfd9f33da45a09a070f781d33f217a4dc80296c5a SHA512 571e8c8cd6782f7d955d8d7ff481424c8aa2bea6ab2d702036f991065f75d8e08f26b1004a91a88e2a6add8d64018cec3bb7de131635b264ad7990c392467e1c WHIRLPOOL 491af5dd4248e2728048e51d21a12768966201a93731df7743baa24ccde12228c15c9288be7cefb9b29f3ed83f27729a6f1146506365ef14d3d516b7acaf6862
-MISC ChangeLog 2210 SHA256 e0078f0626c5c8bb11243563a54e3596f4d145204d481800491417627d0b33d9 SHA512 1a55c57982db8ee7c6f3b776503fa78faa3a19fda2f11592aeb15716d250f843c2546c8628af42f9d2ee0c8f34e39ba95da04576b770fb6c4d7c9f67e8b23275 WHIRLPOOL ee5cec43e3b6a25f3a3ff45d98bf2fcb4000a684b4d8da63fc9c1858f68b5959561ef744096522f69fd1e63f97f7a0736750c795487a257fb9d3cdab0c9b4f09
+EBUILD gitlab-shell-5.0.3.ebuild 3653 SHA256 e2c2cfb805378a6cd7e87d536a43c1d96ae489ce66b8168e6cbc42b703736c0e SHA512 65093fb42096002f2f715b18561f11cfb8afbc36188514a2d95023be53025946928e4e712d03d470d0bf52e6d0ecf8d0438b29cd5c55e162d85a15963e430b48 WHIRLPOOL 3278d0eea3f614f726d0df8d0e6a2f49c1e9d4341829f65fc29aa94544470b5b36ee7ce0d464af2b3b535f3f2f10c16c11d3c39dc87c34f9fbb693f61e9ffa3b
 EBUILD gitlab-shell-5.0.4.ebuild 3653 SHA256 c3e2b2dbb4c6b29bf46442791caee2116be2c698a9cbec9d91ac58b1a5d98adb SHA512 035508013085da402a5926faa5da6b6ac6ac726169122766e381096b316b13e887e99f178a8980d831d0a788549e26b07bdae284bc3a90b3a21b534071239581 WHIRLPOOL 807caff4227ea9fdb853a0e5622dea4d4e8b66c3c8dd86d98aedc14f20f00eeabdc1620ffded43cdb4c6b4009e96528bf1dae784256e40f034cd78d6460348b5
 MISC ChangeLog 2968 SHA256 d1febc13ae1f441766c488effc41cb4d3434d2c8874ce6f8665c71f3f7a94f55 SHA512 e67b8f8785660a0b9d9fb6849f0b14880ca90532b6b22a1ab7efc1be70ca166918364f938b3b1ad8efcb12e544ab9cdac7e0f279df9651dd51ba729ad435f233 WHIRLPOOL fb16d2699a95323ef28c2f97fd67f1882172688b11d1a63c29e5d8e01737b2af0dcf02d96122e0d2a0a751cf5acfa9ca5f0e487a2b2fa8ad4f4ff8f333c5093b
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/dev-vcs/gitlab-shell/files/gitlab-shell-4.1.1-config-paths.patch
+++ b/dev-vcs/gitlab-shell/files/gitlab-shell-4.1.1-config-paths.patch
@ -1,8 +1,8 @@
 diff --git a/config.yml.example b/config.yml.example
-index 166e384..4a47b28 100644
+index cf6c91b..7e144fe 100644
 --- a/config.yml.example
 +++ b/config.yml.example
-@@ -25,11 +25,11 @@ http_settings:
+@@ -25,15 +25,15 @@ http_settings:
   self_signed_cert: false
 # File used as authorized_keys for gitlab user
@ -10,14 +10,19 @@ index 166e384..4a47b28 100644
 +auth_file: "/var/lib/git/.ssh/authorized_keys"
 # File that contains the secret key for verifying access to GitLab.
-# Default is .gitlab_shell_secret in the root directory.
+-# Default is .gitlab_shell_secret in the gitlab-shell directory.
 -# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
 +# Default is /opt/gitlab/.gitlab_shell_secret.
 +# secret_file: "/opt/gitlab/.gitlab_shell_secret"
 # Parent directory for global custom hook directories (pre-receive.d, update.d, post-receive.d)
 # Default is hooks in the gitlab-shell directory.
 -# custom_hooks_dir: "/home/git/gitlab-shell/hooks"
 +# custom_hooks_dir: "/usr/share/gitlab-shell/hooks"
 # Redis settings used for pushing commit notices to gitlab
 redis:
-@@ -43,7 +43,7 @@ redis:
+@@ -55,7 +55,7 @@ redis:
 # Log file.
 # Default is gitlab-shell.log in the root directory.
@ -27,7 +32,7 @@ index 166e384..4a47b28 100644
 # Log level. INFO by default
 log_level: INFO
 diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
-index beaf173..6e1b799 100644
+index a51a32c..7763802 100644
 --- a/lib/gitlab_config.rb
 +++ b/lib/gitlab_config.rb
@@ -4,11 +4,11 @@ class GitlabConfig
@ -52,8 +57,8 @@ index beaf173..6e1b799 100644
 +    @config['secret_file'] ||= "/opt/gitlab/.gitlab_shell_secret"
   end
-   def gitlab_url
+   # Pass a default value because this is called from a repo's context; in which
-@@ -36,7 +36,7 @@ class GitlabConfig
+@@ -43,7 +43,7 @@ class GitlabConfig
   end
   def log_file
--- a/dev-vcs/gitlab-shell/gitlab-shell-4.1.1.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-4.1.1.ebuild
@ -9,7 +9,7 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="0cc6cfc11be21597b11470c1c1aaa7e4a92618db"
+MY_GIT_COMMIT="a3712cc18de8283b25c3a8a034ecc8c9b7feca48"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
@ -32,7 +32,7 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
-	"${PN}-3.2.0-config-paths.patch"
+	"${PN}-4.1.1-config-paths.patch"
 )
 GIT_USER="git"
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -9,7 +9,7 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="ed59fbc3b72146cd9c4e040c64150c8b961c7d42"
+MY_GIT_COMMIT="199e2d62ebea9939e48d442c6a866d26d0aede4f"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
@ -32,7 +32,7 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
-	"${PN}-3.2.0-config-paths.patch"
+	"${PN}-4.1.1-config-paths.patch"
 )
 GIT_USER="git"
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -9,7 +9,7 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="b71ca5da9fde4fa8457af146bd090ec7caa28d60"
+MY_GIT_COMMIT="3d22504d1cebecdfe778e3ee10b9a380efea80dd"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
@ -32,7 +32,7 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
-	"${PN}-3.2.0-config-paths.patch"
+	"${PN}-4.1.1-config-paths.patch"
 )
 GIT_USER="git"
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.3.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.3.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="c6d8af599dc797ec8ba7874380abad393b439c9e"
+MY_GIT_COMMIT="158b424f9aec0e4ce439f56cb193e369b36e0e46"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
@ -32,7 +32,7 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
-	"${PN}-3.2.0-config-paths.patch"
+	"${PN}-4.1.1-config-paths.patch"
 )
 GIT_USER="git"
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild
@ -0,0 +1,130 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="285c061ed8933c0d94a9ad027f99653039673324"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
 SRC_URI="https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
 RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 IUSE=""
 DEPEND=""
 RDEPEND="
 	>=dev-vcs/git-2.7.4
 	dev-db/redis
 	virtual/ssh"
 ruby_add_bdepend "
 	virtual/ruby-ssl"
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
 	"${PN}-4.1.1-config-paths.patch"
 )
 GIT_USER="git"
 DEST_DIR="/usr/share/${PN}"
 DATA_DIR="/var/lib/git"
 LOGS_DIR="/var/log/gitlab"
 CONF_FILE="/etc/gitlab-shell.yml"
 pkg_setup() {
 	enewgroup ${GIT_USER}
 	enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
 	local git_shell=$(egetshell ${GIT_USER})
 	if [ ! ${git_shell} -ef '/bin/bash' ]; then
 		ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
 		ewarn "Changing shell to /bin/bash ..."
 		usermod -s /bin/bash ${GIT_USER} \
 			|| die "failed to change login shell for ${GIT_USER}"
 	fi
 }
 all_ruby_prepare() {
 	# fix paths
 	sed -i -E \
 		-e "s|/home/git|${DATA_DIR}|" \
 		-e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
 		config.yml.example || die "failed to filter config.yml.example"
 	sed -i \
 		-e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
 		lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
 }
 all_ruby_install() {
 	# install lib
 	insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
 	# install scripts
 	exeinto ${DEST_DIR}/bin; doexe bin/*
 	exeinto ${DEST_DIR}/hooks; doexe hooks/*
 	exeinto ${DEST_DIR}/support; doexe support/*
 	# create symlinks to bin
 	local name; for name in $(basename -a bin/gitlab-*); do
 		dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
 	done
 	insinto $(dirname ${CONF_FILE})
 	newins config.yml.example $(basename ${CONF_FILE})
 	# create symlink for .gitlab_shell_secret
 	einfo "creating symlink for .gitlab_shell_secret"
 	TOKEN_FILE="${DEST_DIR}/.gitlab_shell_secret"
 	dosym /opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE"
 	# prepare directories
 	diropts -m750; dodir ${DATA_DIR}
 	diropts -m770; keepdir ${DATA_DIR}/repositories
 	diropts -m755; dodir ${LOGS_DIR}
 	# GitLab stupidly expects that gitlab-shell is in home of git user...
 	dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
 	# fix permissions
 	fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
 }
 pkg_postinst() {
 	# check git home directory
 	local git_home=$(egethome ${GIT_USER})
 	if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
 		ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
 		ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
 		ewarn "either change the authorized_keys location in ${CONF_FILE},"
 		ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
 		ewarn "and move ${git_home}/.ssh here."
 		ewarn
 	fi
 	local auth_dir="${git_home}/.ssh"
 	elog "Initializing authorized_keys file in ${auth_dir}"
 	mkdir -p ${auth_dir}
 	touch ${auth_dir}/authorized_keys
 	chmod -R u=rwX,go=- ${auth_dir}
 	chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
 	elog
 	elog "GitLab Shell was initialized. Repositories are located in"
 	elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
 	elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
 	elog
 	elog "You should change your gitlab_url in: ${CONF_FILE}."
 }
--- a/dev-vcs/gitlab-workhorse/Manifest
+++ b/dev-vcs/gitlab-workhorse/Manifest
@ -1,13 +0,0 @@
 AUX fix-Makefile-0.8.2.patch 354 SHA256 5ad06525d351b433d32569040eac8756aa067860e20f68cea92e59807bbebfbb SHA512 e39e834c3346a75494de0b2daebaa2a2d519c35b5d4f42ffb5a92dcedfca9d2541f523791c744eb3effdcc62503134e3585a9f002425f787727e18614116c670 WHIRLPOOL 39bd515da32f8aa31be1532d5b32f073feaed3cbee2064075c67669c5c683094806e8438b4cf5bf3601de3009b0279787813f78827c25dd3fa7b6c455ab6823c
 AUX fix-Makefile-0.8.5.patch 354 SHA256 1773a2e9f535c08f602903924b24918553acf563ac9804f79f26f9f58cd915bf SHA512 2fa8ed07e5e2d012452368047b8aef441015f013c92670961d3b1ea7f131eb49379e0817eeb0da38f04ddd6b9aaf0d081bfcc6ed9c5b83c94ef97b1831836b08 WHIRLPOOL 20849d2cbbb2d5feb48255c3e98a0c9a524078fb51c311d09e833056f07a35c938bc82686338f028ade7eb74090c6c84473e6945e9bde99dbe3d2d057b94a7f2
 AUX fix-Makefile-1.0.0.patch 354 SHA256 97432841e31d2904f6c3d23b4a5e885def82423c404d45e7b0a03be23bf683cc SHA512 44c0a7b8a3078b7308645fcb7c2ec801ac774dcd138356f3c01e6cdd6cd80bbf1fab155f2b604b0f000f6189f36b3c0a1bd8cf9dbb69ca2f8e6fe7e709ffe86b WHIRLPOOL ca42e23b701247f900615d2dbf1d6c983bfb5aa0519c9e100d94e6019a018f11c30794522aba05e0bee89dfa1a898dc2271326fc495cb3428603e972d3c548d0
 AUX gitlab-workhorse-0.8.2.conf 297 SHA256 8bb99a78197ad22892e4c85496101a39f2c82f6c537f44da8185af54dbb44a38 SHA512 d143489c165ef5e68810bb10d5e97da7ad3be6d53618380231706ec16c3fd8bc3eedbc78a09949479a408646e32aae4cdceaca9b271ba3b816e3449b792c5406 WHIRLPOOL 649d34b60afab816dac559989c9a3b0cb9620c2ac2a7617cfcae8bcc2c421791fa612571f83e6611ec8ab8c26c9c79f9832f4e6a70396497dfc5a40d99bbbef9
 AUX gitlab-workhorse-0.8.2.init 681 SHA256 bf3f94853781251629daae935d04294febf317061536624e2c01188dd6688ae7 SHA512 6275abe0910e7327f952dba36827a9083264f76753605767cc11ee7b162fdecef3170783800263bf8acbe891d41e6be9e27b5fcca2a4f035b990c9865aa02647 WHIRLPOOL bc983d0413c0743ef0843a3abb46ee2be78ac6e18b56f96de63b4ea8cb9242f8ef6a96f2d593dbcda33a0a60b7f941f27bd704b7f64a85db7379ef0b42233527
 DIST gitlab-workhorse-0.8.2.tar.bz2 226124 SHA256 869feddeef18ab01183e2cd969445d5d091cbd09b7e9d98d1c1b505df7c84d62 SHA512 ad9d24e9eaed2644e5703600341aa1af37f69cc902d1dc49b0338dddbb56f987fa9608d447b29419c5e5d7548f4e8fa8f073b76dd9799994fb1464fb766e9da9 WHIRLPOOL 70f605ed70e1696e89ebd0964ded9e47f6401a0da942edf90a9fac4366a67d85e1b8e339cc8928bce5ba84af7ace950e17eaa3d2393ca19f3f39ee9a52cc27c3
 DIST gitlab-workhorse-0.8.5.tar.bz2 229807 SHA256 fec50a37d17c359726ac3e0d2bad4ad3431e6bec9aaa6dbf5dcb81bfce469369 SHA512 c149c4cecc1c64c472e38eaae8cf4522a4b19907ef3a9eda4490ddb6cda6083bdbbc1a827cfc2c4d7ac151e3edc4b5dbfb168e2590ea71f12c2836680b2d8033 WHIRLPOOL 21aa589997e934c664fcf3b6cfb19246910a87ec674fbf2fea5a04728bc00248c79b4ed555601af0adbd20a11ca2ba040c1ccb92323acda7bab3da8c37840340
 DIST gitlab-workhorse-1.0.0.tar.bz2 233511 SHA256 c053224e050b9169441316bb1ab1a23449c7e8c125d4172badfc84ddc700e09a SHA512 f6369c777e3fd422f8136276c8f7ccd5a73d60e2559427074c484672d048dbbae9c7f8a0af7fd54e64de0ca3d1a679cb294f114397b8137a929437b7e10284db WHIRLPOOL b322ee8150c2ca6d0f85a211240fe87b15006ad364c333126d48d65d93ebd57d31f312f88d437bbd473acdaa1f74154b20f9f71a51e8ff0f381f793d89fba6e7
 EBUILD gitlab-workhorse-0.8.2-r1.ebuild 950 SHA256 9ac8a68b13fded800fdaa077df3a5a448662d36e88ef144e565719e95d847612 SHA512 0d776e4be9abef95576103a600425dbb9a73d87dd21387b71dd3f54a62ffb7a9f36713f84c8c6222df0f694d8199148c02b884a56a6abb030d5d3fc9cebd6649 WHIRLPOOL b03658ea70cc2a1bc5034699ef6f6fb8d823889438da7f98d8ba728c7a1c56329aa2e934f902a2964f21975e4a3595d0d7011524ccab31fd0c6e52eea1967ea3
 EBUILD gitlab-workhorse-0.8.5.ebuild 950 SHA256 259a4406de93bd2849916d537b67103bcbd4247c5e00871a0c4d9f0bfc84ae11 SHA512 b30e842434de5ba6277b7e1cb3bc38240eeba272dc3ace95a1dfc2dac7b63b1a7cc098e4c2e763ec57b4592c66b3b990a903e1d2382613ef1a7acd5346e9a9c5 WHIRLPOOL a8734afda28cd6c76c3ff381d780188a4d79c7abe3ca2f96087cb1e82c0f7e37acf0610ae80eed1123a66da16a53b6d4d5f080588a45d3016d73efcd5dc91b3a
 EBUILD gitlab-workhorse-1.0.0.ebuild 950 SHA256 0177716249d616021e648a97e2ca38972a5587e09357f6bf96086b655dbdd7a5 SHA512 65976da76880b22341a0317a97baf4be786fb593e1fc33774d31e8c23ae7b91f67a1d890f3decd6cf83b5732da311c042ef60cd26f030b8f6ad2fd61a27e7f74 WHIRLPOOL 437c69ce0cc4025fa4d32346b9eef9de78ef1a215de2ff8bc6edfb72af43708e35dc6ee1b064f021c566acfcd0bb11156487042e7468680b5781904ce4fbda16
 MISC ChangeLog 4570 SHA256 8df9a2d2435bdd01c1a16cc84c6f8013030ba9c29c26a7f57995befea6e1cc80 SHA512 75b87f3fcb526ccb814b2c7a0c39e8ca30eff705e4070f5fe397c55afe7495625355ba928086261822e9adbf86eb35ac63dffe87be8e7d52323fccfbf68e772c WHIRLPOOL b9eedbaf47a7a3457e26a8ebbafd7a6b136793a446755f29becf8a39ce5d0e6620cd4a1d22d6d0fa6b4502468a078b7e9c62346c5effe90b2789019e502e96d1
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.patch
+++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.patch
@ -1,12 +0,0 @@
 diff --git a/Makefile b/Makefile
 index 3f6ac91..663ffbb 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,5 +1,5 @@
 -PREFIX=/usr/local
 -VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
 +PREFIX=${DESTDIR}/usr
 +VERSION=v0.8.5-$(shell date -u +%Y%m%d.%H%M%S)
 BUILD_DIR = $(shell pwd)
 export GOPATH=${BUILD_DIR}/_build
 export GO15VENDOREXPERIMENT=1
--- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-1.0.0.patch
+++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-1.0.0.patch
@ -1,12 +0,0 @@
 diff --git a/Makefile b/Makefile
 index 3f6ac91..663ffbb 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,5 +1,5 @@
 -PREFIX=/usr/local
 -VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
 +PREFIX=${DESTDIR}/usr
 +VERSION=v1.0.0-$(shell date -u +%Y%m%d.%H%M%S)
 BUILD_DIR = $(shell pwd)
 export GOPATH=${BUILD_DIR}/_build
 export GO15VENDOREXPERIMENT=1
--- a/profiles/updates/2Q-2017
+++ b/profiles/updates/2Q-2017
@ -0,0 +1 @@
 move dev-vcs/gitlab-workhorse www-servers/gitlab-workhorse
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,185 @@
 *gitlab-ce-9.0.7 (25 May 2017)
  25 May 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.7.ebuild:
  www-apps/gitlab-ce:  added ebuild for Gitlab CE 9.0.7
 *gitlab-ce-9.0.2 (30 Mar 2017)
  30 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.2.ebuild:
  www-apps/gitlab-ce:  added ebuild for Gitlab CE 9.0.2
  30 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  brought the ebuild for the GIT version (9999) up to speed
  in terms of dependencies.
 *gitlab-ce-9.0.1-r1 (30 Mar 2017)
  30 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.1-r1.ebuild,
  -gitlab-ce-9.0.0.ebuild, -gitlab-ce-9.0.1.ebuild, gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  updated dependency on Ruby to ruby-2.3 for Gitlab CE >=9;
  removed ebuild for version 9.0.0, as version 9.0.1 is out.
 *gitlab-ce-9.0.1 (29 Mar 2017)
  29 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.0.1.ebuild,
  metadata.xml:
  www-apps/gitlab-ce:  Added ebuild for Gitlab CE 9.0.1; this is the first one
  with the gitaly USE flag; though that is not supported yet, it must therefore
  be disabled at the moment.
  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.
 *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
  dependencies for gitlab-9.0.0_rc4
 *gitlab-ce-9.0.0_rc4 (19 Mar 2017)
  19 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch,
  +files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch,
  +gitlab-ce-9.0.0_rc4.ebuild, -gitlab-ce-8.17.0_rc3.ebuild:
  www-apps/gitlab-ce:   Added ebuild for Gitlab CE 9.0.0 RC4
 *gitlab-ce-8.15.8 (21 Mar 2017)
 *gitlab-ce-8.16.8 (21 Mar 2017)
 *gitlab-ce-8.17.4 (21 Mar 2017)
  21 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.15.8.ebuild,
  +gitlab-ce-8.16.8.ebuild, +gitlab-ce-8.17.4.ebuild, -gitlab-ce-8.15.4.ebuild,
  -gitlab-ce-8.15.7.ebuild, -gitlab-ce-8.16.4.ebuild, -gitlab-ce-8.16.5.ebuild,
  -gitlab-ce-8.16.6.ebuild, -gitlab-ce-8.17.0.ebuild, -gitlab-ce-8.17.2.ebuild,
  -gitlab-ce-8.17.3.ebuild:
  www-apps/gitlab-ce: Added ebuilds containing important security fixes  These
  versions contain the security fixes: - v8.15.8 - v8.16.8 - v8.17.4  Removed
  all older ebuilds, as they are vulnerable. For more information see:
  https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
 *gitlab-ce-8.17.3 (13 Mar 2017)
  13 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.17.3.ebuild,
  gitlab-ce-9999.ebuild, metadata.xml:
  www-apps/gitlab-ce:   added ebuild for gitlab-ce-8.17.3, which is the initial
  ebuild to contain a USE flag for gitlab-pages
 *gitlab-ce-8.17.2 (07 Mar 2017)
  07 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.17.2.ebuild:
  www-apps/gitlab-ce:   Added ebuild for gitlab-ce-8.17.2. This version does not
  include support for gitlab-pages yet, as the ebuild for that is only just
  about to be introduced to the overlay.
  26 Feb 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-8.17.0.ebuild,
  gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  Updated ebuild for the GIT version (-9999) and fixed the
  dependency to nodejs in the 8.17.0 version.
  26 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/06-gitlab-ce-8.17-fix-webpack-config.patch, gitlab-ce-8.17.0.ebuild:
  www-apps/gitlab-ce:  added patch for the webpack config, hopefully fixing the
  emerge --config phase
 *gitlab-ce-8.17.0 (24 Feb 2017)
  24 Feb 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.17.0.ebuild:
  www-apps/gitlab-ce:  added ebuild for gitlab-ce-8.17.0. This is the first
  version to depend on npm
 *gitlab-ce-8.16.6 (24 Feb 2017)
  24 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  +gitlab-ce-8.16.6.ebuild:
  www-apps/gitlab-ce: Added ebuild for gitlab-ce-8.16.6
 *gitlab-ce-8.15.7 (16 Feb 2017)
 *gitlab-ce-8.16.5 (16 Feb 2017)
 *gitlab-ce-8.17.0_rc3 (16 Feb 2017)
  16 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/03-gitlab-ce-8.17.0-database.yml.patch, +gitlab-ce-8.15.7.ebuild,
  +gitlab-ce-8.16.5.ebuild, +gitlab-ce-8.17.0_rc3.ebuild,
  -gitlab-ce-8.17.0_rc1.ebuild, gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  Added ebuilds for the lates patch versions of the 8.15
  and 8.16 branch, and also for the lates release candidate of the 8.17 branch.
 *gitlab-ce-8.16.4 (14 Feb 2017)
 *gitlab-ce-8.17.0_rc1 (14 Feb 2017)
  14 Feb 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.16.4.ebuild,
  +gitlab-ce-8.17.0_rc1.ebuild, -gitlab-ce-8.14.5.ebuild,
  -gitlab-ce-8.16.0_rc2.ebuild, gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce: added ebuild for gitlab-ce-8.16.4
 *gitlab-ce-8.16.0_rc2 (16 Jan 2017)
  16 Jan 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch,
  +gitlab-ce-8.16.0_rc2.ebuild, -gitlab-ce-8.16.0_rc1.ebuild,
  gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce: updated lates RC ebuild
 *gitlab-ce-8.15.0_rc1 (16 Dec 2016)
  16 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.15.0_rc1.ebuild,
  -gitlab-ce-8.14.0_rc4.ebuild:
  www-apps/gitlab-ce:  added ebuild for latest release candidate (8.15.0_rc1).
  This is, as always, untested.
 *gitlab-ce-8.14.5 (16 Dec 2016)
  16 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.14.5.ebuild:
  www-apps/gitlab-ce:  added ebuild for version 8.14.5, latest bugfix release
 *gitlab-ce-8.14.4 (12 Dec 2016)
  12 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.14.4.ebuild:
  www-apps/gitlab-ce:  added ebuild for gitlab-ce-8.14.4, latest bugfix release
 *gitlab-ce-8.14.3 (08 Dec 2016)
  08 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.14.3.ebuild:
  www-apps/gitlab-ce:  added ebuild for gitlab 8.14.3
 *gitlab-ce-8.14.2 (05 Dec 2016)
  05 Dec 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.14.2.ebuild:
  www-apps/gitlab-ce:  added ebuild for latest bugfix release v8.14.2
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
  -files/gitlab-8.10.6-sidekiq.service, -files/gitlab-8.13.0-sidekiq.init,
  -files/gitlab-8.13.0-unicorn.init, -gitlab-ce-8.12.7.ebuild,
  -gitlab-ce-8.13.0.ebuild, -gitlab-ce-8.13.3.ebuild, -gitlab-ce-8.13.5.ebuild,
  gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  pruned old ebuilds
 *gitlab-ce-8.14.0 (23 Nov 2016)
 *gitlab-ce-8.14.0_rc4 (23 Nov 2016)
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
  +files/03-gitlab-ce-8.14.0-database.yml.patch, +gitlab-ce-8.14.0.ebuild,
  +gitlab-ce-8.14.0_rc4.ebuild, -gitlab-ce-8.14.0_rc2.ebuild:
  www-apps/gitlab-ce:  added ebuild for gitlab-ce-8.14.0
 *gitlab-ce-8.13.6 (17 Nov 2016)
  17 Nov 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.13.6.ebuild:
  www-apps/gitlab-ce:  added ebuild for gitlab-ce-8.13.6
 *gitlab-ce-8.13.5 (11 Nov 2016)
 *gitlab-ce-8.14.0_rc1 (11 Nov 2016)
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -1,30 +1,35 @@
 AUX 01-gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0
 AUX 02-gitlab-ce-8.11.0-fix-redis-config-path.patch 423 SHA256 4878d37082c7e5c0aba239d4432ddec23c083230b816cf1ed6792bfd8f6c56fa SHA512 81a543af308bcd11a93a73368aedc89604078f60c0cacf4f614ff18dc5975b2c0d030ad6565fbb134188c8f6fceb74f2767f706d6f5701092252513f5e18de11 WHIRLPOOL 81f6258f03d234c6298b7bfe2982bdfd5f86dea3405ce03d4391b484a4802f7cbe33606ce4561ca67c16a5826dec131a185fa3189c2115b4a9ec8a3b87a2ee16
-AUX 03-gitlab-ce-8.12.7-database.yml.patch 2154 SHA256 6daf34a6be5038e0108169a1a23901d9f235e8d9e1e3dcc0d5113fa1b34b0698 SHA512 d43b6cf7b8c1729944482c4e8abf91ec326b38112de93caba67c37af7e9aa3b86e18d1080a92a4bac096f40c8e0c5e7d28926ed019ef052e186c3aa3ee72c9b7 WHIRLPOOL 93393c879eb120712a7ae0b50a35032752ba41ab65d20b86ff4e737fb6df8fefd4663dc171ded2bd771c1663e728d9cdc201fe4024671b9a2d5d0f01748ecd89
+AUX 02-gitlab-ce-9.0.0-fix-redis-config-path.patch 423 SHA256 9de3711c1f06a0561001166f2a44b4c1dc5fa3fa57a5230eb1dcc2b5d394449c SHA512 ae89fa3c6fde777e844e777862415450787ebf83653435cea329d66810c5805d2126d41cb1ce40b15c42371543bc182a59305b8b1b6a7433121340a625300370 WHIRLPOOL d97962907bb1fc610ebc52665a6ce51f40ee932e7ac715279f3c0554f2880a7b220ecbac2c4c97bd4d3dac22b9a025aa729805221ed5e6d15f04f6cd8e210d22
 AUX 03-gitlab-ce-8.14.0-database.yml.patch 2172 SHA256 8435bf632aab03057342d5d6d75f016b006da00157c0cce2661416b752f8b75d SHA512 048aa5877ef30e702727b917cf7fb6bd534c497a7c24ab55640635598af293b0567bb9f356c4b91d55291341ced50847909f117f46d3fc9962c2f7a0f7b6bfb9 WHIRLPOOL 87b62f5e326211c2ff9001742a04b71bd94b21f4851778a513f7e1981da193dc16718559be42a0ba21aaa0c2f5b65a2571bc20174c063aa13e6436f0b422f057
 AUX 03-gitlab-ce-8.17.0-database.yml.patch 2238 SHA256 c5ec9e8a11fb60a7749b9f8cf553949e78aacf9a8233b39c4986980851196c8e SHA512 1668e2c1d00ef485d2bc5af8d343c9be19f291a627d0041d42b268ec1ad8aedecba99336998e6b1b3ac2f4cd617556d17ab5f1f11f95d696205e3d10d6b74e1c WHIRLPOOL c91a6604f050113c9f584d7bf34ebe660263beb88879382873952d6b1b136ad5b576b813bf9f2f66ee49d6656fb1d24437dca395c2574bd7dab07cd1a3a36a99
 AUX 03-gitlab-ce-9.2.2-database.yml.patch 2342 SHA256 870cddca799897d249773d0b0e58d30b1290475e3c313faa6bbc307c73f80d4b SHA512 257ff2cf3bd090dd08a8f03baa6c06d130313bf46b21ac61a606aaa0f0cf1eaacd3ad231761989448e4dc28aeda01b03192290314582db002c32c65eed4134aa WHIRLPOOL 94d95a9e6d15d48c6e786521b04eb43b12a003feae0a464122f51cdf2a5215b2c025134373842a6633d0adf73ceea1db9fb32e36236391bdf9e750565f908591
 AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231
 AUX 05-gitlab-ce-8.12.7-replace-sys-filesystem.patch 2387 SHA256 dd0e9987ed4bb3a9c73c6aee1d89434afc51ff663fef2ee4ac93adf1b73b944a SHA512 afa82fb8c8d57633c99373f31678760fa6ecca5e459a9059f5b460b458d1dbf3230108a6b4f394780c26a697881c9b2319f15804cb8d04ad3139127e7c0f4ff8 WHIRLPOOL 90ce708f8cde0a4bcaef9fc002ca00b97a1211559bcabf5481ec71c608bc5b772ecd518ff07a8d626a27e4b21c0f0f51fa37a65503e79664ececd78d5f19e87b
-AUX gitlab-8.10.6-sidekiq.service 1085 SHA256 de97287a5cb1d04dd4b6ac96e3569503cf797e605b325e13d4807d72cbcd7333 SHA512 9d5f3ee50f293ae0c9f353f7f9eeed00c57fd54e75a206bf7ec9b201453099222668e1d77dcfe6b35ee9a8722860551822897339c4741e0c612054a9423f132b WHIRLPOOL 5b5cb94db5c7a2c46b487821baba6fe31fa08ecc1cbae6f9b1655d32f95c57c7c8f1bede19d09a8c572512e40b0c8daf27d50ebfcbc8e4af449e21b01ad11441
+AUX 05-gitlab-ce-8.16.0-replace-sys-filesystem.patch 2379 SHA256 cf5e0ea55c99996744422312a46914a8e54b6ab68ac5e67abda444e1170bcd4b SHA512 eb5ea3a9f040c3df64bd8ebb20ed873fb6af17322867c0f5714e3d9ad5ac26b79e9ffaaa4720617513123b651ceccedeb992b64c87b9b945338614c9eeec1468 WHIRLPOOL 2591c1d439447f3e08fe413ab8127b9945f8e4813480093af1da796675903bbb2b8a2205bd1480d383402ef861c348cfa0bd45305e7c1fa20458bfd6b6b327a5
-AUX gitlab-8.13.0-sidekiq.init 1012 SHA256 3c4db0b6249036f880ec49c49601e9da4cabc3abfec79296da35df4c145180ef SHA512 7aba7a6a499b924e81528586919a9db1159df15fd91587553cc6d6f34ca273a6e7112a20bf7c6a53b2547d86d56869737f3e6701a834bf4f93916cf176a6edf9 WHIRLPOOL 01adef44f3faeede4ec8b48fb52adf4a72be320755ad9925209f187feb34d9c598fee55202473f060152c80b9932c1e3bb9442dad6400aef42e59e535cd1c8f0
+AUX 05-gitlab-ce-9.0.0-replace-sys-filesystem.patch 2436 SHA256 53fcd9fc123a0fcb671a8cbcb3b2dc61765e32be6836206ae0edea8cf0ae8203 SHA512 21636f298df7e762f59595f39fb50266f8737311f37aa2b9ba96bc29190b8a67eea01b09e3b589d0885da6b27beaa136fa66c7d98408a8e3ecb3ac6baf20d891 WHIRLPOOL e0c709dfc5f72e33207fd7d62a7db5a85c0ed4b6064d5d6a13bcce7d660d9ba144fe09d0985c16c313f06a4e02911729be132086735eac47ddff981874f31acc
 AUX 06-gitlab-ce-8.17.0-fix-webpack-config.patch 614 SHA256 0c1cdc25032322eff6c279435ba5f3fc349b30de0d55d86fad2616bd2bb7fef4 SHA512 f5ccb4d1849ab395ba4ec3c80735a1fedd9fa7f790c8b114d8dc8d1fc2c431d7b9e5645247485f0b8c1061a00ed61c21a5e50f49af0d76e232182c68868a163f WHIRLPOOL 6968ddefed74607c36cc66dc133dbf4942979d2ae867f819cf2e7e5c9701fe8dd86b266d923e6343971e6904f0ad1f35200971660df139edabcc9e0790fc107c
 AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a
 AUX gitlab-8.13.0-unicorn.init 3141 SHA256 73fc750f671cff94a32218512be07f2f7a353b31fe91f6391a85cef00a863a53 SHA512 e728dc6e2453f5124f347359e6ad592cf171a07540a54ebca68bbc95cbf8ca8c211557156e3e5f0f67df0cfa58e65e1bc6589e99c86eb32706a8dbc9972ff9c4 WHIRLPOOL 3e4a1be447bafd4a609b1f0a786774182c2c2ae01bfd67d4c1c1faa718dab3ae7958f6b8604ba6efd70ca9e8203cdd0f35376afb3775a72c3cf78a1fea112684
 AUX gitlab-8.13.3-sidekiq.init 1459 SHA256 fdf808f9c0a92d7a77ae8be27c8fc11cec571ec6b5b94e31639028eec19546f1 SHA512 ec2130483b603f2be423c288fd0d55615c831ce995a8a5509f0240f149b3464d8f0a75cade1c736d085fb5f898d109368af62d8fdfb280aa00c4df8c06abb1e9 WHIRLPOOL d3493ac268257386e22c677337c8f9b1050212fce4aa855119b2ccd5f56850a5288d0cdd74e3c2f34552f59f9431c9ab5080e372766b88de003cad5dab015100
 AUX gitlab-8.13.3-unicorn.init 3562 SHA256 f4ae5b785d61fb2c463b2405533d5e9a2209bbff7a085106b463f59505123287 SHA512 4af87415da7e482725a6f97f5e2ffafe0d16784cdcf3f877c99b5f646832c14dd1b3e875ec00e57560060bf3c049dd7fd0aeb7452db1100740e6b17dc29fdfb6 WHIRLPOOL a63d236a76bcbbd6e39268c76a7fbb75f4b9e5488d0cbc0bb2973ae09753f11d1863e477fe88f6c652370c19c3a0f037f99cc681b91679eb4da992db5e2eff20
 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
 AUX gitlab-sidekiq.init 990 SHA256 cc996184ae4c1b64fc5ee9325bf3f4bc30753896f6608a2f04112d8552359c38 SHA512 9064b5a2fb1280c7fd674c613e19893b5b4f21cc48967cad1c3ff6caef2d4cdbf077359c453e5bb97226c26348475a97fb055df2bac991a7260811cb933361af WHIRLPOOL f2a298a91318ee067451e90f8b52b45c2dcf7e621bd7014917f8fadfd92949c967b45c59434eac3813fd1acd1dc96b8b481f9d9c324627580f29c0f438bf99db
 AUX gitlab-unicorn.init 3127 SHA256 de2f5861bec58eaac284e74baabe25288a520bc4f7da089a2c53a9494bbea884 SHA512 ae63cc6ef11eb1d3ed155c77dab413d8f7d281ac9c6362dfda12e0fafe23eb9a907a0275d14298c642ba7568119b483b1c520b322dc791f3a9ce64fbffb600f3 WHIRLPOOL de69ab338278e73637b6b1d346bb882d51c4468e71d89932718f394fb9f44725c79897eba8b0230069584ae7d8b92239bb2247c7ff8b46a99383739939a13088
 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792
 AUX gitlab-workhorse.service 930 SHA256 09348a52fec333b4b19828752e0484400c1efa9dfb644723fcf8e80537e294b6 SHA512 6332024fe0049287899cf482b6e4439e9dd90da14e489d08aa8e5e79cb7872efcc517d99b69fa23b011b382acb1e5926496a78f08af5d2d64daa515b869a0c6a WHIRLPOOL 3749c6719b2a35c7de29763cd616e1e9cc30a85aa1630ffc46440334459b5922503d52629556c125a6dd6574bdc5f23f1b2a7f2a85e2270a415b22246e0b6bae
 AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9
-DIST gitlab-ce-8.12.7.tar.gz 27110532 SHA256 003e497e23f730f4990bdb4b431109f2956b5bbf1d202a4003f5af65424157d4 SHA512 7ad53f5fe0c88cfcf5688de5d55489964a4b5e8dd763fbf7d832c199432b9532f0a75e6d803f1d03387c86b3ba0b47b1b75b97e783f7661662b656c7f9aea216 WHIRLPOOL 026d11a8adcde5312b46d626bebc6ed33bfea344042deb1fab0a40a52cfd7deccfe78ef2a544293456f08bf7acbd917233533898b54c3b9dcee9121520607ff2
+DIST gitlab-ce-8.15.8.tar.gz 20035995 SHA256 9fafd6478a6d165ab6acd6f89f169fe72d46df547efe1bf3ac8d3a5bc4ffec11 SHA512 db287ea59d94eacd3c1219f458a403239f7aa39bea0d5e82fac80afc7216b96ac394740ab717c3ed26068617e1234105144820e41b0825511e1adc29e8891bfb WHIRLPOOL b03faf4b30b5c82535c0e148edec7fb5ff26405cfa8587b4bd287e834bb5f3eb6ddabd0b5f1472672b4108bdcb6066d63eb1a117e35fedf2c94d63348186afd6
-DIST gitlab-ce-8.13.0.tar.gz 27763918 SHA256 0c4736ec84fe371334a0b7feca34eb6a2a371242c2ed0ba356b201de5c5e4a46 SHA512 e08ce15b6b8658d12c20cb7b522607c6c54880c1e2737f48e4a80f5d3fd8efb10f680b3a4a8c975dbc5237eea2b0f5fef185286d1ea3a7786573fa2bbca4149c WHIRLPOOL 91e4dc8732f3df17ffa81d5fa9ec6b0be8a04c956021ac95c859819643da426b5cafef2d1811cbc3507688179f2645839ae64eac6bb1941fc17076977bdff960
+DIST gitlab-ce-8.16.9.tar.gz 20906220 SHA256 63e36f3af71ac3f6e45c09f443f5c4ca606c0f401754d3f846a2f54707b1d3b4 SHA512 c947f813a595904808d75286c097274733d05aa70a2dd2cce9d222057253bdaa1482e271d4c73be1e3ba070480f9b130daef90aa44af90a743218c1207edbb30 WHIRLPOOL 48475ee9f7a3e9f15703487170cf069af887b7e41637e3df1bd594aac78f68de88b6df695842084a25ad4505ab5d1a016de162a6ee31b89d2d629df126ecc080
-DIST gitlab-ce-8.13.3.tar.gz 27773077 SHA256 040e43517e10782a0f11b3bfc9c349cec9e48e5c10cf8d46c7e468beb7677101 SHA512 3031798e0c56a7a028a544943304ac84e5a427e40d9db40fe75aba215192f493ee4508d6d99f0a5814ac11a52f8db673d03012cae052b3841c3407c6b9fb83a8 WHIRLPOOL 2a78824adda0aa4006facf0c791b6f0be930eb574a38dda6d58db3cd9331238f50caae4e2e6acb7442a3488b3b9c91239a488063377d6b34befc5a3375c94c7d
+DIST gitlab-ce-8.17.6.tar.gz 22828733 SHA256 dd5086431f2d362afa6bb29b5465112276b6ca8d6196f90b614c1c407a3d2131 SHA512 05c33b67d8febdb320e8c5483793d364b62056086749573bb4e92703ca1001d1c1cc236940ae20f1eac9d5a4159d1aaed97192040d40a4d5e0ba036c188a58db WHIRLPOOL c30b1604f616deed930c065e038fddbdf6866339438f46a66c09c342a368c521ad721dfcaf7e2ae37789b82729718370c6718a2d77c74a286923670a6ef7bf90
-DIST gitlab-ce-8.13.5.tar.gz 27814361 SHA256 05749840b2cf9c39cc54dd88c58571195437811b133379506523df6757c26fec SHA512 9039b46adcff7e4d9ba8029d3b97cedf672179c54c9dc48a91693ed52b2a09b8cdf3dbdfd671e58c2d91f52741bcd4220d75dc896f62cfba798f4bb64931691e WHIRLPOOL 5c6e4db776d5f021aedef7e6a6e6315c7ba01da518b0571aa00037afcad5304ea75e3d130da77644e5ca824653a507c7224207581b440437505ceb0e0d34b628
+DIST gitlab-ce-9.0.7.tar.gz 26358937 SHA256 e70d1f3926f3b7e872353da2d21a7a6b44ed51a3b145e237f4768f8190eaeb08 SHA512 c3f28ef81eb546727f895d92a120e1e459b8eceb1c1068888ec9972444355c02d441bd8d85c360e684f0389b0c6f2ffae57a69a220639fa9ffe7f8c63730daad WHIRLPOOL 04380783f5074fcfe905b129e6e457da44e9dbd1d6d43d70309ea0f55fa8f916af28f52460dc68b1b588feb8d99b8ba543e52bffdee93f3115efa3473c8728ce
-DIST gitlab-ce-8.14.0_rc2.tar.gz 29323411 SHA256 c97ebc9a6ea0f41968fc7fa294caebacb6013950b42b5274e68956d6d58222d3 SHA512 700b644d0556aae5292ca562a1210e273516bc0022c84d5c4fb6f1edb5538d7d3b607f7bbc89bd43d5c4402bca5703e761a1e6288943a981785a29ac55d81097 WHIRLPOOL 7406b04920db10358f80b141ecbc355e726ac8581d3bf4745e40853cdf4926400d82f4ad6233a4ba059f889af9338bc93c10a612cb3cdb9c4625f64386a612e4
+DIST gitlab-ce-9.1.4.tar.gz 30512187 SHA256 36e5e41c89e215ec4b25c4129a9a47878b1e4e6104c54b0cdf8981d3f39f070a SHA512 d29f2d805c14cc98f0851c4877e91ab6785bbe487341b2bf3392ee293bc683bf00dd455e400d2c3a27b8dc0a6ffa020768cbd11ec9ee029b5f0f2ccfcbfb3a4e WHIRLPOOL a05f4c66c20df274d42ea3c76491fd7ba28561ffe4f7fc97c542bd79c54bbea09646be3f7a8d5b896023e6cd1e4e13ad40915f58e91519e04dedc8939f2a405e
-EBUILD gitlab-ce-8.12.7.ebuild 12068 SHA256 5acdce0ee5f3c6cf20a120758ad0c60ec70574d38cc2ee56037b3789d812edfd SHA512 7daf877280f4a8242fa83e1b70d5cabe99aa8bd547d0b4f9a4921c60c44228f508e39a8a4f751b987078c4d680aaff374a055c8ca5882b12f110b232c0006f4e WHIRLPOOL be51f8c53ac45db3c13f179d447665b536df4848a4c63cf5619d2620fbca7bd2701b861f636235d7e746ee7f560eb084e949288f11dceaaef826c138be321625
+DIST gitlab-ce-9.2.0_rc7.tar.gz 30112868 SHA256 8dd30e975416ea8e6701592cd56bdbd7a607e05ea115596728f5eb6219d275df SHA512 3ac2f3d4dd1c18f49a92e97217b5afea511a4e0ffac9bc0f303a819d0c0c6212b57fe1fdb13f1d049acf54a3c767b919dd4517ccd2e317a41b734f0660f1e276 WHIRLPOOL 624769196fad0537bf772533f3e696abc957811b0f929e68d0efa8d871915510bb6f823c0f22c3f09aeea4a46e5908d9f235e9dba2a2f115c99d3298fc83d3c4
-EBUILD gitlab-ce-8.13.0.ebuild 11859 SHA256 b90393b330f1048ea73536071793f1897d62e14773bc170600abb9ab9dc0fcc0 SHA512 31c32936dbe355dc9dae68bb5b726822a9f5222796dd11dc95b8907fbb2e316930a95568061557328a9d87b5b5eded5867a1a8d552cd9041f10054140d461426 WHIRLPOOL 2ce6cf02c5b27fe70f00795c16fa3d20f369ba820f8583c90808ac5d6c1d838425d447caaad67b76ebc64e6a3f1b6866ac2e890566dc71504056c20103b8ad97
+DIST gitlab-ce-9.2.2.tar.gz 30969181 SHA256 6d8a1ab6c808c53bccc2c3f3b4dc052cf9e8e7d1a47d5c83ef799afad5304815 SHA512 c047d8f471e360abe913bccde07a8604153dbe064df69a5797ab5f82f4aa7f7191f5ba26444d846364518a8575a48c5be6111df4516f961b714257d58c5ca730 WHIRLPOOL 246b24d44b8654ff9ad1750c930f8a885c0db1c579b28944e71f6aa9c081b940b8f3fa418d0bb7c42fcf517b1837e4782ea5388000be262d29aa703b086316c2
-EBUILD gitlab-ce-8.13.3.ebuild 11979 SHA256 b5a243613dbca1645c70b0b76191172d823a1775372172054c653706261dd1e7 SHA512 9121a34bb8f071395f26d0dbb87fb8bae50f00b8b606c1ced4d43d7e9908c7937fc5bd3d15992b34545206bcbf138e2ab1a593df709904b409ad9041b6a62f9a WHIRLPOOL d7c84308560a28e0222da75acad82cda660770acff43b180d40b35e6395f46adc66afb40ce3ba8c73dd76251e89f72b9dff51bc602c82154a1ea974f693104fa
+EBUILD gitlab-ce-8.15.8.ebuild 11986 SHA256 6c86e66d4b568b88dd44ec52401e25c33b2d5e61d9a76e77180320d40ef57132 SHA512 91e1dc1cd8b9b77ea039e7e194b06c44900511b9e7787a714faec14746f96da6d00aa66bd16763732c468d8a46815e29fe761349a0a0d712db21bd4a12d31e06 WHIRLPOOL 50923df1fdda85abf7c7984a49d73d6486628439612de18ec3914274f3a053ce98ffbffec0f6ca9f2f9ba1ca9491467de0762d2d4a31ea480f32eb68222c79f9
-EBUILD gitlab-ce-8.13.5.ebuild 11979 SHA256 7b16a160712995d17004adbdfed92974f31e83bdbad745f0999e403c7db50090 SHA512 9bad09441979c9ef7bc764cddf3daf02b85b657b21b0b409dcd2257fcbae9691c3afef605ebe3f60eb11bdc61abb0ff6b22b344d41ef549dea7795576deba987 WHIRLPOOL 960d55ed74694e31dedd28307a45cfe6808fd94eb4e79c667d670f84d00a9f6bc72d702e1a59d9325087752e1a2f7ccbfcb290e573e31da0384ed3fa2ae91bae
+EBUILD gitlab-ce-8.16.9.ebuild 11986 SHA256 21a0d7336a0a022db75ded6f29fe12d64012bd20a46e538ce0940a3c7e402a11 SHA512 c8e3ff6de9d97e25300315e967b7bcfc7d4aa5bc3e78aa45564e12bb673fbf79c9ba454174fe4f362d9d58575611debf797b52685b2061ac3053113390401a5c WHIRLPOOL 4644465cfcaf81184c62acf888ced3f16ccffc9de84fac7774a5463a778684c051580dd1f273546b9be8a0ace83243abc06e1e5ba042b18a10f7d352783a995f
-EBUILD gitlab-ce-8.14.0_rc2.ebuild 11956 SHA256 9f71c449b8ad06ac69a4de8197890aa5148db76d94d201f61b4193c586c1342d SHA512 e64507e0872f21eb0f5435f5aeb8ad34089c5973afd5d234bdeceefd185ce628a28ae4bbc652784941d303d118131b3cd040e6955cf8d5de3d97c55fce2b17ca WHIRLPOOL ab9e79520d8e405c72a60001637ae30e75d24ef29dc3cbd9f403a7b6e33e79e837f1d69a2ca5ce3b6bca80a5ee4f33704341ae7e6ec036cad565a55908caccce
+EBUILD gitlab-ce-8.17.6.ebuild 12932 SHA256 e5f7cc94653a6c55627264e02116d43febdcc58bd60ccf9f7c5fecf9476d1b0a SHA512 65fc18401842e1c1176d8178acff3ca48f1fe80ee8869b7263cd1819ced46bb8d1c2771226d9f7c9c5507ef120d69d66114605d8ed7b3923e5f9a61e2cc0125d WHIRLPOOL 3c979ba2e30fbb3c628063f71e3a8b12183632413f4342b81298e4fd4847e8a583adab16c202340d89fde010097f140005ae564c0d52fefb0fcb57b67ede398d
-EBUILD gitlab-ce-9999.ebuild 11913 SHA256 9f3f58ebf1fa7fa7c6b00374e83dda8476116057ee8c6a3ecb5779f0bc7e5254 SHA512 5f2a68f540e26129d9d57a5a72ee924503bc8f8cc89539545aa0ebedf70e42e6104be879eff8cfa65fcde151dad0b4e78523210aee0f9f26549e6279dc76246e WHIRLPOOL 9810dc5e8a1f87601448fae42c8f136e2a9d1ad892357c15590bf53f26b70d3022b383da7b801a51a4ad88ec1f7033f072d294bcc884f614f695e294cfa40e2b
+EBUILD gitlab-ce-9.0.7.ebuild 13087 SHA256 68f0d2d7c8cde9b07bb280bb2f6b6d3fea4de6791571f27aaf619853940d2d30 SHA512 21545e878a2f60d082b132256fb09c72a5cc1d252115f448770432fd98becc5aeef42281f00fa55642a1a0866f41f107903b33160e52c61bc4c6d7811f5a06fe WHIRLPOOL 6ad81da17812721b94e8fcfc2328a24355a1f777d067ff2f557f0928ea2f4af55f0edb8587b8fe004f5481254cd72a520a7a77a6a601afc12315d8d37773f5c8
-MISC ChangeLog 10326 SHA256 da12df11f2931226c61e3ee21cbce3a321c8f67f559cdf5ebedf9d5c932261fd SHA512 0abc2fc358e7ea8f342b55ecd9344216bc670387126f5fca4fe2dee37626a0235b615a9441d6a6586339339f6b74e7db9fd56f8554e980c925506a3aa2552e76 WHIRLPOOL bd45f399ddd9eaa633b871c67cf3ad389c6b8b6c7f3969b8673b58591f620d7a6922a1863bbf12388bd8b976c1ab45d1bdb31768077a644c33e8b64c7a390cc5
+EBUILD gitlab-ce-9.1.4-r1.ebuild 13243 SHA256 ab673fa216da6c964b7c1a49bdc4b0225f437f0e9635022c165694ef9cdb3be3 SHA512 c664cca08eb02d069878dc0d9bb03a6470164cb85e6f0f47bde566eba1ee3c829d255851f4703016415b311595257d8b4da7e22eee2a96b33a7436a8a55776d8 WHIRLPOOL a564ed0ef3c3faba21bdbe29dd7e6a0a13384a26de1addf2292e7c9069b8c19c2e573d8940603f598088b5ea44d4af38b0e9527dcfdbfb0c575dfc5919487e1b
-MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3
+EBUILD gitlab-ce-9.2.0_rc7.ebuild 12970 SHA256 e0a935dbc638799ae3c9f0032fc88665a22c2f3f4077638678ed88271abd4e01 SHA512 f2ef406fd513d5944579199774a5553c5416886d01c82e7e90884ffc29b20da33e3dc1211277c745e66d4c86fab57ca8cec64079c90087a4234fde2056c9a357 WHIRLPOOL 7710f6d7cc5b9b1797b28c4b706accf9ead024fa30e83534ff34c44ebfca2c674f6e04b6b1c05e31fefa02625973ca2f31d3118c71c8ee8a63db1780b4eb6abc
 EBUILD gitlab-ce-9.2.2.ebuild 12988 SHA256 a1ec15fafbe7031dbb71859497f3d334d9b062d75126b4ff5e6ab4f911e816ef SHA512 ac3fb3d10dc34f07d43a700e9dc4453138e11284d5f26a93e0e1cc59160faca75fa979390f9ac293538172c97523a8fe6f99812084bc94ac5181a17fd9110483 WHIRLPOOL e1a8afacad18607af2cc2a1abf9222657d85b3694a37280c05904ded91226fdcba3c7df6a705dde8ace85bebfd6dc8e07e547469dc6616c94e12b5d21d4efb9e
 EBUILD gitlab-ce-9999.ebuild 12936 SHA256 577fb46481f157ac44e97c70c318dcf29aaa300b25d902e5129eac19f9ab18d1 SHA512 fde643225335f33e4b7aa01c33a570670aea8780d2789e15fc356cede52b87fafb5714ce0bb0b03020e7e3e673382aeb06e94e3afa1fe82e289cfbe38cbb6f0e WHIRLPOOL 49e50d7c1a2d4c426b751f6ffb7d9917481c5da804c0af0c17a3367f5d0a456925add5ccd9730938482b4ac5ce84483e3c013d3e38d14302d5be7e01f36e14bf
 MISC ChangeLog 17848 SHA256 d57ce2fbafb6a62a30a4bf02feff9c37f33b94f8158f6b50c87053d8422307b2 SHA512 3b83ca4c32949ff08d1d59131388f3f59497c7831c5b09d1fd10a36445f1c383dbf04e91ddeff6c9b6c5131578450afb354b03819ddba80f7249b0ddd0b4f2e9 WHIRLPOOL d5ab8749e2c7d6a18adf2d63a7c7a69b40d93357d3e5714f131ec7cacca6008ca41f23a2c2bb8ece1ba10aaebf47b5f1363a2c4a29bbbe45672d06904e82f614
 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6
--- a/www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch
+++ b/www-apps/gitlab-ce/files/02-gitlab-ce-9.0.0-fix-redis-config-path.patch
@ -0,0 +1,12 @@
 diff --git a/config/mail_room.yml b/config/mail_room.yml
 index 88d93d4..688d663 100644
 --- a/config/mail_room.yml
 +++ b/config/mail_room.yml
@@ -1,6 +1,6 @@
 :mailboxes:
   <%
 -    require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
 +    require_relative "/opt/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
     config = Gitlab::MailRoom.config
     if Gitlab::MailRoom.enabled?
--- a/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch
+++ b/www-apps/gitlab-ce/files/03-gitlab-ce-8.14.0-database.yml.patch
@ -0,0 +1,92 @@
 diff --git a/config/database.yml.mysql b/config/database.yml.mysql
 index d970287..a3b5ecc 100644
 --- a/config/database.yml.mysql
 +++ b/config/database.yml.mysql
@@ -6,37 +6,9 @@ production:
   encoding: utf8mb4
   collation: utf8mb4_general_ci
   reconnect: false
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   username: git
   password: "secure password"
   # host: localhost
 -  # socket: /tmp/mysql.sock
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: mysql2
 -  encoding: utf8mb4
 -  collation: utf8mb4_general_ci
 -  reconnect: false
 -  database: gitlabhq_development
 -  pool: 5
 -  username: root
 -  password: "secure password"
 -  # socket: /tmp/mysql.sock
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: mysql2
 -  encoding: utf8mb4
 -  collation: utf8mb4_general_ci
 -  reconnect: false
 -  database: gitlabhq_test
 -  pool: 5
 -  username: root
 -  password:
 -  # socket: /tmp/mysql.sock
 +  # socket: /run/mysqld/mysqld.sock
 diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
 index 7067e0f..74af7df 100644
 --- a/config/database.yml.postgresql
 +++ b/config/database.yml.postgresql
@@ -4,42 +4,9 @@
 production:
   adapter: postgresql
   encoding: unicode
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   # username: git
   # password:
   # host: localhost
   # port: 5432 
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_development
 -  pool: 5
 -  username: postgres
 -  password:
 -
 -#
 -# Staging specific
 -#
 -staging:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_staging
 -  pool: 5
 -  username: postgres
 -  password:
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_test
 -  pool: 5
 -  username: postgres
 -  password:
--- a/www-apps/gitlab-ce/files/03-gitlab-ce-8.17.0-database.yml.patch
+++ b/www-apps/gitlab-ce/files/03-gitlab-ce-8.17.0-database.yml.patch
@ -1,10 +1,15 @@
 diff --git a/config/database.yml.mysql b/config/database.yml.mysql
-index a99c507..0f081c8 100644
+index a33e40e..a3b5ecc 100644
 --- a/config/database.yml.mysql
 +++ b/config/database.yml.mysql
-@@ -6,37 +6,9 @@ production:
+@@ -3,40 +3,12 @@
-   encoding: utf8
+ #
-   collation: utf8_general_ci
+ production:
   adapter: mysql2
 -  encoding: utf8
 -  collation: utf8_general_ci
 +  encoding: utf8mb4
 +  collation: utf8mb4_general_ci
   reconnect: false
 -  database: gitlabhq_production
 +  database: gitlab
@ -33,8 +38,8 @@ index a99c507..0f081c8 100644
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: mysql2
-  encoding: utf8
+-  encoding: utf8mb4
-  collation: utf8_general_ci
+-  collation: utf8mb4_general_ci
 -  reconnect: false
 -  database: gitlabhq_test
 -  pool: 5
--- a/www-apps/gitlab-ce/files/03-gitlab-ce-9.2.2-database.yml.patch
+++ b/www-apps/gitlab-ce/files/03-gitlab-ce-9.2.2-database.yml.patch
@ -0,0 +1,102 @@
 diff --git a/config/database.yml.mysql b/config/database.yml.mysql
 index db1b712..a3b5ecc 100644
 --- a/config/database.yml.mysql
 +++ b/config/database.yml.mysql
@@ -3,42 +3,12 @@
 #
 production:
   adapter: mysql2
 -  encoding: utf8
 -  collation: utf8_general_ci
 +  encoding: utf8mb4
 +  collation: utf8mb4_general_ci
   reconnect: false
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   username: git
   password: "secure password"
   # host: localhost
 -  # socket: /tmp/mysql.sock
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: mysql2
 -  encoding: utf8
 -  collation: utf8_general_ci
 -  reconnect: false
 -  database: gitlabhq_development
 -  pool: 5
 -  username: root
 -  password: "secure password"
 -  # host: localhost
 -  # socket: /tmp/mysql.sock
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: mysql2
 -  encoding: utf8mb4
 -  collation: utf8mb4_general_ci
 -  reconnect: false
 -  database: gitlabhq_test
 -  pool: 5
 -  username: root
 -  password:
 -  # host: localhost
 -  # socket: /tmp/mysql.sock
 +  # socket: /run/mysqld/mysqld.sock
 diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
 index c517a4c..28f7993 100644
 --- a/config/database.yml.postgresql
 +++ b/config/database.yml.postgresql
@@ -4,45 +4,9 @@
 production:
   adapter: postgresql
   encoding: unicode
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   # username: git
   # password:
   # host: localhost
   # port: 5432
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_development
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
 -
 -#
 -# Staging specific
 -#
 -staging:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_staging
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_test
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
--- a/www-apps/gitlab-ce/files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch
+++ b/www-apps/gitlab-ce/files/05-gitlab-ce-8.16.0-replace-sys-filesystem.patch
@ -0,0 +1,77 @@
 diff --git a/Gemfile b/Gemfile
 index 07ff500..1352dd4 100644
 --- a/Gemfile
 +++ b/Gemfile
@@ -350,4 +350,4 @@ gem 'health_check', '~> 2.2.0'
 # System information
 gem 'vmstat', '~> 2.3.0'
 -gem 'sys-filesystem', '~> 1.1.6'
 +gem 'sys-filesystem', '~> 1.1.6', group: :exclude
 diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
 index ca04a17..1efb29e 100644
 --- a/app/controllers/admin/system_info_controller.rb
 +++ b/app/controllers/admin/system_info_controller.rb
@@ -1,3 +1,5 @@
 +require 'open3'
 +
 class Admin::SystemInfoController < Admin::ApplicationController
   EXCLUDED_MOUNT_OPTIONS = [
     'nobrowse',
@@ -28,10 +30,14 @@ class Admin::SystemInfoController < Admin::ApplicationController
     'vfat'
   ]
 +  MOUNT_REGEX = /(\S+) on (\S+) type (\S+) \(([^)]+)\)/
 +
 +  Mount = Struct.new('Mount', :name, :mount_point, :mount_type, :options)
 +  FsStat = Struct.new('FsStats', :path, :bytes_total, :bytes_used)
 +
   def show
     @cpus = Vmstat.cpu rescue nil
     @memory = Vmstat.memory rescue nil
 -    mounts = Sys::Filesystem.mounts
     @disks = []
     mounts.each do |mount|
@@ -41,15 +47,38 @@ class Admin::SystemInfoController < Admin::ApplicationController
       next if (EXCLUDED_MOUNT_TYPES & [mount.mount_type]).any?
       begin
 -        disk = Sys::Filesystem.stat(mount.mount_point)
 +        disk = fs_stat(mount.mount_point)
         @disks.push({
           bytes_total: disk.bytes_total,
           bytes_used:  disk.bytes_used,
           disk_name:   mount.name,
           mount_path:  disk.path
         })
 -      rescue Sys::Filesystem::Error
 +      rescue IOError
       end
     end
   end
 +
 +  def mounts
 +    stdout, stderr, status = Open3.capture3('mount')
 +    fail IOError, stderr unless status.success?
 +
 +    stdout.lines
 +      .map { |line| MOUNT_REGEX.match(line) }
 +      .compact
 +      .map { |match| Mount.new(*match.captures) }
 +  end
 +
 +  def fs_stat(mount_point)
 +    stdout, status = Open3.capture2('stat', '-c', '%s %b %a', '-f', mount_point)
 +    fail IOError unless status.success?
 +
 +    block_size, blocks_total, blocks_free = stdout.split(' ').map(&:to_i)
 +
 +    bytes_total = blocks_total * block_size
 +    bytes_free = blocks_free * block_size
 +    bytes_used = bytes_total - bytes_free
 +
 +    FsStat.new(mount_point, bytes_total, bytes_used)
 +  end
 end
--- a/www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch
+++ b/www-apps/gitlab-ce/files/05-gitlab-ce-9.0.0-replace-sys-filesystem.patch
@ -0,0 +1,80 @@
 diff --git a/Gemfile b/Gemfile
 index 2f81332..8d1b7d6 100644
 --- a/Gemfile
 +++ b/Gemfile
@@ -349,7 +349,7 @@ gem 'health_check', '~> 2.6.0'
 # System information
 gem 'vmstat', '~> 2.3.0'
 -gem 'sys-filesystem', '~> 1.1.6'
 +gem 'sys-filesystem', '~> 1.1.6', group: :exclude
 # Gitaly GRPC client
 gem 'gitaly', '~> 0.2.1'
 diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
 index 9903972..41af5a2 100644
 --- a/app/controllers/admin/system_info_controller.rb
 +++ b/app/controllers/admin/system_info_controller.rb
@@ -1,3 +1,5 @@
 +require 'open3'
 +
 class Admin::SystemInfoController < Admin::ApplicationController
   EXCLUDED_MOUNT_OPTIONS = [
     'nobrowse',
@@ -29,10 +31,14 @@ class Admin::SystemInfoController < Admin::ApplicationController
     'vfat'
   ].freeze
 +  MOUNT_REGEX = /(\S+) on (\S+) type (\S+) \(([^)]+)\)/
 +
 +  Mount = Struct.new('Mount', :name, :mount_point, :mount_type, :options)
 +  FsStat = Struct.new('FsStats', :path, :bytes_total, :bytes_used)
 +
   def show
     @cpus = Vmstat.cpu rescue nil
     @memory = Vmstat.memory rescue nil
 -    mounts = Sys::Filesystem.mounts
     @disks = []
     mounts.each do |mount|
@@ -42,15 +48,38 @@ class Admin::SystemInfoController < Admin::ApplicationController
       next if (EXCLUDED_MOUNT_TYPES & [mount.mount_type]).any?
       begin
 -        disk = Sys::Filesystem.stat(mount.mount_point)
 +        disk = fs_stat(mount.mount_point)
         @disks.push({
           bytes_total: disk.bytes_total,
           bytes_used:  disk.bytes_used,
           disk_name:   mount.name,
           mount_path:  disk.path
         })
 -      rescue Sys::Filesystem::Error
 +      rescue IOError
       end
     end
   end
 +
 +  def mounts
 +    stdout, stderr, status = Open3.capture3('mount')
 +    fail IOError, stderr unless status.success?
 +
 +    stdout.lines
 +      .map { |line| MOUNT_REGEX.match(line) }
 +      .compact
 +      .map { |match| Mount.new(*match.captures) }
 +  end
 +
 +  def fs_stat(mount_point)
 +    stdout, status = Open3.capture2('stat', '-c', '%s %b %a', '-f', mount_point)
 +    fail IOError unless status.success?
 +
 +    block_size, blocks_total, blocks_free = stdout.split(' ').map(&:to_i)
 +
 +    bytes_total = blocks_total * block_size
 +    bytes_free = blocks_free * block_size
 +    bytes_used = bytes_total - bytes_free
 +
 +    FsStat.new(mount_point, bytes_total, bytes_used)
 +  end
 end
--- a/www-apps/gitlab-ce/files/06-gitlab-ce-8.17.0-fix-webpack-config.patch
+++ b/www-apps/gitlab-ce/files/06-gitlab-ce-8.17.0-fix-webpack-config.patch
@ -0,0 +1,13 @@
 diff --git a/config/webpack.config.js b/config/webpack.config.js
 index d1bf9c6..210c871 100644
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
@@ -6,7 +6,7 @@ var webpack = require('webpack');
 var StatsPlugin = require('stats-webpack-plugin');
 var CompressionPlugin = require('compression-webpack-plugin');
 -var ROOT_PATH = path.resolve(__dirname, '..');
 +var ROOT_PATH = '/opt/gitlab';
 var IS_PRODUCTION = process.env.NODE_ENV === 'production';
 var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
 var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
--- a/www-apps/gitlab-ce/files/gitlab-8.10.6-sidekiq.service
+++ b/www-apps/gitlab-ce/files/gitlab-8.10.6-sidekiq.service
@ -1,27 +0,0 @@
 #####################################################
 #
 # GitLab version    : 5.x - 7.x
 # Contributors      : davispuh, mtorromeo, axilleas, boeserwolf91, Stefan Tatschner (rumpelsepp)
 # Downloaded from   : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd
 #
 ####################################################
 [Unit]
 Description=GitLab Sidekiq Worker
 Requires=redis.service
 Wants=mysqld.service postgresql.service
 After=redis.service mysqld.service postgresql.service
 [Service]
 Type=forking
 User=git
 WorkingDirectory=/opt/gitlab
 Environment=RAILS_ENV=production
 SyslogIdentifier=gitlab-sidekiq
 PIDFile=/run/gitlab/sidekiq.pid
 ExecStart=/usr/bin/bundle exec "sidekiq -d -q archive_repo -q post_receive -q mailers -q system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q default -e production -P /run/gitlab/sidekiq.pid -d -L /var/log/gitlab/sidekiq.log >> /var/log/gitlab/sidekiq.log 2>&1"
 ExecStop=/usr/bin/bundle exec "sidekiqctl stop /run/gitlab/sidekiq.pid >> /var/log/gitlab/sidekiq.log 2>&1"
 [Install]
 WantedBy=multi-user.target
--- a/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init
+++ b/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init
@ -1,43 +0,0 @@
 #!/sbin/openrc-run
 name="GitLab Sidekiq"
 description="Sidekiq for GitLab"
 : ${gitlab_user:=@USER@}
 : ${gitlab_base:="@GITLAB_BASE@"}
 : ${rails_env:=production}
 : ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
 : ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
 : ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"}
 sidekiq_command="/usr/bin/bundle"
 sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
 depend() {
 	need redis gitlab-workhorse
 	use net
 }
 start() {
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${name} - Sidekiq"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command}
 	eend $?
 }
--- a/www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init
+++ b/www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init
@ -1,122 +0,0 @@
 #!/sbin/openrc-run
 extra_started_commands="restartsidekiq"
 name="GitLab"
 description="GitLab on Unicorns"
 description_restartsidekiq="Restarts Sidekiq only"
 : ${gitlab_user:=@USER@}
 : ${gitlab_base:="@GITLAB_BASE@"}
 : ${rails_env:=production}
 : ${server_pidfile:="/run/gitlab/unicorn.pid"}
 : ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
 : ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
 : ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"}
 : ${mail_room_pidfile:="/run/gitlab/mail_room.pid"}
 : ${mail_room_logfile:="/var/log/gitlab/mail_room.log"}
 : ${mail_room_config:="/etc/gitlab/mail_room.yml"}
 server_command="/usr/bin/bundle"
 server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
 sidekiq_command="/usr/bin/bundle"
 sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
 mail_room_command="/usr/bin/bundle"
 mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1"
 depend() {
 	provide gitlab
 	need redis gitlab-workhorse
 	use net
 }
 start() {
 	ebegin "Starting ${name} - Unicorn servers"
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")"
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
 	start-stop-daemon --start \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${server_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${server_command} -- ${server_command_args}
 	eend $?
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 	if [ -e /etc/default/gitlab ]; then
 		. /etc/default/gitlab
 		if [ "${mail_room_enabled}" == "true" ]; then
 			ebegin "Starting ${name} - mail_room"
 			start-stop-daemon --start \
 				--background --quiet \
 				--chdir "${gitlab_base}" \
 				--user=${gitlab_user} \
 				--pidfile="${mail_room_pidfile}" -m \
 				--env RAILS_ENV=${rails_env} \
 				--exec ${mail_room_command} -- ${mail_room_command_args}
 			eend $?
 		fi
 	fi
 }
 stop() {
 	ebegin "Stopping ${name} - mail_room"
 	start-stop-daemon --stop \
 		--signal QUIT \
 		--pidfile=${mail_room_pidfile} \
 		--exec ${mail_room_command}
 	eend $?
 	ebegin "Stopping ${name} - Sidekiq"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command}
 	eend $?
 	ebegin "Stopping ${name} - Unicorn servers"
 	start-stop-daemon --stop \
 		--signal QUIT \
 		--pidfile=${server_pidfile} \
 		--exec ${server_command}
 	eend $?
 }
 restartsidekiq() {
 	ebegin "Restarting ${name} - Sidekiq: Stopping"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command} \
 		--progress \
 		--retry 180
 	eend $?
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 }
--- a/www-apps/gitlab-ce/files/gitlab-sidekiq.init
+++ b/www-apps/gitlab-ce/files/gitlab-sidekiq.init
@ -1,43 +0,0 @@
 #!/sbin/openrc-run
 name="GitLab Sidekiq"
 description="Sidekiq for GitLab"
 : ${gitlab_user:=@USER@}
 : ${gitlab_base:="@GITLAB_BASE@"}
 : ${rails_env:=production}
 : ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
 : ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
 : ${sidekiq_queues:="@QUEUES@"}
 sidekiq_command="/usr/bin/bundle"
 sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
 depend() {
 	need redis gitlab-workhorse
 	use net
 }
 start() {
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 }
 stop() {
 	ebegin "Stopping ${name} - Sidekiq"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command}
 	eend $?
 }
--- a/www-apps/gitlab-ce/files/gitlab-unicorn.init
+++ b/www-apps/gitlab-ce/files/gitlab-unicorn.init
@ -1,122 +0,0 @@
 #!/sbin/openrc-run
 extra_started_commands="restartsidekiq"
 name="GitLab"
 description="GitLab on Unicorns"
 description_restartsidekiq="Restarts Sidekiq only"
 : ${gitlab_user:=@USER@}
 : ${gitlab_base:="@GITLAB_BASE@"}
 : ${rails_env:=production}
 : ${server_pidfile:="/run/gitlab/unicorn.pid"}
 : ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
 : ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
 : ${sidekiq_queues:="@QUEUES@"}
 : ${mail_room_pidfile:="/run/gitlab/mail_room.pid"}
 : ${mail_room_logfile:="/var/log/gitlab/mail_room.log"}
 : ${mail_room_config:="/etc/gitlab/mail_room.yml"}
 server_command="/usr/bin/bundle"
 server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
 sidekiq_command="/usr/bin/bundle"
 sidekiq_command_args="exec sidekiq -q ${sidekiq_queues//,/ -q } -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
 mail_room_command="/usr/bin/bundle"
 mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1"
 depend() {
 	provide gitlab
 	need redis gitlab-workhorse
 	use net
 }
 start() {
 	ebegin "Starting ${name} - Unicorn servers"
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")"
 	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
 	start-stop-daemon --start \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${server_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${server_command} -- ${server_command_args}
 	eend $?
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 	if [ -e /etc/default/gitlab ]; then
 		. /etc/default/gitlab
 		if [ "${mail_room_enabled}" == "true" ]; then
 			ebegin "Starting ${name} - mail_room"
 			start-stop-daemon --start \
 				--background --quiet \
 				--chdir "${gitlab_base}" \
 				--user=${gitlab_user} \
 				--pidfile="${mail_room_pidfile}" -m \
 				--env RAILS_ENV=${rails_env} \
 				--exec ${mail_room_command} -- ${mail_room_command_args}
 			eend $?
 		fi
 	fi
 }
 stop() {
 	ebegin "Stopping ${name} - mail_room"
 	start-stop-daemon --stop \
 		--signal QUIT \
 		--pidfile=${mail_room_pidfile} \
 		--exec ${mail_room_command}
 	eend $?
 	ebegin "Stopping ${name} - Sidekiq"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command}
 	eend $?
 	ebegin "Stopping ${name} - Unicorn servers"
 	start-stop-daemon --stop \
 		--signal QUIT \
 		--pidfile=${server_pidfile} \
 		--exec ${server_command}
 	eend $?
 }
 restartsidekiq() {
 	ebegin "Restarting ${name} - Sidekiq: Stopping"
 	start-stop-daemon --stop \
 		--pidfile=${sidekiq_pidfile} \
 		--exec ${sidekiq_command} \
 		--progress \
 		--retry 180
 	eend $?
 	ebegin "Starting ${name} - Sidekiq"
 	start-stop-daemon --start \
 		--background --quiet \
 		--chdir "${gitlab_base}" \
 		--user=${gitlab_user} \
 		--pidfile="${sidekiq_pidfile}" \
 		--env RAILS_ENV=${rails_env} \
 		--exec ${sidekiq_command} -- ${sidekiq_command_args}
 	eend $?
 }
--- a/www-apps/gitlab-ce/gitlab-ce-8.12.7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.12.7.ebuild
@ -1,389 +0,0 @@
 # Copyright 1999-2016 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="7429b21d3260edb25e9d3f98713d163f97b23e28"
 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 ~arm ~arm64"
 IUSE="kerberos mysql +postgres +unicorn systemd 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
 	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-3.6.1
 	>=dev-vcs/git-2.7.4
 	~dev-vcs/gitlab-workhorse-0.8.2
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
 RDEPEND="
 	${COMMON_DEPEND}
 	>=dev-db/redis-2.8
 	virtual/mta
 	systemd? ( sys-apps/systemd:0= )"
 ruby_add_bdepend "
 	virtual/rubygems
 	>=dev-ruby/bundler-1.0"
 #
 # 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}-8.11.0-fix-redis-config-path.patch"
 	"03-${P}-database.yml.patch"
 	"04-${P}-fix-check-task.patch"
 	"05-${P}-replace-sys-filesystem.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}"
 # When updating ebuild to newer version, check list of the queues in
 # https://gitlab.com/gitlab-org/gitlab-ce/blob/${MY_PV}/bin/background_jobs
 SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
 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.10.6-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-sidekiq.init
 		use unicorn && rcscript=gitlab-unicorn.init
 		cp "${FILESDIR}/${rcscript}" "${T}" || die
 		sed -i \
 			-e "s|@USER@|${MY_USER}|" \
 			-e "s|@GITLAB_BASE@|${dest}|" \
 			-e "s|@LOGS_DIR@|${logs}|" \
 			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
 			"${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
 	# 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 "Cleaning old precompiled assets ..."
 		exec_rake 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
 	fi
 	einfo "Precompiling assests ..."
 	exec_rake assets:precompile
 	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."
 	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
 }
 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}"
 	echo "   ${command}"
 	su -l ${MY_USER} -c "
 		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
 		cd ${DEST_DIR}
 		${command}" \
 		|| die "failed to run rake $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-8.15.8.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.15.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="8d79ab3a090ee0a43659121b858692791be52cf8"
+MY_GIT_COMMIT="03782f78e91005a7ce818d6e3225d36143acec62"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -54,9 +54,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.6.6
+	~dev-vcs/gitlab-shell-4.1.1
-	>=dev-vcs/git-2.7.4
+	>=dev-vcs/git-2.8.4
-	~dev-vcs/gitlab-workhorse-0.8.5
+	~www-servers/gitlab-workhorse-1.2.1
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -69,7 +69,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )"
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.0"
+	>=dev-ruby/bundler-1.13.6"
 #
 # fix-sendmail-config:
@ -80,7 +80,7 @@ ruby_add_bdepend "
 RUBY_PATCHES=(
 	"01-${PN}-8.7.5-fix-sendmail-config.patch"
 	"02-${PN}-8.11.0-fix-redis-config-path.patch"
-	"03-${PN}-8.12.7-database.yml.patch"
+	"03-${PN}-8.14.0-database.yml.patch"
 	"04-${PN}-8.12.7-fix-check-task.patch"
 	"05-${PN}-8.12.7-replace-sys-filesystem.patch"
 )
--- a/www-apps/gitlab-ce/gitlab-ce-8.16.9.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.16.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="09cedb5f68b5cdb1b2e2a08ccf4505a847e02155"
+MY_GIT_COMMIT="385dbfb50d691a7a7bb94c4fb3a97dd61a0c6e41"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -54,9 +54,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.6.6
+	~dev-vcs/gitlab-shell-4.1.1
-	>=dev-vcs/git-2.7.4
+	>=dev-vcs/git-2.8.4
-	~dev-vcs/gitlab-workhorse-0.8.5
+	~www-servers/gitlab-workhorse-1.3.0
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -69,7 +69,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )"
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.0"
+	>=dev-ruby/bundler-1.13.7"
 #
 # fix-sendmail-config:
@ -80,9 +80,9 @@ ruby_add_bdepend "
 RUBY_PATCHES=(
 	"01-${PN}-8.7.5-fix-sendmail-config.patch"
 	"02-${PN}-8.11.0-fix-redis-config-path.patch"
-	"03-${PN}-8.12.7-database.yml.patch"
+	"03-${PN}-8.14.0-database.yml.patch"
 	"04-${PN}-8.12.7-fix-check-task.patch"
-	"05-${PN}-8.12.7-replace-sys-filesystem.patch"
+	"05-${PN}-8.16.0-replace-sys-filesystem.patch"
 )
 MY_NAME="gitlab"
--- a/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.14.0_rc2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -16,7 +16,11 @@ USE_RUBY="ruby21 ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="4c97f6fa3f0201abb4635c64b4263d85c7deeb6e"
+MY_GIT_COMMIT="7dd5ec18d1b5563061857dc8a332ba42050f3a0e"
 GITLAB_PAGES_VERSION="0.3.2"
 GITLAB_SHELL_VERSION="4.1.1"
 GITLAB_WORKHORSE_VERSION="1.3.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -27,8 +31,8 @@ RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
+IUSE="kerberos mysql +postgres +unicorn systemd pages rugged_use_system_libraries"
 ## Gems dependencies:
 #   charlock_holmes     dev-libs/icu
@ -54,11 +58,13 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-4.0.0
+	~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION}
-	>=dev-vcs/git-2.7.4
+	>=dev-vcs/git-2.8.4
-	~dev-vcs/gitlab-workhorse-1.0.0
+	~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	>=net-libs/nodejs-4.3.0
 	kerberos? ( !app-crypt/heimdal )
-	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
+	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}"
@ -67,9 +73,10 @@ RDEPEND="
 	>=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.0"
+	>=dev-ruby/bundler-1.13.7"
 #
 # fix-sendmail-config:
@ -80,9 +87,10 @@ ruby_add_bdepend "
 RUBY_PATCHES=(
 	"01-${PN}-8.7.5-fix-sendmail-config.patch"
 	"02-${PN}-8.11.0-fix-redis-config-path.patch"
-	"03-${PN}-8.12.7-database.yml.patch"
+	"03-${PN}-8.17.0-database.yml.patch"
 	"04-${PN}-8.12.7-fix-check-task.patch"
-	"05-${PN}-8.12.7-replace-sys-filesystem.patch"
+	"05-${PN}-8.16.0-replace-sys-filesystem.patch"
 	"06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
@ -330,8 +338,11 @@ pkg_config() {
 		einfo "Migrating iids ..."
 		exec_rake migrate_iids
 		einfo "Installing npm modules ..."
 		exec_npm install
 		einfo "Cleaning old precompiled assets ..."
-		exec_rake assets:clean
+		exec_rake gitlab:assets:clean
 		einfo "Cleaning cache ..."
 		exec_rake cache:clear
@ -347,10 +358,13 @@ pkg_config() {
 		einfo "Initializing database ..."
 		exec_rake gitlab:setup
 		einfo "Installing npm modules ..."
 		exec_npm install
 	fi
 	einfo "Precompiling assests ..."
-	exec_rake assets:precompile
+	exec_rake gitlab:assets:compile
 	if [ "${update}" = 'true' ]; then
 		ewarn
@ -359,6 +373,10 @@ 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"
@ -380,12 +398,23 @@ ryaml() {
 }
 exec_rake() {
-	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
+	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 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 $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-9.0.7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.0.7.ebuild
@ -0,0 +1,423 @@
 # 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="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="810cc51be37e03ebbe99711a53663956e4ffde8c"
 GITALY_VERSION="0.3.0"
 GITLAB_PAGES_VERSION="0.4.0"
 GITLAB_SHELL_VERSION="5.0.0"
 GITLAB_WORKHORSE_VERSION="1.4.2"
 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 -gitaly 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
 	~www-servers/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} )
 	gitaly? ( ~www-servers/gitaly-${GITALY_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
 	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() {
 	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_yarn 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_yarn 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."
 	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_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 yarn $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-9.1.4-r1.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.1.4-r1.ebuild
@ -0,0 +1,426 @@
 # 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="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="fed799ae87ba5a95cf46d8426e96ad621940d0a7"
 # Gitaly is optional in Gitlab 9.1, and it is not yet supported by this
 # ebuild. But the version declaration is already here.
 GITALY_VERSION="0.6.0"
 GITLAB_PAGES_VERSION="0.4.1"
 GITLAB_SHELL_VERSION="5.0.2"
 GITLAB_WORKHORSE_VERSION="1.4.3"
 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 -gitaly 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
 	~www-servers/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} )
 	gitaly? ( ~www-servers/gitaly-${GITALY_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}"/
 	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
 	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() {
 	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_yarn 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_yarn 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."
 	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_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 yarn $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-9.2.0_rc7.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.2.0_rc7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -11,12 +11,19 @@ EAPI="5"
 #   difficult to maintain them via ebuilds.
 #
-USE_RUBY="ruby21 ruby23"
+USE_RUBY="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="053a0a2ccdc74c2fd2ae400fd73675d0e14b1aba"
+MY_GIT_COMMIT="add9abadbdfac7e4c03b06b47d3afc296e00ac97"
 # Gitaly is optional in Gitlab 9.2, and it is not yet supported by this
 # ebuild. But the version declaration is already here.
 GITALY_VERSION="0.10.0"
 GITLAB_PAGES_VERSION="0.4.2"
 GITLAB_SHELL_VERSION="5.0.3"
 GITLAB_WORKHORSE_VERSION="2.0.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -27,8 +34,8 @@ RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+KEYWORDS=""
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
+IUSE="kerberos mysql +postgres +unicorn systemd pages -gitaly rugged_use_system_libraries"
 ## Gems dependencies:
 #   charlock_holmes     dev-libs/icu
@ -45,7 +52,8 @@ GEMS_DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-util/ragel
-	net-libs/nodejs
+	>=net-libs/nodejs-4.3.0
 	>=sys-apps/yarn-0.17.0
 	postgres? ( >=dev-db/postgresql-9.1:* )
 	mysql? ( virtual/mysql )
 	kerberos? ( virtual/krb5 )"
@ -54,11 +62,13 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.6.6
+	~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION}
-	>=dev-vcs/git-2.7.4
+	>=dev-vcs/git-2.8.4
-	~dev-vcs/gitlab-workhorse-0.8.5
+	~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	kerberos? ( !app-crypt/heimdal )
-	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
 	gitaly? ( ~www-servers/gitaly-${GITALY_VERSION} )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
@ -67,9 +77,10 @@ RDEPEND="
 	>=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.0"
+	>=dev-ruby/bundler-1.13.7"
 #
 # fix-sendmail-config:
@ -79,10 +90,11 @@ ruby_add_bdepend "
 #
 RUBY_PATCHES=(
 	"01-${PN}-8.7.5-fix-sendmail-config.patch"
-	"02-${PN}-8.11.0-fix-redis-config-path.patch"
+	"02-${PN}-9.0.0-fix-redis-config-path.patch"
-	"03-${PN}-8.12.7-database.yml.patch"
+	"03-${PN}-9.2.2-database.yml.patch"
 	"04-${PN}-8.12.7-fix-check-task.patch"
-	"05-${PN}-8.12.7-replace-sys-filesystem.patch"
+	"05-${PN}-9.0.0-replace-sys-filesystem.patch"
 	"06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
@ -171,6 +183,7 @@ all_ruby_install() {
 	# install the rest files
 	# using cp 'cause doins is slow
 	cp -Rl * "${D}/${dest}"/
 	cp -Rl .??* "${D}/${dest}"/
 	# install logrotate config
 	dodir /etc/logrotate.d
@ -215,8 +228,8 @@ all_ruby_install() {
 		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
 		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
 	else
-		local rcscript=gitlab-8.13.0-sidekiq.init
+		local rcscript=gitlab-8.13.3-sidekiq.init
-		use unicorn && rcscript=gitlab-8.13.0-unicorn.init
+		use unicorn && rcscript=gitlab-8.13.3-unicorn.init
 		cp "${FILESDIR}/${rcscript}" "${T}" || die
 		sed -i \
@ -278,6 +291,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() {
@ -330,8 +348,11 @@ pkg_config() {
 		einfo "Migrating iids ..."
 		exec_rake migrate_iids
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 		einfo "Cleaning old precompiled assets ..."
-		exec_rake assets:clean
+		exec_rake gitlab:assets:clean
 		einfo "Cleaning cache ..."
 		exec_rake cache:clear
@ -347,10 +368,13 @@ pkg_config() {
 		einfo "Initializing database ..."
 		exec_rake gitlab:setup
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 	fi
 	einfo "Precompiling assests ..."
-	exec_rake assets:precompile
+	exec_rake gitlab:assets:compile
 	if [ "${update}" = 'true' ]; then
 		ewarn
@ -368,6 +392,11 @@ pkg_config() {
 	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() {
@ -375,11 +404,11 @@ ryaml() {
 }
 exec_rake() {
-	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
+	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 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 $@"
--- a/www-apps/gitlab-ce/gitlab-ce-9.2.2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.2.2.ebuild
@ -0,0 +1,415 @@
 # 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="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="cbde95c281af5cdd6b4dee3bdb1bdb360eb71d2c"
 # Gitaly is optional in Gitlab 9.2, and it is not yet supported by this
 # ebuild. But the version declaration is already here.
 GITALY_VERSION="0.10.0"
 GITLAB_PAGES_VERSION="0.4.2"
 GITLAB_SHELL_VERSION="5.0.4"
 GITLAB_WORKHORSE_VERSION="2.0.0"
 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 -gitaly 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
 	~www-servers/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} )
 	gitaly? ( ~www-servers/gitaly-${GITALY_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}-9.2.2-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}"/
 	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
 	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() {
 	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_rake yarn: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_rake yarn: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."
 	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 $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -11,22 +11,30 @@ EAPI="5"
 #   difficult to maintain them via ebuilds.
 #
-USE_RUBY="ruby21 ruby23"
+USE_RUBY="ruby23"
 inherit eutils git-r3 ruby-ng user systemd
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 EGIT_REPO_URI="https://gitlab.com/gitlab-org/${PN}.git"
 EGIT_BRANCH="master"
 EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 # Gitaly is optional in Gitlab as of yet, and it is not yet supported by
 # this ebuild. But the version declaration is already here.
 GITALY_VERSION="0.10.0"
 GITLAB_PAGES_VERSION="0.4.2"
 GITLAB_SHELL_VERSION="5.0.4"
 GITLAB_WORKHORSE_VERSION="2.0.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
+IUSE="kerberos mysql +postgres +unicorn systemd pages -gitaly rugged_use_system_libraries"
 ## Gems dependencies:
 #   charlock_holmes     dev-libs/icu
@ -43,7 +51,8 @@ GEMS_DEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-util/ragel
-	net-libs/nodejs
+	>=net-libs/nodejs-4.3.0
 	>=sys-apps/yarn-0.17.0
 	postgres? ( >=dev-db/postgresql-9.1:* )
 	mysql? ( virtual/mysql )
 	kerberos? ( virtual/krb5 )"
@ -52,11 +61,13 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-4.0.0
+	>=dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION}
-	>=dev-vcs/git-2.7.4
+	>=dev-vcs/git-2.8.4
-	>=dev-vcs/gitlab-workhorse-1.0.0
+	>=www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	kerberos? ( !app-crypt/heimdal )
-	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
 	pages? ( >=www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
 	gitaly? ( >=www-servers/gitaly-${GITALY_VERSION} )"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
@ -65,9 +76,10 @@ RDEPEND="
 	>=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.0"
+	>=dev-ruby/bundler-1.13.7"
 #
 # fix-sendmail-config:
@ -77,10 +89,11 @@ ruby_add_bdepend "
 #
 RUBY_PATCHES=(
 	"01-${PN}-8.7.5-fix-sendmail-config.patch"
-	"02-${PN}-8.11.0-fix-redis-config-path.patch"
+	"02-${PN}-9.0.0-fix-redis-config-path.patch"
-	"03-${PN}-8.12.7-database.yml.patch"
+	"03-${PN}-9.2.2-database.yml.patch"
 	"04-${PN}-8.12.7-fix-check-task.patch"
-	"05-${PN}-8.12.7-replace-sys-filesystem.patch"
+	"05-${PN}-9.0.0-replace-sys-filesystem.patch"
 	"06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
@ -174,6 +187,7 @@ all_ruby_install() {
 	# install the rest files
 	# using cp 'cause doins is slow
 	cp -Rl * "${D}/${dest}"/
 	cp -Rl .??* "${D}/${dest}"/
 	# install logrotate config
 	dodir /etc/logrotate.d
@ -281,6 +295,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() {
@ -333,8 +352,11 @@ pkg_config() {
 		einfo "Migrating iids ..."
 		exec_rake migrate_iids
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 		einfo "Cleaning old precompiled assets ..."
-		exec_rake assets:clean
+		exec_rake gitlab:assets:clean
 		einfo "Cleaning cache ..."
 		exec_rake cache:clear
@ -350,10 +372,13 @@ pkg_config() {
 		einfo "Initializing database ..."
 		exec_rake gitlab:setup
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 	fi
 	einfo "Precompiling assests ..."
-	exec_rake assets:precompile
+	exec_rake gitlab:assets:compile
 	if [ "${update}" = 'true' ]; then
 		ewarn
@ -383,11 +408,11 @@ ryaml() {
 }
 exec_rake() {
-	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
+	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 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 $@"
--- a/www-apps/gitlab-ce/metadata.xml
+++ b/www-apps/gitlab-ce/metadata.xml
@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="unicorn">Use the Unicorn web server. Never tested the package without it, so disable at your own risk.</flag>
 		<flag name="pages">Use the GitLab Pages feature. See https://gitlab.com/gitlab-org/gitlab-pages/</flag>
 		<flag name="gitaly">Use Gitaly Server to speed up git operations. Not yet supported. See https://gitlab.com/gitlab-org/gitaly/</flag>
 		<flag name="rugged_use_system_libraries">Use dev-libs/libgit2 from the system instead of the bundled libgit. The bundled library sometimes causes build breakages.</flag>
 	</use>
 </pkgmetadata>
--- a/www-servers/gitaly/ChangeLog
+++ b/www-servers/gitaly/ChangeLog
@ -0,0 +1,8 @@
 *gitaly-0.3.0 (29 Mar 2017)
  29 Mar 2017; Manuel Friedli <manuel@fritteli.ch> +gitaly-0.3.0.ebuild,
  +metadata.xml:
  www-servers/gitaly:  Added dummy-ebuild for gitaly-0.3.0. This will not build,
  but instead just show an error message upon installation. It is a mere
  placeholder for the future. It is needed so that the gitaly USE-flag could be
  added to the gitlab-ce-9.0.1 ebuild.
--- a/www-servers/gitaly/Manifest
+++ b/www-servers/gitaly/Manifest
@ -0,0 +1,8 @@
 DIST gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455
 DIST gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8
 DIST gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34
 EBUILD gitaly-0.10.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e
 EBUILD gitaly-0.3.0.ebuild 1593 SHA256 f07387ac6ec3c68d2c4aa8894804caf5a456b8e12e15937d82fda4d2ed864185 SHA512 95d19b0e799195fa5e3d8cc2879c1017503f68aa586a074119441fbbcff28d2cd9d538830a3a2b40a542bdbfa99518f9afd09232907ac7e763d500cf00abe32f WHIRLPOOL 1e3c778ac33e385865a610dfef5ee07841e9a7b91800b94a3a88714caf38084584524b2f120553a9f13ee2df57309fbd8e9b1e119cdbfd2f6cc1749e25f14bcf
 EBUILD gitaly-0.6.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e
 MISC ChangeLog 392 SHA256 c85d6fb8a93d47762d1a6279f7523138234a5951a71700a0abb5bd6c69405704 SHA512 ff7a8dc6e0457f88e22c93ae062fb7c4da834cf679e0742f276465060164dbb510573b55bab7471ae851e5380cc60fece093ef973d4c0da4413ce0f8f3c99263 WHIRLPOOL d3b4cf6e3182e5be74aa8689b2ea5b3baf53bbf2ff2ad56bc60429d89627aad8d148877c285cc1ed0e8960ad5e02344901c3554e7e78c2e2a3a1fca9c5533825
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitaly/gitaly-0.10.0.ebuild
+++ b/www-servers/gitaly/gitaly-0.10.0.ebuild
@ -0,0 +1,67 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="661135a"
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 #MY_USER="gitlab_pages"
 pkg_setup() {
 	eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported."
 	die "Gitaly is not yet supported."
 }
 #pkg_setup() {
 #	enewgroup ${MY_USER}
 #	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 #}
 #src_prepare() {
 #	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
 #
 #	sed -i -E \
 #		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 #		src/gitlab.com/gitlab-org/${PN}/Makefile
 #
 #	eapply_user
 #}
 #src_compile() {
 #	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 #}
 #src_install() {
 #	golang-build_src_install
 #	dobin bin/*
 #	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 #
 #	# rc script
 #	local rcscript="${PN}-0.3.2.init"
 #
 #	cp "${FILESDIR}/${rcscript}" "${T}" || die
 #	sed -i \
 #		-e "s|@USER@|${MY_USER}|g" \
 #		"${T}/${rcscript}" \
 #		|| die "failed to filter ${rcscript}"
 #
 #	newinitd "${T}/${rcscript}" "${PN}"
 #	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
 #}
--- a/www-servers/gitaly/gitaly-0.3.0.ebuild
+++ b/www-servers/gitaly/gitaly-0.3.0.ebuild
@ -0,0 +1,67 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="fdcb2c9"
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 #MY_USER="gitlab_pages"
 pkg_setup() {
 	eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported."
 	die "Gitaly is not yet supported."
 }
 #pkg_setup() {
 #	enewgroup ${MY_USER}
 #	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 #}
 #src_prepare() {
 #	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
 #
 #	sed -i -E \
 #		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 #		src/gitlab.com/gitlab-org/${PN}/Makefile
 #
 #	eapply_user
 #}
 #src_compile() {
 #	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 #}
 #src_install() {
 #	golang-build_src_install
 #	dobin bin/*
 #	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 #
 #	# rc script
 #	local rcscript="${PN}-0.3.2.init"
 #
 #	cp "${FILESDIR}/${rcscript}" "${T}" || die
 #	sed -i \
 #		-e "s|@USER@|${MY_USER}|g" \
 #		"${T}/${rcscript}" \
 #		|| die "failed to filter ${rcscript}"
 #
 #	newinitd "${T}/${rcscript}" "${PN}"
 #	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
 #}
--- a/www-servers/gitaly/gitaly-0.6.0.ebuild
+++ b/www-servers/gitaly/gitaly-0.6.0.ebuild
@ -0,0 +1,67 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="661135a"
 DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 #MY_USER="gitlab_pages"
 pkg_setup() {
 	eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported."
 	die "Gitaly is not yet supported."
 }
 #pkg_setup() {
 #	enewgroup ${MY_USER}
 #	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 #}
 #src_prepare() {
 #	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
 #
 #	sed -i -E \
 #		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 #		src/gitlab.com/gitlab-org/${PN}/Makefile
 #
 #	eapply_user
 #}
 #src_compile() {
 #	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 #}
 #src_install() {
 #	golang-build_src_install
 #	dobin bin/*
 #	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 #
 #	# rc script
 #	local rcscript="${PN}-0.3.2.init"
 #
 #	cp "${FILESDIR}/${rcscript}" "${T}" || die
 #	sed -i \
 #		-e "s|@USER@|${MY_USER}|g" \
 #		"${T}/${rcscript}" \
 #		|| die "failed to filter ${rcscript}"
 #
 #	newinitd "${T}/${rcscript}" "${PN}"
 #	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
 #}
--- a/dev-vcs/gitlab-workhorse/metadata.xml
+++ b/dev-vcs/gitlab-workhorse/metadata.xml
--- a/www-servers/gitlab-pages/ChangeLog
+++ b/www-servers/gitlab-pages/ChangeLog
@ -0,0 +1,27 @@
 *gitlab-pages-0.4.0 (13 Mar 2017)
  13 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile-0.4.0.patch, +gitlab-pages-0.4.0.ebuild:
  www-servers/gitlab-pages:   added ebuild for gitlab-pages-0.4.0
 *gitlab-pages-0.3.2-r1 (13 Mar 2017)
  13 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +gitlab-pages-0.3.2-r1.ebuild:
  www-servers/gitlab-pages:   added arches ~x86, ~arm, ~arm64; otherwise repoman
  would complain about the most recent gitlab-ce ebuilds.
  07 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  files/gitlab-pages-0.3.2.conf, files/gitlab-pages-0.3.2.init:
  www-servers/gitlab-pages:   Fixed buggy configuration: - Logfile was not
  accessible - Init script didn't start nor stop the daemon correctly
  07 Mar 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-pages-0.3.2.ebuild:
  www-servers/gitlab-pages:   Fixed the creation ofthe new user (syntax).
 *gitlab-pages-0.3.2 (07 Mar 2017)
  07 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile-0.3.2.patch, +files/gitlab-pages-0.3.2.conf,
  +files/gitlab-pages-0.3.2.init, +gitlab-pages-0.3.2.ebuild, +metadata.xml:
  www-servers/gitlab-pages:   added first ebuild for gitlab-pages
--- a/www-servers/gitlab-pages/Manifest
+++ b/www-servers/gitlab-pages/Manifest
@ -0,0 +1,14 @@
 AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3
 AUX 0001-fix-Makefile-0.4.0.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3
 AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301
 AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0
 DIST gitlab-pages-0.3.2.tar.bz2 205531 SHA256 392b0620871ab36a362f8b8b9008c266eda465e6f32611ccbdbe640cd77ae7b5 SHA512 e452af8a9d2032ccba827a7a165abf324008c585369f74d14a47524eaaa3255a92c38f102e8cf63a86012650da6265aa1a28f0ade5131ebb1df51e6202be0edc WHIRLPOOL d47459d214d1ed9818de534885ea806f092fe2fb02b2aa08b00b95fb9c3f2693b7c9b8d3e5723be55535888e1276ba4dbc24ead2f659677a43d326dcff9f3925
 DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1bd76ea305902e4885746280755c3ea0 SHA512 9ff1d51655c0af93eca0b3a7e5cf250ce9a6787b3bc5eabcb59207ca3af13b6972bbebbc9c4a05bc1056cd12d6ad4c4bc30700efb656a2b9cfedf71ef57666e2 WHIRLPOOL 064625dfbfd428da5ecbf7ceb0532ff16e61ef9fbdbe1f4f72824e06ca21a93266a3d5eeec730f6423cb9d5d26d99fc6dbb568f30a79c4a691a0fdb08301c1cf
 DIST gitlab-pages-0.4.1.tar.bz2 206039 SHA256 ed856e1d549597b5f1b7aa5d006538aa4def240206b4756728aaeeefa49734c7 SHA512 e6dc7c73ec0601ebe53c54aa8d0978954c24450e488776bef1bb2483efd2db14d23188ee10660f6833f44bbbb50f462f8b9568a77cd4ff970300c604856319a0 WHIRLPOOL c8abfaf677f935b752be24c7ce703c49dcc23061a24f2137ea18df33a96d42233e7e00de120a812df58b84bf3db0739e97a1e37fc04367d370ef2558986d73fa
 DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e5273899518b83529c787c0a5f724161005ca786 SHA512 74e4cd810712d1506b927f75b63dc4fca09802097579d456cfada94f06c59b05f5e11309dc6fbd0f4c701243933688afa89ef8c1cf921f15536f505c7dec99f4 WHIRLPOOL 0f352db3977565b7c41609dcbed9161fcc99398fc56aa535255a69d12169b75b985410964a9adce60ed9eb8b88a68128dac9a9528f85ec62bae468fb8907e182
 EBUILD gitlab-pages-0.3.2-r1.ebuild 1968 SHA256 947c1a842bf512d712a73c723adc9db7651041e740a575050ea636b43948d294 SHA512 c7330aaee4252d6c0bde0440d4dace061e59802459efb3da71148c100e71fe6231bb694a5aaf57e8372d5c8fca2ca84a3d359ce86dcb8c918e12fca92ca22757 WHIRLPOOL 68762bc267f336c0ac866c8e782f878d1ad5dd7066fd85bb0d5ed506b8ea9b57f28a801d6e2535869912b93fa2143f13b0155771b3ee0a31cedd3b64a01169bd
 EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3
 EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53
 EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039
 MISC ChangeLog 1198 SHA256 20adea92aa197d2774657be760b12b92a18a668e73adb7bebaf909bd34c9745e SHA512 13c40fd3574847af8c92b7a8758fc91001e9b82ac53c2a0f6259f494676e7dfc6a0e87c4717a0b287676164562dbe5abd61c62bfbceb1067da9a02c265d7c619 WHIRLPOOL 3778bbfd3436fca31f4a802ecc9893e31657e633720180d2f295a7e6b2616beba0e21a29ecb48c65b8da93ac83b256380bcff51aa84f76bb9041562950165efa
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-pages/files/0001-fix-Makefile-0.3.2.patch
+++ b/www-servers/gitlab-pages/files/0001-fix-Makefile-0.3.2.patch
@ -0,0 +1,18 @@
 diff --git a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
 index 2c1b8e1..4c6feb0 100644
 --- a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
 +++ b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
@@ -1,12 +1,6 @@
 -REVISION := $(shell git rev-parse --short HEAD || echo unknown)
 -LAST_TAG := $(shell git describe --tags --abbrev=0)
 -COMMITS := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`)
 +REVISION := @@REVISION@@
 VERSION := $(shell cat VERSION)
 -ifneq (v$(VERSION),$(LAST_TAG))
 -    VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION))
 -endif
 -
 GO_LDFLAGS ?= -X main.VERSION=$(VERSION) -X main.REVISION=$(REVISION)
 GO_FILES ?= $(shell find . -name '*.go')
--- a/www-servers/gitlab-pages/files/0001-fix-Makefile-0.4.0.patch
+++ b/www-servers/gitlab-pages/files/0001-fix-Makefile-0.4.0.patch
@ -0,0 +1,18 @@
 diff --git a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
 index 2c1b8e1..4c6feb0 100644
 --- a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
 +++ b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile
@@ -1,12 +1,6 @@
 -REVISION := $(shell git rev-parse --short HEAD || echo unknown)
 -LAST_TAG := $(shell git describe --tags --abbrev=0)
 -COMMITS := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`)
 +REVISION := @@REVISION@@
 VERSION := $(shell cat VERSION)
 -ifneq (v$(VERSION),$(LAST_TAG))
 -    VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION))
 -endif
 -
 GO_LDFLAGS ?= -X main.VERSION=$(VERSION) -X main.REVISION=$(REVISION)
 GO_FILES ?= $(shell find . -name '*.go')
--- a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf
+++ b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.conf
@ -0,0 +1,7 @@
 LISTEN_HTTP=:9090
 LISTEN_HTTPS=
 LISTEN_PROXY=
 PAGES_DOMAIN=example-pages.com
 PAGES_ROOT=/opt/gitlab/shared/pages
 LOGFILE=/var/log/gitlab-pages.log
--- a/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init
+++ b/www-servers/gitlab-pages/files/gitlab-pages-0.3.2.init
@ -0,0 +1,21 @@
 #!/sbin/openrc-run
 start() {
 	ebegin "Starting gitlab-pages"
 	checkpath -f -m 0640 -o @USER@:@USER@ /var/log/gitlab-pages.log
 	start-stop-daemon --start --exec /usr/bin/gitlab-pages --pidfile /run/gitlab-pages.pid \
 	--make-pidfile --background --user @USER@:@USER@ --stdout "${LOGFILE}" --stderr "${LOGFILE}" \
 	-- ${LISTEN_HTTP:+-listen-http }${LISTEN_HTTP} \
 	${LISTEN_HTTPS:+-listen-https }${LISTEN_HTTPS} \
 	${LISTEN_PROXY:+-listen-proxy }${LISTEN_PROXY} \
 	-pages-domain "${PAGES_DOMAIN}" -pages-root "${PAGES_ROOT}"
 	eend $?
 }
 stop() {
 	ebegin "Stopping gitlab-pages"
 	start-stop-daemon --stop --exec /usr/bin/gitlab-pages --pidfile /run/gitlab-pages.pid --user @USER@:@USER@
 	eend $?
 }
--- a/www-servers/gitlab-pages/gitlab-pages-0.3.2-r1.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.3.2-r1.ebuild
@ -0,0 +1,79 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_BRANCH="1-10-stable"
 MY_GIT_HASH="7285dc6"
 DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 MY_USER="gitlab_pages"
 pkg_setup() {
 	enewgroup ${MY_USER}
 	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 }
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
 	sed -i -E \
 		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 		src/gitlab.com/gitlab-org/${PN}/Makefile
 	eapply_user
 }
 src_compile() {
 	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 }
 src_install() {
 	golang-build_src_install
 	dobin bin/*
 	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 	# rc script
 	local rcscript="${PN}-0.3.2.init"
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|g" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 	newinitd "${T}/${rcscript}" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.3.2.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."
 }
--- a/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild
@ -0,0 +1,78 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="fdcb2c9"
 DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 MY_USER="gitlab_pages"
 pkg_setup() {
 	enewgroup ${MY_USER}
 	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 }
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch"
 	sed -i -E \
 		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 		src/gitlab.com/gitlab-org/${PN}/Makefile
 	eapply_user
 }
 src_compile() {
 	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 }
 src_install() {
 	golang-build_src_install
 	dobin bin/*
 	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 	# rc script
 	local rcscript="${PN}-0.3.2.init"
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|g" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 	newinitd "${T}/${rcscript}" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.3.2.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."
 }
--- a/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild
@ -0,0 +1,78 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="043be6d"
 DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 MY_USER="gitlab_pages"
 pkg_setup() {
 	enewgroup ${MY_USER}
 	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 }
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile-0.3.2.patch"
 	sed -i -E \
 		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 		src/gitlab.com/gitlab-org/${PN}/Makefile
 	eapply_user
 }
 src_compile() {
 	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 }
 src_install() {
 	golang-build_src_install
 	dobin bin/*
 	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 	# rc script
 	local rcscript="${PN}-0.3.2.init"
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|g" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 	newinitd "${T}/${rcscript}" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.3.2.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."
 }
--- a/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild
@ -0,0 +1,62 @@
 # 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-pages/..."
 MY_PV="v${PV/_/-}"
 MY_GIT_HASH="dccd0f2"
 DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 LICENSE="MIT"
 SLOT="0/${PVR}"
 DEPEND=">=dev-lang/go-1.5"
 RESTRICT="test mirror"
 MY_USER="gitlab_pages"
 pkg_setup() {
 	enewgroup ${MY_USER}
 	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
 }
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile-0.3.2.patch"
 	sed -i -E \
 		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
 		src/gitlab.com/gitlab-org/${PN}/Makefile
 	eapply_user
 }
 src_compile() {
 	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
 }
 src_install() {
 	golang-build_src_install
 	dobin bin/*
 	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
 	# rc script
 	local rcscript="${PN}-0.3.2.init"
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|g" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 	newinitd "${T}/${rcscript}" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
 }
--- a/www-servers/gitlab-pages/metadata.xml
+++ b/www-servers/gitlab-pages/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>
--- a/www-servers/gitlab-workhorse/ChangeLog
+++ b/www-servers/gitlab-workhorse/ChangeLog
@ -1,3 +1,49 @@
 *gitlab-workhorse-1.2.1-r1 (29 Mar 2017)
 *gitlab-workhorse-1.3.0-r1 (29 Mar 2017)
 *gitlab-workhorse-1.4.1-r1 (29 Mar 2017)
 *gitlab-workhorse-1.4.2 (29 Mar 2017)
  29 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-fix-Makefile.patch, +gitlab-workhorse-1.2.1-r1.ebuild,
  +gitlab-workhorse-1.3.0-r1.ebuild, +gitlab-workhorse-1.4.1-r1.ebuild,
  +gitlab-workhorse-1.4.2.ebuild, -files/fix-Makefile-1.2.1.patch,
  -files/fix-Makefile-1.3.0.patch, -files/fix-Makefile-1.4.1.patch,
  -gitlab-workhorse-1.2.1.ebuild, -gitlab-workhorse-1.3.0.ebuild,
  -gitlab-workhorse-1.4.1.ebuild:
  dev-vcs/gitlab-workhorse:  Added ebuild for gitlab-workhorse-1.4.2 and finally
  cleaned up the fix-makefile-patch mess.
 *gitlab-workhorse-1.4.1 (13 Mar 2017)
  13 Mar 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/fix-Makefile-1.4.1.patch, +gitlab-workhorse-1.4.1.ebuild:
  dev-vcs/gitlab-workhorse:   added ebuild for gitlab-workhorse-1.4.1
  14 Feb 2017; Manuel Friedli <manuel@fritteli.ch>
  -files/fix-Makefile-1.1.1.patch, -gitlab-workhorse-1.1.1.ebuild:
  dev-vcs/gitlab-workhorse: added new ebuild, removed old one
 *gitlab-workhorse-1.1.1 (12 Dec 2016)
  12 Dec 2016; Manuel Friedli <manuel@fritteli.ch>
  +files/fix-Makefile-1.1.1.patch, +gitlab-workhorse-1.1.1.ebuild,
  -files/fix-Makefile-1.1.0.patch, -gitlab-workhorse-1.1.0.ebuild:
  dev-vcs/gitlab-workhorse:  added ebuild for gitlab-workhorse-1.1.1, a
  dependency of gitlab-ce-8.14.4
 *gitlab-workhorse-1.0.1 (05 Dec 2016)
 *gitlab-workhorse-1.1.0 (05 Dec 2016)
  05 Dec 2016; Manuel Friedli <manuel@fritteli.ch>
  +files/fix-Makefile-1.0.1.patch, +files/fix-Makefile-1.1.0.patch,
  +gitlab-workhorse-1.0.1.ebuild, +gitlab-workhorse-1.1.0.ebuild:
  dev-vcs/gitlab-workhorse:  added ebuilds for versions 1.0.1 (dependency of
  gitlab-ce-8.14.2) and 1.1.0 (probably dependency of future gitlab-ce versions)
  23 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
  -files/fix-Makefile-0.8.2.patch, -gitlab-workhorse-0.8.2-r1.ebuild:
  dev-vcs/gitlab-workhorse:  pruned old ebuilds
 *gitlab-workhorse-1.0.0 (11 Nov 2016)
  11 Nov 2016; Manuel Friedli <manuel@fritteli.ch>
--- a/www-servers/gitlab-workhorse/Manifest
+++ b/www-servers/gitlab-workhorse/Manifest
@ -0,0 +1,15 @@
 AUX 0001-fix-Makefile.patch 360 SHA256 7dfdf28c0124c5054d452a9ff33b7f8f9b818f8aac63f26c8c3b567c919e0930 SHA512 d4a54811aadf330a31a562a78a99e34abaea83b647c8002de72fe27c6b58155879f8238f6382979cdc34370f5a81f979cab6d0f54a8ec8e529ca22a118901d3a WHIRLPOOL 19d77424ff65b51b120e88e9c7bd9f9520213d42cf70aa436e339beb402d528ca5efaf14009ecd2b01e9de1a8bb350b82f52541e885265e5649d869df80a7659
 AUX gitlab-workhorse-0.8.2.conf 297 SHA256 8bb99a78197ad22892e4c85496101a39f2c82f6c537f44da8185af54dbb44a38 SHA512 d143489c165ef5e68810bb10d5e97da7ad3be6d53618380231706ec16c3fd8bc3eedbc78a09949479a408646e32aae4cdceaca9b271ba3b816e3449b792c5406 WHIRLPOOL 649d34b60afab816dac559989c9a3b0cb9620c2ac2a7617cfcae8bcc2c421791fa612571f83e6611ec8ab8c26c9c79f9832f4e6a70396497dfc5a40d99bbbef9
 AUX gitlab-workhorse-0.8.2.init 681 SHA256 bf3f94853781251629daae935d04294febf317061536624e2c01188dd6688ae7 SHA512 6275abe0910e7327f952dba36827a9083264f76753605767cc11ee7b162fdecef3170783800263bf8acbe891d41e6be9e27b5fcca2a4f035b990c9865aa02647 WHIRLPOOL bc983d0413c0743ef0843a3abb46ee2be78ac6e18b56f96de63b4ea8cb9242f8ef6a96f2d593dbcda33a0a60b7f941f27bd704b7f64a85db7379ef0b42233527
 DIST gitlab-workhorse-1.2.1.tar.bz2 381033 SHA256 b9e0bf7c2b3ad1378c59def86d59726e988ee31db94b96d3e907aeae402ce1bd SHA512 de50574b39f84ea980c64cf54e7e0aa5bc94ed933bcb550f5712d07a8d60e4843fcf97993e285bd67361f931dd9a63f5cbde98a96478444b8381f23491635493 WHIRLPOOL 7cea252ada82a4d7281bbdd002fffbc3bebbcffe20748b8e4b8e4e8aa6fcee852bc18076c9ea4761849e24b5291b4552ef3e8ea812f1156ab980f476ded59b7a
 DIST gitlab-workhorse-1.3.0.tar.bz2 384385 SHA256 b0acbd61a7ccf37512b569dc50625ff89dec9e181f8d5ed0b6115c81ef611032 SHA512 e2ea0183666e48795d97f19117995ce0191ce6d3a3810ceabb9c365b359839d8603b65608d754fd54b41a50fa2375eb64312203d58988aabfe81026f520d2f8f WHIRLPOOL 35e8eee022fc12e7d281656cdb65f35b23eb45fff739bd6fad05e594be56578043445cd6c5fd0ac3d3b097a4d0215a19cff0cc54c2d0d5dbec6dc5df3398fdaf
 DIST gitlab-workhorse-1.4.2.tar.bz2 625125 SHA256 4df4d93bc59102c312ad2a642d7f1ca463357c60d440a11fa72cfcbd4363a8e6 SHA512 1fa23991b463136565185982c1d10d17ecccd44f18138dc27cd0ef8ba0c63abc84347475d295fb71de9aaf8ad3de5747bb656c53c87769d3bce5db67571f89e2 WHIRLPOOL 3e5f2d311d96124546492d3b1da0740e70b8418f3a58f2dae2d457fb15a61d3ebdceea0e67c5a474a00ad7ac67575931a9d6ec8a4cc74572bc5549783b76304d
 DIST gitlab-workhorse-1.4.3.tar.bz2 655746 SHA256 5b621887aa8b6c0cb1b5b1aae6edd4d4cc60de77ef70f263a5968e56899da9ca SHA512 bdf62b8d5925fb45d439d2b9caf4cd2c175129bc3fe3bc24b8914dd128c1b6fc8ed700ad20513ee272e24698964c2daa7657e7bae86d58ae53cbe0e7ef44b89f WHIRLPOOL 507ba152b90db9b9459ef3f939780d39e7af17c6f2081a53c9affe621e4c624c46259993a6d94b218b476a2908ee9e3ff882f27c4d8f29e5ebc98f9bc4d878a7
 DIST gitlab-workhorse-2.0.0.tar.bz2 656360 SHA256 4e9864b7885b1102d9eb18e9c4bd3baf6021b4d3b64adbf5e9ba70b49aea8d8b SHA512 f439affafc54a090f105897de3ee5fcf2864c26dfd5f87299097c6827b9563f5ec0f7ebc9b1abfc90d6f88f864a640620c58b8a004aa230789ea5e27cf3a2e4c WHIRLPOOL a8488fcb95d06f88eef01e7d1f045fcab766c439738e44fb523b5198d29531b230bd8a1ac27e53fc668a0ba034773cf44477fce623489afe268be9b110ad04f3
 EBUILD gitlab-workhorse-1.2.1-r1.ebuild 1019 SHA256 59a9b9fef8350811a1ebeb8824b8bacdfc2c145b88367841c82fe327729b63a2 SHA512 e708d5bc395b4eb8760ba218559e65059dcb499ebc45b33360da2b4b738f51fbb81ad1a2f6eb909d0d40025b45faf4c3be8fb84c945f231de0c635c2770bdbc2 WHIRLPOOL b536bb41b413beb5af648e406dc285c2e8d8b2dc8fd2803296753734feca0856219f560817c58c538b0207c4392e3c73142a8c701646033af9218023c1ca7471
 EBUILD gitlab-workhorse-1.3.0-r1.ebuild 1019 SHA256 c89fb85c3f9be066b78dc3eb7eeff6b2a93e5036e526688fe19bfa7c4242795b SHA512 69db5fd2700f3ff5ee8513c60d3a704b7de82757f2c3e8d8162606873aeec05655a30169ce53ca036d52e71507f4d1e39ca1f7520abba3bd9955c5d2408d8a7f WHIRLPOOL 96890317f566dc9775eeb85d231ed92a65979d12adb8dace28bcd52bd1b0e3d5ff3acb852def13edd0d8e797922e82d0fb20b41112933496216578ab92417f97
 EBUILD gitlab-workhorse-1.4.2.ebuild 1019 SHA256 12e00f04075eb815e41640f4ca906ce1aaa833104e79c43f19c1a34c4454ce2c SHA512 8b430448c28ea695502f08928626f628657d58582439c3458370a56dc134c108c24f266a3fe2353b1ecd5082d2e53b985fa998b8919b60f81836579c884555e3 WHIRLPOOL ff37a454aa77734d4cd15b6bc4181a5dc8f1ead2d03710fdc59a514cbaa0a67202ded330021f2c6f763797763b8de94e2ffe86c90cba2336903479abcdfc3437
 EBUILD gitlab-workhorse-1.4.3.ebuild 1019 SHA256 9f04f9b9a1af3b6a14af32fc27143ef98cf8d5ea297c754e2af2f75faab90cf9 SHA512 f38aee3ae9318d4db08a6f5bf55a7d25944ca65d132f23e5638e670a31745381d93a39d9489409ee75de943edf80af555638b2748d3eb7b1b8b0d65d8c02d6e7 WHIRLPOOL 60491062d73591e137a7a6d6875174a7f7c31c6972d104c2dd856ef8513276617e1be97f18679853b86638d92ba87152ca5b3f17c43dee79db2918e3e3139584
 EBUILD gitlab-workhorse-2.0.0.ebuild 1019 SHA256 6b5b1af7f4bb91d6f38b5160ea4a1711392ba42ae296388c72ceeb1e19dabf99 SHA512 aa607720a13052e2fa5e086d3f5fa2bac42dc9a1028940c6c42e9307596439bb89f6405d23a8f2c216ff9a15e2d83be373adddb6598ed84b7b00af872cd8efc3 WHIRLPOOL 9cd700793dbad67c8a88bf7794bc1273e809b8435702c4359b12c25006fa1a08c8d5963ab76ac75bd46d520442b3195a79659718f8c7bca49d7fb5b4c0d9d6b1
 MISC ChangeLog 6613 SHA256 cb006b86036d17d1a77bd16ee43b701a4bcb245851299fb73181e92fb10cc787 SHA512 e891fd757198a066c82a2f8843911ae836fc962d661d5d5569b82b00b9ce732f015ff5712f32c7ffe71e6ed2091f376ec621cbdfca21d5d0e7e6f85db3be49d1 WHIRLPOOL a6f6b6d975f2d0f73ff17de76c82166a5f106ab869ea15ebd31f15fd4161121c18dd4a1b216884a66e76a2bcf05083d8d6d3105b4c0dcd7dbc13c631a9c0922d
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-workhorse/files/0001-fix-Makefile.patch
+++ b/www-servers/gitlab-workhorse/files/0001-fix-Makefile.patch
@ -6,7 +6,7 @@ index 3f6ac91..663ffbb 100644
 -PREFIX=/usr/local
 -VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
 +PREFIX=${DESTDIR}/usr
-+VERSION=v0.8.2-$(shell date -u +%Y%m%d.%H%M%S)
+VERSION=v@@VERSION@@-$(shell date -u +%Y%m%d.%H%M%S)
 BUILD_DIR = $(shell pwd)
 export GOPATH=${BUILD_DIR}/_build
 export GO15VENDOREXPERIMENT=1
--- a/www-servers/gitlab-workhorse/files/gitlab-workhorse-0.8.2.conf
+++ b/www-servers/gitlab-workhorse/files/gitlab-workhorse-0.8.2.conf
--- a/www-servers/gitlab-workhorse/files/gitlab-workhorse-0.8.2.init
+++ b/www-servers/gitlab-workhorse/files/gitlab-workhorse-0.8.2.init
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.2.1-r1.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.2.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -10,7 +10,7 @@ DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
-MY_GIT_COMMIT="15dcdbd45d90330cd7e2cf1126834f829b7d3961"
+MY_GIT_COMMIT="0fe5a09e85de07cae1210627f1ecbaeb38e8372b"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -20,7 +20,11 @@ KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
-PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.3.0-r1.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.3.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -10,7 +10,7 @@ DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
-MY_GIT_COMMIT="b598d29066ee0c36b7c1b604965d6c78edc39dfd"
+MY_GIT_COMMIT="b30cda2218572674082636d9851086eeee9a971f"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -20,7 +20,11 @@ KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
-PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -10,7 +10,7 @@ DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
-MY_GIT_COMMIT="06632c751d46de97776f1a5aeb2432fae0f6fd4d"
+MY_GIT_COMMIT="a0f050c8fc680faa2c758c11ad2815cfe367db44"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -20,7 +20,11 @@ KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
-PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
@ -34,6 +38,6 @@ src_install() {
 	done
 	## RC script ##
-	newinitd "${FILESDIR}/${PN}-${PV}.init" "${PN}"
+	newinitd "${FILESDIR}/${PN}-0.8.2.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-${PV}.conf" "${PN}"
+	newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}"
 }
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 inherit eutils user
 DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for GitLab >= 8.4"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 MY_GIT_COMMIT="97d3583a6b36f8c267680c826bced98a43ba95f7"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
 	diropts -m755
 	dodir ${dest}
 	exeinto ${dest}
 	for f in "${PN}" gitlab-zip-cat gitlab-zip-metadata ; do
 		doexe "${S}/${f}"
 	done
 	## RC script ##
 	newinitd "${FILESDIR}/${PN}-0.8.2.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}"
 }
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 inherit eutils user
 DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for GitLab >= 8.4"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 MY_GIT_COMMIT="eacd5b7aff7cc1b51a2409d8645dfc61904f308c"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
 	diropts -m755
 	dodir ${dest}
 	exeinto ${dest}
 	for f in "${PN}" gitlab-zip-cat gitlab-zip-metadata ; do
 		doexe "${S}/${f}"
 	done
 	## RC script ##
 	newinitd "${FILESDIR}/${PN}-0.8.2.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}"
 }
--- a/www-servers/gitlab-workhorse/metadata.xml
+++ b/www-servers/gitlab-workhorse/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>
		`@ -0,0 +1 @@`
							`move dev-vcs/gitlab-workhorse www-servers/gitlab-workhorse`