Merge branch '108-gitlab-ci-multi-runner' into 'master'

Resolve "Gitlab-CI-Multi-Runner"

Closes #108

See merge request !185

dev-vcs/gitlab-ci-multi-runner/ChangeLog

@@ -1,3 +1,11 @@
+*gitlab-ci-multi-runner-9.3.0-r1 (30 Jul 2017)
+
+  30 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  +gitlab-ci-multi-runner-9.3.0-r1.ebuild, -gitlab-ci-multi-runner-9.3.0.ebuild,
+  gitlab-ci-multi-runner-9.4.1.ebuild:
+  dev-vcs/gitlab-ci-multi-runner:  Fix missing install of init script and add
+  ebuild for version 9.4.1.
+
 *gitlab-ci-multi-runner-9.3.0 (25 Jul 2017)
 
   25 Jul 2017; Manuel Friedli <manuel@fritteli.ch>

dev-vcs/gitlab-ci-multi-runner/Manifest

@@ -22,11 +22,15 @@ DIST gitlab-ci-multi-runner-1.9.2.tar.gz 3563622 SHA256 ed480b29f5dd305758e1158a
 DIST gitlab-ci-multi-runner-9.3.0-prebuilt-arm.tar.xz 9108608 SHA256 48b91ec516c9f1ac37c41392249875dba3217c240d31c7a4cc8ca3d159db59f5 SHA512 e21f773ddcbb172c3a3e8c0d3c916bc4f0348a71c89cc99613fa714edfeb61a02e32bb35c12e9d894b22921eb51d262e12f19daa3cbbfe4a3dc2c9ea2b9c19d1 WHIRLPOOL 8f9f7171e2a04eccb28d0b16a03de577abd05e0607039542e3d5dc63bfc4bc536001f53b68057b9de81130dd7fcce14f65e958ecc81fde089dbf5b745b42453a
 DIST gitlab-ci-multi-runner-9.3.0-prebuilt-x86_64.tar.xz 11123268 SHA256 3a5f832ae12bc1358a98fbcd296f8b5801162de34c1cd3c5933a1a2ab22051a3 SHA512 079c22c4e4e72dec218c1f6ddbebe2ea8da1f118b4f4ddb97f0cf28078f5009f1b900b5106ee147e113c9bb0a6b08b05af1bd36c7d0e1da5caa815ef4ec34a62 WHIRLPOOL 77e454af031c7fb18210bb83812f06db6790a71b7db8d3e95096e0d941703377b20ddb76ab78de7180981443dfd20aaeeb59fa2470759454dc933f6211444ea0
 DIST gitlab-ci-multi-runner-9.3.0.tar.gz 3188309 SHA256 e0cc29f3962ac655336f67159c59b44a8c6a4b7f969963e8103ff84872a0b98f SHA512 c47c88bdf6e69ca7bd5d62f1c845b6aaa014241093ec59489d2306eb3f163f1cc1424af4de2d3f1903c96f817fb981c8cf9ada7787561c1638297a0426653677 WHIRLPOOL 1f8fa03c49ced02259283f864c9ffd6b62e3cb7926e58e31cab2ddb5562b2af95398817a3dd6e18d04d0e53a4c2ce0f3bb2cc4c99dea461ad32fbc7375fffc6c
