Merge branch '103-purge-gitlab-ce-9-0' into 'master'

Resolve "Purge <gitlab-ce-9.0" Closes #103 See merge request !174
2017-07-09 04:10:35 +02:00 · 2017-07-09 04:10:35 +02:00 · 20ea1960d9
commit 20ea1960d9
parent f8c62206e7 29fa7edc87
12 changed files with 204 additions and 21 deletions
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,6 @@
+  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch> gitlab-ce-9999.ebuild:
+  www-apps/gitlab-ce:  Update ebuild for gitlab-ce-9999
+
  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  -files/02-gitlab-ce-8.11.0-fix-redis-config-path.patch,
  -files/03-gitlab-ce-8.14.0-database.yml.patch,
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -25,6 +25,6 @@ EBUILD gitlab-ce-9.1.7.ebuild 13250 SHA256 be342467f79215ec736c6d1f4d9d26bb67911
 EBUILD gitlab-ce-9.2.7.ebuild 12995 SHA256 93cb032967c0388d706be2dda0cfca2ca4765c0774e283ab0d61769cf43ddea6 SHA512 b8ecb0a4cc893786d4cd2dd94d53a21c6a8fbec5d181843286584914363f1160361dccfe2f61487f6744f7fb4d42a5efc4085e64bca7b29dea7e4672788c49cf WHIRLPOOL 2d8ada573da9e209e7a0bf3f05aef83e2419c18f4406b3abdbb24a90b488acdbdf7d4406b665a92356b457d100dd46c2a39084f87ba90b23da87392f2f98beb4
 EBUILD gitlab-ce-9.3.0_rc2.ebuild 12829 SHA256 6951949f8d98f867746a0128e99ce3baabddecdaa45952565f38a913b2868058 SHA512 3337e413db8680d0d177099425a71c2410afdec9130d57f9c910770aeb12dd7a13c410782f41f8a0cd24d243534d513b66ec4d93eb09c7e15896716863682eb0 WHIRLPOOL 6b9d03912224808065b3bc301f9ce7b82925293db2916cdeb3184b28c0d58fc034b06dda6b43109b251c942d3b4bebd0c4e6bde7c644630baaece585c35ae6d3
 EBUILD gitlab-ce-9.3.5.ebuild 13625 SHA256 dc6861e35fc5808e65da7c956276c7fd86f705a64c72d97db1feb6a938912497 SHA512 7e2e11e3fe21cadbe490cba14bc1b1dc117239a1293b31befe52d26d98877d22191454f2c36cab150b3adf5f741f7281ce61cdbd26eed44d44c75b1bda703c36 WHIRLPOOL 8851ba2c369a7e36f2b99340f80ff46bba63944fb3e0362ec7161c20a5bbc26ca7c5e7a96660035158758454b558c40faa39ca8490fcf39664a54188bb3f9b08
