Merge branch 'master' into gitlab-8-11-0-rc1

2016-08-02 13:11:31 +02:00 · 2016-08-02 13:11:31 +02:00 · 3a45b92e02
commit 3a45b92e02
parent 31c1191b12 be2469eb62
26 changed files with 106 additions and 1550 deletions
--- a/app-crypt/certbot-apache/ChangeLog
+++ b/app-crypt/certbot-apache/ChangeLog
@ -1,3 +1,8 @@
 *certbot-apache-0.8.1 (27 Jul 2016)
  27 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +certbot-apache-0.8.1.ebuild,
  -certbot-apache-0.6.0.ebuild:
  app-crypt/certbot-apache:  updated ebuild to version 0.8.1
  07 Jun 2016; Manuel Friedli <manuel@fritteli.ch> +ChangeLog:
  Added ChangeLog
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@ -1,4 +1,4 @@
-DIST certbot-apache-0.6.0.tar.gz 686826 SHA256 58eaa6be4ae90af07d682296e42dbac924b5602c51002445059596313e182a09 SHA512 966fdbff13ac9651ebb5fafae86a58a45538d57a43eb6d157358bbecef4286634bb61dd13b94e0ca5b006980a35cc5fe55b4a12efdeadc2530653d844516c926 WHIRLPOOL 0bd424395b9002a04f6c900b208aea758f74e9864d75f6aa87fc30573f046c63f9791aa8bcce0a5452831192d1579e9b52fda5ed77befd6e4f361dab976d6369
+DIST certbot-apache-0.8.1.tar.gz 698305 SHA256 1fb4834eba306a656f26257f86ed298df354cdecb1b0bde316a9d23a1e19db01 SHA512 8b21d270b5ee847086369b956b3346fdddd50ab0e4490d988e7ca535f4d4101e2859e99bc5f77ac920afd3a6a9210e407b155c89c28d282dc0544735a27e3eaa WHIRLPOOL 909a3f6f63fac84bf6fe8fb35b9aba46c06912af01d5f702eee5b6aeab49d4f2a92fa05e4f060da11ac6cbc89047e92457f626d6c82aa0de0f1127ca79924fc7
-EBUILD certbot-apache-0.6.0.ebuild 1051 SHA256 ead789957c63cb1d0951bca583256109f5deb55c52b58a9b3772afceb5a0f64b SHA512 ca49a904ed44ec950bea4c3864cb7f8e8c61d5a3d74111fe5be5a3f478a5a9a4c4f9d2beb7d216dfb86dfd05020236bce7c4e0c9f81c52a68316b88e152b8bbf WHIRLPOOL 5f21a34c264de958564ee199a6b819211339a0280b22b1447005d72b5a8f1f538af729180b20dadf6c49ffa98e841e0b568f3cd85e26da66d5a7f4c27de98134
+EBUILD certbot-apache-0.8.1.ebuild 1051 SHA256 ead789957c63cb1d0951bca583256109f5deb55c52b58a9b3772afceb5a0f64b SHA512 ca49a904ed44ec950bea4c3864cb7f8e8c61d5a3d74111fe5be5a3f478a5a9a4c4f9d2beb7d216dfb86dfd05020236bce7c4e0c9f81c52a68316b88e152b8bbf WHIRLPOOL 5f21a34c264de958564ee199a6b819211339a0280b22b1447005d72b5a8f1f538af729180b20dadf6c49ffa98e841e0b568f3cd85e26da66d5a7f4c27de98134
-MISC ChangeLog 82 SHA256 12ed3543adc88564630b15553233b47b2bf04f4acc8f97eeb5c5befa2c16c75b SHA512 bf31a0cd9c7f4c2b560ef6cd2174e927933d1004c8fab2089e1d0d8c8d76f26f449f9babd33b72176038868259296cd4dda9db0b9cb175274e98fff888290703 WHIRLPOOL f7606de1e805cc293c25b9538e2fd7433ed4cd076bf7e047d7583e4e3886de1a365fe6b1e75bbcbd80f8d4da4a74ec3259d9914462a80ac75e9537dca5c9e52f
+MISC ChangeLog 293 SHA256 cca201ced8166ea196e6c310e023e761766598b37115d7a028767b8c8194aba9 SHA512 331873b058d7c06b0daf62426745da3c4cfd9c35680b9a74c2f46a358030e68d1adafd29d6ccfe3307e6fa64cbb52363236bc264c631e75a4e2dce1e88ca6f70 WHIRLPOOL 5f72209ce20589e582d5e6fcb846915c58d5a6589e92e34923549dafb2e09135b3afaac010d016fa10c6b8bdae1f4e5ba9a5a66b4759b0f949f1fb3b76d858cb
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.8.1.ebuild
--- a/dev-vcs/gitlab-ci-multi-runner/ChangeLog
+++ b/dev-vcs/gitlab-ci-multi-runner/ChangeLog
@ -1,3 +1,11 @@
 *gitlab-ci-multi-runner-1.4.1 (26 Jul 2016)
  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
  +gitlab-ci-multi-runner-1.4.1.ebuild, -gitlab-ci-multi-runner-1.1.4.ebuild,
  -gitlab-ci-multi-runner-1.3.1.ebuild:
  dev-vcs/gitlab-ci-multi-runner:  - added ebuild for version 1.4.1 - deleted
  ebuilds for versions <1.3.2
 *gitlab-ci-multi-runner-1.3.2 (09 Jul 2016)
  09 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
--- a/dev-vcs/gitlab-ci-multi-runner/Manifest
+++ b/dev-vcs/gitlab-ci-multi-runner/Manifest
@ -1,16 +1,12 @@
 AUX gitlab-ci-multi-runner.conf 44 SHA256 0b93ba53d557fbf603b50f6d78eb2c4415b9a79f056142b6edf4a63fc6612d6e SHA512 1f5ff480740b18fc985ae9337b8dc4ddd1bde5253e09042b5542cb9a3db54b9cef1f7b24445c829eb83fcfd8751b693018154f6b97ce0a6e723d5d71d9a27429 WHIRLPOOL fc5218c55917b3303baf649fbafaf1dc50cf52d0ee04852716defe4f21b806f4f313071b1c55920d89da66180405d35da0f7cca73c2617b70bcaa67f725cab2a
 AUX gitlab-ci-multi-runner.init 696 SHA256 03fc8cf6f5d8883b69122362202779f1ef8c8bcc5e60b828a97fb4b6b98ba315 SHA512 70e77d175239827df7470d716d59a61147390f9ae3b796f38bfd4edf966dabb09a6be4ed620e34a8eeb1345d7e2c32082dcc00d7857193fc02024b9ba12142b6 WHIRLPOOL 53ce6f85bc624b44242bc424f755414c8303ba953cdbcbc15b5e3be7b67f0438278d1689f7ce2bc2ae5c4a296fd706401988d0f889d8c37eabd7955e6becca91
 DIST gitlab-ci-multi-runner-1.1.4-amd64 35350128 SHA256 0674fb0669a7de3c20ed70b94206ba0f2e2e90058458a8df2818f78700ed21a4 SHA512 0a7c1fc6530f28d6b0d6e804a5cea44c49c204d0e5f3a7fbd51ad9ddf61b5e6d3e7d3ee2360b746c421fe351705cf7e2fed2d983afc68383bdca2fd8f1686a23 WHIRLPOOL 274caad86300d0c564e13cdc9d236b621ec768ecd9605e620a6401958d84757c7cc104ac93a93d007b08913d84163d630fe0bff97404132f6505c5384acd856e
 DIST gitlab-ci-multi-runner-1.1.4-arm 32386448 SHA256 e5986b65a642124d355aa25822b12f46f81b5ab3a4922f99693788072f8fb4a1 SHA512 e202da365233adbc817036a1a80fea703185985f1ffb4d1d47d4c4efda111cf39d638801873b4bda734aca0708d9f247f5e62a711db4511141b69e4e0b297653 WHIRLPOOL 478bfd2fec6eb2f9825e40b79dbe9b84d88b3728621d9686f9a1c642d9b0ccd762ddc03a8f52855c7b9313ee3e07bbd817e9ff7bd9ea362623bb2397e3c7f491
 DIST gitlab-ci-multi-runner-1.1.4-x86 32562200 SHA256 4b5cc4a70d7f8fdb5c389c7525aba24a1cff82f8e76dd01cd7f94c4a053e457d SHA512 c46fae0766b863fb8e41abbf74bf5d6dfdc94daa412850a65711ab97113bd62c2c1c4685d5d12b5508a245aac9448ea4c5da0b0cc925bc525ec22f5d04157a1d WHIRLPOOL c2ca6d6465469a37c1567681638122f401db48b0cc81c5e507a89c90c2a74f25631d0b1b77c00d22868b6392c085c55c7b3b5fa95aabcd927555a0d906520be8
 DIST gitlab-ci-multi-runner-1.3.1-amd64 59026624 SHA256 3a80fefb5bb76e43999d95a44467531b47b30b99385ccb2e67b00279cdab6eb7 SHA512 af62b0e7b76d909bfaaa7ebac385df61ae8ba4ca6e0bd9ad7463f628117f1428160ac1a2aa16834837130edb28a22b2c2e720ee93eb70c1086ce6855127f5767 WHIRLPOOL 140b1aa6bfd6ba45acde7a27b29d0410cbcd3940e37f45de9ab4e5c064ffb4ea73cfe25ae80e30ec6f6cc8733535607c779596e7e56c2412f74c51b3cb9b1328
 DIST gitlab-ci-multi-runner-1.3.1-arm 55880648 SHA256 106a6abb55b055f6f9f7f6ac2f65dd26f440b4afcd000cfc128a10c347c3e95d SHA512 a019c30c390d6da949ada3dccc8de9ed0e8c24fc68abbd2d3fa78fb79055c542d74584bff013a228b9abec6e7e2881f99ad5a94ebc008fb19584f12fc55111af WHIRLPOOL 1f9f1e0e4bbfc1c7a3702e2748868e3a9021e9d1289274b4014dbe6876e379ef12f258cdcc9d85320ef5c2e413d78e6815a41e33b9aad2781fba226a2fcc3b13
 DIST gitlab-ci-multi-runner-1.3.1-x86 56049856 SHA256 3b8df407e0014bf82d7751d0cc6a55c7cf73be224550cdc239aa23b4f053a7f4 SHA512 4635de807a4812bf75396eb3f81f160409b1997931b5601530af794a06914bcbb41d25139bc5899385e16ae7ec2f09387b5973589c7ea66c5df6b4e993050814 WHIRLPOOL fa576629cd700ff7cd9f55c5da4f4dbf24e8188066df78f383be413052462fccc13d5e3b45ff582785052acef2a77ff49f3a9e1f2f1742e6ce98b67274bb03a3
 DIST gitlab-ci-multi-runner-1.3.2-amd64 59026624 SHA256 11a27560c0b52138e1947b25fc02768a493fb6480a9e81f1be9980823767dfc0 SHA512 1f80754c13460ea3c849b91a1e08ca19cc906e96ed2d392a7a5b5ac86596b065ef0969c396b17dede090d00b2d61734db1c997ab6884f2768170bc50a69ff262 WHIRLPOOL c0c48efd7591861a969c3ab0d0c3317eefa8ea9f90d518e3f4698d16df2ab35865fe90320063570c064c9fe553f79a015b22f6ac0202f8b70ea381e4a6e42308
 DIST gitlab-ci-multi-runner-1.3.2-arm 55880656 SHA256 9277c93936071c28853e30c65f1619ad8633636cd33b44d844f564e606f9a816 SHA512 95bf8ba209c137b02fc9d08ffa8222a98d3d9e821360c77cac174b8482dc41f04ea294784b7dc3937515731ad41927f756c448247728582e3782484ffa3015e5 WHIRLPOOL 7ed4df051005b9b77aecdc99753e8a6a63afacbacf57e86431a544ca6fbd0fd9d6acf3c9685d28b6dce6213a235c29c35145833bcd74183e7ce42ac593b7962b
 DIST gitlab-ci-multi-runner-1.3.2-x86 56049864 SHA256 f76eb70b7033f0db62022136e585635e28e8f89bebef327a240f8becb7bd254e SHA512 cf379e9fc3187ce018f23fdc4be0c541e7d0bc9080ba9358beb20b8db9ad0e18926d383f22bbdbbe5345668c84d4005c206568c10a2b255a93d7e6e0735a709e WHIRLPOOL 200ffa04bcf330f0f3f54b7f13639c5b17bd4571b599539ae1f5166a5709f410945b1b33450b87aad666250cfc13a32a1312afa4c6509c906c8e15cd5a579188