+DIST gitlab-ci-multi-runner-9.4.1-prebuilt-arm.tar.xz 9094820 SHA256 12d2f730aa53cbdce80b87aaa9540b03be05502561cfdc8e4d1db2a1cd0537e0 SHA512 34481641c367c050de1f7e63c552bf4d56016ade3102f4a05a7e8947ba0a122d95dee5c7efad47e336ae42a7708b23e5a30c6b96b478be246c39a4f2df8f15ee WHIRLPOOL 973c0974add8ffb236210b237c4c35ae3fe46ebdacc1953d6e595b2443b72a76deded9062c3a53bfe3cbf1e0043e2d078421002a6191e94e73c737fd692846dd
+DIST gitlab-ci-multi-runner-9.4.1-prebuilt-x86_64.tar.xz 11105652 SHA256 01596f0ff33ae6e4106bf8fb15c18641e0d896b979a721234de6102d431feb94 SHA512 456483f5f0f9d87c4c2fc3f0072ec80c7737f2e1f1970ae70ca3d10c647774ef49ff5522047db1b560bf6db545fd739a9779ad047351b7ae6a5f5dc1f4df208f WHIRLPOOL 87950cadf2ae4d41dbe81b7b46f78150b505f41a656329c8ab64995b6c196fa0c6a4cad446c24e49dc13ab54402bd9651fca76677b2e3560e748f905f5d39e20
+DIST gitlab-ci-multi-runner-9.4.1.tar.gz 3205123 SHA256 231c4c6ea2dc78e82ab60da69dc20d18f69a8ad42d34bd70b2de50e9bb810fed SHA512 3046c10cf32050ba8b1ae2398861874cffc050f23441a2a8a0096c49055ec76a05a47aa1ff8e55d8780898857af2fe6f3735a908b54290b6fba5bf790cdb6982 WHIRLPOOL d3bfd9100aa4dd28b17c33da652e38dc769e3988268190c40fb4d377ebfa69203b1b78c4370daafde8369bcf88513080ab4c80266a0d5c754a7420d937939248
 EBUILD gitlab-ci-multi-runner-1.10.4.ebuild 3266 SHA256 403a1b8eafa8bc74582cbdf7cd90b9c18ee72e1a386bae07fecb6adfcd56fece SHA512 802c5fafcdf7b997115bf70c01b168499bfd1b0cf78195a414ccb0ca1c5f58da3eeb5c8eb3d1960b049b0509e92682e13dac7a80549bf5f9f7c818d0f931ffd0 WHIRLPOOL 616be2cfd835f9912f0698321a230b2d242251556a519541dea18b9673f3b84d32d4095104d5620d326dc5db7934a9c222ca1d92cc157bcca341dd5862f03723
 EBUILD gitlab-ci-multi-runner-1.11.1.ebuild 3267 SHA256 a63c1a0112653c298ed03bda0108d013563dbf70399628c48106af4a2564aa66 SHA512 65ca42ea46321ee37fc9e5683c923c0f1f3670d79c1ea9ec3b876de8962ef665c66bf38d19462981f689b3db3b4c46d1bef58dce0bab20c39ad30009db3a6ebe WHIRLPOOL bdf42cc264767ccbbbbda661edb61529d60951f8774a001cfea3900c670ff3310747fa86b1fd588e39d14851d018fa9d5a7fc1973e37e1a7a85489b5d5f69fc5
 EBUILD gitlab-ci-multi-runner-1.7.0.ebuild 3250 SHA256 fc9f976619ff9ddedaceee812dd2babcb1fb7d7236868368d23a5b67b60bd08b SHA512 276835a37b5be71c8663f92bb093c568ecdcae69d45a88a9ce3ccf896cefd3d59a7f8bfce43eed7de72744e4a60b110b8ca9ae8c2fed94f62c0da475e5c40a50 WHIRLPOOL cc4796822e8443f81f958c8fa39475fb1b168ca06b7e8c38f148b91b77da033c1113c88dd818aaf14265ea07ade5de367235168cdf6e2ccb276ffd45538e9812
 EBUILD gitlab-ci-multi-runner-1.8.0.ebuild 3258 SHA256 d54d70f365868526144decb5671c834bf259d8b8659ec57a8ed9cd55cb6589da SHA512 7023a29d0615b986ef6d0fb0f2ca3ba9f0c0cca095b739cb7da63eb13cb4bee413978807032a674bd5876da9eda198a8fbb11be44c5fe43099e8e98148524b10 WHIRLPOOL c77aaa33c1d24a278cf53d63aa54052c5bddc5c671d2189457b209dcd8a8bf4c911f50be6478c613ba111a709f500f2fb4ba98399fc78a5ece897c852b79d4a4
 EBUILD gitlab-ci-multi-runner-1.9.2.ebuild 3258 SHA256 2d753e9effbba47ddce697875a94572ea44a866fd4988924d38c5f3e87030f14 SHA512 7e691285841aad5fd200e83ed039cf24f3185d18d4b55545f2f325b9fbb6affc30e54ec1aa104799d3cdbfbdbfc4ad96c481485e8f5ce40753ad17b4dc5084d9 WHIRLPOOL 6b00e7b8446c6b78502f2fca6dcf752273245a8a71830fb968a286ae6cf1f0029285a547e0c568ae668315006a39cf9880e0db384504f428538c4810e11805f6
