Merge branch '107-gitlab-9-4' into 'master'

Resolve "Gitlab 9.4" Closes #107 See merge request !181
2017-07-25 12:40:34 +02:00 · 2017-07-25 12:40:34 +02:00 · bf58440130
commit bf58440130
parent 08febb5ede 4bdcc34e16
18 changed files with 1051 additions and 56 deletions
--- a/dev-vcs/gitlab-shell/ChangeLog
+++ b/dev-vcs/gitlab-shell/ChangeLog
@ -1,3 +1,10 @@
 *gitlab-shell-5.3.1 (25 Jul 2017)
 *gitlab-shell-5.4.0 (25 Jul 2017)
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-5.3.1.ebuild,
  +gitlab-shell-5.4.0.ebuild:
  dev-vcs/gitlab-shell:  Add new versions of gitlab-shell
  16 Jul 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-shell-5.0.0.ebuild,
  gitlab-shell-5.0.2.ebuild, gitlab-shell-5.0.4.ebuild,
  gitlab-shell-5.0.5.ebuild, gitlab-shell-5.1.1.ebuild:
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@ -6,10 +6,14 @@ DIST gitlab-shell-5.0.2.tar.gz 79009 SHA256 bb5125f12f2f3fbbb93aa78f6810cd62f97b
 DIST gitlab-shell-5.0.4.tar.gz 626142 SHA256 9947c9cf7e7f2e1c2af696cf4610c6e2ad256dcae42e95cc0c8dc387ad5d07e3 SHA512 2718e99a43ad934dfb6d8b3df47bab0b957fa362c84510434fdd07ed994bf53ab059569ff0da106c8bd5ebc49cc460694ad5fb2fec57f0fb0cbb297609a00d97 WHIRLPOOL 6666d2dcb06c156686080b6a0f489ef03d331bc8f20eeb996fe5ce51aeb25d2f334002c15e235c1ad21d808eee8617aa178a5ad974ea99ec8f89bd2478f7f9eb
 DIST gitlab-shell-5.0.5.tar.gz 682091 SHA256 c1583e931280e93d59f86a571a628e697d8d073dbfbfd58fa957617581c4edae SHA512 8e22a2bed622c81976b827fac81ca94de7023d710160cb6daa24d24269b068292ee2e36a5917bb5399340661a28f6480ac40c0a5253f71bd36b8bd78a56c7380 WHIRLPOOL 76503debe3baeded25067b6fcc1c9b5f103a7fb21035521bc3ab8b89547a566b557f38c073deb7d8a0867f1225edfe4d5587d14570ca2889812d3da73b4bf5c9
 DIST gitlab-shell-5.1.1.tar.gz 688960 SHA256 33a4b79b0b06ad935a4bcf1ad41ab88882eb31b349cca007f1e60f3eb5826a06 SHA512 a247e37bfd7b8fe28fe68f3b9d401ccfe534bd4221bce2cda092f6a72a6926f49944f4a008c71636426ca1f7ae6033f53035bc10a8d8121c8093e09abfc675f4 WHIRLPOOL 29aaa30c73997a28cdb68485087a36c6c8109b9f909e2776899f1094a17dcbc6189ed759f9acc81caa6cda516b44f89ad36567bd9f96ec6802e4553182607e20
 DIST gitlab-shell-5.3.1.tar.gz 708811 SHA256 989e7976c56d09d455e5e67e587426be2aca71ef2e27541c8654e74aac82f68c SHA512 00c6dde3d7a59c956396988b2f5790291c44fe134812588ab5c03e7612d49c08de2f5fd08a8b4a55a2c95a46db1d0cdb0e07469958d5c0d6c778d0f9dd279afc WHIRLPOOL 266218edb547e2e7fab95982f78d5c2a7057e061a48a854697949214791dab512f4512a57197ce1ac901dd2b97f4e363a39b8cd2ac74f5cb002ffdc38b8fd06a
 DIST gitlab-shell-5.4.0.tar.gz 713393 SHA256 2c778f559617a63911fbc9fdb531d0cd2266b56eb2d3c8533f455312aa185eb0 SHA512 81991ee212f5babfe5217aa14afbf2cdc3aee6e3b44418c6262632fbadaf97eecf0688537e602b4cd297881134f789b57475c9a43a85b57ab00b3feebf6dca71 WHIRLPOOL da193bcbccfe8248a90fd5c6a1d1df61bfe9ec045a8a3cb6a83660f9fa74b6b7e0f23cf96629cd8e7477dcfda4ad0fb39ebe4395c58350f10eb9f9a765750d9d
 EBUILD gitlab-shell-5.0.0.ebuild 3653 SHA256 346718615330cb98f84556a65fbac2561c14fab6ed22a42d4fa6cbcb651faa98 SHA512 390c922cc1eebd3dd7fa10e94b58a61a2d7363e19b59cffbd54be40c6fee60a894487c168b42294af5bae772d94c687dd14edf48c50c43696a52e4c8db87088c WHIRLPOOL 1278ab21caa8385e21976bed117ac1428ea2ed08576e20f58c7337ab8e8d565c4bf4742895458373878f19dfc48924f808bb4950303f48ce17af216f797f885a
 EBUILD gitlab-shell-5.0.2.ebuild 3653 SHA256 0af6f31c8d068612d618ec4d5959e06e78cd867dfb994079793fb2041803663f SHA512 65eac38adc73d5bec64bb95214a0c9599a72d51b6e4c766881b39087afc0b72b4180fad30b7ee5f46e85949a2d52956475db7b8d52976a12bae7d51681e140e1 WHIRLPOOL 8d406881dfd71e0b3b9168f3fd23766a04dfeecfdf668de9e3298a5650333c851feb6702c8f2134cfe683fd280369481cd53896ec95d1b89f4f9a92d89eb3f7b
 EBUILD gitlab-shell-5.0.4.ebuild 3653 SHA256 8e235cbe5a233e0382aadb466ee130c8b76bc3474fdfe175bf27a38d2cb975a0 SHA512 16e3a82a9705dd525fb24d3cb3981c12c2dbf3f944055570b1299cfcd67ad480c3ad69068c4347c61274003c20908bf2918a336d80c7a5148df5418fd1524d8a WHIRLPOOL edab6e46dc3af776db143be3a0009917f55fdcd01528c746bfa69b7acb0135d9880387e46653c31b5a04c60d6aee51efd7773aa2403e1cf0142d4a3e4a380835
 EBUILD gitlab-shell-5.0.5.ebuild 3646 SHA256 6ccddb217f38775da4165ffd595965b81724565317615b3ff824d8754aeada13 SHA512 18cd05520e0310384fdd662db00e0ae4c7dd9283b32553ec06493a1ab2fbed64207a9664d7130dab5343aa3e8fc2246e8560949e84327a7ac1c99ab637e857fa WHIRLPOOL f577a12fee7f171804eff6e79d43f6ac5f19e0166487536704197e645ff3467a9b7e791b1ee78c38054d74ceff76337bc546f5f132acc993b8aaf58ca830a95c
 EBUILD gitlab-shell-5.1.1.ebuild 3888 SHA256 9e7c878a166555bdd6c14d1be5929b0363eabe4352073db46e84905937323169 SHA512 4bb335f810619f813e84a20a0861ab3e1fdff1134b829f55bd209e70fcfb43fdac96b9fe011aed1a031b6674518c8b36be13d8fb7c8f9ea9cbc3335e3f0b1edc WHIRLPOOL 0285dacb4e03ede570ed4c5d07153d0c7835e91d7dc7742064021c92ec8d2d04ffc9a6d2baf533f86edf4bd18337658a96297918e38ff6c81ee2291284e9a237
