diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog
index 7a93385..fc140ae 100644
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@@ -1,3 +1,8 @@
+  23 Sep 2016; Manuel Friedli <manuel@fritteli.ch> -gitlab-ce-8.10.6.ebuild,
+  -gitlab-ce-8.11.0.ebuild, -gitlab-ce-8.11.2.ebuild, -gitlab-ce-8.11.3.ebuild,
+  -gitlab-ce-8.11.4.ebuild, -gitlab-ce-8.11.5.ebuild:
+  www-apps/gitlab-ce: removed old versions
+
 *gitlab-ce-8.12.0 (23 Sep 2016)
 
   23 Sep 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.12.0.ebuild:
diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest
index 2000e32..20e9b6c 100644
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@@ -9,24 +9,12 @@ AUX gitlab-unicorn.init 3127 SHA256 de2f5861bec58eaac284e74baabe25288a520bc4f7da
 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.6.tar.gz 21039451 SHA256 8c7313ce49dfec816ba74187f920960229f3740d2a433582d48d8f03ac0ffd71 SHA512 aed0a8760eec42ebe059b271134ccad644092a2ce0a7f51a1f338428edbe045d636bf115450fd55ecce500445a94bccece6a7a4ec32f6cc0fbde8f5c3d879dcd WHIRLPOOL 69b3c694d27020edeeacd8da6f2826cbf7c704cd4b11387ac3baf07ec07b37b8374fc73256d39b132f51f49e8038dce16db8eb266dd807acd126a0de1584e244