-EBUILD gitlab-ce-9999.ebuild 12789 SHA256 27db871b7d51cae37b6802043c82887bb810c1183682ce6c7efe0dc546d9b29e SHA512 99ca91ab0b8045d8bc2cd9d4208ecd4e8eb96c3d01afe49d119bb5677ee88f5f700042f502ab0c446f7acaaaeb7b9758c6d721a91f256eea335eb744a05a4b27 WHIRLPOOL a1e812d1d9562e7febee89e5c847ea0febec360aee38efc5cf779e45b92bb73eff3f066eb90fb96c292e8cfdc2a322bc9222a786796ac0470a221e44369a3270
-MISC ChangeLog 20093 SHA256 43e885357988a70d91ba1a565c56a7f18092dbad86998f54fbbe25d183ff9df3 SHA512 facdb433fcf354d3f9f7561b00ac18557869681dce75557e4ffde9df21fe1988927685be23029c97298fc81a9ec33aa6d5be66264489a354a1f7df8184522c32 WHIRLPOOL 29ee5017135170ba13b75abbffaf9c1a57d475c4a128409c3cacf2343cd0d635783b5caccdb60cf462903f746984cd4a59b26ad83eb2ea52f72975b4144c708f
+EBUILD gitlab-ce-9999.ebuild 13567 SHA256 e95e726378e2a0d973269468e005b8e6acfd98aab8778866bb65edab422cd468 SHA512 7553b727503842ab765e162f587a89ebf5f41d796d66987c21219fbd4168a99a4d8d93c0db60cb867fd49b0151e81ba56088f75572f4219df77a6f127aac5004 WHIRLPOOL 46c304600e438ba8bf03a79f84dcb6e23a32fe96c980db9c70684a065c740276fcf3c0ce0be0ac3714b77cc0f2356ecd92b154215df5a6484b6938979255f993
+MISC ChangeLog 20224 SHA256 d0a532924a67f4db71e659333d4318cb9728e342940232d8f8015753ecde9a40 SHA512 7e385226053afa4b6254f88ab37efdbf749d227965de1edcd9a12eb411b4b50dbd6ef09eee01aed0eb67e37122e46af5c4bbb98d06015fe83281a98a23854b11 WHIRLPOOL 8a2b2419bb904ae023a126bfdcdf5d30e2c465829ef85d56f4fca74da4d5bdbf181a31262a71419501d4791331edaad1a4b8d4e1f4ce7db9fa649e28b4de37d8
 MISC metadata.xml 801 SHA256 3dc7486a12903f47f65968d524c93500ba30a4a09fa57e5a9dacf356509b44bb SHA512 e132754b72e64246531fa883400a0cf1a473ac5a6a49623db58ccf118a038b7cf37df03d9550f37b4a25f9ddbb1dcc5652ec9a4f2259d8e3ce202692c4025f41 WHIRLPOOL e9d961681fd790008eaf80fa07ce2c55a00a58f2e920d759793783ca8c8f508602a777e94c0cb65fe87c7dbef0cabdf26e4f4082584421097d939cbab20c4ac6
--- 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.11.2"
-GITLAB_PAGES_VERSION="0.4.3"
-GITLAB_SHELL_VERSION="5.0.5"
-GITLAB_WORKHORSE_VERSION="2.1.1"
+GITALY_VERSION="0.16.0"
+GITLAB_PAGES_VERSION="0.5.0"
+GITLAB_SHELL_VERSION="5.1.1"
+GITLAB_WORKHORSE_VERSION="2.3.0"

 DESCRIPTION="GitLab is a free project and repository management application"
 HOMEPAGE="https://about.gitlab.com/"
@ -74,7 +74,7 @@ RDEPEND="
 	>=dev-db/redis-2.8
 	virtual/mta
 	systemd? ( sys-apps/systemd:0= )"
-# required bundler >= 1.14.2
+# required bundler >= 1.15.0
 ruby_add_bdepend "
 	virtual/rubygems
 	>=dev-ruby/bundler-1.13.7"
@ -112,22 +112,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/log|${LOGS_DIR}|" \
-		-e "s|/home/git/gitlab|${DEST_DIR}|" \
+		-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/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
@ -230,14 +233,14 @@ all_ruby_install() {
 		systemd_dounit "${FILESDIR}/gitlab-mailroom.service"
 		systemd_dotmpfilesd "${FILESDIR}/gitlab.conf"
 	else
-		local rcscript=gitlab-8.13.3-sidekiq.init
-		use unicorn && rcscript=gitlab-8.13.3-unicorn.init
+		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}|" \
-			-e "s|@GITLAB_BASE@|${dest}|" \
-			-e "s|@LOGS_DIR@|${logs}|" \
+			-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}"

@ -294,8 +297,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
 }
@ -306,7 +314,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)"
@ -332,6 +341,17 @@ 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"
--- a/www-servers/gitlab-gitaly/ChangeLog
+++ b/www-servers/gitlab-gitaly/ChangeLog
@ -1,3 +1,8 @@
+*gitlab-gitaly-0.16.0 (09 Jul 2017)
+
+  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-gitaly-0.16.0.ebuild:
+  www-servers/gitlab-gitaly:  Add ebuild for gitlab-gitaly-0.16.0
+
  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  +files/0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch,
  +files/gitlab-gitaly-0.11.2.conf, +files/gitlab-gitaly-0.11.2.init,