-MISC ChangeLog 4040 SHA256 99697080185e83be7d6207ecaaccd5035b975f3883d5b09fe70acfa678e59281 SHA512 29661c24b561d7c885113b74e3e54f9a89d8cc4438a128a549a288ec2de6a741f9e97ab153027c282642c52b2bb29b43fa778b43e729784cf1358db8e012bfab WHIRLPOOL 8c1692f859f55ed8d85a0fe12cff710ccaebcadeea31922c10947754865fc1ae075acd4baeb367a0b8a32de27aa8522e88e83bb5c93a442da4a9c7586f253453
+EBUILD gitlab-shell-5.3.1.ebuild 3888 SHA256 7075b271eeee6da9a8bd9f9e5aaf9c0c9612ab2d27f8399df32628e7bde53fa2 SHA512 b7c567e262e23fdb9f6845b141aa4157d31b86ce115e305f56f30e1673dcd9cb1a4dce82f45a4139ff47008c9072cc743d76f00ab92f4d9fa869dcf4ecd26cc4 WHIRLPOOL e3efacb596afb62d21feffa26e7c2b2947a03e742a55edd1d4f60746395ab6edd636824d14f937d3e66003fdec9b168ebb80ba31a34e9ee6faf8964cca8839e7
 EBUILD gitlab-shell-5.4.0.ebuild 3888 SHA256 3e66c555e3d1f7a8e9cdacd615917014329b42a12fd8f7d74faa01493bd77add SHA512 e2d6afbce2906462943b3405b386ab92a8f6529790de206806b7cddd0d0425fd2fca06ff9a76218323bb6f2bc9b08175677c97e9d111e28af995636acca3bbbc WHIRLPOOL 9889b9cdf7bd3f0d2109cc4c6e6873c0bdb424977537a404afe92935a9a831f81d1a4dec18133668d9f4625e29e60990ac065e7b521b80fa124eec4704b9a65d
 MISC ChangeLog 4277 SHA256 40eeac9d723336be3aaf1868a1a893c02ce6670eaa0c60c7a08fa718c63a0d2b SHA512 d60bba4aacdc44ac5e6b2f635515b2c018ae2dac61bd622818cab213b14d4cdc8a20b09be140cf2e458f4c0816ba41de35dbbd06b138fccca14be1d39e8370ad WHIRLPOOL 8b94560d063f6f1e85818650044bcdca11979855e3d6426cb098235cdcb6c7818911c9c0d98be916125fc7a376ccd5a4012ba3c2b9977a97482f5a4642425a6a
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild
@ -0,0 +1,140 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 USE_RUBY="ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="5f1ab2100c2e520785a46da6d759685a65849d51"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
 SRC_URI="https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
 RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 IUSE=""
 CDEPEND=">=dev-lang/go-1.8.3"
 DEPEND=""
 RDEPEND="
 	>=dev-vcs/git-2.7.4
 	dev-db/redis
 	virtual/ssh"
 ruby_add_bdepend "
 	virtual/ruby-ssl"
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
 	"0001-${PN}-4.1.1-config-paths.patch"
 	"0002-${PN}-5.1.1-Makefile.patch"
 )
 GIT_USER="git"
 DEST_DIR="/usr/share/${PN}"
 DATA_DIR="/var/lib/git"
 LOGS_DIR="/var/log/gitlab"
 CONF_FILE="/etc/gitlab-shell.yml"
 pkg_setup() {
 	enewgroup ${GIT_USER}
 	enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
 	local git_shell=$(egetshell ${GIT_USER})
 	if [ ! ${git_shell} -ef '/bin/bash' ]; then
 		ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
 		ewarn "Changing shell to /bin/bash ..."
 		usermod -s /bin/bash ${GIT_USER} \
 			|| die "failed to change login shell for ${GIT_USER}"
 	fi
 }
 all_ruby_prepare() {
 	# fix paths
 	sed -i -E \
 		-e "s|/home/git|${DATA_DIR}|" \
 		-e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
 		config.yml.example || die "failed to filter config.yml.example"
 	sed -i \
 		-e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
 		lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
 }
 all_ruby_compile() {
 	emake all
 }
 all_ruby_install() {
 	# install lib
 	insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
 	# install scripts
 	exeinto ${DEST_DIR}/bin; doexe bin/*
 	exeinto ${DEST_DIR}/hooks; doexe hooks/*
 	exeinto ${DEST_DIR}/support; doexe support/*
 	# create symlinks to bin
 	local name; for name in $(basename -a bin/gitlab-*); do
 		dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
 	done
 	insinto $(dirname ${CONF_FILE})
 	newins config.yml.example $(basename ${CONF_FILE})
 	# create symlink for .gitlab_shell_secret
 	einfo "creating symlink for .gitlab_shell_secret"
 	TOKEN_FILE="${DEST_DIR}/.gitlab_shell_secret"
 	dosym /opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}"
 	# Gitaly stupidly hardcodes the path to config.yml :(
 	MY_CONF_FILE="${DEST_DIR}/config.yml"
 	dosym "${CONF_FILE}" "${MY_CONF_FILE}"
 	# prepare directories
 	diropts -m750; dodir ${DATA_DIR}
 	diropts -m770; keepdir ${DATA_DIR}/repositories
 	diropts -m755; dodir ${LOGS_DIR}
 	# GitLab stupidly expects that gitlab-shell is in home of git user...
 	dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
 	# fix permissions
 	fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
 }
 pkg_postinst() {
 	# check git home directory
 	local git_home=$(egethome ${GIT_USER})
 	if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
 		ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
 		ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
 		ewarn "either change the authorized_keys location in ${CONF_FILE},"
 		ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
 		ewarn "and move ${git_home}/.ssh here."
 		ewarn
 	fi
 	local auth_dir="${git_home}/.ssh"
 	elog "Initializing authorized_keys file in ${auth_dir}"
 	mkdir -p ${auth_dir}
 	touch ${auth_dir}/authorized_keys
 	chmod -R u=rwX,go=- ${auth_dir}
 	chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
 	elog
 	elog "GitLab Shell was initialized. Repositories are located in"
 	elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
 	elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
 	elog
 	elog "You should change your gitlab_url in: ${CONF_FILE}."
 }
--- a/dev-vcs/gitlab-shell/gitlab-shell-5.4.0.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-5.4.0.ebuild
@ -0,0 +1,140 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 USE_RUBY="ruby23"
 inherit eutils ruby-ng user
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="914f968523779972e74f5a12a9e6b668c184c898"
 DESCRIPTION="SSH access and repository management for GitLab"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-shell"
 SRC_URI="https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
 RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 IUSE=""
 CDEPEND=">=dev-lang/go-1.8.3"
 DEPEND=""
 RDEPEND="
 	>=dev-vcs/git-2.7.4
 	dev-db/redis
 	virtual/ssh"
 ruby_add_bdepend "
 	virtual/ruby-ssl"
 MERGE_TYPE="binary"
 RUBY_PATCHES=(
 	"0001-${PN}-4.1.1-config-paths.patch"
 	"0002-${PN}-5.1.1-Makefile.patch"
 )
 GIT_USER="git"
 DEST_DIR="/usr/share/${PN}"
 DATA_DIR="/var/lib/git"
 LOGS_DIR="/var/log/gitlab"
 CONF_FILE="/etc/gitlab-shell.yml"
 pkg_setup() {
 	enewgroup ${GIT_USER}
 	enewuser ${GIT_USER} -1 /bin/bash ${DATA_DIR} "${GIT_USER}"
 	local git_shell=$(egetshell ${GIT_USER})
 	if [ ! ${git_shell} -ef '/bin/bash' ]; then
 		ewarn "User ${GIT_USER} already exists, but with the shell ${git_shell}."
 		ewarn "Changing shell to /bin/bash ..."
 		usermod -s /bin/bash ${GIT_USER} \
 			|| die "failed to change login shell for ${GIT_USER}"
 	fi
 }
 all_ruby_prepare() {
 	# fix paths
 	sed -i -E \
 		-e "s|/home/git|${DATA_DIR}|" \
 		-e "s|[\# ]*(log_file: ).*|\1\"${LOGS_DIR}/gitlab-shell.log\"|" \
 		config.yml.example || die "failed to filter config.yml.example"
 	sed -i \
 		-e "s|File\.join(ROOT_PATH, 'config.yml')|'${CONF_FILE}'|" \
 		lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
 }
 all_ruby_compile() {
 	emake all
 }
 all_ruby_install() {
 	# install lib
 	insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
 	# install scripts
 	exeinto ${DEST_DIR}/bin; doexe bin/*
 	exeinto ${DEST_DIR}/hooks; doexe hooks/*
 	exeinto ${DEST_DIR}/support; doexe support/*
 	# create symlinks to bin
 	local name; for name in $(basename -a bin/gitlab-*); do
 		dosym "${DEST_DIR}/bin/${name}" "/usr/bin/${name}"
 	done
 	insinto $(dirname ${CONF_FILE})
 	newins config.yml.example $(basename ${CONF_FILE})
 	# create symlink for .gitlab_shell_secret
 	einfo "creating symlink for .gitlab_shell_secret"
 	TOKEN_FILE="${DEST_DIR}/.gitlab_shell_secret"
 	dosym /opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}"
 	# Gitaly stupidly hardcodes the path to config.yml :(
 	MY_CONF_FILE="${DEST_DIR}/config.yml"
 	dosym "${CONF_FILE}" "${MY_CONF_FILE}"
 	# prepare directories
 	diropts -m750; dodir ${DATA_DIR}
 	diropts -m770; keepdir ${DATA_DIR}/repositories
 	diropts -m755; dodir ${LOGS_DIR}
 	# GitLab stupidly expects that gitlab-shell is in home of git user...
 	dosym ${DEST_DIR} ${DATA_DIR}/gitlab-shell
 	# fix permissions
 	fowners -R ${GIT_USER}:${GIT_USER} ${DATA_DIR} ${LOGS_DIR}
 }
 pkg_postinst() {
 	# check git home directory
 	local git_home=$(egethome ${GIT_USER})
 	if [ ! "${git_home}" -ef ${DATA_DIR} ]; then
 		ewarn "An authorized_keys is configured to be inside ${DATA_DIR}/.ssh,"
 		ewarn "but HOME of ${GIT_USER} user is located in ${git_home}. You must"
 		ewarn "either change the authorized_keys location in ${CONF_FILE},"
 		ewarn "or change home directory of ${GIT_USER} user to ${DATA_DIR}"
 		ewarn "and move ${git_home}/.ssh here."
 		ewarn
 	fi
 	local auth_dir="${git_home}/.ssh"
 	elog "Initializing authorized_keys file in ${auth_dir}"
 	mkdir -p ${auth_dir}
 	touch ${auth_dir}/authorized_keys
 	chmod -R u=rwX,go=- ${auth_dir}
 	chown -R ${GIT_USER}:${GIT_USER} ${auth_dir}
 	elog
 	elog "GitLab Shell was initialized. Repositories are located in"
 	elog "${DATA_DIR}/repositories, scripts in ${DEST_DIR}/bin."
 	elog "All gitlab-* scripts was symlinked to /usr/bin to be on your path."
 	elog
 	elog "You should change your gitlab_url in: ${CONF_FILE}."
 }
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,16 @@
 *gitlab-ce-9.4.0 (25 Jul 2017)
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/03-gitlab-ce-9.4.0-database.yml.patch, +gitlab-ce-9.4.0.ebuild,
  gitlab-ce-9.4.0_rc6.ebuild, gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  Add ebuild for version 9.4.0 and update dev versions
 *gitlab-ce-9.4.0_rc6 (25 Jul 2017)
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-9.4.0_rc6.ebuild,
  -gitlab-ce-9.3.0_rc2.ebuild, gitlab-ce-9999.ebuild:
  www-apps/gitlab-ce:  Update dev versions of gitlab-ce
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9.0.12.ebuild,
  gitlab-ce-9.1.9.ebuild, gitlab-ce-9.2.9.ebuild, gitlab-ce-9.3.9.ebuild:
  www-apps/gitlab-ce:  Fix build errors due to missing dependency on dev-
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -2,6 +2,7 @@ AUX 01-gitlab-ce-8.7.5-fix-sendmail-config.patch 705 SHA256 cfc4ffd896e03cc76360
 AUX 02-gitlab-ce-9.0.0-fix-redis-config-path.patch 423 SHA256 9de3711c1f06a0561001166f2a44b4c1dc5fa3fa57a5230eb1dcc2b5d394449c SHA512 ae89fa3c6fde777e844e777862415450787ebf83653435cea329d66810c5805d2126d41cb1ce40b15c42371543bc182a59305b8b1b6a7433121340a625300370 WHIRLPOOL d97962907bb1fc610ebc52665a6ce51f40ee932e7ac715279f3c0554f2880a7b220ecbac2c4c97bd4d3dac22b9a025aa729805221ed5e6d15f04f6cd8e210d22
 AUX 03-gitlab-ce-8.17.0-database.yml.patch 2238 SHA256 c5ec9e8a11fb60a7749b9f8cf553949e78aacf9a8233b39c4986980851196c8e SHA512 1668e2c1d00ef485d2bc5af8d343c9be19f291a627d0041d42b268ec1ad8aedecba99336998e6b1b3ac2f4cd617556d17ab5f1f11f95d696205e3d10d6b74e1c WHIRLPOOL c91a6604f050113c9f584d7bf34ebe660263beb88879382873952d6b1b136ad5b576b813bf9f2f66ee49d6656fb1d24437dca395c2574bd7dab07cd1a3a36a99
 AUX 03-gitlab-ce-9.2.2-database.yml.patch 2342 SHA256 870cddca799897d249773d0b0e58d30b1290475e3c313faa6bbc307c73f80d4b SHA512 257ff2cf3bd090dd08a8f03baa6c06d130313bf46b21ac61a606aaa0f0cf1eaacd3ad231761989448e4dc28aeda01b03192290314582db002c32c65eed4134aa WHIRLPOOL 94d95a9e6d15d48c6e786521b04eb43b12a003feae0a464122f51cdf2a5215b2c025134373842a6633d0adf73ceea1db9fb32e36236391bdf9e750565f908591
 AUX 03-gitlab-ce-9.4.0-database.yml.patch 2402 SHA256 1c7bed7db0a0a7f46111a3cb0fbc37d46c64c184201ba6d7777e3f9ad6c647fd SHA512 42c66dcbf6f311ddcf391330b97acc36493f5ddc8e66c8812bf9826f7750c6bd268da6d5a159973902077528cdd11ae61594e3e377b1f9a6a5b551522d615a35 WHIRLPOOL e66453787d14c653b5fe9a68b666afc532d13870edebe222f235a94368cc5e44c8def781a1e73918844f25726d4d845693212419380822470a5849f2fb4d1958
 AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231
 AUX 04-gitlab-ce-9.3.0-fix-check-task.patch 1090 SHA256 51ade91e5e7ef67e6d3c0e6e1f708156755ad44d42dbc3ccdd4356b259e46846 SHA512 2eacb47df7f9782172ae4f71d8e5fb07f2a830da7733e2ec84b95259a9ee5d454f9c68f93b40251050cedd502761800ec56fe7f502309364e61e9e4431e2b112 WHIRLPOOL 0f7b6a7281eb8dd736b6f329e8511b9145a48450361264465f37aa852bf9d0e4ed265c0292272e75000216ddbd4c285b496aef86a4cfd2944f6819b7a3cc3982
 AUX 05-gitlab-ce-9.0.0-replace-sys-filesystem.patch 2436 SHA256 53fcd9fc123a0fcb671a8cbcb3b2dc61765e32be6836206ae0edea8cf0ae8203 SHA512 21636f298df7e762f59595f39fb50266f8737311f37aa2b9ba96bc29190b8a67eea01b09e3b589d0885da6b27beaa136fa66c7d98408a8e3ecb3ac6baf20d891 WHIRLPOOL e0c709dfc5f72e33207fd7d62a7db5a85c0ed4b6064d5d6a13bcce7d660d9ba144fe09d0985c16c313f06a4e02911729be132086735eac47ddff981874f31acc
@ -18,13 +19,15 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1
 DIST gitlab-ce-9.0.12.tar.gz 26367049 SHA256 2cd78b2686bb7c35af4b3684b7e5932f37c93e68da3de3e925e98f52f29d13b3 SHA512 07329b7a3cb083b6993e1e405059262260476912438bf5d3304461e1d5f2dfa9c433b761fe84a1627468ba76f2a9d22b336af997eb8a6807ea3ee20cea85ae4b WHIRLPOOL b9554526572b7c190af9a9b6dcdcb8d604cfdeed57795beda7b909dc8ddec0243cbca1793765294fc9b98f4c60fc85e8a3abddebc08638dc24d254735a1dac59
 DIST gitlab-ce-9.1.9.tar.gz 30516632 SHA256 52436dfb7d086cd449a975d63a973dc3a58f677031ae5e7653ad27888544d86c SHA512 2c47720cd05d94f31d8b9d665ed7ef1c66fbc9ffb30967bf12e9db20b1607043f488e5cfacc53abca3be7e846b0d661578b0768d737a257ef4bf3cc35883c23a WHIRLPOOL acafd9a98e253d2318e6c53148bff3253be3bf98dd836562f0897bc91a34724b4f2e583e90e590e21e34b3811229a5119a71e0d02ada1d0745c8ad9c81288190
 DIST gitlab-ce-9.2.9.tar.gz 30992595 SHA256 ce6fc7d908bc5348734c0519c3d976f29fac8b9e249a49b82bc920aea02629da SHA512 8f9bcfe4563aa6b84a01b295530b584b96745a10528c0e7ab0b2f894474a1a28a082bd1996bff0e38b36f77741e7624105d573278839aa8b976e4914d7b775ab WHIRLPOOL 7aaff53923772b725f80ad3f09ccf2f903bffc31c9536a5419a68692f19402dffec4a37cfe8d355f382641712d18064b642e82705210ff5c8421eecf71379ef8
 DIST gitlab-ce-9.3.0_rc2.tar.gz 31567867 SHA256 fbd93af8281b2460a9600a84b24b007e4557da49f8d118387724c8166236220c SHA512 942e3e1ec856b0ff3dedcfcb7b8cdee51e7d44779024acaa69ce7d415d08bb1ee785bcd265d1f9f08790c8e9508779b7f9cc8a40acf417cbc0e94f3a98f1fb64 WHIRLPOOL 1f210495ac3632f88c663ae9dd936bea5e556012a5b5dfe598425046f845d0467c17b92abd24924dc720c3877f8b6ef65e6b551ad9b2c3486dc27eee430a6a0e
 DIST gitlab-ce-9.3.9.tar.gz 31766776 SHA256 1ea93e0031ce57e1fcc4bab4809a989376717b2d81b37bd9cd70c0d51f2e042e SHA512 8cb5ad4b03a9ae266150f84305953886e877241e846cd0fc84b619c0137b30ed1cd7aa5017c5e496e28e30a866a5c8d13e3f4ba6b4cd1449becf0a2290bc61b9 WHIRLPOOL 58dc164054a420fb134dc9a837982aa83428199da5d6cd9ba15a000c42ddbe8936bd2420d7d0a2272751f33885f65d005bd3cb306cf4bcb6e3dddb58b8204f06
 DIST gitlab-ce-9.4.0.tar.gz 32800286 SHA256 ee6873a626a150c21e74fef4c97cb70947d3442ffb78b40aa9031d3d4b4a346f SHA512 325ab189679687ca6861667d20412a0e585025cb9b3cc149cabbd15f58ff3bc0310113b3774fadaf068618e2699c4e7dac1f20b3df51845964a0d35b215afa9a WHIRLPOOL 1c10f35e45d7b0053fec4f5e93319fd766c56cd1dfadee36cb80a4fe936706486c402a0ab098fc5d053e4dc2810cc821f85468ee54c9f5d3fc59609ccabead28
 DIST gitlab-ce-9.4.0_rc6.tar.gz 32810524 SHA256 4cd8ae890bbe2b90047078c6d61fd29c8c62e8aa0059d97ca14db81b68ea64f2 SHA512 b8aeaa3f017b47c3455885c57fc21da8fc393ce6258de6813f0c7104f7dc725ffd3800c22d480ed19aa553c7d1040a4006dbd923cb6a1f3cdd685b17ee21afc0 WHIRLPOOL dd583d05f6937612e9a34980c558030bed266f2a0f50a2d9977c23a4cb8fcbfcfc71a3157c846250a02091688333c5b76ccdeec2a9f3e5a23af715caa7d58f05
 EBUILD gitlab-ce-9.0.12.ebuild 13079 SHA256 8d0d7ed4d3bc3049d45c86743742354827f811bdeb81cb5370713d115b5f2453 SHA512 9420cd9d0138d23a96e15d4ce0f21d265804eb78fc4724708f20f4c153cbc0942940a0bc646492eb143fd2f7870b9b0c767d51974bf5d070be37431e87135070 WHIRLPOOL 9a69b3c796dfcd5845583b217375ab354b5fbf707261b3407d4bc215ab91e646539759986a0b321409513c4c19ed4994054677fe10340fcb50706d72e78e3e49
 EBUILD gitlab-ce-9.1.9.ebuild 13235 SHA256 b97e426661b11c52432bd4a47faa7e96867fc09cf7c8f25c227c96d3e3a5102e SHA512 5fe79ff6cbd48915fa8906cb41b2d1d29a908339943c24cd34870d8368c589990fce2c3f7844e0898b952558a85f527d5e5f04cb15db3f8afd310014610dda39 WHIRLPOOL 1fae0a60762a707144911101bca134fcc5da990b42b0afd9d0ac439557885f7548c0088852a5492706355d80b3c57166d591b5e195d43676d10f0ecf5273ad8a
 EBUILD gitlab-ce-9.2.9.ebuild 12980 SHA256 a3722674324dbb418d379f326865eb03125555d631f34079193b12ba77878d8a SHA512 53094a4ccd6635df51fb45618e6eb9f2904e0939cb40685135a9165a45712112d0d5d527da6626e9096234e64ef0620dc774e58515ab48baa7754163736cdeeb WHIRLPOOL eca9905ee808983b1a72f8907f5d969f2ed273bd707e5948edb2192fa2603d4f0aeafedb24339f00a9daa4eb8e5dadfbe2ba2c64a1b97f50abe9232ae8d37953
 EBUILD gitlab-ce-9.3.0_rc2.ebuild 12829 SHA256 a873ba63a4e3108bf321949d4f68267b6168720daee6e581b6964d8574fdcbe9 SHA512 cd3f9215109e91bdcc52704845de95fa45a6345222b0ea53453257c44424b38d0b2d087030b23953d22236f2b9f76dcf0eb7c2f918d61cc9f0a4710f99e9c71b WHIRLPOOL fa340d85a5ea8a16f4bfe6cf1e8379617115d983e6a0346cd09612d86bb09c802286b65e419bd6cdd7c2ab5f4b9baba62584efd30da6a96473c1130b4ab4d27c
 EBUILD gitlab-ce-9.3.9.ebuild 13639 SHA256 039ba276fb5c3ba71c04d830b90781457ae1e8ae855f1454b3309b8e3c477bc1 SHA512 ab7add79547b10908253460a27e1a733128323e304b64e0a1291ab69d1ed2daac3296c5dc4996deae6e5c72d6a62c88f825aa1485b1086c29c221397c3871968 WHIRLPOOL ec2d63679e376e1bffd3731b401fbac8f3773352708629d4c4bd092ba4a1c63ae4be03bf75038422e5be14e3836bda461dddbaa7c49b4e5946a81679b554302d
-EBUILD gitlab-ce-9999.ebuild 13567 SHA256 f1d12d56c0c52aa3f5f428a270ae4d6bf63e3ff2789a5dbc2ebc452fcb5273af SHA512 08eabbc8080fdaa34b93d68f7a0bca2e2cf6936bc3023917bc51878ebd1e4d0e3d04399915f1190987956ea934260c05b49aff97e68c6fefa3fc1f886f3481de WHIRLPOOL b355d5c4710e708b03e14dd83c5f6b76a89bc9899f2c73e14033595bf95502f3ac601fe1a2e1b367bcc133ec3edea72996b7f621687d92e3012137dd8bd269a0
+EBUILD gitlab-ce-9.4.0.ebuild 13533 SHA256 e73704941750b2169481fd187dd54671d626e6cf665b2fe4cdc7e5cfa95fcb56 SHA512 7c8a6ee161e2088773a09d55afa7b6c7bd92890b2ed69a368119cb2afc593e7ebf7e2b009291422dddc00e0d0beaaf39e6085fb0cd3dee7f4d1c30b8071cfa4d WHIRLPOOL c41a90adc829ab7dec3dd77065227384cc782246bd539d69f7d39a870fda7cf1bceb3914c18baf16dbef920fa1c5e03950db931ff218fc77dd3db9c881ea7df4
-MISC ChangeLog 21631 SHA256 b6e574a2529776a3874b1682480ffec15aad57acc4230c5a8b4aa4ab30fb29a2 SHA512 c8f8588f3290115731e431c20b33e50b8250956eff55239d2000c3192a8c00f92cef45ac35d555d832b13254c95cc205d9dc41ba1442667c69f2b9854d208b71 WHIRLPOOL f97c7da48d3fcf6961f9a8f448d32bd6949011fc13a346d1878ae2ee847aad1d1537076151cadf89121e39103cb3cc5d9e64c0d59c6b691065d31facd235645f
+EBUILD gitlab-ce-9.4.0_rc6.ebuild 13515 SHA256 55d3f521d4b54ae3a8e1730e603cc3699a957bb037d7bb402984c27b68e3ba50 SHA512 b47acf7328fc7396bf4e33b5e5fd147e20a5b4d0ea115518ad3492cac3e8d65e861e3ab961e73779d0bee82a5c08ca04a355e4c547c4504d5881d81f182ba6e4 WHIRLPOOL 47547b6d7368a086aa474cad44a304936a06615406c9c72d899677c2742596a991d9b2e4cb4f7a65a1011db2966b7f21ff0901004e00e4f96cbae8b28018e3bb
 EBUILD gitlab-ce-9999.ebuild 13475 SHA256 ae6496c7a3fd61c484fed4822631005348ab5d9c05df61ef927ae797753e83c6 SHA512 79f6b2457187f95a52cddcd67643c9b6d4ca72a4f4e52f34849786ff8ac9be32b771504f6cdd7dbaf5de5f77869db75812ff4ea3aeaf2abbdc874e755b627d99 WHIRLPOOL 2fbd6ea7b1013128416c511f2d4eb4f08e087046a8c3dfe60c5b3d5b7ac521d86ab33dba9a62e5bd10b4f5ef0e1d9d3a8cac43a189dca018c6ddb734806d8a76
 MISC ChangeLog 22144 SHA256 eba6ec85e1ae3bfebaf7ca83e838f96d079292df206f55d519dd28a8ede3151b SHA512 2fc8df1c2e72996265597e289853c724ef4e2ea7a16fe299fa9f63f0eda2f4463056d53eb5c57aab463425aea141e6c5aa37ae3cc834084d0cca52dac4659de4 WHIRLPOOL 3f718a89224caf7ce158f0496cb0439e336fe90682a56b67627a1fb038f33be5f56094bbec33d6f934a03c031a4a9de69d6fa5ec15647a381b5f694e103d2569
 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6
--- a/www-apps/gitlab-ce/files/03-gitlab-ce-9.4.0-database.yml.patch
+++ b/www-apps/gitlab-ce/files/03-gitlab-ce-9.4.0-database.yml.patch
@ -0,0 +1,104 @@
 diff --git a/config/database.yml.mysql b/config/database.yml.mysql
 index eb71d3f..a3b5ecc 100644
 --- a/config/database.yml.mysql
 +++ b/config/database.yml.mysql
@@ -3,43 +3,12 @@
 #
 production:
   adapter: mysql2
 -  encoding: utf8
 -  collation: utf8_general_ci
 +  encoding: utf8mb4
 +  collation: utf8mb4_general_ci
   reconnect: false
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   username: git
   password: "secure password"
   # host: localhost
 -  # socket: /tmp/mysql.sock
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: mysql2
 -  encoding: utf8
 -  collation: utf8_general_ci
 -  reconnect: false
 -  database: gitlabhq_development
 -  pool: 5
 -  username: root
 -  password: "secure password"
 -  # host: localhost
 -  # socket: /tmp/mysql.sock
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: mysql2
 -  encoding: utf8mb4
 -  collation: utf8mb4_general_ci
 -  reconnect: false
 -  database: gitlabhq_test
 -  pool: 5
 -  username: root
 -  password:
 -  # host: localhost
 -  # socket: /tmp/mysql.sock
 -  prepared_statements: false
 +  # socket: /run/mysqld/mysqld.sock
 diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
 index 4b30982..28f7993 100644
 --- a/config/database.yml.postgresql
 +++ b/config/database.yml.postgresql
@@ -4,46 +4,9 @@
 production:
   adapter: postgresql
   encoding: unicode
 -  database: gitlabhq_production
 +  database: gitlab
   pool: 10
   # username: git
   # password:
   # host: localhost
   # port: 5432
 -
 -#
 -# Development specific
 -#
 -development:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_development
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
 -
 -#
 -# Staging specific
 -#
 -staging:
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_staging
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
 -
 -# Warning: The database defined as "test" will be erased and
 -# re-generated from your development database when you run "rake".
 -# Do not set this db to the same as development or production.
 -test: &test
 -  adapter: postgresql
 -  encoding: unicode
 -  database: gitlabhq_test
 -  pool: 5
 -  username: postgres
 -  password:
 -  # host: localhost
 -  prepared_statements: false
--- a/www-apps/gitlab-ce/gitlab-ce-9.4.0.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.4.0.ebuild
@ -0,0 +1,430 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 # Maintainer notes:
 # - This ebuild uses Bundler to download and install all gems in deployment mode
 #   (i.e. into isolated directory inside application). That's not Gentoo way how
 #   it should be done, but GitLab has too many dependencies that it will be too
 #   difficult to maintain them via ebuilds.
 #
 USE_RUBY="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
 MY_GIT_COMMIT="9bbe2acf7fb75d19cc3db4e82e82eba47c65202e"
 GITALY_VERSION="0.21.2"
 GITLAB_PAGES_VERSION="0.5.0"
 GITLAB_SHELL_VERSION="5.3.1"
 GITLAB_WORKHORSE_VERSION="2.3.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz"
 RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm64"
 IUSE="kerberos mysql +postgres +unicorn systemd pages 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-libs/re2
 	dev-util/ragel
 	>=net-libs/nodejs-4.3.0
 	>=sys-apps/yarn-0.17.0
 	postgres? ( >=dev-db/postgresql-9.1:* )
 	mysql? ( virtual/mysql )
 	kerberos? ( virtual/krb5 )"
 CDEPEND="
 	dev-util/cmake
 	virtual/pkgconfig"
 COMMON_DEPEND="
 	${GEMS_DEPEND}
 	~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION}
 	>=dev-vcs/git-2.8.4
 	~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	kerberos? ( !app-crypt/heimdal )
 	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/25 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
 	~www-servers/gitlab-gitaly-${GITALY_VERSION}"
 DEPEND="
 	${CDEPEND}
 	${COMMON_DEPEND}"
 RDEPEND="
 	${COMMON_DEPEND}
 	>=dev-db/redis-2.8
 	virtual/mta
 	systemd? ( sys-apps/systemd:0= )"
 # required bundler >= 1.15.1
 ruby_add_bdepend "
 	virtual/rubygems
 	>=dev-ruby/bundler-1.14.6"
 #
 # 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
 #
 PATCHES=(
 	"${FILESDIR}/01-${PN}-8.7.5-fix-sendmail-config.patch"
 	"${FILESDIR}/02-${PN}-9.0.0-fix-redis-config-path.patch"
 	"${FILESDIR}/03-${PN}-9.4.0-database.yml.patch"
 	"${FILESDIR}/04-${PN}-9.3.0-fix-check-task.patch"
 	"${FILESDIR}/05-${PN}-9.0.0-replace-sys-filesystem.patch"
 	"${FILESDIR}/06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
 MY_USER="git"    # should be same as in gitlab-shell
 DEST_DIR="/opt/${MY_NAME}"
 CONF_DIR="/etc/${MY_NAME}"
 LOGS_DIR="/var/log/${MY_NAME}"
 TEMP_DIR="/var/tmp/${MY_NAME}"
 all_ruby_prepare() {
 	# fix paths
 	local satellites_path="${TEMP_DIR}/repo_satellites"
 	local repos_path=/var/lib/git/repositories
 	local shell_path=/usr/share/gitlab-shell
 	local run_path=/run/${MY_NAME}
 	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/|" \
 		-e "/path: \\/home\\/git\\/repositories\\/$/ s|/home/git/repositories/|/var/lib/git/repositories/|" \
 		-e "/gitaly_address:/ s|/home/git/gitlab/tmp/sockets/private/|${run_path}/sockets/|" \
 		config/gitlab.yml.example || die "failed to filter gitlab.yml.example"
 	sed -i -E \
 		-e "s|/home/git/gitlab/tmp|${run_path}|g" \
 		-e "s|/home/git/gitlab/log|${LOGS_DIR}|g" \
 		-e "s|/home/git/gitlab|${DEST_DIR}|g" \
 		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
 	sed -i \
 		-e "s|/home/git/gitlab/tmp|${run_path}|g" \
 		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
 	# modify default database settings for PostgreSQL
 	sed -i -E \
 		-e 's|(username:).*|\1 gitlab|' \
 		-e 's|(password:).*|\1 gitlab|' \
 		-e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \
 		config/database.yml.postgresql \
 		|| die "failed to filter database.yml.postgresql"
 	# rename config files
 	mv config/gitlab.yml.example config/gitlab.yml
 	mv config/unicorn.rb.example config/unicorn.rb
 	local dbconf=config/database.yml
 	if use postgres && ! use mysql; then
 		mv ${dbconf}.postgresql ${dbconf}
 		rm ${dbconf}.mysql
 	elif use mysql && ! use postgres; then
 		mv ${dbconf}.mysql ${dbconf}
 		rm ${dbconf}.postgresql
 	fi
 	# remove useless files
 	rm -r lib/support/{deploy,init.d}
 	use unicorn || rm config/unicorn.rb
 }
 all_ruby_install() {
 	local dest=${DEST_DIR}
 	local conf=${CONF_DIR}
 	local logs=${LOGS_DIR}
 	local temp=${TEMP_DIR}
 	# prepare directories
 	diropts -m750
 	dodir ${logs} ${temp}
 	diropts -m755
 	dodir ${conf} ${dest}/public/uploads
 	dosym ${temp} ${dest}/tmp
 	dosym ${logs} ${dest}/log
 	# install configs
 	insinto ${conf}
 	doins -r config/*
 	dosym ${conf} ${dest}/config
 	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
 	# remove needless dirs
 	rm -Rf config tmp log
 	# install the rest files
 	# using cp 'cause doins is slow
 	cp -Rl * "${D}/${dest}"/
 	cp -Rl .??* "${D}/${dest}"/
 	# install logrotate config
 	dodir /etc/logrotate.d
 	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
 		${logs}/*.log {
 		    missingok
 		    delaycompress
 		    compress
 		    copytruncate
 		}
 	EOF
 	## Install gems via bundler ##
 	cd "${D}/${dest}"
 	local without="development test aws"
 	local flag; for flag in mysql postgres unicorn kerberos; do
 		without+="$(use $flag || echo ' '$flag)"
 	done
 	local bundle_args="--deployment ${without:+--without ${without}}"
 	use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES"
 	einfo "Running bundle install ${bundle_args} ..."
 	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
 	einfo "Cleaning old gems ..."
 	${RUBY} /usr/bin/bundle clean
 	# clean gems cache
 	rm -Rf vendor/bundle/ruby/*/cache
 	rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git
 	## RC script ##
 	if use systemd ; then
 		ewarn "Beware: systemd support has not been tested, use at your own risk!"
 		systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service"
 		systemd_dounit "${FILESDIR}/gitlab-unicorn.service"
 		systemd_dounit "${FILESDIR}/gitlab-workhorse.service"
 		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
 		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
 	else
 		local rcscript=gitlab-9.3.5-sidekiq.init
 		use unicorn && rcscript=gitlab-9.3.5-unicorn.init
 		cp "${FILESDIR}/${rcscript}" "${T}" || die
 		sed -i \
 			-e "s|@USER@|${MY_USER}|g" \
 			-e "s|@GITLAB_BASE@|${dest}|g" \
 			-e "s|@LOGS_DIR@|${logs}|g" \
 			"${T}/${rcscript}" \
 			|| die "failed to filter ${rcscript}"
 		newinitd "${T}/${rcscript}" "${MY_NAME}"
 	fi
 	# fix permissions
 	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
 }
 pkg_postinst() {
 	elog "If this is an update from a previous version, stop your GitLab"
 	elog "instance and issue the following command to perform all required"
 	elog "migrations:"
 	elog "       emerge --config \"=${CATEGORY}/${PF}\""
 	elog "PLEASE NOTE: It's HIGHLY recommended to backup your database"
 	elog "before running the config phase. Run these commands (as root):"
 	elog
 	elog "    cd /opt/gitlab"
 	elog "    sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production"
 	elog
 	elog "If this was a fresh install, follow these steps:"
 	elog
 	elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml."
 	elog
 	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
 	elog "   for \"production\" environment."
 	elog
 	elog "3. Then you should create a database for your GitLab instance, if you"
 	elog "   haven't done so already."
 	elog
 	if use postgres; then
 		elog "If you have local PostgreSQL running, just copy&run:"
 		elog "      su postgres"
 		elog "      psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\"
 		elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
 		elog "      createdb -E UTF-8 -O gitlab gitlabhq_production"
 		elog "  Note: You should change your password to something more random..."
 		elog
 	fi
 	elog "4. Finally execute the following command to initialize the environment:"
 	elog "       emerge --config \"=${CATEGORY}/${PF}\""
 	elog "   Note: Do not forget to start Redis server first!"
 	elog
 	elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and"
 	elog "you can't login after the upgrade, be sure to read the section about the"
 	elog "verification of the CSRF token in GitLab's trouble-shooting guide at"
 	elog "http://goo.gl/5XGRGv."
 	if use postgres; then
 		elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the"
 		elog "`pg_trgm` extension by running the following command as a PostgreSQL"
 		elog "super user for *every* GitLab database:"
 		elog "      CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 		elog "For details, see the documentation at the GitLab website."
 	fi
 	if use mysql ; then
 		ewarn "You must grant the GitLab user permissions the following on the database:"
 		ewarn "     mysql -u root -p -e \\"
 		ewarn "     \"GRANT TRIGGER ON \`gitlab\`.* TO 'gitlab'@'localhost';\""
 		ewarn "PLEASE also read this document about needed migrations on MySQL:"
 		ewarn
 		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
 		ewarn
 		ewarn "Failing to follow those instructions may make the config phase fail!"
 	fi
 }
 pkg_config() {
 	einfo "Checking configuration files"
 	if [ ! -r "${CONF_DIR}/database.yml" ]; then
 		eerror "Copy ${CONF_DIR}/database.yml.* to"
 		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your"
 		eerror "database settings for \"production\" environment."
 		die
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
 	local git_home="$(egethome ${MY_USER})"
 	# configure Git global settings
 	if [ ! -e "${git_home}/.gitconfig" ]; then
 		einfo "Setting git user"
 		su -l ${MY_USER} -c "
 			git config --global user.email '${email_from}';
 			git config --global user.name 'GitLab'" \
 			|| die "failed to setup git name and email"
 	fi
 	su -l ${MY_USER} -c "git config --global repack.writeBitmaps true"
 	# determine whether this is an update or a fresh install. we do this by
 	# checking whether the ${DEST_DIR}/.git directory exists or not
 	#
 	if [ -d "${DEST_DIR}/.git" ]; then
 		local update=true
 	else
 		local update=false
 	fi
 	if use mysql ; then
 		ewarn "Please only proceed if you've read and understood the following page:"
 		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
 		if [ "${update}" = 'true' ]; then
 			ewarn "Failing to follow those instructions may cause the upgrade to fail"
 		fi
 		ewarn
 		ewarn "Press any key to continue, or abort with Ctrl+C"
 		read
 	fi
 	## Initialize app ##
 	local RAILS_ENV="production"
 	local RUBY=${RUBY:-/usr/bin/ruby}
 	local BUNDLE="${RUBY} /usr/bin/bundle"
 	if [ "${update}" = 'true' ]; then
 		einfo "Migrating database ..."
 		exec_rake db:migrate
 		# https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496
 		einfo "Migrating iids ..."
 		exec_rake migrate_iids
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 		einfo "Cleaning old precompiled assets ..."
 		exec_rake gitlab:assets:clean
 		einfo "Cleaning cache ..."
 		exec_rake cache:clear
 	else
 		# create dummy git repo as workaround for
 		# https://github.com/bundler/bundler/issues/2039
 		einfo "Initializing dummy git repository to avoid false errors from bundler"
 		su -l ${MY_USER} -c "
 			cd ${DEST_DIR}
 			git init
 			git add README.md
 			git commit -m 'Dummy repository'" >/dev/null
 		einfo "Initializing database ..."
 		exec_rake gitlab:setup
 		einfo "Installing npm modules ..."
 		exec_rake yarn:install
 	fi
 	einfo "Precompiling assests ..."
 	exec_rake gitlab:assets:compile
 	if [ "${update}" = 'true' ]; then
 		ewarn
 		ewarn "This configuration script runs only common migration tasks."
 		ewarn "Please read guides on"
 		ewarn "    https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/"
 		ewarn "for any additional migration tasks specific to your previous GitLab"
 		ewarn "version."
 	fi
 	elog
 	elog "If you want to make sure that the install/upgrade was successful, start"
 	elog "Gitlab now and then run these commands (as root):"
 	elog
 	elog "    cd /opt/gitlab"
 	elog "    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production"
 	elog "    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production"
 	elog
 	if ! use systemd ; then
 		elog "You may also run"
 		elog "    /etc/init.d/gitlab check"
 		elog " for convenience."
 	fi
 }
 ryaml() {
 	ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
 }
 exec_rake() {
 	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV} NODE_ENV=${RAILS_ENV}"
 	echo "   ${command}"
 	su -l ${MY_USER} -c "
 		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules
 		cd ${DEST_DIR}
 		${command}" \
 		|| die "failed to run rake $@"
 }