-DIST gitlab-ce-8.11.0.tar.gz 25292875 SHA256 581f228ea5caaa872d180b5864929070b18d16f565bf265a237f85f57fbe04c7 SHA512 41f9a192118ef7a044ed587e45ef6aa7fdd90bc002dd893a201cfcc2b367c6eb1137ea7f4969ac4caec284e68a92b1b1af46218764ea1f9b0ff18257b4dec925 WHIRLPOOL 4b79dab88def24af0c3f71222e14cfc7314132185c14993c8085b1d00ea61250496ca9e2c97b9e8d0d3303440184f500caf7ea16524ab2c1330c83d9766ecd40
-DIST gitlab-ce-8.11.2.tar.gz 25627225 SHA256 a807f06cb80ac3becae2f89702988203e2843cdd929f5e21ba073babe6987731 SHA512 7bdbf045c36a65528b960e466ab8b8bcc930aacb1201ce332a0a9329808960d0fede27c6e155a26b0eb64a1ec0c2c75901cdca6051df7f0f31d421e970004f16 WHIRLPOOL 4cad8c23cfbdb3620a758b6e7478bf044a23d9aeb748aae3ff7145e25e2b4d7bfc016d8ad43b029b563e99e5aa24b35dcc8178775f7e3c8b0586c65c321de166
-DIST gitlab-ce-8.11.3.tar.gz 25701850 SHA256 23dc756ae148074701acaefcc686a66ccf703da53dce721f0fc2673f143620eb SHA512 0808da71567799396389164b54954caf326a501199ded766c0cb39905d7aef44df7267e2066b3bd9a586833df7b19dbf4ae4b7f356aa49ad9d8eed065b162d90 WHIRLPOOL 87277ed4793e75814d82ed3bb8076ddb4fe5f47aa68115121c80d6899ab2fad56a39e1ec88e9ac157961a6ef2dc57d076f265816dc58a5b86ab36d15bffc5535
-DIST gitlab-ce-8.11.4.tar.gz 25704666 SHA256 c8d94888b4f7aabaab2d548926935edf0fc284277006e284424e202122b072a3 SHA512 dc4f2dfaabe95ecea1202da8e1af6d850281146faa7ed2c522c34abd0167f9ff4b4807fca76a61fc2f607126efedca552652474edf552f2848d797f92b5b1ef2 WHIRLPOOL 30b2a46e3b3a4503fd1a1cc68eb2709b76067068550729fe45b9a4b3917cfac08932da689743744c03041a7b705432a4f601fb6a1e2d81a897cc035197e90b5f
-DIST gitlab-ce-8.11.5.tar.gz 25704701 SHA256 5a0de2cdcb97396d8174ad49126e67829df47a2abf1831439186ae443e692662 SHA512 961dad680e4a7a158e316ac66e29ff42bb4f065796fcf360c6cba4c102eb67a240ea188a8ef1164608e05a3d6c5e04790ecc73ea2f2e5cc89766a2751b108532 WHIRLPOOL 35c1e8f7ba2f9fba159cd182c97f0d14f17b289e6e238027beccd9f805fa8622a353c507a56a9ec8d81bc64698fd35fc2cd0ad73c35a86a03cb894c62b458848
 DIST gitlab-ce-8.11.6.tar.gz 25705796 SHA256 354da5db4087ce80d9f43cbae87830ccd06c2c559f8dfb764dffd7420588a66b SHA512 5abda185bfbbad61060ac9b5e83101d88f0f6c8cc12580c71467c7bfdc380d60acc9a8a855ac448759c8be9a5297ba721d0e641ec144741a7c57dd038e13b269 WHIRLPOOL 046ecd777cebc8768c9cdefab7f782c7943403e0c5c6b963ee2359f10f446b5cbe6974d07e14a3089c79830722de6d1e965fa2a58316e75a280ddf09825a1fe6
 DIST gitlab-ce-8.12.0.tar.gz 27105188 SHA256 373109c33ded8f14f3f21e675afa9de8a2a8dd6519309b51844a50f79c5337f4 SHA512 81129858de4a574e2c56958c8c7de8177ce15028993dcff77aa7aea18eb4eb0bbab247d02eca88ffa6da1353f7ea2961332fd4843fe402a35f733e0e9f1484ce WHIRLPOOL 72a70bd3248648f947cc39d7d2633a28e5d9da29adb33675f3fc1f15f6ab5ec181063f13cfc44b90f286ccf0b1214941aaefb41d8ab84f92b4a5868155bbffca
 DIST gitlab-ce-8.12.0_rc6.tar.gz 26786541 SHA256 41719da8de79093accae302c0cb7082e3e4248ed2413f6cda456051fead1f05c SHA512 e5c6ea64e3fc495c41dfe405325caf3fb34e58416d6cf284805f3e9666b085f4ef58b97e0de04ded4cf658421d8e4b716781f9ce58465410a7a715e72800feaf WHIRLPOOL b29ae1c37f71e4474077f18fe42f07bca213f7cf6faa2f942b615430aa68245a43a6223e430926c1b917debff548fd6d6b8c3f5c6e4e7ddd121878e2c390e9ba