-EBUILD gitlab-ci-multi-runner-1.1.4.ebuild 2349 SHA256 6432c48b3a7a36c0b28ccab7fb79382061fa9296df9b6dc9ca32d4caa5f20702 SHA512 2a7674d506e79d8570fa8527dd10b87e775a75b4daf41458bcca28f5ad9863145571d4ebf9d9e0d9df015e48c89a7bd4a05d1bc7928223fdc2b7fd528d5282d8 WHIRLPOOL 6df8346401d631b58a3a6e1ce9f2c0e3e8b871e99880099463dcb9b5639d08b3725c7c83e7f96dfe7e8cba4e60abe77e2afbeb2c7ae8ec13cf02b05d1723fd9f
+DIST gitlab-ci-multi-runner-1.4.1-amd64 59770288 SHA256 8efbffac459fab6bc0532ba09d527e5a93d1da521fd90b1ff6408a714fcc8261 SHA512 33d8a509def74caa937fbfb69dc4aae50266e1ffd83bcddd2e358649010602108bc99647192fd64e8bbd1892a18f27b69b704ea1b4fc6622ec0d8ee4fdd564c0 WHIRLPOOL 6fae8f2a04aa3a74506746906e91300e05ea3ca31cdf8a4fc8e092328277975832f80a56eee1e26359dd510ed135fd756fd11b3ad75e23284c92388c162f388a
-EBUILD gitlab-ci-multi-runner-1.3.1.ebuild 2349 SHA256 e08c86353148305b0d0b6e671061ae22bf551b8bdce0902b65112fffb9b35cde SHA512 43c9921253423607a395f943d50c699e33e868aac3c76c06c9d9e3701d97fbf8513d06734eefb826f8a26fa62bd435bd12945dd623af122013edfd6295025185 WHIRLPOOL dec520c11a615649549616dac61335367183f08eec5ec137750d64b8fd47330870370cd5dae50a11244203f8c4ddfdf9ef11ef1e654e6508b999d5db211cfc06
+DIST gitlab-ci-multi-runner-1.4.1-arm 56437360 SHA256 8f029a87d1ac1e1fc0f53249e8c8d9fc8f8c5191609a74521fdf626d6a9aec1e SHA512 9fbb8fd89a25e7f51354ec5d55bc4e1a60a166c39849ea4fa54435dbc48135ac8720a6f0cea2645fb449ceff5e74cfb402f33bb6aa75189eeeceb7a60abfba29 WHIRLPOOL 764c516580dec2bddfbcd270c4234f164256ab5801608875a9edbe59852e679c7f285a7ef09748662900add74fde6ebeeb2842e34cb208cd5858eed6dc60b1ec
 DIST gitlab-ci-multi-runner-1.4.1-x86 56606472 SHA256 c4c1d15912a48a6de66a0093ad3db7a50e7c28c64dc250a328de3a120fa36baf SHA512 f394834d78cf743fa80d219b92e071a450f055d2eca38486f5b9aecf85e3daba10e370a14ac9bdb847fcea63b80101f98ed75b9f741944eadd14e0a9f2faa388 WHIRLPOOL 793e873eac8a85de75e4dc54456a21f9c235d5c83a6d19b039c4112f5d145ca373d8c4fc70b9bae9c137bb30fbe5ebaae81b7f03a904d634ede242829c482ba4
 EBUILD gitlab-ci-multi-runner-1.3.2.ebuild 2349 SHA256 29cac383ea3d01f2c5edc10698d5c49870e6d82eb05dc035610df7028ba5ebc9 SHA512 ebe3807eba35b313a64baf16121cc1794bda640a4f5e979c5898c33f4d02e756832fe1a052e500bc7257dfdd16faa43de5abe69062572064360689add0f3ad76 WHIRLPOOL 2674e052ed40f61530c34c396fc35fe9aa555f6f825abc3ac20b89f0d0090234e198bce69c5d1580c25401888b000b5e9c47c4ae6c0f3f02d8d2654f3a8ecd89