--- a/www-servers/gitlab-gitaly/Manifest
+++ b/www-servers/gitlab-gitaly/Manifest
@ -12,7 +12,8 @@ DIST gitlab-gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf
 EBUILD gitlab-gitaly-0.10.0.ebuild 1611 SHA256 dc246485ca030c1e9700a8e7707f5e1fafebffd88f7ab12399c12076ee67632a SHA512 ed5e46fa20bfeb81da16f8fb0b702b7d8f71ca5d35f81456fd2ee31eec781cae75e14081b2eeaae3959d6b5db7eb5ed84398c90c6f687b0a3dbf9e602b7cb8f6 WHIRLPOOL 7c6cbdd81e2da6f659482db204433430e2bb947175a56b85addd688dc511cae7dea45a99796c14c6cb2d352fb868752bafc14af34f100d538b5b40bebe2a0846
 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.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 1545 SHA256 564ba53f13b6525862eadb30b9eca08dae900582f165fbf251c3a25738a476fd SHA512 48a2c9cbc0546c8fd6fdd1d3582002efa44b1ae6a1d89947a1a8bf64c42a5016bce77b9bbb5fa08e1eab8f6a653915eb3f22ab2724a3f644a7bdf4f94694b75f WHIRLPOOL 415e4c103b83dfb0dcf84f01faa45685faea9601e261a2ce280537a10dc63d68f83374d0a65b17f93bac409aa2ea20ec77e7c13f16702df4a4b0a0e65d3671f6
+MISC ChangeLog 1730 SHA256 c12ce313e917e3b58a7f319fb372fad1fe166e2a6a6bf6f19c57d837c6bf0b58 SHA512 ed07d9198bf9311efd1cd359a83c1dc2767efd464839a4f84f48f90047e474cc6e3bc0f1f12b40cb894ffc480dff7ed066140eb67a8c5943aeb387f16ee0b21d WHIRLPOOL 71fd8e729c3edc7330638f3396bb40e3c6d1fb8cea903899133193649c7f96df24301b5266baf1fc66a724e9b9459a72dcfe9ab3daa5a3516ef9fc73b5025781
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.16.0.ebuild
+++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.16.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.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-pages/ChangeLog
+++ b/www-servers/gitlab-pages/ChangeLog
@ -1,3 +1,8 @@
+*gitlab-pages-0.5.0 (09 Jul 2017)
+
+  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-pages-0.5.0.ebuild:
+  www-servers/gitlab-pages:  Add ebuild for gitlab-pages-0.5.0
+
  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  -gitlab-pages-0.3.2-r1.ebuild:
  www-servers/gitlab-pages:  Purge obsolete versions
--- a/www-servers/gitlab-pages/Manifest
+++ b/www-servers/gitlab-pages/Manifest
@ -6,9 +6,11 @@ DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1b
 DIST gitlab-pages-0.4.1.tar.bz2 206039 SHA256 ed856e1d549597b5f1b7aa5d006538aa4def240206b4756728aaeeefa49734c7 SHA512 e6dc7c73ec0601ebe53c54aa8d0978954c24450e488776bef1bb2483efd2db14d23188ee10660f6833f44bbbb50f462f8b9568a77cd4ff970300c604856319a0 WHIRLPOOL c8abfaf677f935b752be24c7ce703c49dcc23061a24f2137ea18df33a96d42233e7e00de120a812df58b84bf3db0739e97a1e37fc04367d370ef2558986d73fa
 DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e5273899518b83529c787c0a5f724161005ca786 SHA512 74e4cd810712d1506b927f75b63dc4fca09802097579d456cfada94f06c59b05f5e11309dc6fbd0f4c701243933688afa89ef8c1cf921f15536f505c7dec99f4 WHIRLPOOL 0f352db3977565b7c41609dcbed9161fcc99398fc56aa535255a69d12169b75b985410964a9adce60ed9eb8b88a68128dac9a9528f85ec62bae468fb8907e182
 DIST gitlab-pages-0.4.3.tar.bz2 209161 SHA256 d79fd61ac54945596e708ee5b38b35d8cf2ab07f53525af6cec3192e59d7ac98 SHA512 cb1902661f8eba65e8f330d7a57c57fec565db9b046d34af66909920d4f772a418b331f74038a506780d9a4ae6bb2158bbdba684a26020b253bf709b996bbeda WHIRLPOOL 5f0f60ea22071ac740745c60db62041e0ee75a5c68385b2ff5b24ed266fbcaf9a89481b456768159d551525d52b31b25469b9f7c023409b5a2ce05d7026cb327
