Merge branch 'gitlab-workhorse-0.8' into 'master'

dev-vcs/gitlab-workhorse:

added ebuilds for versions 0.8.0 and 0.8.1, as required by www-apps/gitlab-ce-8.12.0_rc2

Package-Manager: portage-2.2.28

See merge request !112

dev-vcs/gitlab-workhorse/ChangeLog

@@ -1,3 +1,12 @@
+*gitlab-workhorse-0.8.0 (11 Sep 2016)
+*gitlab-workhorse-0.8.1 (11 Sep 2016)
+
+  11 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
+  +files/fix-Makefile-0.8.0.patch, +files/fix-Makefile-0.8.1.patch,
+  +gitlab-workhorse-0.8.0.ebuild, +gitlab-workhorse-0.8.1.ebuild:
+  dev-vcs/gitlab-workhorse:  added ebuilds for versions 0.8.0 and 0.8.1, as
+  required by www-apps/gitlab-ce-8.12.0_rc2
+
   05 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
   gitlab-workhorse-0.7.10.ebuild, gitlab-workhorse-0.7.11.ebuild,
   gitlab-workhorse-0.7.8.ebuild:

dev-vcs/gitlab-workhorse/Manifest

@@ -1,13 +1,19 @@
 AUX fix-Makefile-0.7.10.patch 380 SHA256 1d046041dc63129ecdd726a1dc3a35853344493f4dfad60ed4ef4942ae38191c SHA512 d647fe047007e297f13be67997fc156c8b6f6eb53ca711e2b2b531260184029c611921a71d43ca78ac404d302dc23b356d6aaf47204c9015e2f5f11ea44b8522 WHIRLPOOL de148ab791b98cec0922b462bed5b4d39eafcd327cbf885f0a64b3971a36ac9121233973d019957973c821dabc7b1ef1ea7fbfa788b8ea39d0d808bd9a093d4f
 AUX fix-Makefile-0.7.11.patch 380 SHA256 331a8fb441f2f26385ff72993afad04e03f23b81b69d2d2a7d84933f91096503 SHA512 c4c497d98346eac1d80a860957ffcce57b9da1df192a418030d1833711268919a5556b861922006f9af47971c7799e8f67466962479e5cd91b7089ca0668a3b9 WHIRLPOOL 4173604725a22413eec7620f947e986c02cce1a06a9db81a16d06115e7d2e367b34f87370acac6c48a2bb42c9444a92f4f98d830c484afbb9f3e43bc7a252b0a
 AUX fix-Makefile-0.7.8.patch 397 SHA256 491e085466e5e653bb7adc13458fae4c2fa96e87d53ffcd16af1a012f7fddd05 SHA512 27ee0a6e40db1b02acd4c4b67e7d47045af93b063391ec2546340bd5b3b20e057e924b713549b35a2c0073eb62fea1f451073de4b311fa1fdb154421efdc4950 WHIRLPOOL 4475084cb5667ac3460c5c82fd68699125feec26dc54c68abbb20ba0e38e27c1ddd1bf39bb97e28dc7c9f6220e4db0db3f8d0d9571edbe3e591dae64881fd386