-MISC ChangeLog 568 SHA256 9a3476e5b90bd7e8a8a6ad0e3009e8eb3ea9fa5aedb5858fcad5b72df1607ff5 SHA512 3e709080b37f1d014f5f27e0b150a0418e98d6c473500382878fa3dac67b1b969727afa2fb8a44896ce9a57460808611598b77ab9c9b7a135f37a5f645c90a94 WHIRLPOOL 6df59c07af7f11b8475feae33c2b9150fffde873ae082948c3e7900fbd804712e06735c32789e8bf24b6cd0fb5bbd7c7af28f73d991e03057aca2c080a656fa3
+EBUILD gitlab-ci-multi-runner-1.4.1.ebuild 2342 SHA256 f33ce8f464292cbdf84362d51309082dc92cf2a2b9941be5706fbff881cab321 SHA512 a647a90f50e8337233b0642a04b26e81558cebad999ef209df9d5b6ad7900893e025e3e472c8d3221e63858f5ee6c7ba77faf32346baf5cb3833795e6648cd4c WHIRLPOOL 6179938277f66df49b316293fedb830a7f2e87c57786bae8cd8e6b301a89dd6343dc367cd702b462b4fdf8dcf9bdb6c116b788033c87ce366045fc876eee79e3
 MISC ChangeLog 891 SHA256 96ef46ae5199d64dce40df1c4fd11b3f0bc363adba9654fb5ac65c60cf7d4e8c SHA512 64ef58b086b4355622b1d3904bd782a660b6beb63e98da4c192d7841ea0dd505bb2cce9715869311be7263a928959203f232412443b29e7cc2cab8fd13c1e4ec WHIRLPOOL 812774ea0fcded80bfe8b0793b19ffc0730f0dd62496d7a0eb9fbd1bceb182465ce7bba2c1a81471627dbd3d2a66fdf23690279c2ddefa5d2473bd0c4ccc9699
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.1.4.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.1.4.ebuild
@ -1,100 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 inherit eutils user
 DESCRIPTION="GitLab CI Multi Runner is the new build processor needed for GitLab CI >= 7.12"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
 	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
 	arm?      ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 DEPEND="dev-vcs/git"
 RDEPEND="${DEPEND}
 	net-libs/nodejs
 	virtual/mta"
 MY_NAME="${PN}"
 MY_USER="gitlab_ci_multi_runner"
 DEST_DIR="/opt/${MY_NAME}"
 LOGS_DIR="/var/log/${MY_NAME}"
 TEMP_DIR="/var/tmp/${MY_NAME}"
 RUN_DIR="/run/${MY_NAME}"
 pkg_setup() {
 	enewgroup ${MY_USER}
 	enewuser ${MY_USER} -1 /bin/bash ${DEST_DIR} ${MY_USER}
 }
 src_unpack() {
 	local a="$(usev amd64)$(usev arm)$(usev x86)"
 	mkdir -p "${S}"
 	cp "${DISTDIR}/${P}-${a}" "${S}/${PN}"
 }
 src_prepare() {
 	chmod +x "${S}/${PN}"
 }
 src_compile() {
 	# nothing to compile, binary all-in-one goodness! (?)
 	:
 }
 src_install() {
 	local dest=${DEST_DIR}
 	local conf="/etc/gitlab-runner"
 	diropts -m755
 	dodir ${dest}
 	exeinto ${dest}
 	doexe "${S}/${PN}"
 	disopts -m750
 	dodir ${conf}
 	dosym ${conf} ${dest}/.gitlab-runner
 	# fix permissions
 	fowners -R ${MY_USER}:${MY_USER} ${dest} ${conf}
 	## RC script ##
 	local rcscript="${MY_NAME}.init"
 	cp "${FILESDIR}/${rcscript}" "${T}" || die
 	sed -i \
 		-e "s|@USER@|${MY_USER}|" \
 		"${T}/${rcscript}" \
 		|| die "failed to filter ${rcscript}"
 	newinitd "${T}/${rcscript}" "${MY_NAME}"
 	newconfd "${FILESDIR}/${MY_NAME}.conf" "${MY_NAME}"
 }
 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 on"
 	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.4.1.ebuild
+++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-1.4.1.ebuild
@ -6,7 +6,7 @@ EAPI="5"
 inherit eutils user
-DESCRIPTION="GitLab CI Multi Runner is the new build processor needed for GitLab CI >= 7.12"
+DESCRIPTION="GitLab CI Multi Runner is the build processor needed for GitLab CI 8.10"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 )
 	amd64?    ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 )
