From 96b16652904ca00cb11e7c097537fd5e3221d7ed Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Fri, 26 Dec 2014 04:04:52 +0100
Subject: [PATCH 1/6] unmasked ebuilds for testing

---
 dev-vcs/gitlab-shell/Manifest                  | 2 +-
 dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild | 3 +--
 www-apps/gitlabhq/Manifest                     | 2 +-
 www-apps/gitlabhq/gitlabhq-7.6.1.ebuild        | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest
index 6a155eb..f2a0669 100644
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@@ -17,4 +17,4 @@ EBUILD gitlab-shell-2.0.0.ebuild 3297 SHA256 668c0430dc5783852cfff4588ac1fef2fa0
 EBUILD gitlab-shell-2.0.1.ebuild 3304 SHA256 35c085cd702149462fafe0bdfdb41ab244fe06c6caef3542aceb399d37f334bf SHA512 24725735f67323d5b6cd95f9a54981c20288acea05b07b1b195b62bf9add1b850fb787f4a9fb7749f7103cd932023d3180653dc812a02d6314ec1b674e751449 WHIRLPOOL 8adf08faa3892f2ab5ad03eadab584097f6869a720517fd925f34a05f042410411cb3132df42b1d82c3f5dba68fdb2f76b1f00611747d3f48074d9e69dc9c49f
 EBUILD gitlab-shell-2.3.1-r1.ebuild 3502 SHA256 6c604db35e20522c499f45d5994c421ea08b25313f630af8349441ddae96d757 SHA512 8d492097a53e1314212c263730b5f00f8f53c8d52b1fdc8b6c5d8abed86927f4ff56c2bf04a430dd6aa0b155d4531881d5fbbd7d8948131ec609dc2d7eb41080 WHIRLPOOL 2b491377ffe21cd0706e6c8422e1c5b52530460b08abbc315cb7e172a052f1acfdabc335575b284bd8a9107cc83d4d1411e3afe1294710d4064d14025acf1bb4
 EBUILD gitlab-shell-2.3.1.ebuild 3635 SHA256 d7b6f533145bdf67c3b19bfb2e5d330be77077939d2b75bff73d056c29645dd6 SHA512 b3f1690327682a30fbe166e38ec49171fedec22127db1555195271e4ed949238ad6d1b186dcb4d7a9c31f5c44ad60663e68efb0adfd29f1b9d6e18f58b260954 WHIRLPOOL 2a24f5a92d4a2495b8d4dd7a4182c869e32def571b2e74450659017256be08c02f4a9fa6ff8523c819391b8204aebbac41ecb6d8f5e4198168a34f10348cd73a
-EBUILD gitlab-shell-2.4.0.ebuild 3517 SHA256 2472686d1345ab662937f68106db980c580a177bd0f0749a3125dc82e0d7cfec SHA512 9e55af71dea179f8fcb5ed0485491058cdc3aad1341c7c1af73a00f82c622d1ebf88f715d45146fe014ca671944b0c4a8e77e0983575fb599cbe55a44d2136f1 WHIRLPOOL 74d62aebb6c59f6242c4f194b3a3a9e45cfd29479f4f64effc665eb6af98ac0fcee65c289edfc65f94671d651babadcbf622a22c67d1a36eaf706adc5bb0281f
+EBUILD gitlab-shell-2.4.0.ebuild 3502 SHA256 6c604db35e20522c499f45d5994c421ea08b25313f630af8349441ddae96d757 SHA512 8d492097a53e1314212c263730b5f00f8f53c8d52b1fdc8b6c5d8abed86927f4ff56c2bf04a430dd6aa0b155d4531881d5fbbd7d8948131ec609dc2d7eb41080 WHIRLPOOL 2b491377ffe21cd0706e6c8422e1c5b52530460b08abbc315cb7e172a052f1acfdabc335575b284bd8a9107cc83d4d1411e3afe1294710d4064d14025acf1bb4
diff --git a/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild
index 4777f57..f900aaf 100644
--- a/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild
@@ -14,8 +14,7 @@ SRC_URI="https://github.com/gitlabhq/gitlab-shell/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 16b1ff8..0dcb81d 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -72,4 +72,4 @@ EBUILD gitlabhq-7.4.3.ebuild 10586 SHA256 aee278ec37ac8a5fd8af179a2e26785ba5abd5
 EBUILD gitlabhq-7.5.1.ebuild 10914 SHA256 f7e3e82083b03d05ab5122245abde5fba8b62ada55777e70340fbb40615d0967 SHA512 d2aa8cd57d5f67ed02f83e2419c00a44b371b3bbc27cd2b3e9f15b284a3c350e6228af1ad105f03f765276dacc56cc05107c2a21d82c3d4f6b60ef335d9e8bcd WHIRLPOOL a2eabdb95779de550343d691b758f2e6d599e1d0eb21c3056c979cdcdb1989e798fa0662aec49a91550c6fd5ca6d9e65740cbe76fb743c6a2a600453f7543d78
 EBUILD gitlabhq-7.5.3-r1.ebuild 10917 SHA256 af2ce5ac4315c3341252f73aaa9b59f04e2bb53160828c19890ead00865cff34 SHA512 2066d1ce213c915e3abbefc4c4bca979642e8d58a297e6c4a4acba0638e6391ee75a197b03b556d7ad5e567aa8e08e3cdb0abf8c05d14b9ed1f0862b9babe211 WHIRLPOOL 37821dcdfd2548bd80693a8ab274b860fb45829711c5dc33cf65a586c8a8d3aa8f4cce21c3a4473d7ae694896f7916381d9dda2de32691e2038ee4fe408b49a7
 EBUILD gitlabhq-7.5.3.ebuild 10914 SHA256 f7e3e82083b03d05ab5122245abde5fba8b62ada55777e70340fbb40615d0967 SHA512 d2aa8cd57d5f67ed02f83e2419c00a44b371b3bbc27cd2b3e9f15b284a3c350e6228af1ad105f03f765276dacc56cc05107c2a21d82c3d4f6b60ef335d9e8bcd WHIRLPOOL a2eabdb95779de550343d691b758f2e6d599e1d0eb21c3056c979cdcdb1989e798fa0662aec49a91550c6fd5ca6d9e65740cbe76fb743c6a2a600453f7543d78
