Merge branch '40-gitlab-8-12-with-ruby-2-3-support' into 'master'

Resolve "GitLab 8.12 with Ruby 2.3 support"

Closes #40

See merge request !114
This commit is contained in:
Manuel Friedli 2016-09-18 12:54:22 +02:00
commit d11fecd14a
13 changed files with 161 additions and 118 deletions

View file

@ -1,3 +1,8 @@
*gitlab-shell-3.5.0 (16 Sep 2016)
16 Sep 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-3.5.0.ebuild:
dev-vcs/gitlab-shell: added ebuild for versioin 3.5.0
22 Aug 2016; Manuel Friedli <manuel@fritteli.ch>
-files/gitlab-shell-2.0.0-config-paths.patch, -gitlab-shell-3.0.0.ebuild,
-gitlab-shell-3.2.0.ebuild:

View file

@ -1,7 +1,9 @@
AUX gitlab-shell-3.2.0-config-paths.patch 1826 SHA256 c83db7c37dcac577ce499eab4bb0168253f49d303ba1991fdec90d13cc3fe37a SHA512 7524b6b8cd7cd141a56c468efa303b1d21576ac9e03cb866cbf9dcac34e1b8d4f356333737050e2e5dfeb0f0ad904b3f548c40e1209c1f35054ed2027b1d8271 WHIRLPOOL fdbd2dfe43ff4a2af97227fbf8c4589ca3734ebf0320b7e9c5e8ea39882c49d45815a0ee3c765a141affacbe48f4063987b9664a918e0e216b49ca46a475cc5f
DIST gitlab-shell-3.2.1.tar.gz 68788 SHA256 ad21f8676901b9d90a1c8016b5fe2ad73f9a7966ab378ce244b12fc0373e9f46 SHA512 2280b5ea529d1efff365b1f72ded2af71c7cd19c88c1d7638f730044c5a804a0adb8670685b2016b26e894755a0b70f365d234c95e4ca3bf09913d7b6bebca76 WHIRLPOOL e21d77c00a02105babe4cf84c7ff9223131eef5e7e1db80d06b40bae87d225b579f4fbdca4ac2809be436f96b25753f73b354e6d03ad1b22ad57bfac7c720ae9
DIST gitlab-shell-3.4.0.tar.gz 71972 SHA256 0ac8f18b1615194943e935b670d630a1ba9870ad876f7486256972c7be1d45d4 SHA512 1138e02dbf5169547e39eea87ac88f05009424c76f26b4b0f2cb3882eaefc9d7aa11e167c6d9309947da728fc5381a234b93e25a0ded4f87eb8d8c88baaa2b9c WHIRLPOOL ef9ff2b349af97019da56c2e0b850fc4885ad036074e7bce39ba6f12bea611b771becc5ebf3e1889a71078243488bbf7c93ed90e545844b36aeb42b79265ab2c
DIST gitlab-shell-3.5.0.tar.gz 73374 SHA256 6591b768a4f51c535e97e5632518583f6559a4202f4219739ad01a27161687ef SHA512 b5935c6f9b19bab1716901c8015e107f7fbc545646d5e35a6a943e1692d3ddd61efeb862f4d59efe75eda9c1117adf9d90b50f572ab0a69199069d1fc52e8718 WHIRLPOOL 938c600d0810867fc9aef62a286b05dc34bf52352612530d459614483e3c37b3cef6ee5b2dc11f7b041218cbe569d11f4f5f0240b9c28e613bd762c06786772e
EBUILD gitlab-shell-3.2.1.ebuild 3653 SHA256 e8043271a1a42664862a4284a185ee11c7fc6c133a1b3c7dfb44b748d705cc3d SHA512 0232d94c21d675b1e8762a2de1d95a36bf41afc97435d84e54dd93bbf190cacbbfd426e6e6253c5f2f894c5d3ff7c878c261df7714d477c4332beeb433fea223 WHIRLPOOL 02fa858649c50c040fc16930c5f7f35dcb9d9df2d693898dd930cc945d0d5f264b52009cde063fafbaae78aecfab6dcf6d6f03fb9e4c2f9444300e8fd514175a
EBUILD gitlab-shell-3.4.0.ebuild 3653 SHA256 7bf777fc3b5bda03f9a455874f62bb6260eeb73dd8727e4145ed0cda2e283465 SHA512 de5b78133d317155f5764d6888d421c4f2945ccb5972c032c05138344188eb0a0f85817431aa4348e2074667c901f44cf2b575f572aeb2620aab58a32ddba22b WHIRLPOOL e53de830c17bc9c784df06670c6fdc7465ba05ca40de42e4857e5a83421208f9bbb4381c2988fbabc85f86476d5c2b7301123392de132558bdd6f969726a9a57
MISC ChangeLog 1110 SHA256 c43ec8d94e3186c9bfd4c1ffa84a302d9889914969316d7157c2959985600326 SHA512 b709fedc11c89fbd7032a45c68ae7967285ce41f543cab491dce232a570a5024b5bec8a0e7facbd169637434d027280054f60819afd5e0569c33947e1dd2ea25 WHIRLPOOL ce0dd267c7c52bf8763f2875401654c9cf003b64fe8f7eeca846d5424c9aad44637bc6b64838069e75211107dc4e85c9dbe5467b044011fe4340bf6811dcac67
EBUILD gitlab-shell-3.5.0.ebuild 3653 SHA256 3b73797e283ff4ec30c87d50a54a80cf6895c0c03dedc3ff34087b3037dd9fd5 SHA512 cc235d625f1eabac09822fbca06b706886601e550958338ea5ee7ccfdbbb85e2d96bb348b4ccce532c92d18389c63ddb78bcd77e407f789127fbb3d9ac32d0d9 WHIRLPOOL 4a8bb0ee8a1b547bb8517c300806457187a8fd1855b223cf079784733fdef55e2dd5fa9998da9523bcd3b021aa10d45cc74445bae5bd8f853e3355d6a1d6417a
MISC ChangeLog 1282 SHA256 0c3aaf7b0e9386180213edaf75d2be70cd75b4797c79a053be1e3bb109220012 SHA512 78232992b59d4d15947347fb3a7b8efcd399c8584886230a946ddeda8bb7ad06f42de730ceed9df296933c7d88a2441d8d8e8787f5610941f191076344c6bcd1 WHIRLPOOL 2db732b38f62051acadfbb434ffe1e3ac6861f9f213b688246cfa00404cbddb790d61c007b8a0c73ac43328622a2b54f46139da397ca4590af7235383823c31c
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431