@ -61,7 +61,7 @@ src_install() {
 	exeinto ${dest}
 	doexe "${S}/${PN}"
-	disopts -m750
+	diropts -m750
 	dodir ${conf}
 	dosym ${conf} ${dest}/.gitlab-runner
@ -92,7 +92,7 @@ pkg_postinst() {
 pkg_config() {
 	einfo "You need to register the runner with your GitLab CI instance. Please"
-	einfo "Follow the instructions on"
+	einfo "Follow the instructions at"
 	einfo
 	einfo "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/blob/master/docs/install/linux-manually.md"
 	einfo
--- a/dev-vcs/gitlab-shell/ChangeLog
+++ b/dev-vcs/gitlab-shell/ChangeLog
@ -1,3 +1,13 @@
 *gitlab-shell-3.2.1 (27 Jul 2016)
  27 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-3.2.1.ebuild:
  dev-vcs/gitlab-shell:  Added ebuild for version 3.2.1 which is a dependency of
  gitlab-ce-8.10.2
  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch> -gitlab-shell-2.7.2.ebuild:
  dev-vcs/gitlab-shell:  removed ebuild for gitlab-shell-2.7.2, as all available
  versions of gitlab-ce require >=gitlab-shell-3*
 *gitlab-shell-3.2.0 (09 Jul 2016)
  09 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-3.2.0.ebuild:
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@ -1,10 +1,10 @@
 AUX gitlab-shell-2.0.0-config-paths.patch 1356 SHA256 442a8e18b4d8e6092db0d39659cba5e41404e90f21070ed50b5460177f28f1b2 SHA512 0445cd42086b2d77825c487d604ddcb11f8fdf4eb8dcdfa1fe1b8e8c24d7b8f273834dbec0bfbb763a35a74605d558cc8d3feaa056eb02a113d18124a764551e WHIRLPOOL 0e3367b229ea4f13818fe2e485dc8da83ad695aec496881cb5eb918b183029b0013518ca64acba1568d93dc418dfaf083c2a86b9f2e3adf9fe15cad038011b30
 AUX gitlab-shell-3.2.0-config-paths.patch 1826 SHA256 c83db7c37dcac577ce499eab4bb0168253f49d303ba1991fdec90d13cc3fe37a SHA512 7524b6b8cd7cd141a56c468efa303b1d21576ac9e03cb866cbf9dcac34e1b8d4f356333737050e2e5dfeb0f0ad904b3f548c40e1209c1f35054ed2027b1d8271 WHIRLPOOL fdbd2dfe43ff4a2af97227fbf8c4589ca3734ebf0320b7e9c5e8ea39882c49d45815a0ee3c765a141affacbe48f4063987b9664a918e0e216b49ca46a475cc5f
 DIST gitlab-shell-2.7.2.tar.gz 37901 SHA256 2cb4bac3d5888154f39a51b717ad2ae0795c6c59ecbc97deb9c94f51b1c9af27 SHA512 7b28d6593f8752e79f78f24c1be216eb94a5bed827e12ef96fe3f04f57e55e9eabfcf66259df8191d5eee7932a788d0f9f36e4d1658a296547c4c9021f6d7662 WHIRLPOOL c1211d5195e9c92325dc0cc706cbfad29f3df91ce63e8926bb91112846739f65249fcec511c54fc1c52cb8ac123f695010ffbc360e11c5ab7e289c93902cb2fe
 DIST gitlab-shell-3.0.0.tar.gz 68088 SHA256 3b00daa0e003b73a34f20ed06b4c0298b33099600de7832bec25bfbce525d779 SHA512 97874a4a76240b73e3dac93510910fde847d0ccb8906011412091769345a2efef82bd187609ea2596b6a7b1838fa144eb62f9e246f4aea396df96316f18121e9 WHIRLPOOL 378b9f9a879e4c011fb0714387aa0f24616e6cb8c19084431923cc24853212e0319dffe5081a0b556dca41712e5015538a7038548bcd737cd9116fecbb2421c9
 DIST gitlab-shell-3.2.0.tar.gz 68796 SHA256 a279d78f1439b13f9f96c6cc1507175040732aab25954b1e6a41445b336d1460 SHA512 836b94fdff10daafa54ad672752eb8fcf1acc4f238a7c47a0795669ffcbfd0c892abd49c4102cb07bcc0350867a7bc53acecffe5b0eb46849f1fae0b38200c25 WHIRLPOOL cb536713dd2352d94e657313c717f3c13f50c1056e30391f31a6bfdc82b559c8738d722b95aa194d1c4182923198cf4defda7c1c31e00fa360b132a2c610398c
-EBUILD gitlab-shell-2.7.2.ebuild 3516 SHA256 5ae386bd0f8960b1d068530a5b8502651c76cb43195502f76551a4249a510efc SHA512 ed9d009a894ee3ae2f1d140aec64f8c9ad4013178419f87f96e57f5cda4dbd7b099436568cf3d718d25753e405d859bb7bc8aea2c4683a14b024b942503eaa13 WHIRLPOOL b325873e31a1b5b8afaa4ba3678ae8435c20678b5ad720482283f48ba217f48cfe50c533b13c7e9bfb4e32719dc8155512d743b7f7db3dae6262e07612519331
+DIST gitlab-shell-3.2.1.tar.gz 68788 SHA256 ad21f8676901b9d90a1c8016b5fe2ad73f9a7966ab378ce244b12fc0373e9f46 SHA512 2280b5ea529d1efff365b1f72ded2af71c7cd19c88c1d7638f730044c5a804a0adb8670685b2016b26e894755a0b70f365d234c95e4ca3bf09913d7b6bebca76 WHIRLPOOL e21d77c00a02105babe4cf84c7ff9223131eef5e7e1db80d06b40bae87d225b579f4fbdca4ac2809be436f96b25753f73b354e6d03ad1b22ad57bfac7c720ae9
 EBUILD gitlab-shell-3.0.0.ebuild 3516 SHA256 5ae386bd0f8960b1d068530a5b8502651c76cb43195502f76551a4249a510efc SHA512 ed9d009a894ee3ae2f1d140aec64f8c9ad4013178419f87f96e57f5cda4dbd7b099436568cf3d718d25753e405d859bb7bc8aea2c4683a14b024b942503eaa13 WHIRLPOOL b325873e31a1b5b8afaa4ba3678ae8435c20678b5ad720482283f48ba217f48cfe50c533b13c7e9bfb4e32719dc8155512d743b7f7db3dae6262e07612519331
 EBUILD gitlab-shell-3.2.0.ebuild 3509 SHA256 55b1f12be58f972793adc90dc952e7f09d7a2cee3591d9ba40f42a503f22b9cb SHA512 fe5d78bf082e9bd53acf4326764d3a99c509c3a8bde7af7d6edd294e35c1c4cca808a38d5a91f090fcf20922b91f2a2efb33db410e3041b5a998164b35e34d78 WHIRLPOOL 2777285c7ac88b68d99fb60b0dea2725bdcade41bca08eeb30b666b9ed6c0867db6e54438da884ec558455c8e01801cb622b584073c6a6c14bb22828eaaf19d8
-MISC ChangeLog 252 SHA256 13d7252e9eba043b242db349e9b0135102cd8c0e2d94a4187b666980f5ae2799 SHA512 e007f03eeec6dfb6af802b065f97b5684a67b77e2fd57c8bba93f23de37dd4c7f3e338280d8103599fa6088313414928569042fe667d00f94440e18ee0fe55fd WHIRLPOOL 5cfa7f635df904ab467621b61dd57cafc01d6b398fdfe2819a6358b0ad6a2b8b8f84e53fcae77abf4c909aa84718d643213aecf3491813883631c7997e19d475
+EBUILD gitlab-shell-3.2.1.ebuild 3653 SHA256 e8043271a1a42664862a4284a185ee11c7fc6c133a1b3c7dfb44b748d705cc3d SHA512 0232d94c21d675b1e8762a2de1d95a36bf41afc97435d84e54dd93bbf190cacbbfd426e6e6253c5f2f894c5d3ff7c878c261df7714d477c4332beeb433fea223 WHIRLPOOL 02fa858649c50c040fc16930c5f7f35dcb9d9df2d693898dd930cc945d0d5f264b52009cde063fafbaae78aecfab6dcf6d6f03fb9e4c2f9444300e8fd514175a
 MISC ChangeLog 678 SHA256 9f9189571066a0bf35ca4647472790074c914ccbafc88620acc206cd81ca8bf7 SHA512 193ca08208434a87b26ccaac1d98d562e79346d4261159d2bdabb448eea713b5252c1278ff5b5bd2431cd555d7f529967aa8d8f4b1786afb33696a549ebaad56 WHIRLPOOL 28174489e18ab1f0a8f05e942700c7716aa1389e6312264f88ef60085fd56dda0aa899433b1a872602d6101c4e043aed67f1bdb072500806ced12485498e0737
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-shell/gitlab-shell-3.2.1.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-3.2.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -8,9 +8,13 @@ USE_RUBY="ruby20 ruby21"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="87b388232505b1715a1d7448dc393a383cd7a53f"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
-SRC_URI="https://github.com/gitlabhq/gitlab-shell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
@ -28,7 +32,7 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
-	"${PN}-2.0.0-config-paths.patch"
+	"${PN}-3.2.0-config-paths.patch"
 )
 GIT_USER="git"
--- a/dev-vcs/gitlab-workhorse/ChangeLog
+++ b/dev-vcs/gitlab-workhorse/ChangeLog
@ -1,3 +1,9 @@
  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
  -files/fix-Makefile-0.7.1.patch, -files/fix-Makefile-0.7.6.patch,
  -gitlab-workhorse-0.7.1.ebuild, -gitlab-workhorse-0.7.6.ebuild:
  dev-vcs/gitlab-workhorse:  removed all versions <0.7.7, as all available
  ebuilds of gitlab-ce require >=gitlab-workhorse-0.7.7
 *gitlab-workhorse-0.7.8 (11 Jul 2016)
  11 Jul 2016; Manuel Friedli <manuel@fritteli.ch>
--- a/dev-vcs/gitlab-workhorse/Manifest
+++ b/dev-vcs/gitlab-workhorse/Manifest
@ -1,16 +1,10 @@
 AUX fix-Makefile-0.7.1.patch 377 SHA256 10fa5bfbf9d61de4f07d0f117a0d2e2498f97b7a23a04f37e0a0bcfdf87c69c1 SHA512 c25175937b18a153f63990d37fb3161aa55428df3f7f3d9e1bc22836c055511cee649a998239c9765adbc1273ba8059ac2b1b1e2b3c4d016d762ccb78834a5bf WHIRLPOOL 85ecc6518b540a8cee0189e67c0cf3b67ca1943e4ed3433ea6827fe37fda11d1ac741b142d7d43ccc2afe5d4b85b6a02b9c603c21bc4df1b107e4a411cafc898
 AUX fix-Makefile-0.7.6.patch 397 SHA256 e38d2418507d2b76013523a1e527163560101089b377760b220648cc60527c92 SHA512 11681e6dfaf674beb7fa3a5cabec56f835f63173dceab188ef5fb0a33e82b5af8fc7bf90f009f036358f13e56be4979937433614f21ad4316ea58382ad99a980 WHIRLPOOL bf394735aad3bb331aafc98b97be4553b1fdff190bf6ac90af88541ed152b4b8f767baab4f2ad5fc5bb47301c5ce15654e658c8bb1efe8eac108ceae52b8eb31
 AUX fix-Makefile-0.7.7.patch 397 SHA256 5923fe2acd4c7ab4a425345cc95cdfce9da5fa9a6630624c97424a567602ccd8 SHA512 3e2304d38bbd52b4a130564a36e4318ad7c96150f31411c8729bbe62b1b0f3b4e82ccf9f9a1ad579e2bab96665765970a8b50a303b4faf178170c95c5bb841b8 WHIRLPOOL de1748c9c79e08c07fd264e24591a5665867d13f5bb23d8cfce0a0249e7127a38f04bcc95c0a7427f247af10e8b661bc219d2275e08b06a058cb6293e0f383f7
 AUX fix-Makefile-0.7.8.patch 397 SHA256 491e085466e5e653bb7adc13458fae4c2fa96e87d53ffcd16af1a012f7fddd05 SHA512 27ee0a6e40db1b02acd4c4b67e7d47045af93b063391ec2546340bd5b3b20e057e924b713549b35a2c0073eb62fea1f451073de4b311fa1fdb154421efdc4950 WHIRLPOOL 4475084cb5667ac3460c5c82fd68699125feec26dc54c68abbb20ba0e38e27c1ddd1bf39bb97e28dc7c9f6220e4db0db3f8d0d9571edbe3e591dae64881fd386
 AUX gitlab-workhorse.conf 248 SHA256 6d11d63aa869cfd8c6f77c3a875984c226db633be899ad7ce97fafe94236eee7 SHA512 234213c8361702bdfeea40bd306b5899de19f34ce985e090a86e01aa601cf4ed23da4dfb75f74fe5986bbea5535a7a6a745406b4f67f79d352bd1c863777c7f1 WHIRLPOOL 8ac1134cde3aee942466d206e703ebd5330f83537d7e29641447f812d857bcc57b07fbf82eab086c0d622750694f64fabf8ffca2ba26a725f61b40fd1941e963
 AUX gitlab-workhorse.init 653 SHA256 f38c37ed818cb8c25fb800bfcb5448f659e876b78ea33ea7a1ba3c80e73ea95e SHA512 2667997def39e6dc17e6a1d9be06d6e855d5d3e956e64d93bb3e74bbad0a1d427dc034f9c139f3b05e2666abab014404b2c8013c5347f4ec25fbf5ef86e7e88e WHIRLPOOL 63cd7ff80d88676b44c2d6ccdadf74907d5f8e4268f03ee11775c423bf95955f9d3aaeedd79fa6e0486b2d225336eb2ffa165dd7b9ac87ed0c2d403dc7e5afb4
 DIST gitlab-workhorse-0.7.1.tar.bz2 26792 SHA256 3f00a7813d84a86980d739fad30e527257ff186fd0e3df069d42760b6b056ae7 SHA512 7d9a02a37a6e4612c07a7ced022151a19d783e902fa21bd1a401066101ff07e61ed281217bf01bd7f51ae5cd329eea212ebff1c01d30e80d52d4a8b71bb94eb3 WHIRLPOOL edf291bbf981b58543169c839b449e92b95ecfda0be127429c6490981380e00e1cefc0a0684dc38dbe9f573e93e37f51f0d4b5385418b10af16a5a12c77f9b80
 DIST gitlab-workhorse-0.7.6.tar.bz2 27970 SHA256 a00e6db3de8a48bc8ac44e609bf994e81fbcdf9226ea77d5ea5700e89a1deaf1 SHA512 a269110823602ae0e92bfcbfb391f7999144caeb35ae62a32f5ec896b04a7e9d791a8baba21c06784acec4d1f074ba3ec99a79a2eab14b664196e6b72d7132be WHIRLPOOL c8b5716df1ce525927c5a56492a1eab7a2a7776c3541f4ac50e3621fc5332d3278b08c5cfde54c9ae05e6a32ec355de44c63f16861e4e7921685ced483eebcdc
 DIST gitlab-workhorse-0.7.7.tar.bz2 28097 SHA256 6b18467ca987e898c7b948e9306e215a4a37c94e03fa5c1d3bf36c13cd3a149e SHA512 8053d8091f6b3687dbc866278aeeb4ab5df706536085bf3182a712c4147a1f8db70f0fc5d96043ed92b9d569d83b979507aba20073cc05cfa8ad637d8119ec36 WHIRLPOOL 27d4fb645f51045db6282063b47952e2ac8503a198b1d9f60e502a905463d49461b13cd40914e73ec8efef7b128d66cc77f09128aeb1c17fc461b0459f04f606
 DIST gitlab-workhorse-0.7.8.tar.bz2 28253 SHA256 0823495288304a4e2c6491fb011d509ccabea8af765bd35e47e6e5b1da52a599 SHA512 392d1a11da1f61fa5e319d8cf5fc2f158cbc90baaedbd98f33a992cc938f67efe5837e9731c8b4b8d1e8265620c5ae69ced3326eb376aa1cc691457eb6fbc002 WHIRLPOOL fa61930d4a8ecad35b3d27f46da731623f6e41898485d564403ee53badd793824afdf1376c0e0cf6e2e6e30cbf205091db3e416841f60bf6ff905504714ca1be
 EBUILD gitlab-workhorse-0.7.1.ebuild 854 SHA256 c9e78983856490f7b638453356da30d6396f96ea3960f990e9cbb5dbef249eef SHA512 3c490abda76ed861ac7c126a656b91c4dac72f70ac99688865ec8a90a5aabb34f6d767899445510b9bbbc4edd30ba6b756668bb8d7c529dc000ba7fd570801e1 WHIRLPOOL e03f624cb7eceb56d45e638f772b935086bda3c21ec9e7e804aaf2449a2f6546da6d3143fe8499343b0fa7dc489a9413f1720a757d09e0803d8105af34116151
 EBUILD gitlab-workhorse-0.7.6.ebuild 918 SHA256 42a55a2b0604345c1314a1a4333c507db888ad4e456ad4a908514e320658e58a SHA512 14f5a80e5d9effef0cdbb226b1536b75d9a37472c012703c35d38dc0a54fecdca5cf04b56574220327a7f87fcb6875d65757442f17e6f47d26aa8a1d876aa8d9 WHIRLPOOL 07ef711760eb4aed11d60a893074c816dd201ab0ad731bcbba9e914460983a9b17f775e6bce11f6bb0f6a5dfdb384f7a70ecabe0fcf00700b10842d14d81f7fc
 EBUILD gitlab-workhorse-0.7.7.ebuild 918 SHA256 42fe96bd48d1db6764075287040198b9363788ae7327b8ce59c1e06a10009c50 SHA512 b398f6c402d1934658c675a4e075daf5375d98da898e3187454d8b02f6f31a028f5661d39eb753b4136844bf531f76868217d2d78277e4667c8f87261e3137ce WHIRLPOOL a1145879b65f1434309b2420b2cb2391750247aecf321132740b7afd609d8e4f325d084f351c72174db28f05343fc1e5b20d15512ffc9d876962828905d2abcf
 EBUILD gitlab-workhorse-0.7.8.ebuild 918 SHA256 e3d95d2e627772b1bb034134890e1f9422ad419d2ac57e55337a16e68b847466 SHA512 ee391c4ec21da9a04f1abbca7067aa3dd70b405cb271fab417ea7d023cbe874b05f70d1dd5f08f6d75bb7a16d02d80e0634aad3848dc3cdf95a9c6da8448fc62 WHIRLPOOL 7e27afa5c674c931dd96e1df0b1f2e74741039025d9c2f8937589a52af62acdec46f41eff201404904d5c7b1f7748aeaea091196a68ec7b2f9758f4bad519e34
-MISC ChangeLog 940 SHA256 2d1196d93b88692f0f2a56366df5147c4ef2bb2f947ef9b138543e299debb87b SHA512 0b482a6e3658bb19105d13839cfe5ef8e45232c25d97bd10c250d682b94486e69fc5efe895e89f3a04001618975b8dad167161ada35b704a936f593e6814975a WHIRLPOOL 4bce53e9a14904da925f6d6a5d2187978ba0b52ebb10ea6ab859605d572d5939f6a42303b267fc3cdd419ad1ed1d2244dc8846751d4dbdf61ad906bfd23fd8fb
+MISC ChangeLog 1257 SHA256 d065aec4075c54bb1abab76f5fde0cc7a305eee5f3864991d682d4ae57f0bc49 SHA512 84a2256474efae43c23af16011695c8dfe6e8f68b164d3c004e77b5531df4dc98d4f89f930e295db4340f58e83edfc7ff31d77330e3eaefef52c72d35c49d463 WHIRLPOOL ca8edecd7891f1c6a68ad65ee67d6b3fc59c11f5719e1304679445911391647c7f87ccdc4f98915cd1ec5b76b67694974ee1a56b967cc9ede9c4308371fccd63
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431
--- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.1.patch
+++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.1.patch
@ -1,12 +0,0 @@
 diff --git a/Makefile b/Makefile
 index c81222f..1a90927 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,5 +1,5 @@
 -PREFIX=/usr/local
 -VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
 +PREFIX=${DESTDIR}/usr
 +VERSION=0.7.1-$(shell date -u +%Y%m%d.%H%M%S)
 GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
 all: gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
--- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.6.patch
+++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.6.patch
@ -1,12 +0,0 @@
 diff --git a/Makefile b/Makefile
 index 9b3146d..b3c0630 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.7.6-$(shell date -u +%Y%m%d.%H%M%S)
 export GOPATH=$(shell pwd)/_build
 GOBUILD=go build -ldflags "-X main.Version=${VERSION}"
 PKG=gitlab.com/gitlab-org/gitlab-workhorse
--- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.1.ebuild
+++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.1.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 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"
 S="${WORKDIR}/${PN}-v${PV}-bb9806f226a519d493d3b0df1446488cce6d162c"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
 src_prepare() {
 	epatch "${FILESDIR}/fix-Makefile-${PV}.patch"
 }
 src_install() {
 	local dest=/usr/bin
 	diropts -m755
 	dodir ${dest}
 	exeinto ${dest}
 	doexe "${S}/${PN}"
 	## RC script ##
 	newinitd "${FILESDIR}/${PN}.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
 }
--- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.6.ebuild
+++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.6.ebuild
@ -1,39 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="5"
 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"
 S="${WORKDIR}/${PN}-v${PV}-988b04b63537e20a101a74b6b1a984e75f09eb22"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.5.1"
 src_prepare() {
 	epatch "${FILESDIR}/fix-Makefile-${PV}.patch"
 }
 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}.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
 }
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,28 @@
 *gitlab-ce-8.10.3 (02 Aug 2016)
  02 Aug 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.10.3.ebuild:
  www-apps/gitlab-ce:  Added ebuild for version 8.10.3
  02 Aug 2016; Manuel Friedli <manuel@fritteli.ch> -gitlab-ce-8.10.0_rc9.ebuild:
  www-apps/gitlab-ce:  removed old RC version
 *gitlab-ce-8.10.2 (27 Jul 2016)
  27 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.10.2.ebuild:
  www-apps/gitlab-ce:  added ebuild for version 8.10.2 which fixes several bugs
  27 Jul 2016; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-8.10.1.ebuild:
  www-apps/gitlab-ce:  Fixed config phase for gitlab-ce-8.10.1
 *gitlab-ce-8.10.1 (26 Jul 2016)
  26 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.10.1.ebuild,
  -files/gitlab-ce-8.8.1-fix-redis-config-path.patch, -gitlab-ce-8.8.5.ebuild,
  -gitlab-ce-8.9.1.ebuild, -gitlab-ce-8.9.2.ebuild, -gitlab-ce-8.9.3.ebuild,
  -gitlab-ce-8.9.4.ebuild, -gitlab-ce-8.9.5.ebuild:
  www-apps/gitlab-ce:  - added ebuild for gitlab-ce-8.10.1 - deleted all
  versions < 8.9.6 - removed obsolete patch file
 *gitlab-ce-8.10.0_rc9 (18 Jul 2016)
  18 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.10.0_rc9.ebuild,
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -1,5 +1,4 @@
 AUX gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc763601aca5cdd5ac43f85152705cbf5a4e9144a6156d6f77e SHA512 a92659db8cab022185d87f321b037b1731612bf5f89b9df4552dd49b843bb49b6019f8ddda96a6fd6cb6544664a1c3d52ca5fee2c11be8b33698cc713219510f WHIRLPOOL 81a6504a8583bc46ea4005d9f8a2113802439161c40f11d3da46332b8980fc6b9520d81d9e32a6555bcdc893245448ba9151a271c511ae87f6468f588d4804b0
 AUX gitlab-ce-8.8.1-fix-redis-config-path.patch 349 SHA256 df585c942ecfa71968e90521f5621af59befbe3bbe48ffbf49a49ddeae989e93 SHA512 af95d7bb4909ca1205098a791f97cf00126ad3407a9bb5c4e8d699ed7ca46843af2fa38cf148c8575b48617ecaa8822e65dad612bda5716acac0dbf10592df6f WHIRLPOOL 40193ae35cbe620d79fb7eb816efaa5a6bef870b4962d81ed6d9267045b2514f6ef4ae129893e06a2c9b06ae695735e50381595eaa1eabd1cea1e5d72711df73
 AUX gitlab-ce-8.9.1-fix-redis-config-path.patch 411 SHA256 d88b8c4d4dcc30d7533bc9cccd735d8ca7b2ae3878938904b1b5ba36e11a810c SHA512 4852edec468d5f62f6e903687a1791fd8cc840f361448a538fb3d42e8a885aa326a7663538145eed7f852f3b66a90b8a0ca9dc90f86534bdcc42e66855a801c9 WHIRLPOOL ffeec14be3859e5640e3348de98f67660eacda7a63ea13b463e6411f516a40d09a9e99d841939c9d4317544f2bb6d813156b461e61be27c08b68a67bc2ecbfd6
 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208
 AUX gitlab-sidekiq.init 989 SHA256 72f9acb269b2e60f7571b2c658f7f29e9c36c6987c9fc8f1d02b9a1bae8ba747 SHA512 cc6ab63f238507bb4a66f48f8df487a8c493afc0e0433ed82c09a7b6dec984a45f465c526cf7be70f485222607af0baa04e7057183f16badcf04950b43fc02f8 WHIRLPOOL 0cda6727f0f0a7a15eb4476c9d651fb5aa6f7ccf9c23a24d040576309c8a30aa6e1790974c82de9656f316c2d9beaf0d1fdd100cab1b7ac7f8cebf2079a13dbe