-EBUILD gitlabhq-7.6.1.ebuild 10936 SHA256 3ecbc1e2a7f9c7c09fa68e277469838fdb3ece481c16aa85af3354eb61cc0456 SHA512 a075e2a7e8e339ecbe8b7f446a4888c542994a85841bbea528e022b1283390376c81f9cd0d252cef1dbd5104b0a63c81c2d900b0383f452080ae089efec6079a WHIRLPOOL 10a21c0b1dd1f3253cdcf9e5f60b417977ff93ed09f2f87aa7bce90d8b047f845124300f34419b9854b4575a976a8a8bc09ea2177b165c440cf92b074104cb6f
+EBUILD gitlabhq-7.6.1.ebuild 10921 SHA256 46e903613c00a767c547d568bd3db5a21022371bdf5b7cad5ac4f6bca2b918ad SHA512 cb711fd5d8f3eef46dac45cd62018b72cbe5c412dd887b7c194d612c76e805bbe09f2f3f0bcad3878b0d1f0d27965baff53596832f2999cced55f7ec19cb1783 WHIRLPOOL 077140dd848f78c2d304457e5f8c99e4f0cf6c7794007c781eee912fe690cbe17b3696980402107448f3b9fb396bae8ef630f4870b03bc9adea1d8e4dd26eed8
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild
index 0fd0eea..d05122f 100644
--- a/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild
@@ -25,8 +25,7 @@ RESTRICT="mirror"
 
 LICENSE="MIT"
 SLOT="6"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 IUSE="mysql +postgres +unicorn systemd"
 
 ## Gems dependencies:

From ed52c03712147139d80fe9c8fb58cf7b977cad36 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 26 Jan 2015 16:55:46 +0100
Subject: [PATCH 2/6] added ebuild for gitlabhq-7.6.2

---
 www-apps/gitlabhq/Manifest              |   2 +
 www-apps/gitlabhq/gitlabhq-7.6.2.ebuild | 368 ++++++++++++++++++++++++
 2 files changed, 370 insertions(+)
 create mode 100644 www-apps/gitlabhq/gitlabhq-7.6.2.ebuild

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 50eff2a..7a99409 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -56,6 +56,7 @@ DIST gitlabhq-7.4.3.tar.gz 4189957 SHA256 e03092298526bafb65336a14944570083f96e9
 DIST gitlabhq-7.5.1.tar.gz 4221894 SHA256 cbaef29b55c35b1428fb4678be76500e7f0c292aa72314fa457d94c61fb5e00d SHA512 fc99100aab666819c06df96fc7979cb108a42249d811482c64473a51ec38e89d325346a4e069666a9130cff9eab21a470e68724cbe53d135bf4dc3b52a6b8930 WHIRLPOOL d86887f196cdc8d2690ff0a788c70994b7192d39b89d47c63a8b0baad8102c22efac3b3dc6556eefba7bb5cb12aaad347e5adb7d9a5a591fd8ca1d7de3a5b493
 DIST gitlabhq-7.5.3.tar.gz 4222058 SHA256 533afcf5b9a0683d2f920a436e552af8d8e953c78d03f150cfb8dcfa0da3112d SHA512 18e9d5ee9d39c8e11101d370228b8edd38ccbfc1b7d768977f3cdd575604d7f72f897484749f9d74988b91f8195c0b9452a47a6f83acb6a7890d4aac9dd9f1a7 WHIRLPOOL 0bf347b12c2d2b5d4bf4bbcd0ff790bccfa100d0ff818a77e0843e3ff1ce87a627cd541bd7e5d8160f0954477809c8539ac1c309c3bcbc0e0b517ad3f30193de
 DIST gitlabhq-7.6.1.tar.gz 4239328 SHA256 96746351fdf05fc39f473930dcef4b25a02d9056c211004fbc14ad796b938cb0 SHA512 fbf807e6d9f5b9c0a6f86c086b6d69f0fd9ff268400432b023093053adf8d8b2e93e32675e0703df5cd00449af308f1fa6f649214d25bb00cd73c62437b60559 WHIRLPOOL 5f252240bf5e6722d7c064c52ce1e79548b2ab908487427aa4fee0dcf74652cd822325f1abb85aff14b83f19417626087fda489180bbbf6c10bdf8035d3ebc01
