Merge branch 'gitlab.10.4.5' into 'master'

Gitlab.10.4.5 See merge request linux/gentoo-overlay!213
2018-03-09 20:48:30 +01:00 · 2018-03-09 20:48:30 +01:00 · a18bf2e102
commit a18bf2e102
parent 6daf787cd5 e7d788867c
6 changed files with 85 additions and 4 deletions
--- a/www-apps/gitlab-ce/ChangeLog
+++ b/www-apps/gitlab-ce/ChangeLog
@ -1,3 +1,9 @@
+*gitlab-ce-10.4.5 (09 Mar 2018)
+
+  09 Mar 2018; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-10.4.5.ebuild,
+  -gitlab-ce-10.4.4.ebuild:
+  www-apps/gitlab-ce:  v10.4.4 -> v10.4.5
+
  08 Mar 2018; Manuel Friedli <manuel@fritteli.ch>
  -files/03-gitlab-ce-8.17.0-database.yml.patch,
  -files/03-gitlab-ce-9.2.2-database.yml.patch,
--- a/www-apps/gitlab-ce/Manifest
+++ b/www-apps/gitlab-ce/Manifest
@ -25,7 +25,7 @@ EBUILD gitlab-ce-10.0.7.ebuild 13568 SHA256 c164db3f0af93824bb97992b20b0bc5415bb
 EBUILD gitlab-ce-10.1.7.ebuild 13679 SHA256 9c1bec7e86d46422f87baecaece80197c506b758eab28fd85fc214512ff67e3c SHA512 6958f3f67b7d8729519175337b5e411b9d32fa3e7348105870d5f35c938e905cc60e7af23802b1b5835610c72e9a76ca50c229f5d862403ffd5065e82ee39d25 WHIRLPOOL 6caf644203291c7903f7c67a93e3f11a3f8d632e01384390742bc8b1fc4068e494f750c44817f0143a0f6eeaadbb4a7243c4194397fded59956363b49bd32ae4
 EBUILD gitlab-ce-10.2.8.ebuild 13681 SHA256 0e02e1a51f335872facce2751aa23d8ff5b9cd8aa7359fed1cd0f5a3ed5bd1e7 SHA512 805d6a717b0dcdc6551f549722abb8322a51d6cee1eb807dabac1fe4b98ffd32fcf3667d1de7f845a08e9dfb72afa257c51c6382cbc48f5f23fe15b027724dde WHIRLPOOL 1c48b8ea54d65d1d2ea001c6af45c0a76f0587d815353675ce36245c721f4b2d9c5b48c608fe632743863f5db859c5ee0c96b95fe6b429fcdd7053d4e8fb86e8
 EBUILD gitlab-ce-10.3.7.ebuild 14085 SHA256 cbff8442516b815e386974191d48464202b3b4f93e5d4688a71de08fadaeb89c SHA512 311e256f675c6cbb8e374448858e0adcfecd6a5432c4384a5d9c302a3c82dcab0aab0eb9a79d90f8f770dba0d1d984f0b7e3d53ce1e3b2c4c915aaa2facdbdd7 WHIRLPOOL 29674dc1a54311518047df70ecd21971b642bc7b8511d8c6ba3f754b7beae3de10c289704dcd214c7c5cf76f60772117c2649daac4d691b13387d758d2fb3f36
-EBUILD gitlab-ce-10.4.4.ebuild 13152 SHA256 6b226f67a85d25131a9acef87447a357ea67cc3f48e6aab927735de62fdbcaed SHA512 b8b43172d6b37ca3bbf84b7d2598ff558cebf84157a87957316d5f7168b52e8c91f87db853cf7a9c0843ab83540d811a4ad98da9c69343e87a0633b44f72b37b WHIRLPOOL d39bc072986261de7ddc35d58ee570eedfe8f01532dea8fa1423cfb40a5352453a1ba2647023032194ef44a87dfa7f0b4ca0dc96472c609ea3a49a1a5a339153
+EBUILD gitlab-ce-10.4.5.ebuild 13152 SHA256 69e512b9a7bad02d6d9b848c08f070914ab59c74444c93185bfc05ea08decf18 SHA512 ac8d91aa7b4e8bebc4fbca44d413ff7c8f9549d340de730341ee026328dc25220d6e34b31dac86383d48c8b6cc465eb01a0fb601e944c20966e2016adc7d0024 WHIRLPOOL 6f14b737b117cb43b8551fc5f5fcfb79910db8496ef60b26dff758ce669fc47d910c003222f595e0635c22c16a4d05df0b39d2628ea20f9a46a5bdc3039ebaea
 EBUILD gitlab-ce-9.5.10.ebuild 13526 SHA256 6e7c361f31989dd608eff4c8dd01b7301b142b4d38acdf38e61e2eecb2d4b285 SHA512 e33e56c8e49bd2ef03dd9af508b186f7908b8502960cbdb95ca9166631b84d5357c4965c0919e432ee5de9b9eeb33f68773ac405c24430568f9abb0d8e7354a6 WHIRLPOOL 3e866d785e8018096a92a223a2f6cedf4398cc07726a183d805005b3cd718fed2296edd63f5bc9d2b8849fe2298e9a61bf998a2241de2cd5ab4527f8ddaed325