@ -8,22 +7,14 @@ AUX gitlab-unicorn.init 3126 SHA256 124354df8a929ae5b9df4f044c46684758a585ddc703
 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.10.0_rc9.tar.gz 20704170 SHA256 6f072d72b21d11c1cf8355213afe69642841164b4433620700fdede72a2412fa SHA512 9b99dbedcab82a0226d5dc3418e57da8c29c5d78ba419ef1ba446409e2b60bdb9158cdc8a742ccbab99ca3e5b2da0161a3d1a3ada6029a9de51bb5e3ab633995 WHIRLPOOL 06a3b67d1e5a22f7053f60970b283941f076e14b996188e9c6515760592edbddf4f12717c206ddeb482e7a9db702472b10deacbf9a6d71e8937f771a3cb31268
+DIST gitlab-ce-8.10.1.tar.gz 21035550 SHA256 8fe9c994b87f4ef819b14c8149b07a594a8f624285e6f80f888a63978b3c9ef8 SHA512 00d762c65d24cdebe05b3a31e9577500f437c0c64711c121b3967a9ebf3f711dc94cf08e8cc3fe1a3919236acce019e149ce1c64dd8ad0f43d9f298b9d76a167 WHIRLPOOL c3bfe435b8018c0488e760d115c6a290a13f8eaebd900201a807a386a62a0aeace04e4e7daa24f500347676b5aab760efbcbb1daf252aaefd6a73033b382a4fb
-DIST gitlab-ce-8.8.5.tar.gz 18478664 SHA256 385fefd73ea70797ee2b1d9084c0b5a0f90917a7636926537746bd86143e0335 SHA512 9fef95ecabc16fd441b81ca107567d7ff5abfde39bbfe23b777b0ca1e11cb0bb3028cb597a04c31b478e06fb2f91bd635fc4484ee01d44b4856e528d5eea328c WHIRLPOOL 8a010f2dfc635c87dc3434daae60c0f5965cccb98fd37672ccb772c5baaf2cfe1e232fa1dd21e612d6d08f409714e79e879c46ea28a0e2fe24198308f280b34a
+DIST gitlab-ce-8.10.2.tar.gz 21038115 SHA256 71cba117f895beb96278b81ec09d60d46189f71024cb2e1db14628206d64c26e SHA512 d9fccb2530357835e647ecbbd04e825154cb9b780c4d67210b3cd5598418e377af90046c10a1b192e8b4ea99b77ad0b6ac734e237360c4c179338003ce24463f WHIRLPOOL bfe3eb27576a31d5abcc1bb60824ce06feb78c1c15b0a94a514707ba536db0d37be00db0ebc3a6c83b0533b0bfb80d01e9bcd851545703ea4ac398a12e6fc866
-DIST gitlab-ce-8.9.1.tar.gz 21151788 SHA256 f93c32ea9c79e80f705afc3b008cfc52b29cbd9de07b6b2b6dd3c5c4338ae0c6 SHA512 2409469acc91da52a04ad4f733ece019fedd94051ba02c48c508c6a9784e51f484b15d9b18c84d12c58e1b3cfe5998315005bc037aac4b228ea0376699ba6243 WHIRLPOOL fd479b7e0c1c6f4e7f54625154f619cdb7cc86739a79f5a196a716799504be0b1d59a5fb15353d74b13269d2e41ca1e3dcad5e36e83a7384875ab2a772ee43df
+DIST gitlab-ce-8.10.3.tar.gz 21039284 SHA256 4d00eab29d24e03b36e61d74544cccda0eb3acccbe09efb91b9670d70116f74b SHA512 e66c5a5919352c78f8fbb983dc17d5ba5e39bed7e335b031d599eb827315c4253ee59d2955ba50df9c3923003595519ee4bfd4e67dfd0c6bd4d47c61ac576350 WHIRLPOOL 38cf4cdaf4c89529f345c5eb2723fbeb986012d5f3e8732d9d527c6497a1ddfb124806888759d9f256c57e13b1be843ef7d0a6f8725ab89bb4e5b45a9c080805
 DIST gitlab-ce-8.9.2.tar.gz 21152737 SHA256 f1da983b827297ed45ee859293e9abd1b2da401e5c02d4d94deb08971cc019a9 SHA512 dd9fe895a3a9590b8c22fd158c6909b3abe4652721e1defe5dc6ab529fca9954e15b6e0c11be21f2a3a047b43188a23b7b7d75830808f4283838631fcc910b8e WHIRLPOOL 4570ed68e7918ec2cf149bed6fbe551d7e5a3e74e4a7334038f66d3970b77569d16f514ff6aa34f1e0fadf40e474f572e34cda5515e57fb410d46b069c6bfd83
 DIST gitlab-ce-8.9.3.tar.gz 21156182 SHA256 39578df8b98113bbe79f49d1435d9c399729e9b0d42062a60c8d8c11d1fe056b SHA512 e03b448da007145a8869813e39ceb96f3209b5ab79cc1eee06bdfdb8c85392fdb7a7d5bf3c957fb9d55be93ee6f35945e88747ca1770d566dd4a55cdb0170149 WHIRLPOOL c390be29b4da63f222d22e667baa9876cdbba3d0d1d9d3aa22783355dd1989b2f2bb3692e6c17094444518e36bb0e87b972484c7afc3af132ddc3c536aebcaf9
 DIST gitlab-ce-8.9.4.tar.gz 21156625 SHA256 bd2e2342e68b887f35b322f3e15894aa654c0701476ecfd7c4072f70c1752ad9 SHA512 7b60c99746a3f36298a30c396769189c10d129c827ef0b1f52b38b2fc72a3e425ca4b46fdd47cfec7d0680e84ecc37ab478dfaf9fbff45bb3773abab5681c088 WHIRLPOOL 70a698d85526537ec1f965472ebfeab76b6cc1ce8b638fbfa5c433b9ee9411f48284969c1dcac8297e5415e229ec172e38605338d1108aebde5e6645c1350aa1
 DIST gitlab-ce-8.9.5.tar.gz 21555267 SHA256 6f1685d5b2cf36a580467017ba5a4ce59dc13f90ce160e031d883b424e2557d0 SHA512 7d8a6bb7fee72b4b6b877b5484aeacfb1ccbc387b5635c4bd56cc7296b7b107532aac43f25911580906b186504452c9a8a43d8b64e2c5a5b4b8027ef10bc8e52 WHIRLPOOL aaac0b42fe2b97107b868924e6710829376f42df6ed11af7456362463f19e5d4cd6cc9d4616dd1d7e865caa6f420e028fca2abf07746b5fb0ef3cb2c0427aec3
 DIST gitlab-ce-8.9.6.tar.gz 21555571 SHA256 1b357ed1157a2a20b647004f588b67d72416df805a385fa7b605905bafb26f55 SHA512 d4693cdc80fff44e2f2d2e640163337b153ee08fbd12cefd055c8a595e1487010f7c0db39a11056577d331d3a76cc7da9936139199aad324d9c324395f684f9a WHIRLPOOL 00474d385cd9b574bbef0847f80613253f4543c54b356ab654b0ca3e7233e056efbe995a9de3e418c68d482d4a2b9b0cf676941c7013755bd795bfe83c9766aa