View file

@ -0,0 +1,130 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
USE_RUBY="ruby20 ruby21"
inherit eutils ruby-ng user
MY_PV="v${PV/_/-}"
MY_GIT_COMMIT="c6d8af599dc797ec8ba7874380abad393b439c9e"
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=""
DEPEND=""
RDEPEND="
>=dev-vcs/git-2.7.4
dev-db/redis
virtual/ssh"
ruby_add_bdepend "
virtual/ruby-ssl"
MERGE_TYPE="binary"
RUBY_PATCHES=(
"${PN}-3.2.0-config-paths.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_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"
# 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}."
}

View file

@ -1,3 +1,8 @@
16 Sep 2016; Manuel Friedli <manuel@fritteli.ch>
-files/fix-Makefile-0.7.10.patch, -files/fix-Makefile-0.8.0.patch,
-gitlab-workhorse-0.7.10.ebuild, -gitlab-workhorse-0.8.0.ebuild:
dev-vcs/gitlab-workhorse: deleted unneeded ebuilds
*gitlab-workhorse-0.8.0 (11 Sep 2016)
*gitlab-workhorse-0.8.1 (11 Sep 2016)

View file

@ -1,19 +1,13 @@
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
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 ChangeLog 3005 SHA256 a160c77317bbff19b3abe8cdaf4d0ea83ada6619008fccce14dbca79d345bb0f SHA512 bdcefab56045ad276188aad82cd0c1574444d1df333777275c6efcaf065745061531a4da4d756509f62f91553f728c3b575b71ed3b6d5eb6b4535cd965980b0f WHIRLPOOL 2d8834907e193dee30bcc920e3386b8956a7b92cf7d7f1696580c3bed7c695ee72f68d6612bf004f09f08c7b5e5f3244be08d3ec9e1824c600d5655f94928a95
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431

View file

@ -1,12 +0,0 @@
diff --git a/Makefile b/Makefile
index 5ac82e5..63a967b 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.7.10-$(shell date -u +%Y%m%d.%H%M%S)
BUILD_DIR = $(shell pwd)
export GOPATH=${BUILD_DIR}/_build
GOBUILD=go build -ldflags "-X main.Version=${VERSION}"

View file

@ -1,12 +0,0 @@
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

View file

@ -1,37 +0,0 @@
# 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"
S="${WORKDIR}/${PN}-v${PV}-73e8288744223ef8561ab6dc090df014b024aba6"
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}"
}

View file