+DIST gitlabhq-7.6.2.tar.gz 4238734 SHA256 bc8f92dacca6be48c7a34b60a727e0755a44742500164c131dde7b88bedb71f0 SHA512 ecff2159536c72c82e34aadaaa02e2ee29ec494e7caf132665139622dcb6ba94af15295a0a8bbdeb550a9c2777284cd67cf57b7940b49da98e288a48577ba1b0 WHIRLPOOL 8b4fa295e82c9d61cc0c9a0e5e84b65ac2528f4afacada065e37214234b98d6aee90abe9d1599b8827e459f5ad503fccbab00f1d7528b89735f1617f4d55507c
 EBUILD gitlabhq-6.7.5.ebuild 10973 SHA256 d74d454bd9972f15d21a3454e39a78ab042ccb3444cbbedb25da01d40335361b SHA512 b5494ee857055022da0803277d6a8b84d1fa1d9af66a853eedafdd3fa4993dfe4a66962581234333b16f41b6d605cfe6a207a4d2706c90d921fbc54474deb296 WHIRLPOOL 03026c7b7029c8bc7d5e5ad05c38e4b507be6c4f36b488753120d7d0849522a9e557c5b04adcac4c22eced0fbc1432fd16e7447198092b6691ccc529147d9dcf
 EBUILD gitlabhq-6.8.2.ebuild 10595 SHA256 24317d99bb9d0e220c11a37709b1b701b9cd7bf7b9fe3adead666c531569dcf0 SHA512 2f3f5e38b33edfdff35f3888e694984e97d897d7c64c0aa6cc35149d253e7211560dbd918b12e891c0d1d009241e53e255a2a3be91beb5a3954d148c4554315e WHIRLPOOL 4dca44d6e271ec14252e3a4690e6736d64133d3d115ec19b77d37cb5a2a3d3a46e9820dae48df5d7fa79dd0ca9c6b178b9dca85811bc0e78b7964580b0696b59
 EBUILD gitlabhq-6.9.2.ebuild 10616 SHA256 4221acadb5ac65ca3d662a2a560ff6343e04e0ca14dbd1b5bdd8f6a07812f7be SHA512 161c587d219c0dfd54b92805f7378aa7b1750bb25e632a16b67e3d24b28fab95f8f4272d685dfc70f1d7bfb15449a208fbb8b343dd8f902d8855034ed7f855d1 WHIRLPOOL effe560de13a29de88bf42aa927ddc2781373722a0e9a83ebef8942b0128208e35658a6b43d1bdc2d6e2b80c43b836dc8cc431f5d38912c201c789f70076e245
@@ -73,3 +74,4 @@ EBUILD gitlabhq-7.5.1.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d
 EBUILD gitlabhq-7.5.3-r1.ebuild 10907 SHA256 3c8b8cabc75968beda5a351b746ab53c7e644d16c437bc54af51fd62283a1917 SHA512 e42b3605ab405a798467713f723ddff553ecef81b2f16baad9bd93653da15fb23e47aa7f28d5cc93eaabf3e8eeb70201dc6f8ae6192b42da82be0a754e54704d WHIRLPOOL eae1bb4dc43c178f61fd8fe5784c1e02f385969dc7237ce9c140774266f4a583f911617014602c1e72c0f8f525edc7b6e620c748045419640f0f0bdc8dc6f0d3
 EBUILD gitlabhq-7.5.3.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
 EBUILD gitlabhq-7.6.1.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