+AUX fix-Makefile-0.8.0.patch 354 SHA256 d3a637780f73f33b7d8bb670841dcf3337f442160323501110ae067378dff540 SHA512 8d3e195f65a472dced9aafc7b8c6a7c4bfa208b5cec22bdcbe7fb58dc95edb196507bc979261637067852885572b30dd4ff68a312de0d97dc248de70d74a16f7 WHIRLPOOL 80a34f3c627b27256d1022fd88172aa9e8fcdc2ebfd1692a518d48441e5f12b5094810240807886d4944df099597753cb350792e0abc70c20c4ae768d559877a
+AUX fix-Makefile-0.8.1.patch 354 SHA256 b7eff06725d0ca4590615b0f3f5c10624f9a85a356edb78b2fd373ab7ee62b73 SHA512 22c4aa508c63e0f7b90c67bdfe698b0a71458858b7ffdce79575e273f186861d2254961cb392b44fe12e6a8f7d7a09f1e9503de6fc6493b918baed71ec4a3aa4 WHIRLPOOL 2139fd7073ffaaf60701502ca44996b094822b3c73487cc4287f0bd6c156d95b8882c5d6625e3839f5215e23ee608b702eaae80f956ac6482f9fe48e905a9b4d
 AUX gitlab-workhorse.conf 248 SHA256 6d11d63aa869cfd8c6f77c3a875984c226db633be899ad7ce97fafe94236eee7 SHA512 234213c8361702bdfeea40bd306b5899de19f34ce985e090a86e01aa601cf4ed23da4dfb75f74fe5986bbea5535a7a6a745406b4f67f79d352bd1c863777c7f1 WHIRLPOOL 8ac1134cde3aee942466d206e703ebd5330f83537d7e29641447f812d857bcc57b07fbf82eab086c0d622750694f64fabf8ffca2ba26a725f61b40fd1941e963
 AUX gitlab-workhorse.init 654 SHA256 c7118997a4da198c477120a544969bdcb36404da8717aac79664ba3ca07e9c4a SHA512 7099a110efbd0fd02b3081ec7fba9f4221a7cc3d9e5292ff7c430546a7a5a05162d26939f6028da64490137835bdc03764fcce074d977976acb709409ab994d6 WHIRLPOOL 53943a20bfbce33ff569384a3b17475d718ec507d24f6fbff3da370fd9ef575f26ad00b4f0a59aa1a2073cb346e3ab6399c659d96bab79f872f5cb9c24e5a458
 DIST gitlab-workhorse-0.7.10.tar.bz2 29153 SHA256 df2c81175abe11608df89e1965f4f823f3cd0cac1650cce3bc2c6927dbda0b28 SHA512 17028df034b0fc5063f1ef1067061d1f3e2f38b7848daf242d806cf0abc1e97ebc7fce269c472ef450ba7d33e720554edcc300e1902d71b7b518fb67ee4abb5f WHIRLPOOL a1f5d056509a624279da526bd3a7b134177aafdec66467d121f050f2355406b3bd81a4fa6b7e4f81cc273dee7010e59a61986e69810fe766bf6322f741ff9515
 DIST gitlab-workhorse-0.7.11.tar.bz2 29401 SHA256 54515f030664e33ae3925d9a85c4fe166fb6316752d819f51cb592f553284b4c SHA512 3f8c8b46f60f13a8d747eb92d42db7d7dae133813df34b263ddc87aef04592888532c1f07c9eeed5eb708af8232a2a98a382e056ff184d61547be68ba55da4e9 WHIRLPOOL a4b17b2784e428ea092c76a3a3ba410565fb3c08c47ef542ddcc126785f3eda837b9462311944be1145076fcecc3da51029cef795c3db7b342e8d95606acfde9
 DIST gitlab-workhorse-0.7.8.tar.bz2 28253 SHA256 0823495288304a4e2c6491fb011d509ccabea8af765bd35e47e6e5b1da52a599 SHA512 392d1a11da1f61fa5e319d8cf5fc2f158cbc90baaedbd98f33a992cc938f67efe5837e9731c8b4b8d1e8265620c5ae69ced3326eb376aa1cc691457eb6fbc002 WHIRLPOOL fa61930d4a8ecad35b3d27f46da731623f6e41898485d564403ee53badd793824afdf1376c0e0cf6e2e6e30cbf205091db3e416841f60bf6ff905504714ca1be
+DIST gitlab-workhorse-0.8.0.tar.bz2 43453 SHA256 bec4ee8132e3a0bec22047c03298e969fa35b66399da19273282de2321c1fc6a SHA512 67523fd6b8953266376c1cdb0929e072a2560e55054eb8c15dded8457b2a764e37945530389be36f7f3f9ffb799feb77ab036ce126cae188ecaaec9e20cf3e8e WHIRLPOOL c353c14c80997359ac719cfccfd4d4f327ff6e02d0fe72afc7e97c62a368cbc988698ebf3a563a8ec3b429f6c00572ab3e677eb970e6cfdac85c29de424eda72
+DIST gitlab-workhorse-0.8.1.tar.bz2 225866 SHA256 90c35319b7b1ca44dc51b5ea28b542b2929634294241fe8466eb516706a1ddaa SHA512 c59f869cb7797898609a21115bee75bc51c51172ac44203a010aaf9a312576ce043b656a14ae8ba4fc847a02da5d3c8f772191e356f0e784b78c2b3565896954 WHIRLPOOL 9b75a7e00ffeb65fa57e5d3f3343e6c0b76c615ce3c3ba68d1aa03e62fcd4005b37501937ef98aea736ba915eac47ae87d3541f9db24600bef0a80d13d950f72
 EBUILD gitlab-workhorse-0.7.10.ebuild 904 SHA256 a8b276671d91cbefaa4803780748254e69c82462b6f945c3788f8604182a5b90 SHA512 4f1ece96dfca5ce735cd950bfd4b61ef1c8c6fe11fa00ec84a3b47fdfcb4fa45091371e0bd80581eb59a221d10d3039a33b4c0eaff4ba44aff7f394516339b0e WHIRLPOOL 24537b84809a019a393fbd5640d552c04264b9b6c909a753334fa80754b40f4e8eb6162be049f8c0e872269c88136529c7ceaef500b9bc5e82ac9e4dac703d61
 EBUILD gitlab-workhorse-0.7.11.ebuild 904 SHA256 6623b233fac6d82c6f4b3026daa5c59743ce0243585d16f7d4ba81941c55b68e SHA512 2577c18ea0f0463f032d06a4e7390f78e527f412b9a5811c50d633d1cb818a49de0cc27cc29b9a7aacbf9e703547ca03a2650c2dffda78484e7190774346704c WHIRLPOOL 5652fa188f27dc2c0d03952832f66efef7c3f0b8118957bf1834460e67134ff7b94dc3528818e6a6b00893338bbe6fb13255e7b4b9a8c06f4c539106fd934800
 EBUILD gitlab-workhorse-0.7.8.ebuild 904 SHA256 9b36bcbe79f70bc0b1010a34ff04b99726a773a9eba0cab260f92903d09b7a40 SHA512 9b1bd3afff478775539754f7b4b6db4be2881fc44ba9e09870b086e61bd5979973285c6780c4d6cba23e90d906868f60396ef1a2b91b8393ab0b7ee1ed362e5e WHIRLPOOL 3779eb573fc5a1104c38aace8782bea5ba259fb3c6d89b8772dd3d1c850165ec3f71b5cc0deb3176013b9ccb2365f1b8dddf657facaed161136a86b10062d6ec