+DIST gitlab-pages-0.5.0.tar.bz2 224094 SHA256 b6fe0baec3f1cf7c3dbdce1aa8d732a1510a9d45ffab1b5946c397a95acb8ece SHA512 8f8b4006e44c87f79addc3b87c392e596d286d3d96eb2aa50f0e2a90e3a4e0e5fc2258fdb7c623e743323c88b22e61df9c06015fbc384a8d75369fc9bb64b98d WHIRLPOOL c6d10c0c6dc674d931536daaac35953c792c6e47d9b92033e6c29d2dcbb82e7ad6345b519207ccd6fddbf061b0f0800c8908915854e028302a8357cd45cefb2f
 EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3
 EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53
 EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039
 EBUILD gitlab-pages-0.4.3.ebuild 1436 SHA256 5ac00230fb3166541549c0f75cc6cceefba1dc4cdbad00151902f7f5e4d70d94 SHA512 1b764061cdf5c52ad7681e92c330b91a99eee44128fc56c43bdbce291546ee9796ddb2b14ee9deb2dc61c80c4192223cb67c36c2b70833db05ff241d007b870c WHIRLPOOL 168f97a975a81a8413b92a7bd1c8d7420a3f45571ec668600468b43a375e4ea27ef6b95b0d6c5ff7475657920605c990ba6b2012c6c762f868156d6be4163aa5