+EBUILD gitlabhq-7.6.2.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
new file mode 100644
index 0000000..97dca76
--- /dev/null
+++ b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
@@ -0,0 +1,368 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="ruby20 ruby21"
+PYTHON_DEPEND="2:2.7"
+
+inherit eutils python ruby-ng user systemd
+
+DESCRIPTION="GitLab is a free project and repository management application"
+HOMEPAGE="https://github.com/gitlabhq/gitlabhq"
+SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#RUBY_S="${PN}-7.4.0"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql +postgres +unicorn systemd"
+
+## 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/cmake
+	dev-util/ragel
+	net-libs/nodejs
+	postgres? ( dev-db/postgresql )
+	mysql? ( virtual/mysql )
+	virtual/krb5
+	virtual/pkgconfig"
+DEPEND="${GEMS_DEPEND}
+	>=dev-vcs/gitlab-shell-2.4.0
+	dev-vcs/git"
+RDEPEND="${DEPEND}
+	dev-db/redis
+	virtual/mta
+	systemd? ( sys-apps/systemd:0= )"
+ruby_add_bdepend "
+	virtual/rubygems
+	>=dev-ruby/bundler-1.0"
+
+#
+# fix-gemfile:
+#     Remove therubyracer that doesn't compile well on Gentoo (we're using
+#     nodejs instead that is faster and better). Also replace broken
+#     charlock_holmes version with fixed one.
+#
+# fix-project-name-regex:
+#     Allow project name to contain non-ASCII characters.
+#
+# fix-sendmail-config:
+#     Fix default settings to work with ssmtp that doesn't know '-t' argument.
+#
+RUBY_PATCHES=(
+	"${P}-fix-gemfile.patch"
+	"${PN}-7.1.1-fix-project-name-regex.patch"
+	"${PN}-6.0.2-fix-sendmail-config.patch"
+	"${PN}-7.0.0-email-custom-reply_to.patch"
+)
+
+MY_NAME="gitlab"
+MY_USER="git"    # should be same as in gitlab-shell
+
+DEST_DIR="/opt/${MY_NAME}-${SLOT}"
+CONF_DIR="/etc/${MY_NAME}-${SLOT}"
+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,mailer,system_hook,project_web_hook,gitlab_shell,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:).*|/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} ${temp}/repo_satellites
+
+	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; do
+		without+="$(use $flag || echo ' '$flag)"
+	done
+	local bundle_args="--deployment ${without:+--without ${without}}"
+
+	einfo "Running bundle install ${bundle_args} ..."
+	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
+
+	# clean gems cache
+	rm -Rf vendor/bundle/ruby/*/cache
+
+	# 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_dotmpfilesd "${FILESDIR}/gitlab.conf"
+	else
+		local rcscript=gitlab-sidekiq.init
+		use unicorn && rcscript=gitlab-unicorn-6.init
+
+		cp "${FILESDIR}/${rcscript}" "${T}" || die
+		sed -i \
+			-e "s|@USER@|${MY_USER}|" \
+			-e "s|@SLOT@|${SLOT}|" \
+			-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}-${SLOT}"
+	fi
+}
+
+pkg_postinst() {
+	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 initlize environment:"
+	elog "       emerge --config \"=${CATEGORY}/${PF}\""
+	elog "   Note: Do not forget to start Redis server first!"
+	elog
+	elog "If this is an update from previous version, it's HIGHLY recommended"
+	elog "to backup your database before running the config phase!"
+	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."
+}
+
+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
+}
+
+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 $@"
+}

From 7ece35653314683d7ccb73067e7b6479c0639c9a Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 26 Jan 2015 16:57:56 +0100
Subject: [PATCH 3/6] fixed path to patch file

---
 www-apps/gitlabhq/Manifest              | 2 +-
 www-apps/gitlabhq/gitlabhq-7.6.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 7a99409..3c00ed3 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -74,4 +74,4 @@ EBUILD gitlabhq-7.5.1.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d
 EBUILD gitlabhq-7.5.3-r1.ebuild 10907 SHA256 3c8b8cabc75968beda5a351b746ab53c7e644d16c437bc54af51fd62283a1917 SHA512 e42b3605ab405a798467713f723ddff553ecef81b2f16baad9bd93653da15fb23e47aa7f28d5cc93eaabf3e8eeb70201dc6f8ae6192b42da82be0a754e54704d WHIRLPOOL eae1bb4dc43c178f61fd8fe5784c1e02f385969dc7237ce9c140774266f4a583f911617014602c1e72c0f8f525edc7b6e620c748045419640f0f0bdc8dc6f0d3
 EBUILD gitlabhq-7.5.3.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
 EBUILD gitlabhq-7.6.1.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
-EBUILD gitlabhq-7.6.2.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
+EBUILD gitlabhq-7.6.2.ebuild 10918 SHA256 92a792986997bd161d565ee4cea10bea77a54be30a321de23bc9f592dd458530 SHA512 abfa04d4f2a1853666f982cec5b9f40728cde93583a7d3c07bb9b317d7907877d7ecc34e1a618137fe576c907ee6368e992dfa039a04f14ec40ba4bbee48238e WHIRLPOOL e63aa4db10d70a1b20c9478ed173301ce0fc23f0a82e4c470c401784a67a3be386edf6fd383c30ae18bc41fccb49fe894241762f8bb7b2df020cbbacae4fe9ab
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
index 97dca76..ff6d5d4 100644
--- a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
@@ -73,7 +73,7 @@ ruby_add_bdepend "
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
 #
 RUBY_PATCHES=(
-	"${P}-fix-gemfile.patch"
+	"${PN}-7.6.1-fix-gemfile.patch"
 	"${PN}-7.1.1-fix-project-name-regex.patch"
 	"${PN}-6.0.2-fix-sendmail-config.patch"
 	"${PN}-7.0.0-email-custom-reply_to.patch"

From 21c81ec2eb27dd76b9d806b4e529188ba3406f8c Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 26 Jan 2015 17:26:32 +0100
Subject: [PATCH 4/6] deleted ebuild for gitlabhq-7.6.1, added ebuild for
 gitlabhq-7.6.2; changed patch for Gemfile/Gemfile.lock to incorporate fix
 mentioned here:
 https://github.com/gitlabhq/gitlabhq/issues/8478#issuecomment-71328552

---
 www-apps/gitlabhq/Manifest                    |   6 +-
 ...patch => gitlabhq-7.6.2-fix-gemfile.patch} |  44 +--
 www-apps/gitlabhq/gitlabhq-7.6.1.ebuild       | 368 ------------------
 www-apps/gitlabhq/gitlabhq-7.6.2.ebuild       |   2 +-
 4 files changed, 16 insertions(+), 404 deletions(-)
 rename www-apps/gitlabhq/files/{gitlabhq-7.6.1-fix-gemfile.patch => gitlabhq-7.6.2-fix-gemfile.patch} (65%)
 delete mode 100644 www-apps/gitlabhq/gitlabhq-7.6.1.ebuild

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 3c00ed3..0bae4dc 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -40,7 +40,7 @@ AUX gitlabhq-7.0.0-fix-gemfile.patch 2185 SHA256 48070f5cd7e16ce27abad8e2cf80493
 AUX gitlabhq-7.0.0-ldap-custom-mapping.patch 2708 SHA256 8592744ba8b373b2e89c76d7ceb6c755bd46e2c2de6143b3f1d9967e4b6e5fb3 SHA512 a172444da26ddc9dfebe0c0ead4a2eb73a77ac44dfd9b3dbcf2b3faa679d963db080d2979d707e337b99f8e6384ccfd323f5d6e70921d193e99db75a4ba45b38 WHIRLPOOL d25e1f78342c781d26b84c09bd7eba08b46375c2f353b358f838602253dc2fe57807a437fc0c2891a6bc2893eba0bb278bd605ab8b6c837101a783c84536095b
 AUX gitlabhq-7.1.1-fix-gemfile.patch 2184 SHA256 9ba304baa5a17f1b0637fe243f551ddcc22cf32c3e82b7dc5b1a5cc0c5fc5876 SHA512 db8757874f136fc6a1d138feadbad6f8dfc773446f969b76a4715901dac02c04c978133ef3e9218b9c4a3d0173f53c0d14608ae123ee300a803529cbf232a1d1 WHIRLPOOL 27adf9392f3f1cbc6288afc1aabc174850a689f47f015c9d638b62769607e6e4f5ebe8bcb3811ee189ceeddef7c5bca384b322d15c0008b8867887f26d6188e2
 AUX gitlabhq-7.1.1-fix-project-name-regex.patch 638 SHA256 9f3dfcdc4365422037ecc8854b10e2cf96f4fb9508a6d5214b16c3545ca1353b SHA512 4606eade95b75e31eb791d793e3571c4e998c2d451e1f92ce70fba06e3a29c74a17f2fedba24ded4dbdc6db3da87960890552869fd8790caed26ff6fbb201717 WHIRLPOOL 6470de727d060556cc1413ac23f3c3198035f3cd7b05a291f7dedfcd9071a5afecca57c15f7387a84d9c1830118e47fae4fc72ba2f2e67c346bf18c4dae09865
-AUX gitlabhq-7.6.1-fix-gemfile.patch 3032 SHA256 a97fca0e1f51ed97be469bfd020b014f70c80d5863777c7d299d41f7d4298f9e SHA512 bbbd25b19d4916e75984a44083303b2984052e66b932e604b8aab5dea9c9a2c5f26358b060ac1f1c5b9a0c8f7e834d7a58116be33fbc8cd9cbe8cc3ed937ea32 WHIRLPOOL 483565da0c586bd37afb35538f9a8a6967ebda7b249f28d0bbadd7c48e006957e0535cded04f2505bd4ca6c350cc40d81f3cd22bcacd933ddd67c9cad95ef1b9
+AUX gitlabhq-7.6.2-fix-gemfile.patch 2402 SHA256 864fd1df330de8a47349590a5b893ade4064f08798889f845a0d13ba129cc5eb SHA512 05525456ff1ca3eec4da4763352047d7e4510fd5c03871d75d5f7674e80cb1e5ea960fec9a669c1a31e67f909026d02816117ba6cb6c604425b3ce9ee46ce7c9 WHIRLPOOL 8ae0747b93b023444f5af476059f30c070a9d3c417a0ff787efb18b93d3775e0be715e0dba208a76903fa1c505bb2e4d67f9d3c0ee721f1e0129c2ee2c41ef13
 DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
 DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
 DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
@@ -55,7 +55,6 @@ DIST gitlabhq-7.4.2.tar.gz 4189724 SHA256 b116c49b032e5cd3529698aed3174b6f02748c
 DIST gitlabhq-7.4.3.tar.gz 4189957 SHA256 e03092298526bafb65336a14944570083f96e960f9bdabf8e4e52a403e42a5f8 SHA512 24228e31c7422215309838b1c8c9f24d8b2c77691b480365548ade36be53368bd9cc04e8065386e83b501f8f3f97f365634297a1af2c93c285cddad2f8150af8 WHIRLPOOL 785b6ba8c2c94456c005b7fbca265a762990e24c5164d742d8cb34a0f370c604aec23490ceb034007444ffe65223e163a58364aa01c1d617404a3278ac77f0d7
 DIST gitlabhq-7.5.1.tar.gz 4221894 SHA256 cbaef29b55c35b1428fb4678be76500e7f0c292aa72314fa457d94c61fb5e00d SHA512 fc99100aab666819c06df96fc7979cb108a42249d811482c64473a51ec38e89d325346a4e069666a9130cff9eab21a470e68724cbe53d135bf4dc3b52a6b8930 WHIRLPOOL d86887f196cdc8d2690ff0a788c70994b7192d39b89d47c63a8b0baad8102c22efac3b3dc6556eefba7bb5cb12aaad347e5adb7d9a5a591fd8ca1d7de3a5b493
 DIST gitlabhq-7.5.3.tar.gz 4222058 SHA256 533afcf5b9a0683d2f920a436e552af8d8e953c78d03f150cfb8dcfa0da3112d SHA512 18e9d5ee9d39c8e11101d370228b8edd38ccbfc1b7d768977f3cdd575604d7f72f897484749f9d74988b91f8195c0b9452a47a6f83acb6a7890d4aac9dd9f1a7 WHIRLPOOL 0bf347b12c2d2b5d4bf4bbcd0ff790bccfa100d0ff818a77e0843e3ff1ce87a627cd541bd7e5d8160f0954477809c8539ac1c309c3bcbc0e0b517ad3f30193de
-DIST gitlabhq-7.6.1.tar.gz 4239328 SHA256 96746351fdf05fc39f473930dcef4b25a02d9056c211004fbc14ad796b938cb0 SHA512 fbf807e6d9f5b9c0a6f86c086b6d69f0fd9ff268400432b023093053adf8d8b2e93e32675e0703df5cd00449af308f1fa6f649214d25bb00cd73c62437b60559 WHIRLPOOL 5f252240bf5e6722d7c064c52ce1e79548b2ab908487427aa4fee0dcf74652cd822325f1abb85aff14b83f19417626087fda489180bbbf6c10bdf8035d3ebc01
 DIST gitlabhq-7.6.2.tar.gz 4238734 SHA256 bc8f92dacca6be48c7a34b60a727e0755a44742500164c131dde7b88bedb71f0 SHA512 ecff2159536c72c82e34aadaaa02e2ee29ec494e7caf132665139622dcb6ba94af15295a0a8bbdeb550a9c2777284cd67cf57b7940b49da98e288a48577ba1b0 WHIRLPOOL 8b4fa295e82c9d61cc0c9a0e5e84b65ac2528f4afacada065e37214234b98d6aee90abe9d1599b8827e459f5ad503fccbab00f1d7528b89735f1617f4d55507c
 EBUILD gitlabhq-6.7.5.ebuild 10973 SHA256 d74d454bd9972f15d21a3454e39a78ab042ccb3444cbbedb25da01d40335361b SHA512 b5494ee857055022da0803277d6a8b84d1fa1d9af66a853eedafdd3fa4993dfe4a66962581234333b16f41b6d605cfe6a207a4d2706c90d921fbc54474deb296 WHIRLPOOL 03026c7b7029c8bc7d5e5ad05c38e4b507be6c4f36b488753120d7d0849522a9e557c5b04adcac4c22eced0fbc1432fd16e7447198092b6691ccc529147d9dcf
 EBUILD gitlabhq-6.8.2.ebuild 10595 SHA256 24317d99bb9d0e220c11a37709b1b701b9cd7bf7b9fe3adead666c531569dcf0 SHA512 2f3f5e38b33edfdff35f3888e694984e97d897d7c64c0aa6cc35149d253e7211560dbd918b12e891c0d1d009241e53e255a2a3be91beb5a3954d148c4554315e WHIRLPOOL 4dca44d6e271ec14252e3a4690e6736d64133d3d115ec19b77d37cb5a2a3d3a46e9820dae48df5d7fa79dd0ca9c6b178b9dca85811bc0e78b7964580b0696b59
@@ -73,5 +72,4 @@ EBUILD gitlabhq-7.4.3.ebuild 10576 SHA256 7fdcfdfa51e7b2ed8b523879009c0cd19c2734
 EBUILD gitlabhq-7.5.1.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
 EBUILD gitlabhq-7.5.3-r1.ebuild 10907 SHA256 3c8b8cabc75968beda5a351b746ab53c7e644d16c437bc54af51fd62283a1917 SHA512 e42b3605ab405a798467713f723ddff553ecef81b2f16baad9bd93653da15fb23e47aa7f28d5cc93eaabf3e8eeb70201dc6f8ae6192b42da82be0a754e54704d WHIRLPOOL eae1bb4dc43c178f61fd8fe5784c1e02f385969dc7237ce9c140774266f4a583f911617014602c1e72c0f8f525edc7b6e620c748045419640f0f0bdc8dc6f0d3
 EBUILD gitlabhq-7.5.3.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
-EBUILD gitlabhq-7.6.1.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
-EBUILD gitlabhq-7.6.2.ebuild 10918 SHA256 92a792986997bd161d565ee4cea10bea77a54be30a321de23bc9f592dd458530 SHA512 abfa04d4f2a1853666f982cec5b9f40728cde93583a7d3c07bb9b317d7907877d7ecc34e1a618137fe576c907ee6368e992dfa039a04f14ec40ba4bbee48238e WHIRLPOOL e63aa4db10d70a1b20c9478ed173301ce0fc23f0a82e4c470c401784a67a3be386edf6fd383c30ae18bc41fccb49fe894241762f8bb7b2df020cbbacae4fe9ab
+EBUILD gitlabhq-7.6.2.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
diff --git a/www-apps/gitlabhq/files/gitlabhq-7.6.1-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
similarity index 65%
rename from www-apps/gitlabhq/files/gitlabhq-7.6.1-fix-gemfile.patch
rename to www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
index a0ca338..9ab8969 100644
--- a/www-apps/gitlabhq/files/gitlabhq-7.6.1-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
@@ -1,18 +1,8 @@
 diff --git a/Gemfile b/Gemfile
-index ce9b833..49ddf1a 100644
+index ce9b833..c4bd377 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -28,6 +28,9 @@ gem 'omniauth-google-oauth2'
- gem 'omniauth-twitter'
- gem 'omniauth-github'
- gem 'omniauth-shibboleth'
-+# Version 0.8 does not compile, so let's try tag 0.8.1 from github
-+# This is a dependency of omniauth-kerberos
-+gem "timfel-krb5-auth", '0.8.1.1', :require => 'krb5_auth', :git => "https://github.com/fritteli/krb5-auth.git", :tag => "v0.8.1.1"
- gem 'omniauth-kerberos'
- 
- # Extracting information from a git repository
-@@ -155,6 +158,10 @@ gem "underscore-rails", "~> 1.4.4"
+@@ -155,6 +155,10 @@ gem "underscore-rails", "~> 1.4.4"
  # Sanitize user input
  gem "sanitize", '~> 2.0'
  
@@ -23,7 +13,7 @@ index ce9b833..49ddf1a 100644
  # Protect against bruteforcing
  gem "rack-attack"
  
-@@ -170,7 +177,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
+@@ -170,7 +174,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
  gem "sass-rails", '~> 4.0.2'
  gem "coffee-rails"
  gem "uglifier"
@@ -32,28 +22,21 @@ index ce9b833..49ddf1a 100644
  gem 'jquery-turbolinks'
  
 diff --git a/Gemfile.lock b/Gemfile.lock
-index a93935f..66e2c22 100644
+index a93935f..98721dc 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -1,3 +1,17 @@
+@@ -1,3 +1,10 @@
 +GIT
 +  remote: https://github.com/brianmario/charlock_holmes.git
 +  revision: dde194609b3513b0d2369ce8f916ae52566154b4
 +  ref: dde194609b3513b0d2369ce8f916ae52566154b4
 +  specs:
 +    charlock_holmes (0.6.9.4)
-+
-+GIT
-+  remote: https://github.com/fritteli/krb5-auth.git
-+  revision: 14e09f7fdd79962b146e0a6513fdb1b8e64c221b
-+  tag: v0.8.1.1
-+  specs:
-+    timfel-krb5-auth (0.8.1.1)
 +
  GEM
    remote: https://rubygems.org/
    specs:
-@@ -62,7 +76,6 @@ GEM
+@@ -62,7 +69,6 @@ GEM
        json (>= 1.7)
      celluloid (0.15.2)
        timers (~> 1.1.0)
@@ -61,7 +44,7 @@ index a93935f..66e2c22 100644
      cliver (0.3.2)
      code_analyzer (0.4.3)
        sexp_processor
-@@ -280,7 +293,6 @@ GEM
+@@ -280,7 +286,6 @@ GEM
        addressable (~> 2.3)
      letter_opener (1.1.2)
        launchy (~> 2.2)
@@ -69,7 +52,7 @@ index a93935f..66e2c22 100644
      listen (2.3.1)
        celluloid (>= 0.15.2)
        rb-fsevent (>= 0.9.3)
-@@ -426,7 +438,6 @@ GEM
+@@ -426,7 +431,6 @@ GEM
        redis-store (~> 1.1.0)
      redis-store (1.1.4)
        redis (>= 2.2)
@@ -77,7 +60,7 @@ index a93935f..66e2c22 100644
      request_store (1.0.5)
      require_all (1.3.2)
      rest-client (1.6.7)
-@@ -525,9 +536,6 @@ GEM
+@@ -525,9 +529,6 @@ GEM
      term-ansicolor (1.2.2)
        tins (~> 0.8)
      test_after_commit (0.2.2)
@@ -87,15 +70,16 @@ index a93935f..66e2c22 100644
      thin (1.6.1)
        daemons (>= 1.0.9)
        eventmachine (>= 1.0.0)
-@@ -536,7 +544,6 @@ GEM
+@@ -536,7 +537,7 @@ GEM
      thread_safe (0.3.4)
      tilt (1.4.1)
      timers (1.1.0)
 -    timfel-krb5-auth (0.8)
++    timfel-krb5-auth (0.8.2)
      tinder (1.9.3)
        eventmachine (~> 1.0)
        faraday (~> 0.8)
-@@ -606,6 +613,7 @@ DEPENDENCIES
+@@ -606,6 +607,7 @@ DEPENDENCIES
    bootstrap-sass (~> 3.0)
    capybara (~> 2.2.1)
    carrierwave
@@ -103,13 +87,11 @@ index a93935f..66e2c22 100644
    coffee-rails
    colored
    coveralls
-@@ -704,8 +712,8 @@ DEPENDENCIES
+@@ -704,7 +706,6 @@ DEPENDENCIES
    stamp
    state_machine
    test_after_commit
 -  therubyracer
    thin
-+  timfel-krb5-auth (= 0.8.1.1)!
    tinder (~> 1.9.2)
    turbolinks
-   uglifier
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild
deleted file mode 100644
index 97dca76..0000000
--- a/www-apps/gitlabhq/gitlabhq-7.6.1.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="ruby20 ruby21"
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python ruby-ng user systemd
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://github.com/gitlabhq/gitlabhq"
-SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#RUBY_S="${PN}-7.4.0"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql +postgres +unicorn systemd"
-
-## 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/cmake
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( dev-db/postgresql )
-	mysql? ( virtual/mysql )
-	virtual/krb5
-	virtual/pkgconfig"
-DEPEND="${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-2.4.0
-	dev-vcs/git"
-RDEPEND="${DEPEND}
-	dev-db/redis
-	virtual/mta
-	systemd? ( sys-apps/systemd:0= )"
-ruby_add_bdepend "
-	virtual/rubygems
-	>=dev-ruby/bundler-1.0"
-
-#
-# fix-gemfile:
-#     Remove therubyracer that doesn't compile well on Gentoo (we're using
-#     nodejs instead that is faster and better). Also replace broken
-#     charlock_holmes version with fixed one.
-#
-# fix-project-name-regex:
-#     Allow project name to contain non-ASCII characters.
-#
-# fix-sendmail-config:
-#     Fix default settings to work with ssmtp that doesn't know '-t' argument.
-#
-RUBY_PATCHES=(
-	"${P}-fix-gemfile.patch"
-	"${PN}-7.1.1-fix-project-name-regex.patch"
-	"${PN}-6.0.2-fix-sendmail-config.patch"
-	"${PN}-7.0.0-email-custom-reply_to.patch"
-)
-
-MY_NAME="gitlab"
-MY_USER="git"    # should be same as in gitlab-shell
-
-DEST_DIR="/opt/${MY_NAME}-${SLOT}"
-CONF_DIR="/etc/${MY_NAME}-${SLOT}"
-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,mailer,system_hook,project_web_hook,gitlab_shell,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:).*|/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} ${temp}/repo_satellites
-
-	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; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-
-	# 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_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn-6.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@SLOT@|${SLOT}|" \
-			-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}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-	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 initlize environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If this is an update from previous version, it's HIGHLY recommended"
-	elog "to backup your database before running the config phase!"
-	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."
-}
-
-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
-}
-
-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 $@"
-}
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
index ff6d5d4..97dca76 100644
--- a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
@@ -73,7 +73,7 @@ ruby_add_bdepend "
 #     Fix default settings to work with ssmtp that doesn't know '-t' argument.
 #
 RUBY_PATCHES=(
-	"${PN}-7.6.1-fix-gemfile.patch"
+	"${P}-fix-gemfile.patch"
 	"${PN}-7.1.1-fix-project-name-regex.patch"
 	"${PN}-6.0.2-fix-sendmail-config.patch"
 	"${PN}-7.0.0-email-custom-reply_to.patch"

From 3fb7db0868d5bb14879344c3ffccaf7c2b60fea4 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 26 Jan 2015 18:34:35 +0100
Subject: [PATCH 5/6] bump dependency on timfel-krb5-auth from 0.8.2 to 0.8.3

---
 www-apps/gitlabhq/Manifest                               | 2 +-
 www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 0bae4dc..e46036f 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -40,7 +40,7 @@ AUX gitlabhq-7.0.0-fix-gemfile.patch 2185 SHA256 48070f5cd7e16ce27abad8e2cf80493
 AUX gitlabhq-7.0.0-ldap-custom-mapping.patch 2708 SHA256 8592744ba8b373b2e89c76d7ceb6c755bd46e2c2de6143b3f1d9967e4b6e5fb3 SHA512 a172444da26ddc9dfebe0c0ead4a2eb73a77ac44dfd9b3dbcf2b3faa679d963db080d2979d707e337b99f8e6384ccfd323f5d6e70921d193e99db75a4ba45b38 WHIRLPOOL d25e1f78342c781d26b84c09bd7eba08b46375c2f353b358f838602253dc2fe57807a437fc0c2891a6bc2893eba0bb278bd605ab8b6c837101a783c84536095b
 AUX gitlabhq-7.1.1-fix-gemfile.patch 2184 SHA256 9ba304baa5a17f1b0637fe243f551ddcc22cf32c3e82b7dc5b1a5cc0c5fc5876 SHA512 db8757874f136fc6a1d138feadbad6f8dfc773446f969b76a4715901dac02c04c978133ef3e9218b9c4a3d0173f53c0d14608ae123ee300a803529cbf232a1d1 WHIRLPOOL 27adf9392f3f1cbc6288afc1aabc174850a689f47f015c9d638b62769607e6e4f5ebe8bcb3811ee189ceeddef7c5bca384b322d15c0008b8867887f26d6188e2
 AUX gitlabhq-7.1.1-fix-project-name-regex.patch 638 SHA256 9f3dfcdc4365422037ecc8854b10e2cf96f4fb9508a6d5214b16c3545ca1353b SHA512 4606eade95b75e31eb791d793e3571c4e998c2d451e1f92ce70fba06e3a29c74a17f2fedba24ded4dbdc6db3da87960890552869fd8790caed26ff6fbb201717 WHIRLPOOL 6470de727d060556cc1413ac23f3c3198035f3cd7b05a291f7dedfcd9071a5afecca57c15f7387a84d9c1830118e47fae4fc72ba2f2e67c346bf18c4dae09865
-AUX gitlabhq-7.6.2-fix-gemfile.patch 2402 SHA256 864fd1df330de8a47349590a5b893ade4064f08798889f845a0d13ba129cc5eb SHA512 05525456ff1ca3eec4da4763352047d7e4510fd5c03871d75d5f7674e80cb1e5ea960fec9a669c1a31e67f909026d02816117ba6cb6c604425b3ce9ee46ce7c9 WHIRLPOOL 8ae0747b93b023444f5af476059f30c070a9d3c417a0ff787efb18b93d3775e0be715e0dba208a76903fa1c505bb2e4d67f9d3c0ee721f1e0129c2ee2c41ef13
+AUX gitlabhq-7.6.2-fix-gemfile.patch 2402 SHA256 9abfdff94da0fe5b6db4d740688af179b93cf56c1ecb915c12bc0a5440295c4b SHA512 ce948a768a0803794e102b062fcdfc7569879f3ac649a1cc86f222053810dc758dbecc41834d06a1f6a3e5e03cf36dcb368e24a47401dfac7f6b8c5197706359 WHIRLPOOL ac7696de8bd143dec22cf3e31807249bd1bb58424edeb8de7745afffa8007ecefd577ce11dfe5de2080d87ab19eb7198ddd2d89f06eb96b5e4c70e2476594f27
 DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
 DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
 DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
diff --git a/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
index 9ab8969..1e5a988 100644
--- a/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
@@ -75,7 +75,7 @@ index a93935f..98721dc 100644
      tilt (1.4.1)
      timers (1.1.0)
 -    timfel-krb5-auth (0.8)
-+    timfel-krb5-auth (0.8.2)
++    timfel-krb5-auth (0.8.3)
      tinder (1.9.3)
        eventmachine (~> 1.0)
        faraday (~> 0.8)

From 35bb131c2493fc5067af769977b979a943cbb103 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Mon, 26 Jan 2015 18:37:37 +0100
Subject: [PATCH 6/6] add dependency to virtual/krb5

---
 www-apps/gitlabhq/Manifest              | 2 +-
 www-apps/gitlabhq/gitlabhq-7.6.2.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index e46036f..3952208 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -72,4 +72,4 @@ EBUILD gitlabhq-7.4.3.ebuild 10576 SHA256 7fdcfdfa51e7b2ed8b523879009c0cd19c2734
 EBUILD gitlabhq-7.5.1.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
 EBUILD gitlabhq-7.5.3-r1.ebuild 10907 SHA256 3c8b8cabc75968beda5a351b746ab53c7e644d16c437bc54af51fd62283a1917 SHA512 e42b3605ab405a798467713f723ddff553ecef81b2f16baad9bd93653da15fb23e47aa7f28d5cc93eaabf3e8eeb70201dc6f8ae6192b42da82be0a754e54704d WHIRLPOOL eae1bb4dc43c178f61fd8fe5784c1e02f385969dc7237ce9c140774266f4a583f911617014602c1e72c0f8f525edc7b6e620c748045419640f0f0bdc8dc6f0d3
 EBUILD gitlabhq-7.5.3.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
-EBUILD gitlabhq-7.6.2.ebuild 10911 SHA256 f0fe0342c47c7e0d6ae10e080f56198c752454bddbe8910092124c290c40e716 SHA512 34ae28951cb92b6c01e21c421a156ffd35c45b75f3e4d4701e46da71f13a921fc291c146ee3436e39d68898ae4ee107aa558d63429aa4f96344502654e8c6ee9 WHIRLPOOL 3a43aa3d336ba926a4d9703b96472eddcadf55bc966e65fcf3eca8ee0070effcc0920a18c4f376f1292c64dcbceccd6733c6010ab03db3dfc98f25d0da5b7c6c
+EBUILD gitlabhq-7.6.2.ebuild 10925 SHA256 99fa5c39f57c1ceaba66105b2de907a2235a8d3a8bf491b530c72604e704af4e SHA512 76362d37692a61024c5d34504fefa10245a8ed3d47a6a7f454ff191dc340bb58addae04b0b392b1e67e8b918a504c1cbee47497c05233d3418d02c8d62e932a4 WHIRLPOOL f47f69b4c06d1a41d2fe38cecbcebc49863a31465b868b3403e89d98b6510ff03cc8562ec6d77159b754c39d36b40d492034796613bdb5b0786f64cab4742d10
diff --git a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
index 97dca76..77f0a99 100644
--- a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
@@ -51,7 +51,8 @@ GEMS_DEPEND="
 	virtual/pkgconfig"
 DEPEND="${GEMS_DEPEND}
 	>=dev-vcs/gitlab-shell-2.4.0
-	dev-vcs/git"
+	dev-vcs/git
+	virtual/krb5"
 RDEPEND="${DEPEND}
 	dev-db/redis
 	virtual/mta