--- a/www-apps/gitlab-ce/gitlab-ce-9.4.0_rc6.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9.4.0_rc6.ebuild
@ -16,12 +16,12 @@ USE_RUBY="ruby23"
 inherit eutils ruby-ng user systemd
 MY_PV="v${PV/_/-}"
-MY_GIT_COMMIT="fcd47b1a510a0dd78e9f8435191a0c7ddbf59755"
+MY_GIT_COMMIT="10818692da2d4573b8587221bcb904159272585b"
-GITALY_VERSION="0.11.0"
+GITALY_VERSION="0.21.2"
-GITLAB_PAGES_VERSION="0.4.3"
+GITLAB_PAGES_VERSION="0.5.0"
-GITLAB_SHELL_VERSION="5.0.5"
+GITLAB_SHELL_VERSION="5.3.1"
-GITLAB_WORKHORSE_VERSION="2.0.0"
+GITLAB_WORKHORSE_VERSION="2.3.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -49,6 +49,7 @@ GEMS_DEPEND="
 	dev-libs/icu
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/re2
 	dev-util/ragel
 	>=net-libs/nodejs-4.3.0
 	>=sys-apps/yarn-0.17.0
@ -64,7 +65,7 @@ COMMON_DEPEND="
 	>=dev-vcs/git-2.8.4
 	~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	kerberos? ( !app-crypt/heimdal )