-EBUILD gitlab-ce-8.10.0_rc9.ebuild 12391 SHA256 a73a04d2d82338674f601b9cbce505e7aa591723937b9110d759d2f4c785adbc SHA512 19acc92cf9a59c1498ae07fc0f1635d35aa6f37b61e86c5eeddae68ec96dc8120f5a1bf66aa44c0f41ea48de0ab2dff91ce0d1eb19b47d8aab66c5118ccb23e4 WHIRLPOOL 9678d325b6690602af31a085c59de62ef20dc7919479c8ff297af9cf04f149b32936e1a2019b4d6f2d2b035af870e81a5cd0d510fa67c42b20bbb07acb46562d
+EBUILD gitlab-ce-8.10.1.ebuild 11676 SHA256 18467061975ce0212ddb08cb12b4d2d9f2da6f7999e9d42dd249d96891326318 SHA512 ee1538902ef35fe4f771211eacd0c7fb81aaa81c4b18049111eead6a5ada19318763165245e3e6d05fd41490e0ee4d30ab6fcc946b35e31e1a3f41b200cc46c9 WHIRLPOOL cfad8b037071a70bedf8095cd29cd27d2c703dc9470f4ee943860716e01e7347e78cd9a6612c44fd749a8cb06d6979376493606ab941266ce732e285dc7e3edc
-EBUILD gitlab-ce-8.8.5.ebuild 12342 SHA256 0b528722bb3bc7d232dc6a272973bf8da77992fefa308dabf4b7a9fba8548c18 SHA512 430ee8b469bf43bd8889e9375c49ca83a35d2956c6964e0f1dd07921fbb124a8d7decf60950fbbbc836025d74e73da1e7c89119da2348090d163eb6062739fb4 WHIRLPOOL 3730bf6b32dbc0c3605b15a953114aca56faf859f83672f05ad0b92251697a9cc0778b13d3ba3fd25ddb0858e8ce43b400573f68a605e063ad9bed8597c29fc5
+EBUILD gitlab-ce-8.10.2.ebuild 11677 SHA256 d131e1f22e6ab5d5dfbeca80128ce0838631c82f71cb7f11dbf58d3aec9c2ed6 SHA512 e2530f1f2f2b31ebd4a6adcfacb512d4579baaf69aa2adfb7fd8fd9408966d5454cebdf4441ebc016ff89fa2dbe61ec19239f6e39844e0d3b0a44ec0f73d3cf4 WHIRLPOOL 30d1aa4d499013205953c70210edf6962a4da78ce3c1d11c98d2b048eb57e2d45991a4a2dda34c5c5269dc077ae67cbee76e4859b1c0897b6377673a6f451fb4
-EBUILD gitlab-ce-8.9.1.ebuild 12334 SHA256 63aeb978a978893a3f35e1ed36c7f57a1e1f37c6bca69114ee0a90f654b120af SHA512 29dd88440925723f9b11fc85de810835374739cc7fcde320e51b8bb5561d8850889a16b4750076fa0b786eb4d10ccbcd09db9d518976a09c13bdb600f85a9584 WHIRLPOOL e16c925f82e7a4175b685d3e6093e410cd6c552d9aaec0807f66183b468f6b53a91e3c9084d63f122ea4c9c6de6278aad4e212fd29ea250e23a7bf7bd47f26e2
+EBUILD gitlab-ce-8.10.3.ebuild 11677 SHA256 1d2e22b1611203ad6d2fe3752a9cffceee7568a876c5b650cb52d12f089e4dbb SHA512 3784835943745d42c5f086b5183c2947c903fd67a19569a6fdd903a68f55fbc09fdd7d667e0fa0fca9871bd299587759f7bb133edba2135eb260e91f16ac6a59 WHIRLPOOL af68d6b67236e8bd683f070e97c4277997822ec9b8bcfa4ac0a4c54edfd470e5fff107d8a5ae2017b1f70f5a4f2c845f6bc40caf9387030540b823c380ff03f2
 EBUILD gitlab-ce-8.9.2.ebuild 12341 SHA256 a46bb7c78639ee411a8c0994847f4f90a89133f2d85e7eb71f76f9f6756e5c25 SHA512 19712bb3ece7873e9dc2a5d471512a553108b95338bd370dab8dfac6695da34ee713d4d106c62de1472eab7e3e953471ad6274f7d646900e7ef2c7521460211b WHIRLPOOL 1cdff895e32079e2bd85863d46a3c6c0f39590e454f7c77d058f7403341ab39adf477005a9c6c417ec7ca527bffedf0ec1ec3b3f64cb242c3b2d3404c41b6e8f
 EBUILD gitlab-ce-8.9.3.ebuild 12341 SHA256 a46bb7c78639ee411a8c0994847f4f90a89133f2d85e7eb71f76f9f6756e5c25 SHA512 19712bb3ece7873e9dc2a5d471512a553108b95338bd370dab8dfac6695da34ee713d4d106c62de1472eab7e3e953471ad6274f7d646900e7ef2c7521460211b WHIRLPOOL 1cdff895e32079e2bd85863d46a3c6c0f39590e454f7c77d058f7403341ab39adf477005a9c6c417ec7ca527bffedf0ec1ec3b3f64cb242c3b2d3404c41b6e8f
 EBUILD gitlab-ce-8.9.4.ebuild 12341 SHA256 a46bb7c78639ee411a8c0994847f4f90a89133f2d85e7eb71f76f9f6756e5c25 SHA512 19712bb3ece7873e9dc2a5d471512a553108b95338bd370dab8dfac6695da34ee713d4d106c62de1472eab7e3e953471ad6274f7d646900e7ef2c7521460211b WHIRLPOOL 1cdff895e32079e2bd85863d46a3c6c0f39590e454f7c77d058f7403341ab39adf477005a9c6c417ec7ca527bffedf0ec1ec3b3f64cb242c3b2d3404c41b6e8f
 EBUILD gitlab-ce-8.9.5.ebuild 12341 SHA256 a46bb7c78639ee411a8c0994847f4f90a89133f2d85e7eb71f76f9f6756e5c25 SHA512 19712bb3ece7873e9dc2a5d471512a553108b95338bd370dab8dfac6695da34ee713d4d106c62de1472eab7e3e953471ad6274f7d646900e7ef2c7521460211b WHIRLPOOL 1cdff895e32079e2bd85863d46a3c6c0f39590e454f7c77d058f7403341ab39adf477005a9c6c417ec7ca527bffedf0ec1ec3b3f64cb242c3b2d3404c41b6e8f
 EBUILD gitlab-ce-8.9.6.ebuild 12341 SHA256 a46bb7c78639ee411a8c0994847f4f90a89133f2d85e7eb71f76f9f6756e5c25 SHA512 19712bb3ece7873e9dc2a5d471512a553108b95338bd370dab8dfac6695da34ee713d4d106c62de1472eab7e3e953471ad6274f7d646900e7ef2c7521460211b WHIRLPOOL 1cdff895e32079e2bd85863d46a3c6c0f39590e454f7c77d058f7403341ab39adf477005a9c6c417ec7ca527bffedf0ec1ec3b3f64cb242c3b2d3404c41b6e8f
 EBUILD gitlab-ce-9999.ebuild 12344 SHA256 cd17ceba505495a7633f8f106d2adc1ee81b74d2b09f8a83cccb0010600f8005 SHA512 c961866f01e626855cddc928c14c8f4a8aa4285dd04e87d1bc310b02c7617dce73c93e5b670650a86c075c4adcdd6b4c3489feb4c204d0474a8e993f3e000440 WHIRLPOOL 11159c64d381f201fa33941bbe7f549ca368a16ebc7e1087b286a8a375e687073e1c586e02411e4a2b50ca74835bf1e81ca069eedefaee483ac3deb20f51fa05