-MISC ChangeLog 26925 SHA256 17ed6f6acaad109f9dee884b442a3845ece4b202d1a645bfa6694c337c0d3405 SHA512 bb830b972289a1dbece2329fe555a6afd06b29ebbb541c7b155408f92c8616a4e17fb139ee7bbf854d661f27b4c6f7e54e078301063b3eccd067f3742e00ab75 WHIRLPOOL 898c95a25d81ad987adbc8a8ea4a82c3e5c1d04b5e4b4bd0005f0a9efe9258f4d5829ad193db17cae58c641638f25f1f98a40d563255c09f5563d736611106fd
+MISC ChangeLog 27106 SHA256 957db66c97c8d5f5e346ede41e552bfc0eb410cca091c487278b500aa96c220f SHA512 006a5369989cb5bf71dbf637fb1ee8e00ebcd31429dc08583e6039070bdeb4260384f1910991f2a599a06acdd268d973b54173540ab69fe0fdc598a80e3943e4 WHIRLPOOL 8444b3ff899d10ffce2117b938e95224338d573074003cadf8eb0c71b837a8c810509008b80f59973583c455dadcde61388cd90e6f837269b5befab63ab750c3
 MISC metadata.xml 665 SHA256 2a0cd67ad42f0cc6d8b88391cf6e3153a9883dab31aae8227c57c95f3f68890d SHA512 64b8fbae373d0a057f705f64c1d097dbfab893bd585e1db65ccdb06cda9569211c9b63fa168ac8de9f6d512a17759ecd20b54d818d2790a6f4c99d0ca73fddc3 WHIRLPOOL a81b21bb46aad9757a502628033eba546c686b83bbf1d651ecabba273c454cfb64574affc180db8358ced87eb638e8ad13d7c79c4cfb9a31e72c577d21ab433e
--- a/www-apps/gitlab-ce/gitlab-ce-10.4.5.ebuild
+++ b/www-apps/gitlab-ce/gitlab-ce-10.4.5.ebuild
@ -19,7 +19,7 @@ EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 inherit eutils git-r3 ruby-ng user systemd

 GITLAB_GITALY_VERSION="0.66.0"
-GITLAB_PAGES_VERSION="0.6.0"
+GITLAB_PAGES_VERSION="0.6.1"
 GITLAB_SHELL_VERSION="5.11.0"
 GITLAB_WORKHORSE_VERSION="3.3.1"

--- a/www-servers/gitlab-pages/ChangeLog
+++ b/www-servers/gitlab-pages/ChangeLog
@ -1,3 +1,9 @@
+*gitlab-pages-0.6.1 (09 Mar 2018)
+
+  09 Mar 2018; Manuel Friedli <manuel@fritteli.ch> +gitlab-pages-0.6.1.ebuild:
+  www-servers/gitlab-pages:  Add ebuild for version 0.6.1, dependency of gitlab-
+  ce-10.4.5
+
  08 Mar 2018; Manuel Friedli <manuel@fritteli.ch>
  -files/0001-fix-Makefile-0.4.0.patch, -gitlab-pages-0.4.0.ebuild,
  -gitlab-pages-0.4.1.ebuild, -gitlab-pages-0.4.2-r1.ebuild,
--- a/www-servers/gitlab-pages/Manifest
+++ b/www-servers/gitlab-pages/Manifest
@ -3,7 +3,9 @@ AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7
 AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0
 DIST gitlab-pages-0.5.1.tar.bz2 224270 SHA256 b61ed9c12baf197dfd466342301ccb3160fbfe8fe61270a31a72e5503504f50b SHA512 973615efb54290c0d6b41455d91bf6343d8b09687565b8ad5e72cd69faea99cc3819c3aabea9e7cb94414a61835104e052affb1072ed62b1e2f343517eb94184 WHIRLPOOL 421500d5f0cee352a95dd59e9b799a9b3fd6b7639c656bd54fa601e061ddaa5062fa0b6a567bfce2543dcf9755b824a81362171c779db2f3f238faf760a6c472
 DIST gitlab-pages-0.6.0.tar.bz2 237765 SHA256 2bd99b5c4a1ad05ac02f17f5b450c308d1ef5936ff2e44be706705df8376c41b SHA512 935572062268c8a8429634377e02060f55feb2dfbd6b16e4487c1c4043dff435c304798dd2097f381f1c2e175c21d840e2dee76851dc9e03eeaa49d2b003900d WHIRLPOOL 01541d143a9511911cdd7c0c97d63cc48c682b19392c96ae429d98eeba6aba220e811d4da6826da2d417439202a33fc7a0deb16a9dda8a5a65f0e6b0fa9adf54