-	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/25 )
 	pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
 	~www-servers/gitlab-gitaly-${GITALY_VERSION}"
 DEPEND="
@ -75,10 +76,10 @@ RDEPEND="
 	>=dev-db/redis-2.8
 	virtual/mta
 	systemd? ( sys-apps/systemd:0= )"
-# required bundler >= 1.14.2
+# required bundler >= 1.15.1
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.13.7"
+	>=dev-ruby/bundler-1.14.6"
 #
 # fix-sendmail-config:
@ -86,13 +87,13 @@ ruby_add_bdepend "
 # fix-redis-config-path:
 #     Point to the absolute location of redis_config.rb
 #
-RUBY_PATCHES=(
+PATCHES=(
-	"01-${PN}-8.7.5-fix-sendmail-config.patch"
+	"${FILESDIR}/01-${PN}-8.7.5-fix-sendmail-config.patch"
-	"02-${PN}-9.0.0-fix-redis-config-path.patch"
+	"${FILESDIR}/02-${PN}-9.0.0-fix-redis-config-path.patch"
-	"03-${PN}-9.2.2-database.yml.patch"
+	"${FILESDIR}/03-${PN}-9.4.0-database.yml.patch"
-	"04-${PN}-9.3.0-fix-check-task.patch"
+	"${FILESDIR}/04-${PN}-9.3.0-fix-check-task.patch"
-	"05-${PN}-9.0.0-replace-sys-filesystem.patch"
+	"${FILESDIR}/05-${PN}-9.0.0-replace-sys-filesystem.patch"
-	"06-${PN}-8.17.0-fix-webpack-config.patch"
+	"${FILESDIR}/06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
@ -108,22 +109,25 @@ all_ruby_prepare() {
 	local satellites_path="${TEMP_DIR}/repo_satellites"
 	local repos_path=/var/lib/git/repositories
 	local shell_path=/usr/share/gitlab-shell
 	local run_path=/run/${MY_NAME}
 	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/|" \
 		-e "/path: \\/home\\/git\\/repositories\\/$/ s|/home/git/repositories/|/var/lib/git/repositories/|" \
 		-e "/gitaly_address:/ s|/home/git/gitlab/tmp/sockets/private/|${run_path}/sockets/|" \
 		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/tmp|${run_path}|g" \
-		-e "s|/home/git/gitlab/log|${LOGS_DIR}|" \
+		-e "s|/home/git/gitlab/log|${LOGS_DIR}|g" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
+		-e "s|/home/git/gitlab|${DEST_DIR}|g" \
 		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
 	sed -i \
-		-e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \
+		-e "s|/home/git/gitlab/tmp|${run_path}|g" \
 		lib/support/nginx/gitlab || die "failed to filter nginx/gitlab"
 	# modify default database settings for PostgreSQL
@ -226,14 +230,14 @@ all_ruby_install() {
 		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
 		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
 	else
-		local rcscript=gitlab-8.13.3-sidekiq.init
+		local rcscript=gitlab-9.3.5-sidekiq.init
-		use unicorn && rcscript=gitlab-8.13.3-unicorn.init
+		use unicorn && rcscript=gitlab-9.3.5-unicorn.init
 		cp "${FILESDIR}/${rcscript}" "${T}" || die
 		sed -i \
-			-e "s|@USER@|${MY_USER}|" \
+			-e "s|@USER@|${MY_USER}|g" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
+			-e "s|@GITLAB_BASE@|${dest}|g" \
-			-e "s|@LOGS_DIR@|${logs}|" \
+			-e "s|@LOGS_DIR@|${logs}|g" \
 			"${T}/${rcscript}" \
 			|| die "failed to filter ${rcscript}"
@ -290,8 +294,13 @@ pkg_postinst() {
 		elog "For details, see the documentation at the GitLab website."
 	fi
 	if use mysql ; then
 		ewarn "You must grant the GitLab user permissions the following on the database:"
 		ewarn "     mysql -u root -p -e \\"
 		ewarn "     \"GRANT TRIGGER ON \`gitlab\`.* TO 'gitlab'@'localhost';\""
 		ewarn "PLEASE also read this document about needed migrations on MySQL:"
 		ewarn
 		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
 		ewarn
 		ewarn "Failing to follow those instructions may make the config phase fail!"
 	fi
 }
@ -302,7 +311,8 @@ pkg_config() {
 	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
+		eerror "database settings for \"production\" environment."
 		die
 	fi
 	local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)"
@ -328,16 +338,23 @@ pkg_config() {
 		local update=false
 	fi
 	if use mysql ; then
 		ewarn "Please only proceed if you've read and understood the following page:"
 		ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md"
 		if [ "${update}" = 'true' ]; then
 			ewarn "Failing to follow those instructions may cause the upgrade to fail"
 		fi
 		ewarn
 		ewarn "Press any key to continue, or abort with Ctrl+C"
 		read
 	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
--- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild
@ -19,10 +19,10 @@ EGIT_REPO_URI="https://gitlab.com/gitlab-org/${PN}.git"
 EGIT_BRANCH="master"
 EGIT_CHECKOUT_DIR="${WORKDIR}/all"
-GITALY_VERSION="0.16.0"
+GITALY_VERSION="0.23.0"
 GITLAB_PAGES_VERSION="0.5.0"
-GITLAB_SHELL_VERSION="5.1.1"
+GITLAB_SHELL_VERSION="5.4.0"
-GITLAB_WORKHORSE_VERSION="2.3.0"
+GITLAB_WORKHORSE_VERSION="3.0.0"
 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -48,6 +48,7 @@ GEMS_DEPEND="
 	dev-libs/icu
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/re2
 	dev-util/ragel
 	>=net-libs/nodejs-4.3.0
 	>=sys-apps/yarn-0.17.0
@ -63,7 +64,7 @@ COMMON_DEPEND="
 	>=dev-vcs/git-2.8.4
 	>=www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION}
 	kerberos? ( !app-crypt/heimdal )
-	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )
+	rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/25 )
 	pages? ( >=www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} )
 	>=www-servers/gitlab-gitaly-${GITALY_VERSION}"
 DEPEND="
@ -74,10 +75,10 @@ RDEPEND="
 	>=dev-db/redis-2.8
 	virtual/mta
 	systemd? ( sys-apps/systemd:0= )"
-# required bundler >= 1.15.0
+# required bundler >= 1.15.1
 ruby_add_bdepend "
 	virtual/rubygems
-	>=dev-ruby/bundler-1.13.7"
+	>=dev-ruby/bundler-1.14.6"
 #
 # fix-sendmail-config:
@ -85,13 +86,13 @@ ruby_add_bdepend "
 # fix-redis-config-path:
 #     Point to the absolute location of redis_config.rb
 #
-RUBY_PATCHES=(
+PATCHES=(
-	"01-${PN}-8.7.5-fix-sendmail-config.patch"
+	"${FILESDIR}/01-${PN}-8.7.5-fix-sendmail-config.patch"
-	"02-${PN}-9.0.0-fix-redis-config-path.patch"
+	"${FILESDIR}/02-${PN}-9.0.0-fix-redis-config-path.patch"
-	"03-${PN}-9.2.2-database.yml.patch"
+	"${FILESDIR}/03-${PN}-9.4.0-database.yml.patch"
-	"04-${PN}-9.3.0-fix-check-task.patch"
+	"${FILESDIR}/04-${PN}-9.3.0-fix-check-task.patch"
-	"05-${PN}-9.0.0-replace-sys-filesystem.patch"
+	"${FILESDIR}/05-${PN}-9.0.0-replace-sys-filesystem.patch"
-	"06-${PN}-8.17.0-fix-webpack-config.patch"
+	"${FILESDIR}/06-${PN}-8.17.0-fix-webpack-config.patch"
 )
 MY_NAME="gitlab"
@ -358,10 +359,6 @@ pkg_config() {
 	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
--- a/www-servers/gitlab-gitaly/ChangeLog
+++ b/www-servers/gitlab-gitaly/ChangeLog
@ -1,3 +1,11 @@
 *gitlab-gitaly-0.21.2 (25 Jul 2017)
 *gitlab-gitaly-0.23.0 (25 Jul 2017)
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0001-gitlab-gitaly-0.23.0-fix-Makefile.patch,
  +gitlab-gitaly-0.21.2.ebuild, +gitlab-gitaly-0.23.0.ebuild:
  www-servers/gitlab-gitaly:  Add new versions of gitaly
 *gitlab-gitaly-0.16.0 (09 Jul 2017)
  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-gitaly-0.16.0.ebuild:
--- a/www-servers/gitlab-gitaly/Manifest
+++ b/www-servers/gitlab-gitaly/Manifest
@ -1,4 +1,5 @@
 AUX 0001-gitlab-gitaly-0.10.0-fix-Makefile.patch 248 SHA256 03b4315da76b4409e990a53edce0cb21828a4c505f11266ca3f77e70e7c9857e SHA512 7aa509cf79a538398e9dc09cf92e34d6a8877da13ad1184e37f5e7ba4c24eb88251f692ebefddd07e3bf157a143d93dffb72ccbdfdd5ab4d52bbcd111e6e9380 WHIRLPOOL a03702f7d744239869249f53c49cfb3f62cbb58f75bc624079aced8219fa3d818d6eee9233953483c48a2138399442b7a89ca4ef1d93b96767e8d471dc5db00e
 AUX 0001-gitlab-gitaly-0.23.0-fix-Makefile.patch 253 SHA256 e1a3d0ea2d10145dd9d9b10848fb1731758eb16426ae203fa5a0abab65633380 SHA512 485178891a9589e29f0735bfbb8f1557355881f50498b46185ea6e658214454beed7350aab412699318ee801d8899824177d7d20568e91eb4ddf7562e9e8b9a2 WHIRLPOOL b2088784e30eaf8bb46832cb8454e5a8d2f2eeab00b41ffd021d257b6f19ffc53a420ed7123b1c9b9a83fd8a87184c178a3334d391bc4d85b78b8893245dfc03
 AUX 0002-gitlab-gitaly-0.10.0-fix-config.toml.example.patch 692 SHA256 5f9eda6f748a7622671a41632614e035267520388af90b9c9bddefa2731652f6 SHA512 942c2e012d013d5eca80a679a1ecaf035c1d6b93251c827cf75b31edc5c9e211edf78d41a1148b84142338ae3f19fdd5673b207f18659acfc78982a0a6d4f253 WHIRLPOOL ff414bbfcb1fb6eaae5bc8e5d41cc27e0e93a1b216842d47570f8725988b594ad236c2d33ed8075ecd24f2939c46a2bdb5f77744ed26ab5bd2afcd0a9a93201d
 AUX 0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch 700 SHA256 7f5c3f840581c2c2e98741ad6fcb9b486948dbcd80f52f4c45538b9fe9009087 SHA512 e89636c4e38697fad62553e8b07677fdc0fef5b83249ce79f748e1da7300c28514cdbf7a182232ced95222c9578cc9028de5e039b82f31175c22d840c83c0286 WHIRLPOOL 2b9c2b2b96da648b5f71a4ee8940c2a0a148e9005178e012afc73dd7709a5c407e04240adfb96a4ea3d2384248a23682a8d5727c967ddd5368f0d2d3b38d24e5
 AUX gitlab-gitaly-0.10.0.conf 281 SHA256 54a309ecd95a0c907951a36db5542678f9e68c7e354dcc3278882512a82c5a99 SHA512 23875632a1c523eea855c10b03dab4a2aa38cc8de6be070df4ba8c85360edf8c5c2a636601f05004f62792c9e4304822c679841180b9a23c963de76a7c770873 WHIRLPOOL fac7949ddc161d2df6d4f0168029c405a0b68f64fee9cedf167bdab9ea55de1e52735476402e878f67339f969e40bd341cd21f31c99dd86d997df08a3ce8f217
@ -13,7 +14,9 @@ EBUILD gitlab-gitaly-0.10.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fa
 EBUILD gitlab-gitaly-0.11.0.ebuild 1613 SHA256 6a93e81f94c7af310e4076fa7c81d93d5b4ed3a8c0a2812a58fab96bd6c318ce SHA512 0e2732f634de08a243b57b3766a3b1f3c7d7eafafbf40f72d87dfdbb51aad963aec45899d14a9114f43415dd5dde6734f5619613127485fbc64440b17734db8f WHIRLPOOL 750c4bd7349bd9ced835b3315e31d25ddc0e7fd7ba523ebe31feee86c19b1e0ef7f8e9f1c8fb483fb6b7b246db76ba195a3f48f4b834ff727ce3c2a7512f218e
 EBUILD gitlab-gitaly-0.11.2-r1.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059
 EBUILD gitlab-gitaly-0.16.0.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059
 EBUILD gitlab-gitaly-0.21.2.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059
 EBUILD gitlab-gitaly-0.23.0.ebuild 925 SHA256 7294cc955fc5eedf9bcadfef76572dc1d972165e67de09273bc4159b699e4e4c SHA512 d624de4a9f2f63625669df32ffc0a16e63c356d7f3b0da6be68fe2f0f3c58399ccd8f1c0d1897c1e20fd7e67508133381f4f9e099bd8b929e64042131816e228 WHIRLPOOL f0e4093efa0372249bdc54ee8f4cdb4318f0fd85296964c2412f5b4ca0933677566733b68f64e53b68480d3246126e2e030fac99e962d510a1010907b2d5dac9
 EBUILD gitlab-gitaly-0.3.0.ebuild 1611 SHA256 d4a80bcc6b9f1f6de0308e02fce0927e10c83620bc546ccc5b2ac8166b7cd5f0 SHA512 28ddef1dd80ce57a978e81048e7f07598dd83c83e0fdf4b6dbf01ff543d4abb4de437e658b07b3d60757163ed30e970327403ffd057e1d737d3dd8e23a534d38 WHIRLPOOL 3f42b071f5acaff80072a5708e50fcd8b4a397a6f2e5772f7234fbba3f606c89664433328495f59a84f5f5468503c11961b2d455878e2f445142778c7645397d
 EBUILD gitlab-gitaly-0.6.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846
-MISC ChangeLog 1730 SHA256 c12ce313e917e3b58a7f319fb372fad1fe166e2a6a6bf6f19c57d837c6bf0b58 SHA512 ed07d9198bf9311efd1cd359a83c1dc2767efd464839a4f84f48f90047e474cc6e3bc0f1f12b40cb894ffc480dff7ed066140eb67a8c5943aeb387f16ee0b21d WHIRLPOOL 71fd8e729c3edc7330638f3396bb40e3c6d1fb8cea903899133193649c7f96df24301b5266baf1fc66a724e9b9459a72dcfe9ab3daa5a3516ef9fc73b5025781
+MISC ChangeLog 2029 SHA256 e52fb4a4b518779e916108052d4f07d54e12ec2486b6636406cd630df4af6b46 SHA512 ee127a7ca48f842cdd6c35bb7322656f28b37a7e62e1859f70b3ee2a58adca8ed4409f2227c460ee558fb0be468ad7806cf7a80e8310a163ecb5ce15b9d0e430 WHIRLPOOL 11a51918a29738a4ff9c5f4f3489133fad2b58b9837503046cf30a29985df8313f1cdf2451472cef7579f11841d46b31c221781e9da862f78305b64bf28b5839
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.23.0-fix-Makefile.patch
+++ b/www-servers/gitlab-gitaly/files/0001-gitlab-gitaly-0.23.0-fix-Makefile.patch
@ -0,0 +1,10 @@
 diff --git a/Makefile b/Makefile
 index 6063771..0f31b5d 100644
 --- a/Makefile
 +++ b/Makefile
@@ -1,4 +1,4 @@
 -PREFIX := /usr/local
 +PREFIX := ${DESTDIR}/usr
 PKG := gitlab.com/gitlab-org/gitaly
 BUILD_DIR := $(CURDIR)
 TARGET_DIR := $(BUILD_DIR)/_build
--- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="5"
 EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git"
 EGIT_COMMIT="v${PV}"
 inherit eutils git-2 user
 DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 DEPEND=">=dev-lang/go-1.8.3"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.patch"
 	epatch "${FILESDIR}/0002-${PN}-0.11.2-fix-config.toml.example.patch"
 }
 src_install() {
 	# TODO fowners, fperms on config.toml.example
 	insinto "/etc/gitlab"
 	newins "config.toml.example" "gitaly-config.toml"
 	newconfd "${FILESDIR}/${PN}-0.11.2.conf" "gitlab-gitaly"
 	newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly"
 	into "/usr"
 	newbin "gitaly" "gitlab-gitaly"
 }
--- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.23.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.23.0.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI="5"
 EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git"
 EGIT_COMMIT="v${PV}"
 inherit eutils git-2 user
 DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab."
 HOMEPAGE="https://gitlab.com/gitlab-org/gitaly"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm"
 DEPEND=">=dev-lang/go-1.8.3"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}/0001-${PN}-0.23.0-fix-Makefile.patch"
 	epatch "${FILESDIR}/0002-${PN}-0.11.2-fix-config.toml.example.patch"
 }
 src_install() {
 	# TODO fowners, fperms on config.toml.example
 	insinto "/etc/gitlab"
 	newins "config.toml.example" "gitaly-config.toml"
 	newconfd "${FILESDIR}/${PN}-0.11.2.conf" "gitlab-gitaly"
 	newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly"
 	into "/usr"
 	newbin "gitaly" "gitlab-gitaly"
 }