-MISC ChangeLog 3024 SHA256 5368b56cc957a6b9084d47e9fc7d86a484c5854b625e9ced2983fb9bfc04f5fd SHA512 d538e26a0dd02e515a7388813d17956f716b41413280b82af12408a382602e2a4b8afafcb8fc4a4b36eefa567c0af7cba1df679dd27f20e0636abaac6766161e WHIRLPOOL eecf937c78cae9729cf71749bebbe0624c3dc35a6d263c2f10bbd3e9fe88b30cd58a49f3091fbe69800dfb4b5096ebffedc6f1cd226f6ca8d8c04102be999abb
+MISC ChangeLog 4090 SHA256 106927f5f5c0ffaa2ab86ea0b2421e32d8f22d7a0912f2d69471656b375a85b8 SHA512 534b6f45bfe2a2612b0af6e8d614717386091c7b8306e1538959d39c85ee60d4f4abb3512f3bbe3baa4bb8cedb05692cd1f7002194202917e5b0d0e5d62d26b7 WHIRLPOOL abc2d05705c514ba0196dce14af15ff0e4338bc317083bf9e45a6b486cc913811c4dfe3f650d400777a3151313fc6c758c9a871eb7a435299e6b0d2327e4c453
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1
--- a/www-apps/gitlab-ce/files/gitlab-ce-8.8.1-fix-redis-config-path.patch
+++ b/www-apps/gitlab-ce/files/gitlab-ce-8.8.1-fix-redis-config-path.patch
@ -1,13 +0,0 @@
 diff --git a/config/mail_room.yml b/config/mail_room.yml
 index 761a32a..1e2cbbb 100644
 --- a/config/mail_room.yml
 +++ b/config/mail_room.yml