+DIST gitlab-pages-0.6.1.tar.bz2 238746 SHA256 267a9165470dc820363c61eb20170838c1916b1a7a0b31b6fdf018532db26f64 SHA512 3c93772b7d0b2ff76eae911adf4341492b803deb768eaf82fc03626154892392bd21456c3bbfde54885948ecc290dff5d5e828efcfc0d385aa0160cffcb67013 WHIRLPOOL d841e1bd1952fa4ff852201169c636eb83282b2559a57f9d1405e022aba5cbd124b196757c8afe4ce718353657474eede757181c29ae2769e5278e1af737850e
 EBUILD gitlab-pages-0.5.1.ebuild 1429 SHA256 be42145727bdc839161d6ac74bde5f59f7b69d2c204988e328d6ad2f02ee8704 SHA512 a585ab78624455480bd11ae599bc299a27e99b905b5fd686d71c0c06c157b937e63a46235fdbca758e47a938612b202d1887ef8749c5bd7c3abcf2fa5f48dfee WHIRLPOOL 57d1ace304dc994b27eb1d550885de5356cb2ce07e1d80c7a3c4f1c425115e59bce9220470e8ad9808b1f38d7bcd028ddd43dd04424f8556355417c81ec78a00
 EBUILD gitlab-pages-0.6.0.ebuild 1800 SHA256 7522d58e9b03a923f2e39cd6607c978485fcf3bd5d031f22c5c1831ffa81bb4f SHA512 487381485e2a9cecd8c7dc7a553ab5d107a49db9c77cd0c3d77c97c8e65f43207e6e5fe853959fed2df085a9047ee55b0ea332b8e507338b6ab44004bc7173db WHIRLPOOL efb8a378df194d37b6e59663b488aaa1608b7650489b160d59e98eada7e9f5328287f99843db7e2ebbfeaceaf2ebffc0863ffae915cc8c8f5b7e0a6a66a7206c
-MISC ChangeLog 2878 SHA256 a9702b37131976df434b05fb34317450259bda7176c6cc2ab0ed9b8636b9e02d SHA512 fb41ca3d459f99a750095158cc6c3ee4f4209dd153c0febc35b7b2be860b5add62226d541a9d87f9b1adb834f5f5c1d70e14256fcdbcf2c1cb67d81c072360da WHIRLPOOL a00b2eacfcb4aa3ed20a84b29d62d7b4dd83aa5d5a879f30c0a5cc4a8dfea556e4b8e33a9ccd8aad3efa9d00bc68dc12fd03aafe7fe5993c2ef6646739f04666
+EBUILD gitlab-pages-0.6.1.ebuild 1800 SHA256 924a7c16182db2151a4ed0886a913117ff0c4609a789c4c7e67775d0d89aa2ac SHA512 33092b419793513ac046bc5c154c934ce50a557fa8373b7c84b04431c8eb02545d45dd9caae6ec39304e9b5db714c646c04ec9979fc36d3e4393f20b984dd5dd WHIRLPOOL c8dee5cdb5ed42ee34c5a13be374b26dcb979bd7fed850789d99735034cc5d734fc0b67ac7c791c04d9e68c7476690b0f7a869c42914d6e0cbd59085290dbe2b
+MISC ChangeLog 3086 SHA256 d75860c7b670a98ba601d44adaf414e622ced8649d3370e3d7b449d2ea93153f SHA512 cd1a1202a53f2a693ea9c7015230677de6f8125d850fed500605aad13f39c6b37d7a6491e0b9eddc8ca95e507ecd87567a4811e0018a95302c523c9979789550 WHIRLPOOL 7b9b166afb8c307c3a50d4b042eb47187d916b32db45d4858c7c8fc4534ead433de31dcdda4119d9fc292434f1fe5abbdc3ad3851c106be1450896393e142374
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
--- a/www-servers/gitlab-pages/gitlab-pages-0.6.1.ebuild
+++ b/www-servers/gitlab-pages/gitlab-pages-0.6.1.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..."
+
+EGIT_COMMIT="32dcea08"
+MY_PV="v${PV/_/-}"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=${MY_PV} -> ${P}.tar.bz2"
+
+EGO_BUILD_FLAGS="-ldflags '-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}'"
+
+inherit eutils golang-build golang-vcs-snapshot user
+
+DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages"
+
+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_compile() {
+	# silly golang-build_src_compile doesn't work. some crap about
+	# escaping ...
+	ego_pn_check
+	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go build -v -work -x -ldflags "-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	# silly golang-build_src_install doesn't work. some crap about
+	# escaping ...
+	ego_pn_check
+	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go install -v -work -x -ldflags "-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+	golang_install_pkgs
+
+	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}"
+}