-MISC ChangeLog 1498 SHA256 6973ee175bbb3fd2381bd56aca744eaba0ef74ff895f8486fac0b23a73aa5a9d SHA512 b89e35a418dbc127861db42b3799cd5f82b4e5f6d9e20dac3d58ac307706330c9f77b0a0d60e3eb666ccf181d796dd99f65a5dcd37b0d35e90ec791f130078c9 WHIRLPOOL d1a620bd69ee6b46f87753913b10c6c19804e8507100f7963162ed9fc013a99377bf34988764ea2ce99318bdd6f5a9c34130b0280948cfe393165286572d6dc3
+EBUILD gitlab-pages-0.5.0.ebuild 1436 SHA256 b4aabfef9811f4e591dcd71bbd7d7a399c10233be162c0cf5f903effb1ef0f98 SHA512 cc076544c219b497e39e080e469ce2b39ab4b1bcb8a396be9655af963ea35271548bd4446c1435690cfb459f510901ba1db8dd1d0574a4567b3248fc2e03a582 WHIRLPOOL cd087bc65f0eebedefea46f10c176f0163b77b12b71c89f738f94d223f1db2811fc813b49285fc35719c8430ad4ebe0d6362cdc38f2ac13e9cca7133e080b78f
+MISC ChangeLog 1676 SHA256 68dcc3076e265189ef365cf68cad85798ca511837a3406e88316b6c84527d5e7 SHA512 eb74f46967d769babbad112b2f2aeff8444a8a763b3d6e5f19d68f0fbe5b367a54e4096057e3ad29bf0e427f2818b8d61a1d2b2d3debf7b39926f6b4d5d6b59d WHIRLPOOL a5c69df06800b69c8a56c59f8fba9d877e43e5f14b6ed120f4a9b40fb91153e865ad9b6b7cfd8b9433fe0ca5e1309d675d213664a5fed3b1d2293591b7943fe2
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-pages/gitlab-pages-0.5.0.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.5.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils golang-build golang-vcs-snapshot user
+
+EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
+
+MY_PV="v${PV/_/-}"
+MY_GIT_HASH="0173d4e"
+
+DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+
+DEPEND=">=dev-lang/go-1.8.3"
+
+RESTRICT="test mirror"
+
+MY_USER="gitlab_pages"
+
+pkg_setup() {
+	enewgroup ${MY_USER}
+	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/0001-fix-Makefile-0.3.2.patch"
+
+	sed -i -E \
+		-e "s/@@REVISION@@/${MY_GIT_HASH}/" \
+		src/gitlab.com/gitlab-org/${PN}/Makefile
+
+	eapply_user
+}
+
+src_compile() {
+	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all
+}
+
+src_install() {
+	golang-build_src_install
+	dobin bin/*
+	dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG
+
+	# rc script
+	local rcscript="${PN}-0.3.2.init"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|g" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${PN}"
+	newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}"
+}
--- a/www-servers/gitlab-workhorse/ChangeLog
+++ b/www-servers/gitlab-workhorse/ChangeLog
@ -1,3 +1,9 @@
+*gitlab-workhorse-2.3.0 (09 Jul 2017)
+
+  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-workhorse-2.3.0.ebuild:
+  www-servers/gitlab-workhorse:  Add ebuild for gitlab-workhorse-2.3.0
+
  09 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
  -gitlab-workhorse-1.2.1-r1.ebuild, -gitlab-workhorse-1.3.0-r1.ebuild:
  www-servers/gitlab-workhorse:  Purge obsolete versions.
--- a/www-servers/gitlab-workhorse/Manifest
+++ b/www-servers/gitlab-workhorse/Manifest
@ -5,9 +5,11 @@ DIST gitlab-workhorse-1.4.2.tar.bz2 625125 SHA256 4df4d93bc59102c312ad2a642d7f1c
 DIST gitlab-workhorse-1.4.3.tar.bz2 655746 SHA256 5b621887aa8b6c0cb1b5b1aae6edd4d4cc60de77ef70f263a5968e56899da9ca SHA512 bdf62b8d5925fb45d439d2b9caf4cd2c175129bc3fe3bc24b8914dd128c1b6fc8ed700ad20513ee272e24698964c2daa7657e7bae86d58ae53cbe0e7ef44b89f WHIRLPOOL 507ba152b90db9b9459ef3f939780d39e7af17c6f2081a53c9affe621e4c624c46259993a6d94b218b476a2908ee9e3ff882f27c4d8f29e5ebc98f9bc4d878a7
 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
 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
-MISC ChangeLog 6971 SHA256 0f5f7e210e57403b0bd2519c41dd3f41c1b4110b14e23a7ca6cfb566e0c000db SHA512 7b471de72287c1f57669fe7e0a8a20141b30856cc55b82f5527ab079c9a47a8c2be4541b435ba6cc3f41150a820385d3825e0753501e45713df9d87b1e8c3d06 WHIRLPOOL a4b4a7861f55327ba73f8358d92ab424d44f2707ffbaa828c74dec53abaa28a0a21cfe50aea1b46e820c11d0c6424b19c6fb8a71366255ecc04fc02a7c0fdd53
+EBUILD gitlab-workhorse-2.3.0.ebuild 1019 SHA256 1e7b0b9f7ca61afbdbb525eecb934a858be6bd91ff7ef6614eed2899f207fc8b SHA512 ec98e6aa09ba6245195fa4666fa4174a9ba595922f351dd660c161f419e84dd2c284373a310b55acf986082d175e1659e9396a9c7a3cc324a540b7d67222aaa6 WHIRLPOOL ba7bb5b5a333161bc4a3b04cd00f97893e9e93e63ee505b97d757676520cbbd06d2616be69a248ac81ea3135589fb3f11cd4333f266e1fa293890982d790399e
+MISC ChangeLog 7167 SHA256 75e7796530a68aa3913c5881952a701430189d0d54ae89157f8b9fc7fc7ea810 SHA512 bb14554af2c2f4efa9d701bec4722be0034a053ad3ba5a391ac4425dd072541f511e7dfb37b8ba2d79fa6a60300c75620cd1f19d9a31461246c91a4f44d229b5 WHIRLPOOL c4d0b8acf5785c52011886ffe7e937180c65a4f47891465596254ac7b79fae380cba64bf53e0aa34426f726b53c98eb476990d31f31cccc0756b26e7a058539a
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild
+++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.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="23e62f5114c7427917f9e1ef336ba227f1543192"
+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}"
+}