--- a/www-servers/gitlab-workhorse/ChangeLog
+++ b/www-servers/gitlab-workhorse/ChangeLog
@ -1,3 +1,9 @@
 *gitlab-workhorse-3.0.0 (25 Jul 2017)
  25 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  +gitlab-workhorse-3.0.0.ebuild:
  www-servers/gitlab-workhorse:  Add latest version of gitlab-workhorse
 *gitlab-workhorse-2.3.0 (09 Jul 2017)
  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
--- a/www-servers/gitlab-workhorse/Manifest
+++ b/www-servers/gitlab-workhorse/Manifest
@ -6,10 +6,12 @@ DIST gitlab-workhorse-1.4.3.tar.bz2 655746 SHA256 5b621887aa8b6c0cb1b5b1aae6edd4
 DIST gitlab-workhorse-2.0.0.tar.bz2 656360 SHA256 4e9864b7885b1102d9eb18e9c4bd3baf6021b4d3b64adbf5e9ba70b49aea8d8b SHA512 f439affafc54a090f105897de3ee5fcf2864c26dfd5f87299097c6827b9563f5ec0f7ebc9b1abfc90d6f88f864a640620c58b8a004aa230789ea5e27cf3a2e4c WHIRLPOOL a8488fcb95d06f88eef01e7d1f045fcab766c439738e44fb523b5198d29531b230bd8a1ac27e53fc668a0ba034773cf44477fce623489afe268be9b110ad04f3
 DIST gitlab-workhorse-2.1.1.tar.bz2 658851 SHA256 ab827cfa89f5d3e711357a0317a022b4d5db4d91c01ad0b80b56120e315da899 SHA512 6a316647faff83352c344cc36ef7fbaf327dfab9b8f893c39e22d4cde7e78fe703680d2851663953ee94b3ac9f55a142b5380ed23f26a7600044a3af2fdea08f WHIRLPOOL abded7f69b1a1ddc1aed3f8a8b1ddae89aa19eaa67ac1be1847f3ad6a0f5a23142f60fee545a358ecf27f2b15d4630eb42ea0b68a7076af9e26ee36d9db1243e
 DIST gitlab-workhorse-2.3.0.tar.bz2 673735 SHA256 61dc7ea978223a56e5f2e4617195e43c9e3179f0057e416545060143ea90ae0e SHA512 290713086d8c30fbbc80d32b6924368ceffceb08fc9330403250b775bab20454d5843bfd7b37c1d88fa60d1bebd5b14d7e8bb6b3557142b56b1d9ab02ce46aee WHIRLPOOL a1507a68c06d7335e5fdae4cbb91b01ddcc9d7c988758fd892676c6a78c9746c6f1fa89fe369efdd2352f85c7dade00554263e1a969ce10dfc87983c3136bf6f
 DIST gitlab-workhorse-3.0.0.tar.bz2 678497 SHA256 6a72db70a49c4004881b4e5e727ac088e6b976144466b1e7a5362eb720bcb546 SHA512 25be040a20948a2e82e56e531ed030174a7c0dead542b998a70213aeed4a565eebc6e206fed202d52c538781f25715b93c5dd9708171addb222d13be4c49bb55 WHIRLPOOL 07d3d17bf1d7318fce000fbd8da4d4d8f47040b3ac92efe955ae84ccc9636eb0d8a86816b59caf717848340f53b43d0724bb577d143e2a4524a24eea5e48e33a
 EBUILD gitlab-workhorse-1.4.2.ebuild 1019 SHA256 12e00f04075eb815e41640f4ca906ce1aaa833104e79c43f19c1a34c4454ce2c SHA512 8b430448c28ea695502f08928626f628657d58582439c3458370a56dc134c108c24f266a3fe2353b1ecd5082d2e53b985fa998b8919b60f81836579c884555e3 WHIRLPOOL ff37a454aa77734d4cd15b6bc4181a5dc8f1ead2d03710fdc59a514cbaa0a67202ded330021f2c6f763797763b8de94e2ffe86c90cba2336903479abcdfc3437
 EBUILD gitlab-workhorse-1.4.3.ebuild 1019 SHA256 9f04f9b9a1af3b6a14af32fc27143ef98cf8d5ea297c754e2af2f75faab90cf9 SHA512 f38aee3ae9318d4db08a6f5bf55a7d25944ca65d132f23e5638e670a31745381d93a39d9489409ee75de943edf80af555638b2748d3eb7b1b8b0d65d8c02d6e7 WHIRLPOOL 60491062d73591e137a7a6d6875174a7f7c31c6972d104c2dd856ef8513276617e1be97f18679853b86638d92ba87152ca5b3f17c43dee79db2918e3e3139584
 EBUILD gitlab-workhorse-2.0.0.ebuild 1019 SHA256 6b5b1af7f4bb91d6f38b5160ea4a1711392ba42ae296388c72ceeb1e19dabf99 SHA512 aa607720a13052e2fa5e086d3f5fa2bac42dc9a1028940c6c42e9307596439bb89f6405d23a8f2c216ff9a15e2d83be373adddb6598ed84b7b00af872cd8efc3 WHIRLPOOL 9cd700793dbad67c8a88bf7794bc1273e809b8435702c4359b12c25006fa1a08c8d5963ab76ac75bd46d520442b3195a79659718f8c7bca49d7fb5b4c0d9d6b1
 EBUILD gitlab-workhorse-2.1.1.ebuild 1019 SHA256 0b119e55032bf471921e9011cb3a119b45a78000eae87d9ef28b2c314e302793 SHA512 aa571922dec9bf71d48b0ab23356642bf031328fc18c99600221fff5931259a2127e50432e1fd30c8656dec2ec8fa395d8e15c34f65f2a005c08420f26bcf54b WHIRLPOOL daa44b0fc118f2c05b38ddaf96c78aee1a25993c35ec5a71f4647d95ccfc8cd20362de9e6c9331d531ecd81799733953aef4297c1350d4fd223d9b003e75ab04
 EBUILD gitlab-workhorse-2.3.0.ebuild 1019 SHA256 1e7b0b9f7ca61afbdbb525eecb934a858be6bd91ff7ef6614eed2899f207fc8b SHA512 ec98e6aa09ba6245195fa4666fa4174a9ba595922f351dd660c161f419e84dd2c284373a310b55acf986082d175e1659e9396a9c7a3cc324a540b7d67222aaa6 WHIRLPOOL ba7bb5b5a333161bc4a3b04cd00f97893e9e93e63ee505b97d757676520cbbd06d2616be69a248ac81ea3135589fb3f11cd4333f266e1fa293890982d790399e