@ -1,39 +0,0 @@
# 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}"
}

View file

@ -1,3 +1,10 @@
*gitlab-ce-8.12.0_rc4 (18 Sep 2016)
18 Sep 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.12.0_rc4.ebuild,
-gitlab-ce-8.12.0_rc3.ebuild:
www-apps/gitlab-ce: added ebuild for gitlab-ce-8.12.0_rc4 with Ruby 2.3
support
*gitlab-ce-8.11.6 (18 Sep 2016)
18 Sep 2016; Manuel Friedli <manuel@fritteli.ch> +gitlab-ce-8.11.6.ebuild:

View file

@ -16,7 +16,7 @@ DIST gitlab-ce-8.11.3.tar.gz 25701850 SHA256 23dc756ae148074701acaefcc686a66ccf7
DIST gitlab-ce-8.11.4.tar.gz 25704666 SHA256 c8d94888b4f7aabaab2d548926935edf0fc284277006e284424e202122b072a3 SHA512 dc4f2dfaabe95ecea1202da8e1af6d850281146faa7ed2c522c34abd0167f9ff4b4807fca76a61fc2f607126efedca552652474edf552f2848d797f92b5b1ef2 WHIRLPOOL 30b2a46e3b3a4503fd1a1cc68eb2709b76067068550729fe45b9a4b3917cfac08932da689743744c03041a7b705432a4f601fb6a1e2d81a897cc035197e90b5f
DIST gitlab-ce-8.11.5.tar.gz 25704701 SHA256 5a0de2cdcb97396d8174ad49126e67829df47a2abf1831439186ae443e692662 SHA512 961dad680e4a7a158e316ac66e29ff42bb4f065796fcf360c6cba4c102eb67a240ea188a8ef1164608e05a3d6c5e04790ecc73ea2f2e5cc89766a2751b108532 WHIRLPOOL 35c1e8f7ba2f9fba159cd182c97f0d14f17b289e6e238027beccd9f805fa8622a353c507a56a9ec8d81bc64698fd35fc2cd0ad73c35a86a03cb894c62b458848
DIST gitlab-ce-8.11.6.tar.gz 25705796 SHA256 354da5db4087ce80d9f43cbae87830ccd06c2c559f8dfb764dffd7420588a66b SHA512 5abda185bfbbad61060ac9b5e83101d88f0f6c8cc12580c71467c7bfdc380d60acc9a8a855ac448759c8be9a5297ba721d0e641ec144741a7c57dd038e13b269 WHIRLPOOL 046ecd777cebc8768c9cdefab7f782c7943403e0c5c6b963ee2359f10f446b5cbe6974d07e14a3089c79830722de6d1e965fa2a58316e75a280ddf09825a1fe6
DIST gitlab-ce-8.12.0_rc2.tar.gz 25956358 SHA256 86a25fe391facc0686a03d5e165881131b2d2d0aadef93b0c011c2462eb9abb7 SHA512 c015ba8b4bb6b17a6a55b305ef99956438255b6f9ea9793d3207ac2113ba6f23c0e4817dc91aea7f18f16283b85bc280cb4054ee6fff340c01e1379548c5f8d0 WHIRLPOOL 571f5692866df484c9d26da7aa3ef4aebe6da1371b40e109b7094aad8ec0627a4ec857192abf29b4f1c06b13eaa6e9dc4a1140dc5a9321b68f4b764dd8dab292
DIST gitlab-ce-8.12.0_rc4.tar.gz 25972671 SHA256 0f5efaeb934819ff29d886534adb42b4c6acc910aa4c611315898f851f2b54fe SHA512 5a4b02cabdbb943e3a7092669b54d8ea4f0bb9336269c1edd4d52b5d4f37623097825d6602b33f33dd25c70e96da7ff595b010c868edf1ebf355bf975045718e WHIRLPOOL 6d7184bf9b3b4f51778dec2e6febb8cd16f1a0c23afcf033684f405280088069d5b1ea9a67ffd22ef4326724507c97a969a6d413c39ed07299bc27ad42c44dd9
EBUILD gitlab-ce-8.10.6.ebuild 11710 SHA256 1659a2e43491488fa6fbbee1699cc4138e8938f694e73310e5faf45fbd9f2578 SHA512 70304f8fe862988d4092dd37c5a66fdfec56c9cb2d62a78f2cdf365a0c629606c6fb9081dbdc7e68530d43894d1cb645d168db8f3f0c8a9999873afd9032ec52 WHIRLPOOL dbf26294a9d6eb4258a67c64844370f1423fa59210b306bc66ea53a902cbc564b1cd084b765759e93d7970df30417e6482dfbbf271dda8d387ef006837123ac3
EBUILD gitlab-ce-8.11.0.ebuild 11703 SHA256 f95aa4a60c85da0155df6b989e343296eba23a6c2f12055c5f94bee53f5d9bc0 SHA512 6d1c7c3e3139d456a7b22431b326401a9b56e435000a02a572bfdbb52c5495e098b0406ab9b8051a2a901878e3a3a2c4332af9a0bf50ff1a36051f9436c1ddbe WHIRLPOOL bd92de9d5fda4a4b1802e814a55ea1e1a9848a9e085b9ad88ba108771dc68953156c8cecde64ef2250eba8f2b9568f73969460aa61c4901957d9b7771558ed9c
EBUILD gitlab-ce-8.11.2.ebuild 11712 SHA256 02dd8184aa55060d9b36fefef46d2506f2516034fdff03837205ca152706f13f SHA512 cb14a84ba0e34f795a06f8947e222fb2fa1ee9a79d3d81bc527498e7ccbbb06ec5e26c56d39e0da30148e918397daaaca4337e732e8791994ed7aaf731cae185 WHIRLPOOL 63309d30e1e41db231f074fadef91fda5fc6d7dc0fa85339b64f4a6522d598c2b67b593f769e4ce70d2343607f6f42eee60614bf0556e2a4848a142c8d326fff
@ -24,7 +24,7 @@ EBUILD gitlab-ce-8.11.3.ebuild 11712 SHA256 41be23427e3c7d550888eec40091d7e6f6c0
EBUILD gitlab-ce-8.11.4.ebuild 11954 SHA256 1970a09040e9d4e924a187bf108dece607825fe62a2fed7a6202a8c24e878f15 SHA512 189157bd48f107fff5e7b476f4b103c40c81baf2620bd1bf5600547f66c3dfe4ad7aec4001422c4f69a49ba973fdff724d8868d0cbba9719bed4908f3bb60772 WHIRLPOOL 4f270f6251d4172c956492ac3f2d7a2041db4d5ec3b344f43af9f0d01fc8fd3274e225ecbd1d35128757ece050cd91db5db74629c377d553de2afcf015ce9c48
EBUILD gitlab-ce-8.11.5.ebuild 11954 SHA256 1d064416cf453ac5e66dcb39c332db6ef01636f647dafd80faeb357f61a8c365 SHA512 927327684f3914962f2f48c74dd620cc0e8c1fac0ba5eb00e0411f61189ab8bf77bcc3ee9aa3be533e354c0375935ba981d276487faa965e2159e509d00c5468 WHIRLPOOL f6114dfed971973a89a350637818c9546554aac04fc637b276b37411e3e6b425e254dd8c2bb05019893c07f24deefe35d08a6234b2be4c06c1a6f56d39f21d33
EBUILD gitlab-ce-8.11.6.ebuild 11954 SHA256 2752b8057eac0cd77e74bc7f323a6ab0037c9d70559a637f15e30f11ba244b65 SHA512 a649871bc5594aac19ac816a53a164edde1c7a70933c777489ee45c98515099c2748dd2a65fb433481ecd69ed9fd1f386e2f137b8cb9761453252ceab362e4cd WHIRLPOOL b623e4a6ed638c42672f0f8cde252681c89b92831d8bfb687a8ab7bb374335552586b77bd7066a898ed6612715732f538b29acbe874bd31e72c63f49e54deb00
EBUILD gitlab-ce-8.12.0_rc2.ebuild 11930 SHA256 391f8d9bcb47261f1aed69952ea4555feda25d3e40d9afa8301d510b475d7003 SHA512 b6c0f8ddf8b44e916dff90fcdae0de56291c9f44b44f912db53a478862e9cf76135b90bf9f4266ad572b0f292c0e24b3666344defdefea2ac968d18872e84205 WHIRLPOOL cb52858b2e557e423fc3745da852a6fd24e6b2498abe0700654648cd5398a8d9d05cd3218dbb71947d700ca68b5432aa2c76a666ccdaaafdcf39f6aacb311992
EBUILD gitlab-ce-9999.ebuild 11893 SHA256 f0bee749c09a41df732e4b0527283faecb7570950ece0efc2fd46aadda3755cb SHA512 1f94b0784cb94e5369dcc5e8be9cd6006788cb92edadb4f9268bb8607c7c36cdd2dcd361b050436620199f28a481d9239a425e208cdbf56c205bacc8242a8544 WHIRLPOOL 10dfaa25eef9c6b6fd37f8c0b4d86e58a4bfd03d2e69579543326b804683dd730973165b88dc20823264dcb059cc37bd57c5d43326eccd0e4c845e1e6369ba3a
MISC ChangeLog 6605 SHA256 3cce45e5f6d8aacf11b444d5ed18acaaaaf7e0d6d6d5dd1c6168cee8cc40d917 SHA512 bd07a0d06641cd58bf024a37fd4f2f54857b2b4eefffdf9fa94906aba893804258446ffa9a362336e5e303396fc3ad02c71bfa6ca81a98b0101dcc4e72fd1c9b WHIRLPOOL fd34627aab2bb1b6fece50dc094cbc0d0a5df59ee22f423e94ce7a94d921774344be9b0328b7bb17353d1e6a10f552ea78548fc21c8941a5029431c4e82fe1ae
EBUILD gitlab-ce-8.12.0_rc4.ebuild 11937 SHA256 4f120ce45ff3181f7a28cb279d94d9890cd6d221cf5f9e86f7c963d27f213ff4 SHA512 f3090a64ab9352a236d105cb1f2a7d3cf4e4d64778134ffb10056bb6d74c56d37ca0412776678672c822e7af4d73d6095e25e451a0d820711699adea7abeb59e WHIRLPOOL 1faf0a658927b9a534152797054b39dab6b5e092bd1df6f9ebab9cd8d6a1844a8054c4964123942a96f4b1b59a9d37fc0ee0c543e3f4f9559e9ec59778a25c9b
EBUILD gitlab-ce-9999.ebuild 11892 SHA256 65ecf92d389cc0175716d9bb0b65f6dcef7fb9be80801a5ddfdd5ab86d8905ca SHA512 c0340c00d5668f1ffcd70c17f0436b2f8d10fed7d30e04cd0e611e5254139acd4d8706999b17db58549a06ad7b5e9b706358744da13da942067d7a2319b1a4ce WHIRLPOOL f35e98533e5bc0fb83c4c9f9efd7525da6acc9c53de7eb623d09386aac05763310c0ad3b9abcf58b620bb2aa4099c5eb3a0a7aa0dca26a729eab52eb152ec7e7
MISC ChangeLog 6841 SHA256 5e5fd37fb8a0cb5b67dc2c782cf4aeabfc7c145cc8ed59f0de172fe009f7e641 SHA512 32d04af3d81a30e2ad271d7fbfc15cf377c40b8bf3f106207970e2272efb19e1657e6587f21becf91ee8ceab9cb0c80022fa894bb79013c16c054dd21b11c164 WHIRLPOOL ac7ed9bde2a118311ebddf3a88089b4ce4ecd25f5a4feb243555014aa6aa0dfe07bd909e4b57141f8a4d253ec6a1d005b20a2c7a3e4e8960b30d49b179c0f2be
MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1