-MISC ChangeLog 2380 SHA256 d5c0dba3a294bd225565daf549b537e3c34284e7f09e04b9cfd687e9b74c7d4f SHA512 50fcd60cdded29d72b48e26d16b79147276512dc66e71bba539c58c6e066f771a3d3fff15b0ed781dbfa9ebd05992f3a057bc8af91dbe901d18f097e12b571ad WHIRLPOOL 7a32e920299eca569040eb0c5337b75139634bd06c9bf59a7af31fd0842a1655aa4a54a4ef0af56beeb2f505328d2c7b99c68b4392ff9f2c55aaa6c3fe9b02df
+EBUILD gitlab-workhorse-0.8.0.ebuild 938 SHA256 0d015a3989e8aa737ddb5350214fc1b5d6a4b77e4925e1537bfc52350284e26f SHA512 7d8ac953a664e70147b7a7f38e87e47ded554b3a1d3fc3a1771bc2a11aee6f3760fa53ca6a50178bcc1810f34ba7e8188e42c0708ec9183ad76ec119b53e88bf WHIRLPOOL 37b1941d8a583c9a8461df7faa02729ea18a7e5e9b496f3d113a75a8088beb8e46537cfea0f301a5b6f89cf5cd37835311dfdcec5bb34a0956c3d724dd33adc8
+EBUILD gitlab-workhorse-0.8.1.ebuild 938 SHA256 6ea5b05eee4283dc302e7102a3978aefd9dd6cad1e7b2f6542019d34ce907085 SHA512 e43d7c6e9ad3205ced314cc03af3d71d0507409994828c14d0cbe1b7c0af70098b06f1b18211294789350f3307a9476d89c725d8cac48ddef85dc1947bb7938d WHIRLPOOL 6135c7779ce281bd480a33aafce113e9ab84447205bc0411b4c9d79ed35d29489f68d608ea72088857e23609629f708eabe03873074a3a3b872c13ade3af7d35
+MISC ChangeLog 2763 SHA256 34b741b820322706e80e60050eae19f8a1781e1e74b0e40cc9e4e6e3ba269653 SHA512 76e8888a212639e68d429eb435f6b002aefdcb46da85560a5016304165841e4d42fd6b3a08e998b809a4c04cc7975950a13155f17621821e5b85d67358474ef6 WHIRLPOOL fa7bc3987ce0a9ec567237c9b513097dcfa12b12284a1f2dfdb2386440dac6d93c3222554618d22c111b69677425aec5c7dd1a6cac3849c906ac09a2eae7324a
 MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431

dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.0.patch

@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 3f6ac91..663ffbb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++PREFIX=${DESTDIR}/usr
++VERSION=v0.8.0-$(shell date -u +%Y%m%d.%H%M%S)
+ BUILD_DIR = $(shell pwd)
+ export GOPATH=${BUILD_DIR}/_build
+ export GO15VENDOREXPERIMENT=1

dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.1.patch

@@ -0,0 +1,12 @@
+diff --git a/Makefile b/Makefile
+index 3f6ac91..663ffbb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+-PREFIX=/usr/local
+-VERSION=$(shell git describe)-$(shell date -u +%Y%m%d.%H%M%S)
++PREFIX=${DESTDIR}/usr
++VERSION=v0.8.1-$(shell date -u +%Y%m%d.%H%M%S)
+ BUILD_DIR = $(shell pwd)
+ export GOPATH=${BUILD_DIR}/_build
+ export GO15VENDOREXPERIMENT=1

dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.0.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2016 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="423a1e57e51035803c5df8b642bf9513164df77c"
+S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+
+DEPEND=">=dev-lang/go-1.5.1"
+
+PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+
+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}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+}

dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.1.ebuild

@@ -0,0 +1,39 @@
+# Copyright 1999-2016 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="b5990109b1df8fee925f8a3b7b76aec010407422"
+S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}"
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+
+DEPEND=">=dev-lang/go-1.5.1"
+
+PATCHES=( "${FILESDIR}/fix-Makefile-${PV}.patch" )
+
+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}.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
+}