-EBUILD gitlab-ce-8.10.6.ebuild 11710 SHA256 1659a2e43491488fa6fbbee1699cc4138e8938f694e73310e5faf45fbd9f2578 SHA512 70304f8fe862988d4092dd37c5a66fdfec56c9cb2d62a78f2cdf365a0c629606c6fb9081dbdc7e68530d43894d1cb645d168db8f3f0c8a9999873afd9032ec52 WHIRLPOOL dbf26294a9d6eb4258a67c64844370f1423fa59210b306bc66ea53a902cbc564b1cd084b765759e93d7970df30417e6482dfbbf271dda8d387ef006837123ac3
-EBUILD gitlab-ce-8.11.0.ebuild 11703 SHA256 f95aa4a60c85da0155df6b989e343296eba23a6c2f12055c5f94bee53f5d9bc0 SHA512 6d1c7c3e3139d456a7b22431b326401a9b56e435000a02a572bfdbb52c5495e098b0406ab9b8051a2a901878e3a3a2c4332af9a0bf50ff1a36051f9436c1ddbe WHIRLPOOL bd92de9d5fda4a4b1802e814a55ea1e1a9848a9e085b9ad88ba108771dc68953156c8cecde64ef2250eba8f2b9568f73969460aa61c4901957d9b7771558ed9c
-EBUILD gitlab-ce-8.11.2.ebuild 11712 SHA256 02dd8184aa55060d9b36fefef46d2506f2516034fdff03837205ca152706f13f SHA512 cb14a84ba0e34f795a06f8947e222fb2fa1ee9a79d3d81bc527498e7ccbbb06ec5e26c56d39e0da30148e918397daaaca4337e732e8791994ed7aaf731cae185 WHIRLPOOL 63309d30e1e41db231f074fadef91fda5fc6d7dc0fa85339b64f4a6522d598c2b67b593f769e4ce70d2343607f6f42eee60614bf0556e2a4848a142c8d326fff
-EBUILD gitlab-ce-8.11.3.ebuild 11712 SHA256 41be23427e3c7d550888eec40091d7e6f6c0cbe477712bb0597362db1490e342 SHA512 fca0648f60a292438746b9ba4ab532957a58889458e45c20ad3d18cf6b46130fe8c4087a813fe2b93ac15f6ab756e67188087c5bf51222b16230bd1fb9431872 WHIRLPOOL b1c09c4f9bc50c584f5e22e2db955d636631ec117054c40c77f68945ed64a048a598f014bc463ad9a5afce3f3317dcafd6bcf9321d2c38a1e36e2fe11506e500
-EBUILD gitlab-ce-8.11.4.ebuild 11954 SHA256 1970a09040e9d4e924a187bf108dece607825fe62a2fed7a6202a8c24e878f15 SHA512 189157bd48f107fff5e7b476f4b103c40c81baf2620bd1bf5600547f66c3dfe4ad7aec4001422c4f69a49ba973fdff724d8868d0cbba9719bed4908f3bb60772 WHIRLPOOL 4f270f6251d4172c956492ac3f2d7a2041db4d5ec3b344f43af9f0d01fc8fd3274e225ecbd1d35128757ece050cd91db5db74629c377d553de2afcf015ce9c48
-EBUILD gitlab-ce-8.11.5.ebuild 11954 SHA256 1d064416cf453ac5e66dcb39c332db6ef01636f647dafd80faeb357f61a8c365 SHA512 927327684f3914962f2f48c74dd620cc0e8c1fac0ba5eb00e0411f61189ab8bf77bcc3ee9aa3be533e354c0375935ba981d276487faa965e2159e509d00c5468 WHIRLPOOL f6114dfed971973a89a350637818c9546554aac04fc637b276b37411e3e6b425e254dd8c2bb05019893c07f24deefe35d08a6234b2be4c06c1a6f56d39f21d33
 EBUILD gitlab-ce-8.11.6.ebuild 11954 SHA256 2752b8057eac0cd77e74bc7f323a6ab0037c9d70559a637f15e30f11ba244b65 SHA512 a649871bc5594aac19ac816a53a164edde1c7a70933c777489ee45c98515099c2748dd2a65fb433481ecd69ed9fd1f386e2f137b8cb9761453252ceab362e4cd WHIRLPOOL b623e4a6ed638c42672f0f8cde252681c89b92831d8bfb687a8ab7bb374335552586b77bd7066a898ed6612715732f538b29acbe874bd31e72c63f49e54deb00
 EBUILD gitlab-ce-8.12.0.ebuild 11937 SHA256 a0f667bc1f300e061b130adec06b0abd3ccee5ca631d46dd7e617cfcda5fcfd0 SHA512 a6e3a342ddecb09861cc483e6a53de3c141d8a1d2d1fa6e867f65196436f30ab1d8286ef7839c12c3227afbbe61dfafffc9c58f1d735ca6c2ff9f001a1b6d907 WHIRLPOOL dfbdbc97f50df15e665b75e50e5e780fa28b760ead8e222d397b6a60680a32afe618073daccdc8ce10f25ec61625d7a5912d90c8da8b4fffa0727a02a7656379
 EBUILD gitlab-ce-8.12.0_rc6.ebuild 11937 SHA256 bfa85ccd3fa55a8950eb7ebc031440fcd9d3729cc722a8d353a1dc349e68f4b7 SHA512 2d5c6c8c01fc6e062a82507699bd796d2aca0fbbbd6ac900ab31eef5c8fd627eee62f5b49ea8dacdfbbefaa5675cece97067c0c9752fb4f06545935478c6b8c8 WHIRLPOOL 2940994a2d5905a96952a9f7a1f57007b5207d03a1511082d6381a76270ac4512867e54fdd26bb9216fa32ffc3cfbd2a672f875c19f423f5a3ef480159bb3fa4
 EBUILD gitlab-ce-9999.ebuild 11892 SHA256 3e4cda7670cb343d61d63debf9ec390cb120dc7ffec8365cbee111ab50a06390 SHA512 b3d441e4969266e20d9c9391ffd731df2d7d316d798bf9dc7905f29c18f62dcd2ec63291e640b138a3d4880a4f639bcc98003eadcb3c49c38fedd3ad94f32901 WHIRLPOOL 8ef66ad909c9496facd3c56523a2ddf419bf4dfadd41b81ebdfaef3560f7ad53d9f67f655b3014e997198dc43c362c59d0d7d24decc7da015c66d63acedff254