@@ -2,7 +2,7 @@
 <%
 require "yaml"
 require "json"
 -require_relative "lib/gitlab/redis"
 +require_relative "/opt/gitlab/lib/gitlab/redis"
 rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
--- a/www-apps/gitlab-ce/gitlab-ce-8.10.1.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.10.1.ebuild
@ -15,12 +15,13 @@ USE_RUBY="ruby21"
 inherit eutils ruby-ng user systemd
-MY_PKGNAME="gitlabhq"
+MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="ee0488d18efbf4fe3103b0d83b2056c1bebc50cf"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${MY_PKGNAME}-${PV}"
+RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -53,9 +54,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	=dev-vcs/gitlab-shell-3.0*
+	=dev-vcs/gitlab-shell-3.2*
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.5
+	~dev-vcs/gitlab-workhorse-0.7.8
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -90,7 +91,7 @@ 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/v${PV}/bin/background_jobs
+# 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() {
@ -282,8 +283,6 @@ pkg_postinst() {
 }
 pkg_config() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	einfo "Checking configuration files"
 	if [ ! -r "${CONF_DIR}/database.yml" ]; then
@ -292,23 +291,6 @@ pkg_config() {
 		eerror "database settings for \"production\" environment."; die
 	fi
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
 	local git_home="$(egethome ${MY_USER})"
--- a/www-apps/gitlab-ce/gitlab-ce-8.10.2.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.10.2.ebuild
@ -15,12 +15,13 @@ USE_RUBY="ruby21"
 inherit eutils ruby-ng user systemd
-MY_PKGNAME="gitlabhq"
+MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="97a7ad76ccfb08361b1a18a71b71bfec3f21eb68"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${MY_PKGNAME}-${PV}"
+RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -53,9 +54,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	=dev-vcs/gitlab-shell-3.0*
+	~dev-vcs/gitlab-shell-3.2.1
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.5
+	~dev-vcs/gitlab-workhorse-0.7.8
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -90,7 +91,7 @@ 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/v${PV}/bin/background_jobs
+# 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() {
@ -282,8 +283,6 @@ pkg_postinst() {
 }
 pkg_config() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	einfo "Checking configuration files"
 	if [ ! -r "${CONF_DIR}/database.yml" ]; then
@ -292,23 +291,6 @@ pkg_config() {
 		eerror "database settings for \"production\" environment."; die
 	fi
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
 	local git_home="$(egethome ${MY_USER})"
--- a/www-apps/gitlab-ce/gitlab-ce-8.10.3.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.10.3.ebuild
@ -15,12 +15,13 @@ USE_RUBY="ruby21"
 inherit eutils ruby-ng user systemd
-MY_PKGNAME="gitlabhq"
+MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="131ea30ba13aec76c5d62c107be2074b8221ebef"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${MY_PKGNAME}-${PV}"
+RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
@ -53,9 +54,9 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	=dev-vcs/gitlab-shell-3.0*
+	~dev-vcs/gitlab-shell-3.2.1
 	>=dev-vcs/git-2.7.4
-	>=dev-vcs/gitlab-workhorse-0.7.5
+	~dev-vcs/gitlab-workhorse-0.7.8
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
 DEPEND="
@ -90,7 +91,7 @@ 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/v${PV}/bin/background_jobs
+# 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() {
@ -282,8 +283,6 @@ pkg_postinst() {
 }
 pkg_config() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	einfo "Checking configuration files"
 	if [ ! -r "${CONF_DIR}/database.yml" ]; then
@ -292,23 +291,6 @@ pkg_config() {
 		eerror "database settings for \"production\" environment."; die
 	fi
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
 	local git_home="$(egethome ${MY_USER})"
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.0_rc1.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.11.0_rc1.ebuild
@ -54,7 +54,7 @@ CDEPEND="
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
-	=dev-vcs/gitlab-shell-3.2*
+	~dev-vcs/gitlab-shell-3.2.1
 	>=dev-vcs/git-2.7.4
 	~dev-vcs/gitlab-workhorse-0.7.8
 	kerberos? ( !app-crypt/heimdal )
@ -283,8 +283,6 @@ pkg_postinst() {
 }
 pkg_config() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	einfo "Checking configuration files"
 	if [ ! -r "${CONF_DIR}/database.yml" ]; then
@ -293,23 +291,6 @@ pkg_config() {
 		eerror "database settings for \"production\" environment."; die
 	fi
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
 	local git_home="$(egethome ${MY_USER})"
--- a/www-apps/gitlab-ce/gitlab-ce-8.8.5.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.8.5.ebuild
@ -1,399 +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"
 inherit eutils ruby-ng user systemd
 MY_PKGNAME="gitlabhq"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="${MY_PKGNAME}-${PV}"
 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-2.7.2
 	>=dev-vcs/git-2.7.4
 	=dev-vcs/gitlab-workhorse-0.7.1
 	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=(
 	"${PN}-8.7.5-fix-sendmail-config.patch"
 	"${PN}-8.8.1-fix-redis-config-path.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/v${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
 	# fix permissions
 	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
 	## RC script ##
 	if use systemd ; then
 		ewarn "Beware: systemd support has not been tested, use at your own risk!"
 		systemd_dounit "${FILESDIR}/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
 }
 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() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	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
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	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
 	if [ ! -d "${DEST_DIR}/.git" ]; then
 		# 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
 	fi
 	## Initialize app ##
 	local RAILS_ENV="production"
 	local RUBY=${RUBY:-/usr/bin/ruby}
 	local BUNDLE="${RUBY} /usr/bin/bundle"
 	local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
 	if [ -f "${DEST_DIR}/.secret" ]; then
 		local update=true
 		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
 		local update=false
 		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.9.1.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.9.1.ebuild
@ -1,399 +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"
 inherit eutils ruby-ng user systemd
 MY_PKGNAME="gitlabhq"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="${MY_PKGNAME}-${PV}"
 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.0*
 	>=dev-vcs/git-2.7.4
 	>=dev-vcs/gitlab-workhorse-0.7.5
 	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=(
 	"${PN}-8.7.5-fix-sendmail-config.patch"
 	"${P}-fix-redis-config-path.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/v${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
 	# fix permissions
 	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
 	## RC script ##
 	if use systemd ; then
 		ewarn "Beware: systemd support has not been tested, use at your own risk!"
 		systemd_dounit "${FILESDIR}/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
 }
 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() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	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
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	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
 	if [ ! -d "${DEST_DIR}/.git" ]; then
 		# 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
 	fi
 	## Initialize app ##
 	local RAILS_ENV="production"
 	local RUBY=${RUBY:-/usr/bin/ruby}
 	local BUNDLE="${RUBY} /usr/bin/bundle"
 	local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
 	if [ -f "${DEST_DIR}/.secret" ]; then
 		local update=true
 		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
 		local update=false
 		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.9.3.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-8.9.3.ebuild
@ -1,399 +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"
 inherit eutils ruby-ng user systemd
 MY_PKGNAME="gitlabhq"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="${MY_PKGNAME}-${PV}"
 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.0*
 	>=dev-vcs/git-2.7.4
 	>=dev-vcs/gitlab-workhorse-0.7.5
 	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=(
 	"${PN}-8.7.5-fix-sendmail-config.patch"
 	"${PN}-8.9.1-fix-redis-config-path.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/v${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
 	# fix permissions
 	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
 	## RC script ##
 	if use systemd ; then
 		ewarn "Beware: systemd support has not been tested, use at your own risk!"
 		systemd_dounit "${FILESDIR}/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
 }
 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() {
 	local shell_conf='/etc/gitlab-shell.yml'
 	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
 	# check gitlab-shell configuration
 	if [ -r ${shell_conf} ]; then
 		local shell_repos_path="$(ryaml ${shell_conf} repos_path)"
 		local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \
 			production gitlab_shell repos_path)"
 		if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then
 			eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}"
 			eerror "must points to the same location! Fix the repos_path location and"
 			eerror "run this again."; die
 		fi
 	else
 		ewarn "GitLab Shell checks skipped, could not find config file at"
 		ewarn "${shell_conf}. Make sure that you have gitlab-shell properly"
 		ewarn "installed and that repos_path is the same as in GitLab."
 	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
 	if [ ! -d "${DEST_DIR}/.git" ]; then
 		# 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
 	fi
 	## Initialize app ##
 	local RAILS_ENV="production"
 	local RUBY=${RUBY:-/usr/bin/ruby}
 	local BUNDLE="${RUBY} /usr/bin/bundle"
 	local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
 	if [ -f "${DEST_DIR}/.secret" ]; then
 		local update=true
 		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
 		local update=false
 		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 $@"
 }