-MISC ChangeLog 7167 SHA256 75e7796530a68aa3913c5881952a701430189d0d54ae89157f8b9fc7fc7ea810 SHA512 bb14554af2c2f4efa9d701bec4722be0034a053ad3ba5a391ac4425dd072541f511e7dfb37b8ba2d79fa6a60300c75620cd1f19d9a31461246c91a4f44d229b5 WHIRLPOOL c4d0b8acf5785c52011886ffe7e937180c65a4f47891465596254ac7b79fae380cba64bf53e0aa34426f726b53c98eb476990d31f31cccc0756b26e7a058539a
+EBUILD gitlab-workhorse-3.0.0.ebuild 1019 SHA256 c7bffd0014cc64cc92eeb3566d3af38619bb29ccb5b8d755eb3e86d66c088ea0 SHA512 32a35851126f109da9a3ac12b43ae5b654193d7b4fd0b03fa501d810e1cddf03ae0f4004aedf2d9d98ccda7ca99e689e55f67dda19748bf47e76259b5416575c WHIRLPOOL e0c4403800788d653fcaaf827251771f621ccad15633728b731b52c278b2b33b39321356b2620110597dceb18c2754c460d78685f5a79ef6afda030f2aab24fb
 MISC ChangeLog 7364 SHA256 1201f257e1f27e1ad998346e9ca64e3ee5a010c1d5525f5a3ddbf0468daa7df4 SHA512 954f059e8fc735abbc463a6a55e084092523384ce64aa157a6aefd94d1ee938414a8e5c20dc4163781ae4781d255cd9378a0afde3a5036e0028cadee987fdad0 WHIRLPOOL f5b327abbae59e6672ebfd4ff229713ff38618752f847432914d2aa227798b25d901dad395e51ebb8ba9aed41f2df5a7d71eefa46a2ac3d28e4bef22cc72ce10
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 inherit eutils user
 DESCRIPTION="This is the new backend for Git-over-HTTP communication needed for GitLab >= 8.4"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-workhorse"
 SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
 MY_GIT_COMMIT="e6cfe0c0c6aafe639cdf2c362eab860053bc07cb"
 S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
 RESTRICT="mirror"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 DEPEND=">=dev-lang/go-1.8.3"
 src_prepare() {
 	epatch "${FILESDIR}/0001-fix-Makefile.patch"
 	sed -i -e "s/@@VERSION@@/${PV}/" Makefile
 	eapply_user
 }
 src_install() {
 	local dest=/usr/bin
 	diropts -m755
 	dodir ${dest}
 	exeinto ${dest}
 	for f in "${PN}" gitlab-zip-cat gitlab-zip-metadata ; do
 		doexe "${S}/${f}"
 	done
 	## RC script ##
 	newinitd "${FILESDIR}/${PN}-0.8.2.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}"
 }