View file

@ -11,12 +11,12 @@ EAPI="5"
# difficult to maintain them via ebuilds.
#
USE_RUBY="ruby21"
USE_RUBY="ruby21 ruby23"
inherit eutils ruby-ng user systemd
MY_PV="v${PV/_/-}"
MY_GIT_COMMIT="a6b8c4569eedecda145fc7960643c06472fb8300"
MY_GIT_COMMIT="649683c945ce7e488132a9a66edf634b84bb7b1f"
DESCRIPTION="GitLab is a free project and repository management application"
HOMEPAGE="https://about.gitlab.com/"
@ -54,9 +54,9 @@ CDEPEND="
virtual/pkgconfig"
COMMON_DEPEND="
${GEMS_DEPEND}
~dev-vcs/gitlab-shell-3.4.0
~dev-vcs/gitlab-shell-3.5.0
>=dev-vcs/git-2.7.4
~dev-vcs/gitlab-workhorse-0.8.0
~dev-vcs/gitlab-workhorse-0.8.1
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
DEPEND="

View file

@ -52,9 +52,9 @@ CDEPEND="
virtual/pkgconfig"
COMMON_DEPEND="
${GEMS_DEPEND}
>=dev-vcs/gitlab-shell-3.4.0
>=dev-vcs/gitlab-shell-3.5.0
>=dev-vcs/git-2.7.4
>=dev-vcs/gitlab-workhorse-0.7.11
>=dev-vcs/gitlab-workhorse-0.8.1
kerberos? ( !app-crypt/heimdal )
rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )"
DEPEND="