-MISC ChangeLog 7298 SHA256 dc8a946ff6e0ee4ff762b79ab5c994c1b3431802326a6c3ffcabc54824bb8b85 SHA512 586c40958ace2b41fc3d143091de1081b2619e6a83551cef4c9fa0d3a869ad6c9859fa95a0710c30a9d208894559b24a60e95a6b1bf90b0841a67aa930cd5a39 WHIRLPOOL e0a527ca3c4f335e28ad299163a4a62e7805e680af7d4f87c910fd2d14dfb768eb0594207ddbbe06ff45249bec38955c248dcddb026995a4d74f038ead98077e
+MISC ChangeLog 7553 SHA256 84f5b12177ec7030363965c773bc39de0b2ae4f907616ef3af3e7c644edfeb34 SHA512 22f4ad52452deea73b656840f79e5030e84f426fa467efa62b98163f52d53485525e2d7cbaeb6eb8e930c7c857e185fc9c19199b04cdc7ec9c34db40b57978b3 WHIRLPOOL f3b3d79fa44211dbbec62daadbeb985a2e667b93dad8d42538d522c0609f3f1ad5c5ab2159e63c054560e89fd04d3eff31da1337dc05fe440b138f03438ddf59
 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.10.6.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.10.6.ebuild
deleted file mode 100644
index 57a9cf6..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.10.6.ebuild
+++ /dev/null
@@ -1,381 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="ea71c20d7f60641466c5928d6a22ddab6c739722"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.2.1
-	>=dev-vcs/git-2.7.4
-	~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="
-	${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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	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 $@"
-}
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.0.ebuild
deleted file mode 100644
index d3f0064..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.0.ebuild
+++ /dev/null
@@ -1,381 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="346e677ef9db2a27c3ee69d420563ecc564e5afe"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.4.0
-	>=dev-vcs/git-2.7.4
-	~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="
-	${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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	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 $@"
-}
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.2.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.2.ebuild
deleted file mode 100644
index 135faef..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.2.ebuild
+++ /dev/null
@@ -1,381 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="e618ce28a0862c4bda9d0db4ba843ca79c15d31b"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.4.0
-	>=dev-vcs/git-2.7.4
-	~dev-vcs/gitlab-workhorse-0.7.11
-	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.11.0-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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	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 $@"
-}
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.3.ebuild
deleted file mode 100644
index 0e08029..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.3.ebuild
+++ /dev/null
@@ -1,381 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="6cd4edb7d869d793ee73f4eb880b900203995cec"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.4.0
-	>=dev-vcs/git-2.7.4
-	~dev-vcs/gitlab-workhorse-0.7.11
-	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.11.0-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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	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 $@"
-}
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.4.ebuild
deleted file mode 100644
index ad79d4c..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.4.ebuild
+++ /dev/null
@@ -1,386 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="b871b762bd5b9c8c3648e06549775c26a56b730d"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.4.0
-	>=dev-vcs/git-2.7.4
-	~dev-vcs/gitlab-workhorse-0.7.11
-	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.11.0-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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	# determine whether this is an update or a fresh install. we do this by
-	# checking whether the ${DEST_DIR}/.git directory exists or not
-	# 
-	if [ -d "${DEST_DIR}/.git" ]; then
-		local update=true
-	else
-		local update=false
-	fi
-
-	## Initialize app ##
-
-	local RAILS_ENV="production"
-	local RUBY=${RUBY:-/usr/bin/ruby}
-	local BUNDLE="${RUBY} /usr/bin/bundle"
-
-	# FIXME: this line existed in older ebuilds, but the variable is
-	# never used. what was it for!?
-	# local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
-
-	if [ "${update}" = 'true' ]; then
-		einfo "Migrating database ..."
-		exec_rake db:migrate
-
-		# https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
-		einfo "Migrating iids ..."
-		exec_rake migrate_iids
-
-		einfo "Cleaning old precompiled assets ..."
-		exec_rake assets:clean
-
-		einfo "Cleaning cache ..."
-		exec_rake cache:clear
-	else
-		# create dummy git repo as workaround for
-		# https://github.com/bundler/bundler/issues/2039
-		einfo "Initializing dummy git repository to avoid false errors from bundler"
-		su -l ${MY_USER} -c "
-			cd ${DEST_DIR}
-			git init
-			git add README.md
-			git commit -m 'Dummy repository'" >/dev/null
-
-		einfo "Initializing database ..."
-		exec_rake gitlab:setup
-	fi
-
-	einfo "Precompiling assests ..."
-	exec_rake assets:precompile
-
-	if [ "${update}" = 'true' ]; then
-		ewarn
-		ewarn "This configuration script runs only common migration tasks."
-		ewarn "Please read guides on"
-		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
-		ewarn "for any additional migration tasks specific to your previous GitLab"
-		ewarn "version."
-	fi
-	elog
-	elog "If you want to make sure that the install/upgrade was successful, start"
-	elog "Gitlab now and then run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production"
-	elog "    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production"
-	elog
-}
-
-ryaml() {
-	ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
-}
-
-exec_rake() {
-	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
-
-	echo "   ${command}"
-	su -l ${MY_USER} -c "
-		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
-		cd ${DEST_DIR}
-		${command}" \
-		|| die "failed to run rake $@"
-}
diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.5.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.5.ebuild
deleted file mode 100644
index d48eb61..0000000
--- a/www-apps/gitlab-ce/gitlab-ce-8.11.5.ebuild
+++ /dev/null
@@ -1,386 +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_PV="v${PV/_/-}"
-MY_GIT_COMMIT="f1ce997f4a21bba8105bfde3404f7f462df8dfa7"
-
-DESCRIPTION="GitLab is a free project and repository management application"
-HOMEPAGE="https://about.gitlab.com/"
-SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
-RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries"
-
-## Gems dependencies:
-#   charlock_holmes     dev-libs/icu
-#   grape, capybara     dev-libs/libxml2, dev-libs/libxslt
-#   rugged              dev-util/cmake, virtual/pkgconfig
-#   json                dev-util/ragel
-#   pygments.rb         python 2.7+
-#   execjs              net-libs/nodejs, or any other JS runtime
-#   pg                  dev-db/postgresql
-#   mysql               virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( >=dev-db/postgresql-9.1:* )
-	mysql? ( virtual/mysql )
-	kerberos? ( virtual/krb5 )"
-CDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig"
-COMMON_DEPEND="
-	${GEMS_DEPEND}
-	~dev-vcs/gitlab-shell-3.4.0
-	>=dev-vcs/git-2.7.4
-	~dev-vcs/gitlab-workhorse-0.7.11
-	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.11.0-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/${MY_PV}/bin/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default"
-
-all_ruby_prepare() {
-	# fix paths
-	local satellites_path="${TEMP_DIR}/repo_satellites"
-	local repos_path=/var/lib/git/repositories
-	local shell_path=/usr/share/gitlab-shell
-	sed -i -E \
-		-e "/satellites:$/,/\w:$/   s|(\s*path:\s).*|\1${satellites_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \
-		-e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \
-		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
-
-	local run_path=/run/${MY_NAME}
-	sed -i -E \
-		-e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
-		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
-
-	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
-		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
-
-	# modify default database settings for PostgreSQL
-	sed -i -E \
-		-e 's|(username:).*|\1 gitlab|' \
-		-e 's|(password:).*|\1 gitlab|' \
-		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
-		config/database.yml.postgresql \
-		|| die "failed to filter database.yml.postgresql"
-
-	# rename config files
-	mv config/gitlab.yml.example config/gitlab.yml
-	mv config/unicorn.rb.example config/unicorn.rb
-
-	local dbconf=config/database.yml
-	if use postgres && ! use mysql; then
-		mv ${dbconf}.postgresql ${dbconf}
-		rm ${dbconf}.mysql
-	elif use mysql && ! use postgres; then
-		mv ${dbconf}.mysql ${dbconf}
-		rm ${dbconf}.postgresql
-	fi
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	use unicorn || rm config/unicorn.rb
-}
-
-all_ruby_install() {
-	local dest=${DEST_DIR}
-	local conf=${CONF_DIR}
-	local logs=${LOGS_DIR}
-	local temp=${TEMP_DIR}
-
-	# prepare directories
-	diropts -m750
-	dodir ${logs} ${temp}
-
-	diropts -m755
-	dodir ${conf} ${dest}/public/uploads
-
-	dosym ${temp} ${dest}/tmp
-	dosym ${logs} ${dest}/log
-
-	# install configs
-	insinto ${conf}
-	doins -r config/*
-	dosym ${conf} ${dest}/config
-
-	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
-
-	# remove needless dirs
-	rm -Rf config tmp log
-
-	# install the rest files
-	# using cp 'cause doins is slow
-	cp -Rl * "${D}/${dest}"/
-
-	# install logrotate config
-	dodir /etc/logrotate.d
-	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
-		${logs}/*.log {
-		    missingok
-		    delaycompress
-		    compress
-		    copytruncate
-		}
-	EOF
-
-	## Install gems via bundler ##
-
-	cd "${D}/${dest}"
-
-	local without="development test aws"
-	local flag; for flag in mysql postgres unicorn kerberos; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
-
-	einfo "Running bundle install ${bundle_args} ..."
-	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
-
-	einfo "Cleaning old gems ..."
-	${RUBY} /usr/bin/bundle clean
-
-	# clean gems cache
-	rm -Rf vendor/bundle/ruby/*/cache
-	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
-
-	## RC script ##
-
-	if use systemd ; then
-		ewarn "Beware: systemd support has not been tested, use at your own risk!"
-		systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service"
-		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
-		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
-		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
-		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
-	else
-		local rcscript=gitlab-sidekiq.init
-		use unicorn && rcscript=gitlab-unicorn.init
-
-		cp "${FILESDIR}/${rcscript}" "${T}" || die
-		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
-			-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
-			"${T}/${rcscript}" \
-			|| die "failed to filter ${rcscript}"
-
-		newinitd "${T}/${rcscript}" "${MY_NAME}"
-	fi
-
-	# fix permissions
-	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
-}
-
-pkg_postinst() {
-	elog "If this is an update from a previous version, stop your GitLab"
-	elog "instance and issue the following command to perform all required"
-	elog "migrations:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
-	elog "before running the config phase. Run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
-	elog
-	elog "If this was a fresh install, follow these steps:"
-	elog
-	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
-	elog
-	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
-	elog "   for \"production\" environment."
-	elog
-	elog "3. Then you should create a database for your GitLab instance, if you"
-	elog "   haven't done so already."
-	elog
-	if use postgres; then
-		elog "If you have local PostgreSQL running, just copy&run:"
-		elog "      su postgres"
-		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
-		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
-		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
-		elog "  Note: You should change your password to something more random..."
-		elog
-	fi
-	elog "4. Finally execute the following command to initialize the environment:"
-	elog "       emerge --config \"=${CATEGORY}/${PF}\""
-	elog "   Note: Do not forget to start Redis server first!"
-	elog
-	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
-	elog "you can't login after the upgrade, be sure to read the section about the"
-	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
-	elog "http://goo.gl/5XGRGv."
-	if use postgres; then
-		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
-		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
-		elog "super user for *every* GitLab database:"
-		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
-		elog "For details, see the documentation at the GitLab website."
-	fi
-}
-
-pkg_config() {
-	einfo "Checking configuration files"
-
-	if [ ! -r "${CONF_DIR}/database.yml" ]; then
-		eerror "Copy ${CONF_DIR}/database.yml.* to"
-		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
-		eerror "database settings for \"production\" environment."; die
-	fi
-
-	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
-	local git_home="$(egethome ${MY_USER})"
-
-	# configure Git global settings
-	if [ ! -e "${git_home}/.gitconfig" ]; then
-		einfo "Setting git user"
-		su -l ${MY_USER} -c "
-			git config --global user.email '${email_from}';
-			git config --global user.name 'GitLab'" \
-			|| die "failed to setup git name and email"
-	fi
-
-	# determine whether this is an update or a fresh install. we do this by
-	# checking whether the ${DEST_DIR}/.git directory exists or not
-	# 
-	if [ -d "${DEST_DIR}/.git" ]; then
-		local update=true
-	else
-		local update=false
-	fi
-
-	## Initialize app ##
-
-	local RAILS_ENV="production"
-	local RUBY=${RUBY:-/usr/bin/ruby}
-	local BUNDLE="${RUBY} /usr/bin/bundle"
-
-	# FIXME: this line existed in older ebuilds, but the variable is
-	# never used. what was it for!?
-	# local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
-
-	if [ "${update}" = 'true' ]; then
-		einfo "Migrating database ..."
-		exec_rake db:migrate
-
-		# https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
-		einfo "Migrating iids ..."
-		exec_rake migrate_iids
-
-		einfo "Cleaning old precompiled assets ..."
-		exec_rake assets:clean
-
-		einfo "Cleaning cache ..."
-		exec_rake cache:clear
-	else
-		# create dummy git repo as workaround for
-		# https://github.com/bundler/bundler/issues/2039
-		einfo "Initializing dummy git repository to avoid false errors from bundler"
-		su -l ${MY_USER} -c "
-			cd ${DEST_DIR}
-			git init
-			git add README.md
-			git commit -m 'Dummy repository'" >/dev/null
-
-		einfo "Initializing database ..."
-		exec_rake gitlab:setup
-	fi
-
-	einfo "Precompiling assests ..."
-	exec_rake assets:precompile
-
-	if [ "${update}" = 'true' ]; then
-		ewarn
-		ewarn "This configuration script runs only common migration tasks."
-		ewarn "Please read guides on"
-		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
-		ewarn "for any additional migration tasks specific to your previous GitLab"
-		ewarn "version."
-	fi
-	elog
-	elog "If you want to make sure that the install/upgrade was successful, start"
-	elog "Gitlab now and then run these commands (as root):"
-	elog
-	elog "    cd /opt/gitlab"
-	elog "    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production"
-	elog "    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production"
-	elog
-}
-
-ryaml() {
-	ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
-}
-
-exec_rake() {
-	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
-
-	echo "   ${command}"
-	su -l ${MY_USER} -c "
-		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
-		cd ${DEST_DIR}
-		${command}" \
-		|| die "failed to run rake $@"
-}