-EBUILD gitlab-ci-multi-runner-9.3.0.ebuild 1724 SHA256 9856b976332ff77ec8a4c2a30ce5d6911312303d3c6cbc4b07c691350f9a55dd SHA512 2abae131b8232b52f87485548add900a4bcb4e0be8deb86652d751507785172c7c854703c47fc802ac985312343c32f720c8066c686424a84ede85271e94d0fa WHIRLPOOL db6e448cad522ba456bd9aded04a1d4c554cf9f621ee41ceea2cc882130c5e883567aac4d4c99c8aee3f275d56bd685a6937bb5edb135cf680616d095a75ade1
+EBUILD gitlab-ci-multi-runner-9.3.0-r1.ebuild 2211 SHA256 cbb9bfd300480869d241949d363b1eaa576f2705a54c004402ee285beeb38db3 SHA512 08c4f026a66f7bc1e928ce2add29c64e935b26079d200a9f3b243157997484a7a808922820530cb6eb3302458297b48f7a82ce655b00b6e4f274742a786049d6 WHIRLPOOL 391d3c13fc12c344b42eb79cc17c6db18b31752b1d4a2b06804358a9c865b748ed5d651c23b31ff9a2760133ae62dd9cb359a3f9e29c57e8f44ed3e1a12216e9
-MISC ChangeLog 1762 SHA256 07d0e0a71df9d56a3051fb8226c7cac53407129bfc1b150ad4cc56afb6606c2e SHA512 0fb198b9d3618cd18bf2bcd2a1a024913b15f03874688da32a13701a13f1810afc0a002da956735af41e01ab6e79ceb579237a67a46b91018d036575d87599c8 WHIRLPOOL 70765a73589c597af5a7a11fce10af4f133997bf85e1226827d9261a3afebc24bad2cc88eabcf1d9d3581bd3b2d136feb0a1948028f0963e4ae11c81adff7712
+EBUILD gitlab-ci-multi-runner-9.4.1.ebuild 2325 SHA256 706ac2f05c06c47b98e076e09cc770ab810b2a0faaaf2854ff063b7661d9e60b SHA512 d1b54c1cba20527c7d3a1aa55d4b9a86f00c0f180db94f61b10e726412e3b87db87b5c2afd23b5acdd85b1ef2ee669cf5a04e763813eed60ad29dcac0103e2a0 WHIRLPOOL 1a67be8abdb781104f3015d0056e739c79e710f644b03c80e06b82fef2986896b727b3bd4d1a5f8d3702230e3fc2ef03fbeb6f79252dff6bdd325b13fdf56741
+MISC ChangeLog 2088 SHA256 7e1851b31eee965921973550fafba9cfcf4a4f61ba4634cdbbe767c4d4225841 SHA512 a4387565cfb8788b558b472132e88b8599b81c31822bcf04dc76b8524766f9e7d5adbdea8a578cfeb430c408495ad5ca0d7013d22e0eef90fdf2a281e2e7b304 WHIRLPOOL 1037cfd3b813390bdc1ddfa25613ff059651b202ece13a82eb4ff7db155cd2b366339d3d1f59e43101496a19a36a75519a503b9b1aa5d78eeef38f716036a9a8
 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35

dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.3.0-r1.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit golang-build golang-vcs-snapshot
+inherit golang-build golang-vcs-snapshot user
 
 EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 
@@ -25,6 +25,14 @@ DEPEND="dev-go/gox
 
 RESTRICT="test"
 
+MY_USER="gitlab_ci_multi_runner"
+MY_HOME_DIR="/opt/gitlab-ci-multi-runner"
+
+pkg_setup() {
+	enewgroup ${MY_USER}
+	enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER}
+}
+
 src_prepare() {
 	default
 	pushd src/${EGO_PN} || die
@@ -53,4 +61,18 @@ src_compile() {
 src_install() {
 	newbin src/${EGO_PN}/out/binaries/gitlab-ci-multi-runner gitlab-runner
 	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/CHANGELOG.md
+
+	# rc script
+	local rcscript="${PN}.init"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|" \
+		-e "s|@HOME@|${MY_HOME_DIR}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+
 }

dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-9.4.1.ebuild

@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot user
+
+EGO_PN="gitlab.com/gitlab-org/gitlab-ci-multi-runner"
+
+GITLAB_COMMIT="d24b11c4"
+
+MY_PV="v${PV/_/-}"
+
+DESCRIPTION="Official GitLab CI Runner written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner"
+SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz
+	!docker-build? (
+		https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz
+		https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz
+	)"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="docker-build"
+
+DEPEND="dev-go/gox
+	dev-go/go-bindata
+	docker-build? ( >=app-emulation/docker-1.5 )"
+
+RESTRICT="test"
+
+MY_USER="gitlab_ci_multi_runner"
+MY_HOME_DIR="/opt/gitlab-ci-multi-runner"
+
+pkg_setup() {
+	enewgroup ${MY_USER}
+	enewuser ${MY_USER} -1 /bin/bash ${MY_HOME_DIR} ${MY_USER}
+}
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	if ! use docker-build; then
+		mkdir -p out/docker || die
+		cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz out/docker/prebuilt-x86_64.tar.xz || die
+		cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz out/docker/prebuilt-arm.tar.xz || die
+		sed -i -e "s/docker info/echo false/" Makefile || die
+	else
+		einfo "You need to have docker running on your system during build time"
+		einfo "$(docker info)"
+	fi
+	sed -i -e "s#./ci/version#echo ${PV}#"\
+		-e "s/git rev-parse --short HEAD/echo ${GITLAB_COMMIT}/"\
+		-e "/^LATEST_STABLE_TAG/d"\
+		-e "s#git show-ref.*\$#echo gentoo)#"\
+		-e "s#git describe.*\$#echo 0), 0)#"\
+		Makefile || die
+	popd || die
+}
+
+src_compile() {
+	emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN} build_current
+}
+
+src_install() {
+	newbin src/${EGO_PN}/out/binaries/gitlab-ci-multi-runner gitlab-runner
+	dodoc src/${EGO_PN}/README.md src/${EGO_PN}/CHANGELOG.md
+
+	# rc script
+	local rcscript="${PN}.init"
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|" \
+		-e "s|@HOME@|${MY_HOME_DIR}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+
+}