diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest
index 503fe8d..57ccc82 100644
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@@ -3,4 +3,4 @@ EBUILD gitlab-shell-1.9.1.ebuild 2500 SHA256 ea37fd4b4b3c526f808be1efbfaa4ea5b8f
 EBUILD gitlab-shell-1.9.4.ebuild 2500 SHA256 ea37fd4b4b3c526f808be1efbfaa4ea5b8fbd6bbaac13838016882c1df3cb1f6 SHA512 711c2e77ffa1b06c5922fcf47f8c4bb57815ff3168d13f07e15bc929976b074b0d17cfe5c85d4ef223b86e5fca25f0594a3a9666165ca045b0680617eea1e59b WHIRLPOOL 0348ca8b560414b7c2e2a366f8728cf12640dc4985f5633a46228b54d770195378f82a5a5e5476572fe1bfe6e05f9bbe9c73c244e6f11f1c3ee35c682639bf00
 EBUILD gitlab-shell-1.9.6.ebuild 2500 SHA256 a39c5a44b54c70d16f30de155020ff003fb2e9da22e44360715ada3528bac0fe SHA512 e71bd23c81d1d29c6ebdf58ae480a3ae20b0b66ceffa927e03de10a969a85921ee8088e346ed0e5783d95466d94aca5797e6507409f164d6cf17bc59ff44b843 WHIRLPOOL 93fc131e889553b3b44e7c255eb87e8b30d3941330aa969b054d0b11e6eb741fa5b1c5c2b3143a3284e2bb82443607621aa69979326cf31a412c00167c7facb0
 EBUILD gitlab-shell-2.0.1.ebuild 2633 SHA256 5ca86fbf40b7d606d5a456285437b46fd317aa94053a5e108c9830fe149cba5e SHA512 fe036c162fe78aab513aad36439cb41711248a7cc88956eee93974648ff17d973e1cd302fe73453db193eacd97d4bd93c82cb51087dff5b028d7c88793fedb71 WHIRLPOOL 5692ecf2f4e05676dc648b1159e96925b7e261704d4b8180d454e58e47bb6acca009e6e7106a76c1737fad6bb909f5ae75ac04f6a3ca54ebd8121ee78026b11b
-EBUILD gitlab-shell-2.6.0.ebuild 2622 SHA256 ca56fc2610a264a61fd8461092454c3af1ad2875edbffeb8eda30a6251b6fc45 SHA512 2b2df424ad92ec604e74f2fb7602b8279b66561538848ae1aed6d2e12cef220044df282e83e0a3783131dbc2906032da347278c1422067c31faf9fa4e5a8f5e9 WHIRLPOOL 452cb88159b0b5ef4599f9becee997319ffd23784b72d8548872cc36fd917fa6f58164d7901059ceae38669fbba76f03e5cc8dbb0471ea879b22e37c6f1a33de
+EBUILD gitlab-shell-2.6.0.ebuild 2629 SHA256 16e0bdaa0817acadb808b9ef389fbcf653f320c97299c596efae920da2bd32fd SHA512 4bb3342ffad64d13b5f60ca3d17c3dc8e428d7730596d8cfdad6889122dc5cc53f4d3716b7414dcf470ca54fe90aa01836958ddf009e2f8271564c5346c7c323 WHIRLPOOL cbb368bc8da1f78ead7aeda3187a58f7f4b13247f97b97cd1b25acd578bcdedfb5c189d3b1a3a4cecf2e932f2f9bbe1fdca8fe123d2026ef6a4b67d58869ba61
diff --git a/dev-vcs/gitlab-shell/gitlab-shell-2.6.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-2.6.0.ebuild
index dc25153..9a3cb99 100644
--- a/dev-vcs/gitlab-shell/gitlab-shell-2.6.0.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-2.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 EGIT_REPO_URI="https://github.com/gitlabhq/gitlab-shell.git"
 EGIT_COMMIT="v${PV}"
-USE_RUBY="ruby21"
+USE_RUBY="ruby20 ruby21"
 
 inherit eutils git-2 ruby-ng user
 
@@ -16,7 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 
-DEPEND="$(ruby_implementation_depend ruby21)
+DEPEND="$(ruby_implementation_depend ruby20)
 	dev-vcs/git
 	virtual/ssh
 	dev-db/redis"
diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
index 8c5a8a8..bcbb0cf 100644
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@@ -13,4 +13,4 @@ AUX gitlabhq-7.9.0.init 1920 SHA256 544cf4d927964d38efd016234016e4ac9670cc5c22a7
 EBUILD gitlabhq-6.9.2.ebuild 11730 SHA256 baca492d6634b1e932cf5d1be9a9f56f3aada00ee7e3f10e5fbbb40fd180bf22 SHA512 c1731cb8df63ff9bc04e29ac06a0ec9cd7587ac372460ea0d4ae17735257c19376b9b95e943f46570b3feff541110c96b19de1b1e215655ee28e07f5bdb07846 WHIRLPOOL f916eab9f96e93caba3954079af7f2af5cb3c83bbc5ca2b4f419845c6d84a89148e64a5a7a43c6771bf0590206bc5f2733ec7ba642f74b103a4d142d362b44b8
 EBUILD gitlabhq-7.0.0.ebuild 11770 SHA256 319b8321bad5bd01db8cc633733c557643cacf0251a93c2b94e53d6c8cf716ca SHA512 3c8537afbb1b0aa03957cede02747e967088410e782ed35aed8e2f34d4c282312b88a6fb2f60cb87aeda42688af492795d8562345dcdf010f9844516bd419827 WHIRLPOOL b47a85ee57523a67e9ec6fe6dd93231344e358920b1f42796fc60d614d0cad1ae4696f93b474e12ac08922d684b622b493e45ce5cf968ae3374c83d462e7af19
 EBUILD gitlabhq-7.4.3.ebuild 12261 SHA256 355978fca0c05f261864a0514cb60379b76d7a943daca390fd96601125da7e28 SHA512 02cb41d7ae7cc29c46dc8b745679e3ee6d1bf39fed035e6e1a773900fca743783f8604a3f3bd70c9673a7f03581410ee32c50808226c55ab390671949a68da58 WHIRLPOOL 095d19b2fe9f0789881ab89ef98cc1f711dc567900e160b1a8a0a4523295ad0a8a49e45beeac62c7698ad0c9f46bccba3e0a24c6a190cf21ece2c9bf0e22325a
-EBUILD gitlabhq-7.9.0.ebuild 12270 SHA256 ffb6cba87daefff80da55bf38dfdfde0a7240ef2a6cba07dd69f43ed303ed8f9 SHA512 5614e1e64c6d431845e6183d1a91992c10d94cf0c80dc6da7643e40f03c741251a3b822a372311aef74fe70f7e34d5c817b8bd7e8364cd47ac221feb84016d37 WHIRLPOOL 583d780a54e6ea25e9284c42e86e330123762c6fb408f0147f913d82ccbd0a7205b3943f0b48d6a6b7c2508464b5a01584bdf7f203c2d50c50a8b66d225a6c69
+EBUILD gitlabhq-7.9.0.ebuild 12284 SHA256 2507a0b3fea09d4491e7b14bf5d2fdf3c555736cb90b66a62c826d10dde81e92 SHA512 dcfffad8244fa9c9d3a642a9b966b66b337265a0495f3459f7757311b524e6c5e390344e5915e569f09dc66a5bb6f28813d4fed96fa3f1f850277c22562ed2b2 WHIRLPOOL 6d3bb6286302dded7caaed293adf294c39799f38beefd614cee3c91edc9252588124ef69eb40a3b05e39215bdcd104224589ca07cc8d30d1daf6f7276cf7acee
diff --git a/www-apps/gitlabhq/gitlabhq-7.9.0.ebuild b/www-apps/gitlabhq/gitlabhq-7.9.0.ebuild
index 44307de..1488ad3 100644
--- a/www-apps/gitlabhq/gitlabhq-7.9.0.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.9.0.ebuild
@@ -13,8 +13,8 @@ EAPI="5"
 #   https://github.com/cvut/gitlabhq for more information.
 #
 
-USE_RUBY="ruby21"
-PYTHON_DEPEND="2:2.5"
+USE_RUBY="ruby20 ruby21"
+PYTHON_DEPEND="2:2.7"
 
 EGIT_REPO_URI="https://github.com/gitlabhq/gitlabhq.git"
 EGIT_COMMIT="v${PV}"
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/gitlabhq/gitlabhq"
 
 LICENSE="MIT"
 SLOT=$(get_version_component_range 1-2)
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="memcached mysql +postgres +unicorn"
 
 ## Gems dependencies:
@@ -45,6 +45,7 @@ GEMS_DEPEND="
 	dev-libs/libgit2[ssh]
 	dev-libs/libxml2
 	dev-libs/libxslt
+	dev-util/cmake
 	dev-util/ragel
 	dev-libs/yajl
 	net-libs/http-parser
@@ -53,9 +54,9 @@ GEMS_DEPEND="
 	mysql? ( virtual/mysql )
 	memcached? ( net-misc/memcached )"
 DEPEND="${GEMS_DEPEND}
-	$(ruby_implementation_depend ruby21 '=' -2.1.5*)[readline,ssl]
+	$(ruby_implementation_depend ruby20 '=' -2.0.0*)[readline,ssl]
 	>=dev-vcs/git-1.8.1.5
-	>=dev-vcs/gitlab-shell-2.0.1
+	>=dev-vcs/gitlab-shell-2.6.0
 	net-misc/curl
 	virtual/ssh"
 RDEPEND="${DEPEND}
@@ -63,8 +64,7 @@ RDEPEND="${DEPEND}
 	virtual/mta"
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.0
-	dev-ruby/celluloid"
+	>=dev-ruby/bundler-1.0"
 
 RUBY_PATCHES=(
 	"${P}-fix-checks-gentoo.patch"
@@ -82,7 +82,7 @@ GITLAB_SHELL="/var/lib/gitlab-shell"
 GITLAB_SHELL_HOOKS="${GITLAB_SHELL}/hooks"
 
 RAILS_ENV=${RAILS_ENV:-production}
-RUBY=${RUBY:-ruby21}
+RUBY=${RUBY:-ruby20}
 BUNDLE="${RUBY} /usr/bin/bundle"
 
 pkg_setup() {