From ddcb8ff9812cb0e481f18dd2f7e3c4b29ec7ee4c Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:45:16 +0200 Subject: [PATCH 1/6] dev-vcs/gitlab-shell: added ebuild for version 3.6.6, which is a dependency of gitlab-ce-8.13.0 Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-shell/ChangeLog | 6 + dev-vcs/gitlab-shell/Manifest | 4 +- .../gitlab-shell/gitlab-shell-3.6.6.ebuild | 130 ++++++++++++++++++ 3 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 dev-vcs/gitlab-shell/gitlab-shell-3.6.6.ebuild diff --git a/dev-vcs/gitlab-shell/ChangeLog b/dev-vcs/gitlab-shell/ChangeLog index c85bcca..c249132 100644 --- a/dev-vcs/gitlab-shell/ChangeLog +++ b/dev-vcs/gitlab-shell/ChangeLog @@ -1,3 +1,9 @@ +*gitlab-shell-3.6.6 (22 Oct 2016) + + 22 Oct 2016; Manuel Friedli +gitlab-shell-3.6.6.ebuild: + dev-vcs/gitlab-shell: added ebuild for version 3.6.6, which is a dependency + of gitlab-ce-8.13.0 + 23 Sep 2016; Manuel Friedli -gitlab-shell-3.2.1.ebuild: dev-vcs/gitlab-shell: removed obsolete version 3.2.1 diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest index 7d5b79f..831a85d 100644 --- a/dev-vcs/gitlab-shell/Manifest +++ b/dev-vcs/gitlab-shell/Manifest @@ -3,9 +3,11 @@ DIST gitlab-shell-3.4.0.tar.gz 71972 SHA256 0ac8f18b1615194943e935b670d630a1ba98 DIST gitlab-shell-3.5.0.tar.gz 73374 SHA256 6591b768a4f51c535e97e5632518583f6559a4202f4219739ad01a27161687ef SHA512 b5935c6f9b19bab1716901c8015e107f7fbc545646d5e35a6a943e1692d3ddd61efeb862f4d59efe75eda9c1117adf9d90b50f572ab0a69199069d1fc52e8718 WHIRLPOOL 938c600d0810867fc9aef62a286b05dc34bf52352612530d459614483e3c37b3cef6ee5b2dc11f7b041218cbe569d11f4f5f0240b9c28e613bd762c06786772e DIST gitlab-shell-3.6.0.tar.gz 74513 SHA256 4ad340fbd295b54ad92558fba9642d88b9759a46b9a5473c6a7d73faf9c4f9ce SHA512 beb2fa68f58adc58d5c6418e2a7dd0d15f007d730595dd8871298105dfec8140d9e14dd27350079f1878279a47b0b2096183c80dfd3c9744fd802332252b2005 WHIRLPOOL 32c6e57361ebdd1e031ea055a985a800a7e4c4f9312476c8b228484f02ba58618aa968ba598c5cc74966824029b12d1ec4c0a55e297d97a35c8b405f287aef66 DIST gitlab-shell-3.6.1.tar.gz 74806 SHA256 180dcce14e9caa9c7f09eefdb2e10189318a0f994c4931fae2acebd92e9e4fa3 SHA512 6f54b0a9ddccabb3971c48301292835ecf953e0a9bb3b9d1d78af416a42e3d2883a157ab02990e748b0e6b02805864c314fe9cd538834ab831f565f0c573ed3a WHIRLPOOL 1219213217d5ec280ee521c4f64328634402c795a4fbd10beac3481f4e622faf03859589ee641bbd34647b057c77bdef0d7e1a2906375c3de21cd6b4739a7826 +DIST gitlab-shell-3.6.6.tar.gz 77199 SHA256 db3f54b561bb81059256c634967b181707e11cc25e30b0fa76eb034718d0eaf9 SHA512 d1d15687169f7b151caf3b371d6570099129a2a69d7732e6be7337f70aaef7e36c87e8aa5140e9697c7be36185743bb939d862790b440fc18d7a864d570fcb6b WHIRLPOOL 4161901369cc12a89fb89c41bd98cfc2cfdeb5aac6d317597ae11f10bcd401e4c18148ce9a20f5e967a6fb11559f33aa72c82dff1a52764c5a19bcd0f06250c1 EBUILD gitlab-shell-3.4.0.ebuild 3653 SHA256 7bf777fc3b5bda03f9a455874f62bb6260eeb73dd8727e4145ed0cda2e283465 SHA512 de5b78133d317155f5764d6888d421c4f2945ccb5972c032c05138344188eb0a0f85817431aa4348e2074667c901f44cf2b575f572aeb2620aab58a32ddba22b WHIRLPOOL e53de830c17bc9c784df06670c6fdc7465ba05ca40de42e4857e5a83421208f9bbb4381c2988fbabc85f86476d5c2b7301123392de132558bdd6f969726a9a57 EBUILD gitlab-shell-3.5.0.ebuild 3653 SHA256 3b73797e283ff4ec30c87d50a54a80cf6895c0c03dedc3ff34087b3037dd9fd5 SHA512 cc235d625f1eabac09822fbca06b706886601e550958338ea5ee7ccfdbbb85e2d96bb348b4ccce532c92d18389c63ddb78bcd77e407f789127fbb3d9ac32d0d9 WHIRLPOOL 4a8bb0ee8a1b547bb8517c300806457187a8fd1855b223cf079784733fdef55e2dd5fa9998da9523bcd3b021aa10d45cc74445bae5bd8f853e3355d6a1d6417a EBUILD gitlab-shell-3.6.0.ebuild 3653 SHA256 9a71f83a1bb91c904a43807572477ea143098bf2c7d77bf6777a4b783f524002 SHA512 370c559478716fe31376b6607c233c213df7f0abb3a9ecfc66506cfb29088e63600aecd3046cb272ec32dcb33f3b23a70dbaff5eed9cf308e274236d6dff9e67 WHIRLPOOL 0eee77706d9569d37d1b2cf77d0beacb0e72416d06b9bd937fad1115241908c66b12db6b466a3b579411721cf0d56e7f9137977a7b1fd9f983d7c52b0cb9d724 EBUILD gitlab-shell-3.6.1.ebuild 3653 SHA256 c36f3fcec5b4f954c404e4f41a773461971116d7ad2bd484b05ef479c4915ad2 SHA512 fedce05647f773f5a7e54fd8764f8934666a51d9b5e8a5e93201bd504a042ade828cbb0043817b8552bdb4d1cdee6fd2404b17c4e9a7ed3ce75fc41e79c866fd WHIRLPOOL 4853bcfb4dfe1dd152645ce4d572797ba158d5edf53349f3d66489009b10ec2cd7a598beef46bc9b1e104891a3071e1cb9b67471e284b626023a9e1b46b559a8 -MISC ChangeLog 1624 SHA256 197f5e0ee973c3a48782b6ac5cbf4ec6a3730d4a1dd51f8b22b1ceaf6803487f SHA512 3eb75facea72c7b677507598d0afac5fbc993ea29ff8d82e7916e4c3e8a1b7120b1a28c105daebb315c529c5ba2fbeeec4d2fd64f39baa9afac2af6946cbcd3b WHIRLPOOL b726d6dcac750ac5f7f04823f016533d74affa068644e271909ff630a6db9e56a5f6a366ffd81fe58a67cfe5408a29d47da1f2e96b51b6f62c2f42d040007f80 +EBUILD gitlab-shell-3.6.6.ebuild 3653 SHA256 49c383d1d5895069a6783e44d492935879801efd95f57548a81e10df48339038 SHA512 4e6dd5c34a56ed0e1fc45819c93239c61d900304cc8df20855f4e71e4fab234b5e81612f256155022f362f4f9a0959531a3999eb7ece9013914129e4343795cf WHIRLPOOL 92d40a6cb8dd19a42093a746e29ead878eeb9b0c741e23ca3e6213c0a14b820584633db8f2d5ac60cd28da15546232de417db72ccdf8608bc49ac333107f7193 +MISC ChangeLog 1840 SHA256 e8a2f8fe31ce8058afca46a203fcdeb78610d2ccd9622559fd897ba8bcabdb53 SHA512 148492ad184379dbbf02e201fc8892361b411d840334bb16939865f80a2d656eaf860fb1675a464d0c24f0fb5d3c82410d1b0945c2655d0541ed4e5a61f59260 WHIRLPOOL 40d5819a5817782f53a08e71a2b8e9480425d9e45fd2bff5456a6b45937ba35cf2f062a1cd7f6e0f0a002ca6e99b3d2fdbc965d6ffbe0cb8c3fedef226a4be3b MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-3.6.6.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-3.6.6.ebuild new file mode 100644 index 0000000..be14adc --- /dev/null +++ b/dev-vcs/gitlab-shell/gitlab-shell-3.6.6.ebuild @@ -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="ruby21 ruby23" + +inherit eutils ruby-ng user + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="0cc6cfc11be21597b11470c1c1aaa7e4a92618db" + +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}." +} From bbfe7780d4d30ee80683d791a0025c4c4366a29b Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:46:25 +0200 Subject: [PATCH 2/6] dev-vcs/gitlab-workhorse: added ebuild for version 0.8.5 which is a dependency of gitlab-ce-8.13.0 Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-workhorse/ChangeLog | 7 ++++ dev-vcs/gitlab-workhorse/Manifest | 5 ++- .../files/fix-Makefile-0.8.5.patch | 12 ++++++ .../gitlab-workhorse-0.8.5.ebuild | 39 +++++++++++++++++++ 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.patch create mode 100644 dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.5.ebuild diff --git a/dev-vcs/gitlab-workhorse/ChangeLog b/dev-vcs/gitlab-workhorse/ChangeLog index 9686a69..a12086e 100644 --- a/dev-vcs/gitlab-workhorse/ChangeLog +++ b/dev-vcs/gitlab-workhorse/ChangeLog @@ -1,3 +1,10 @@ +*gitlab-workhorse-0.8.5 (22 Oct 2016) + + 22 Oct 2016; Manuel Friedli + +files/fix-Makefile-0.8.5.patch, +gitlab-workhorse-0.8.5.ebuild: + dev-vcs/gitlab-workhorse: added ebuild for version 0.8.5 which is a + dependency of gitlab-ce-8.13.0 + *gitlab-workhorse-0.8.2-r1 (26 Sep 2016) 26 Sep 2016; Manuel Friedli diff --git a/dev-vcs/gitlab-workhorse/Manifest b/dev-vcs/gitlab-workhorse/Manifest index 3162d68..f0e610d 100644 --- a/dev-vcs/gitlab-workhorse/Manifest +++ b/dev-vcs/gitlab-workhorse/Manifest @@ -1,13 +1,16 @@ AUX fix-Makefile-0.7.11.patch 380 SHA256 331a8fb441f2f26385ff72993afad04e03f23b81b69d2d2a7d84933f91096503 SHA512 c4c497d98346eac1d80a860957ffcce57b9da1df192a418030d1833711268919a5556b861922006f9af47971c7799e8f67466962479e5cd91b7089ca0668a3b9 WHIRLPOOL 4173604725a22413eec7620f947e986c02cce1a06a9db81a16d06115e7d2e367b34f87370acac6c48a2bb42c9444a92f4f98d830c484afbb9f3e43bc7a252b0a AUX fix-Makefile-0.8.2.patch 354 SHA256 5ad06525d351b433d32569040eac8756aa067860e20f68cea92e59807bbebfbb SHA512 e39e834c3346a75494de0b2daebaa2a2d519c35b5d4f42ffb5a92dcedfca9d2541f523791c744eb3effdcc62503134e3585a9f002425f787727e18614116c670 WHIRLPOOL 39bd515da32f8aa31be1532d5b32f073feaed3cbee2064075c67669c5c683094806e8438b4cf5bf3601de3009b0279787813f78827c25dd3fa7b6c455ab6823c +AUX fix-Makefile-0.8.5.patch 354 SHA256 1773a2e9f535c08f602903924b24918553acf563ac9804f79f26f9f58cd915bf SHA512 2fa8ed07e5e2d012452368047b8aef441015f013c92670961d3b1ea7f131eb49379e0817eeb0da38f04ddd6b9aaf0d081bfcc6ed9c5b83c94ef97b1831836b08 WHIRLPOOL 20849d2cbbb2d5feb48255c3e98a0c9a524078fb51c311d09e833056f07a35c938bc82686338f028ade7eb74090c6c84473e6945e9bde99dbe3d2d057b94a7f2 AUX gitlab-workhorse-0.8.2.conf 297 SHA256 8bb99a78197ad22892e4c85496101a39f2c82f6c537f44da8185af54dbb44a38 SHA512 d143489c165ef5e68810bb10d5e97da7ad3be6d53618380231706ec16c3fd8bc3eedbc78a09949479a408646e32aae4cdceaca9b271ba3b816e3449b792c5406 WHIRLPOOL 649d34b60afab816dac559989c9a3b0cb9620c2ac2a7617cfcae8bcc2c421791fa612571f83e6611ec8ab8c26c9c79f9832f4e6a70396497dfc5a40d99bbbef9 AUX gitlab-workhorse-0.8.2.init 681 SHA256 bf3f94853781251629daae935d04294febf317061536624e2c01188dd6688ae7 SHA512 6275abe0910e7327f952dba36827a9083264f76753605767cc11ee7b162fdecef3170783800263bf8acbe891d41e6be9e27b5fcca2a4f035b990c9865aa02647 WHIRLPOOL bc983d0413c0743ef0843a3abb46ee2be78ac6e18b56f96de63b4ea8cb9242f8ef6a96f2d593dbcda33a0a60b7f941f27bd704b7f64a85db7379ef0b42233527 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.11.tar.bz2 29401 SHA256 54515f030664e33ae3925d9a85c4fe166fb6316752d819f51cb592f553284b4c SHA512 3f8c8b46f60f13a8d747eb92d42db7d7dae133813df34b263ddc87aef04592888532c1f07c9eeed5eb708af8232a2a98a382e056ff184d61547be68ba55da4e9 WHIRLPOOL a4b17b2784e428ea092c76a3a3ba410565fb3c08c47ef542ddcc126785f3eda837b9462311944be1145076fcecc3da51029cef795c3db7b342e8d95606acfde9 DIST gitlab-workhorse-0.8.2.tar.bz2 226124 SHA256 869feddeef18ab01183e2cd969445d5d091cbd09b7e9d98d1c1b505df7c84d62 SHA512 ad9d24e9eaed2644e5703600341aa1af37f69cc902d1dc49b0338dddbb56f987fa9608d447b29419c5e5d7548f4e8fa8f073b76dd9799994fb1464fb766e9da9 WHIRLPOOL 70f605ed70e1696e89ebd0964ded9e47f6401a0da942edf90a9fac4366a67d85e1b8e339cc8928bce5ba84af7ace950e17eaa3d2393ca19f3f39ee9a52cc27c3 +DIST gitlab-workhorse-0.8.5.tar.bz2 229807 SHA256 fec50a37d17c359726ac3e0d2bad4ad3431e6bec9aaa6dbf5dcb81bfce469369 SHA512 c149c4cecc1c64c472e38eaae8cf4522a4b19907ef3a9eda4490ddb6cda6083bdbbc1a827cfc2c4d7ac151e3edc4b5dbfb168e2590ea71f12c2836680b2d8033 WHIRLPOOL 21aa589997e934c664fcf3b6cfb19246910a87ec674fbf2fea5a04728bc00248c79b4ed555601af0adbd20a11ca2ba040c1ccb92323acda7bab3da8c37840340 EBUILD gitlab-workhorse-0.7.11.ebuild 904 SHA256 6623b233fac6d82c6f4b3026daa5c59743ce0243585d16f7d4ba81941c55b68e SHA512 2577c18ea0f0463f032d06a4e7390f78e527f412b9a5811c50d633d1cb818a49de0cc27cc29b9a7aacbf9e703547ca03a2650c2dffda78484e7190774346704c WHIRLPOOL 5652fa188f27dc2c0d03952832f66efef7c3f0b8118957bf1834460e67134ff7b94dc3528818e6a6b00893338bbe6fb13255e7b4b9a8c06f4c539106fd934800 EBUILD gitlab-workhorse-0.8.2-r1.ebuild 950 SHA256 9ac8a68b13fded800fdaa077df3a5a448662d36e88ef144e565719e95d847612 SHA512 0d776e4be9abef95576103a600425dbb9a73d87dd21387b71dd3f54a62ffb7a9f36713f84c8c6222df0f694d8199148c02b884a56a6abb030d5d3fc9cebd6649 WHIRLPOOL b03658ea70cc2a1bc5034699ef6f6fb8d823889438da7f98d8ba728c7a1c56329aa2e934f902a2964f21975e4a3595d0d7011524ccab31fd0c6e52eea1967ea3 EBUILD gitlab-workhorse-0.8.2.ebuild 938 SHA256 b8115b810a3187671f4e12c63a7558387aa177787fc1a3746417a4f63a1d681d SHA512 77c2aab70351392de04e6b44920b9d1be55a3bdab9592f6f10eff84d5bc3c000fedd6771f6ea4bb13421ffd77c186f43154520d667a694824030bc618fc6467b WHIRLPOOL 676fb6334d2ad7fbdda94a81c6a429278ffc2a0f33d28ff8df3763e63be3ef98b2d670562aaceced4ebc575976b463c0a3eb5d0893e3de9fde198e475ffb2431 -MISC ChangeLog 3779 SHA256 25599105f83ee95f69c37ec0bed7ddf11989997a4a8f2dad6d37f67cc6c79c1f SHA512 007508dc291ba3d01de64a37988f65dc6800edbecfac30b1f9d12b704281a259c306214d64aa11f24ff0561caa594b5de95c08db4cdc96366dfd3366e29f01e3 WHIRLPOOL d15239b1dc7d82ce9c236a34affcab640a78b58cbc3aec61cab73be8c275171dda57ba2b084511cb43f4cbe521325c2188c58ba3d96a7a8cef1ef213749d3742 +EBUILD gitlab-workhorse-0.8.5.ebuild 950 SHA256 259a4406de93bd2849916d537b67103bcbd4247c5e00871a0c4d9f0bfc84ae11 SHA512 b30e842434de5ba6277b7e1cb3bc38240eeba272dc3ace95a1dfc2dac7b63b1a7cc098e4c2e763ec57b4592c66b3b990a903e1d2382613ef1a7acd5346e9a9c5 WHIRLPOOL a8734afda28cd6c76c3ff381d780188a4d79c7abe3ca2f96087cb1e82c0f7e37acf0610ae80eed1123a66da16a53b6d4d5f080588a45d3016d73efcd5dc91b3a +MISC ChangeLog 4041 SHA256 af20b30b12dd42a54babe7d7bde1c11d3262e57aabd18b07a29fc6e6df2c3623 SHA512 bd40c56a051ba6e8b1e664151956a0cfe2756e68df60f77040fd142c51d1971436275590c5ed8389d3046444c9d3ad27c28afb40cf27bc91e2a3a0bd73349c56 WHIRLPOOL 4e4f0a9bc3e77faf20f328ebebced38a81f2fe37c065e23490b379e8056405e8e29298a89e8320bcdd6ec76a41c231a0c3d2e8da75a5081ee10b4a773f53906d MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.patch b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.patch new file mode 100644 index 0000000..dd74e27 --- /dev/null +++ b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.8.5.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.5-$(shell date -u +%Y%m%d.%H%M%S) + BUILD_DIR = $(shell pwd) + export GOPATH=${BUILD_DIR}/_build + export GO15VENDOREXPERIMENT=1 diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.5.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.5.ebuild new file mode 100644 index 0000000..d29fd2f --- /dev/null +++ b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.5.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="15dcdbd45d90330cd7e2cf1126834f829b7d3961" +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}-0.8.2.init" "${PN}" + newconfd "${FILESDIR}/${PN}-0.8.2.conf" "${PN}" +} From d30d161f5d0e2158ca8d6ffc102dc3a462f1b871 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:47:57 +0200 Subject: [PATCH 3/6] www-apps/gitlab-ce: added ebuild for version 8.13.0 and deleted old ones Package-Manager: portage-2.3.0 --- www-apps/gitlab-ce/ChangeLog | 8 + www-apps/gitlab-ce/Manifest | 13 +- .../files/gitlab-8.13.0-sidekiq.init | 43 ++ .../files/gitlab-8.13.0-sidekiq.service | 27 ++ .../files/gitlab-8.13.0-unicorn.init | 122 ++++++ www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild | 386 ------------------ ...-8.12.0.ebuild => gitlab-ce-8.13.0.ebuild} | 22 +- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 9 +- 8 files changed, 223 insertions(+), 407 deletions(-) create mode 100644 www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init create mode 100644 www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.service create mode 100644 www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild rename www-apps/gitlab-ce/{gitlab-ce-8.12.0.ebuild => gitlab-ce-8.13.0.ebuild} (95%) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index 358f675..9bdea6b 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,11 @@ +*gitlab-ce-8.13.0 (22 Oct 2016) + + 22 Oct 2016; Manuel Friedli + +files/gitlab-8.13.0-sidekiq.init, +files/gitlab-8.13.0-sidekiq.service, + +files/gitlab-8.13.0-unicorn.init, +gitlab-ce-8.13.0.ebuild, + -gitlab-ce-8.11.6.ebuild, -gitlab-ce-8.12.0.ebuild, gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: added ebuild for version 8.13.0 and deleted old ones + *gitlab-ce-8.12.7 (21 Oct 2016) 21 Oct 2016; Manuel Friedli diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 142f6e2..46f3936 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -4,20 +4,21 @@ AUX 03-gitlab-ce-8.12.7-database.yml.patch 2154 SHA256 6daf34a6be5038e0108169a1a AUX 04-gitlab-ce-8.12.7-fix-check-task.patch 917 SHA256 e1adffbd59a418d5e14cbd51ae14d5c1f0364af759c77b6cb485079e0233e90f SHA512 226c3892768dc526dbc9f109aaecdee1eb27c0acb5060ba6db8222410c500336ebcf7184437228480da04ce5de149a14bbb5c1471aed853a280d7f371f271d88 WHIRLPOOL 3ec22dc4d12b5025bddfccdea27a816aca1f818d5138b3dc9a6362e56ec4cd14e5c38c76b64b468f3797e0d2718d38aad4f910abf3f3328a7983832babb7f231 AUX 05-gitlab-ce-8.12.7-replace-sys-filesystem.patch 2387 SHA256 dd0e9987ed4bb3a9c73c6aee1d89434afc51ff663fef2ee4ac93adf1b73b944a SHA512 afa82fb8c8d57633c99373f31678760fa6ecca5e459a9059f5b460b458d1dbf3230108a6b4f394780c26a697881c9b2319f15804cb8d04ad3139127e7c0f4ff8 WHIRLPOOL 90ce708f8cde0a4bcaef9fc002ca00b97a1211559bcabf5481ec71c608bc5b772ecd518ff07a8d626a27e4b21c0f0f51fa37a65503e79664ececd78d5f19e87b AUX gitlab-8.10.6-sidekiq.service 1085 SHA256 de97287a5cb1d04dd4b6ac96e3569503cf797e605b325e13d4807d72cbcd7333 SHA512 9d5f3ee50f293ae0c9f353f7f9eeed00c57fd54e75a206bf7ec9b201453099222668e1d77dcfe6b35ee9a8722860551822897339c4741e0c612054a9423f132b WHIRLPOOL 5b5cb94db5c7a2c46b487821baba6fe31fa08ecc1cbae6f9b1655d32f95c57c7c8f1bede19d09a8c572512e40b0c8daf27d50ebfcbc8e4af449e21b01ad11441 +AUX gitlab-8.13.0-sidekiq.init 1012 SHA256 3c4db0b6249036f880ec49c49601e9da4cabc3abfec79296da35df4c145180ef SHA512 7aba7a6a499b924e81528586919a9db1159df15fd91587553cc6d6f34ca273a6e7112a20bf7c6a53b2547d86d56869737f3e6701a834bf4f93916cf176a6edf9 WHIRLPOOL 01adef44f3faeede4ec8b48fb52adf4a72be320755ad9925209f187feb34d9c598fee55202473f060152c80b9932c1e3bb9442dad6400aef42e59e535cd1c8f0 +AUX gitlab-8.13.0-sidekiq.service 990 SHA256 183ccbdb19a3dcc74cf1f1f865bf396466e06f7408ff7d3e92359b2a0e83f24c SHA512 c356baf65337739b08a0a4bfe24d3b68f557e9d6d95f479b39ec954ee6c2077e380f99d1e9e9390f5b038e093c0a46562f651512a6578dfa86977580159470a2 WHIRLPOOL 81d9ea9febf47d5fdb9c49a54bbc499bd796fc56bc1c16404fe4c74d00c4bb9fa9631e4cd4cf88d3c30a44c04b74b35a61cd4da9f2139a4abf61e758b4e5949a +AUX gitlab-8.13.0-unicorn.init 3141 SHA256 73fc750f671cff94a32218512be07f2f7a353b31fe91f6391a85cef00a863a53 SHA512 e728dc6e2453f5124f347359e6ad592cf171a07540a54ebca68bbc95cbf8ca8c211557156e3e5f0f67df0cfa58e65e1bc6589e99c86eb32706a8dbc9972ff9c4 WHIRLPOOL 3e4a1be447bafd4a609b1f0a786774182c2c2ae01bfd67d4c1c1faa718dab3ae7958f6b8604ba6efd70ca9e8203cdd0f35376afb3775a72c3cf78a1fea112684 AUX gitlab-mailroom.service 773 SHA256 39cea460db7fc505b136a2106902d0515890180e74913bf364aa499368fc5f2e SHA512 f82c63a180add1103e2bd115e67826ad7362a844991ef16f1de7fc6c78bf1955155ecf278fc0d759e674ab85736f3ba2a6650d00e9b3ce683316875efd9efa3c WHIRLPOOL 683c67b12f9666d1c1df5ec61e0072acaecd3aff43d0ff475037e178bc58fd9036ae6d8cd45e922098c842abd057231afd4767ce229d4581356f153b48a06208 AUX gitlab-sidekiq.init 990 SHA256 cc996184ae4c1b64fc5ee9325bf3f4bc30753896f6608a2f04112d8552359c38 SHA512 9064b5a2fb1280c7fd674c613e19893b5b4f21cc48967cad1c3ff6caef2d4cdbf077359c453e5bb97226c26348475a97fb055df2bac991a7260811cb933361af WHIRLPOOL f2a298a91318ee067451e90f8b52b45c2dcf7e621bd7014917f8fadfd92949c967b45c59434eac3813fd1acd1dc96b8b481f9d9c324627580f29c0f438bf99db AUX gitlab-unicorn.init 3127 SHA256 de2f5861bec58eaac284e74baabe25288a520bc4f7da089a2c53a9494bbea884 SHA512 ae63cc6ef11eb1d3ed155c77dab413d8f7d281ac9c6362dfda12e0fafe23eb9a907a0275d14298c642ba7568119b483b1c520b322dc791f3a9ce64fbffb600f3 WHIRLPOOL de69ab338278e73637b6b1d346bb882d51c4468e71d89932718f394fb9f44725c79897eba8b0230069584ae7d8b92239bb2247c7ff8b46a99383739939a13088 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792 AUX gitlab-workhorse.service 930 SHA256 09348a52fec333b4b19828752e0484400c1efa9dfb644723fcf8e80537e294b6 SHA512 6332024fe0049287899cf482b6e4439e9dd90da14e489d08aa8e5e79cb7872efcc517d99b69fa23b011b382acb1e5926496a78f08af5d2d64daa515b869a0c6a WHIRLPOOL 3749c6719b2a35c7de29763cd616e1e9cc30a85aa1630ffc46440334459b5922503d52629556c125a6dd6574bdc5f23f1b2a7f2a85e2270a415b22246e0b6bae AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 -DIST gitlab-ce-8.11.6.tar.gz 25705796 SHA256 354da5db4087ce80d9f43cbae87830ccd06c2c559f8dfb764dffd7420588a66b SHA512 5abda185bfbbad61060ac9b5e83101d88f0f6c8cc12580c71467c7bfdc380d60acc9a8a855ac448759c8be9a5297ba721d0e641ec144741a7c57dd038e13b269 WHIRLPOOL 046ecd777cebc8768c9cdefab7f782c7943403e0c5c6b963ee2359f10f446b5cbe6974d07e14a3089c79830722de6d1e965fa2a58316e75a280ddf09825a1fe6 -DIST gitlab-ce-8.12.0.tar.gz 27105188 SHA256 373109c33ded8f14f3f21e675afa9de8a2a8dd6519309b51844a50f79c5337f4 SHA512 81129858de4a574e2c56958c8c7de8177ce15028993dcff77aa7aea18eb4eb0bbab247d02eca88ffa6da1353f7ea2961332fd4843fe402a35f733e0e9f1484ce WHIRLPOOL 72a70bd3248648f947cc39d7d2633a28e5d9da29adb33675f3fc1f15f6ab5ec181063f13cfc44b90f286ccf0b1214941aaefb41d8ab84f92b4a5868155bbffca DIST gitlab-ce-8.12.0_rc6.tar.gz 26786541 SHA256 41719da8de79093accae302c0cb7082e3e4248ed2413f6cda456051fead1f05c SHA512 e5c6ea64e3fc495c41dfe405325caf3fb34e58416d6cf284805f3e9666b085f4ef58b97e0de04ded4cf658421d8e4b716781f9ce58465410a7a715e72800feaf WHIRLPOOL b29ae1c37f71e4474077f18fe42f07bca213f7cf6faa2f942b615430aa68245a43a6223e430926c1b917debff548fd6d6b8c3f5c6e4e7ddd121878e2c390e9ba DIST gitlab-ce-8.12.7.tar.gz 27110532 SHA256 003e497e23f730f4990bdb4b431109f2956b5bbf1d202a4003f5af65424157d4 SHA512 7ad53f5fe0c88cfcf5688de5d55489964a4b5e8dd763fbf7d832c199432b9532f0a75e6d803f1d03387c86b3ba0b47b1b75b97e783f7661662b656c7f9aea216 WHIRLPOOL 026d11a8adcde5312b46d626bebc6ed33bfea344042deb1fab0a40a52cfd7deccfe78ef2a544293456f08bf7acbd917233533898b54c3b9dcee9121520607ff2 -EBUILD gitlab-ce-8.11.6.ebuild 11960 SHA256 ca2f5ea26710ac36289b0fa6335183714d7ea1a22fa9691067fa54e2785bf48b SHA512 7e1bf0b52d6f10c4a4c26d31c359e8a36fb8429fd5537a86c03867186bd9c554cb4fea6d9de04a21b8a81a7e394e19586b03a493f284425a8547ca4561954150 WHIRLPOOL bcea3b44707d466c548f0b02a5c69464d102f6ff4a4b8e3d51bf1b78ae2321a1512df9e504c540dbb7a5abd718671a9f2c498d13274b905e501fba147184a372 -EBUILD gitlab-ce-8.12.0.ebuild 11966 SHA256 5f747862a230aae8b904fd64d781a6a2ea3fa24fd9dba53794a671c2b9d298e7 SHA512 6ed88a63c68decf4807e1e520b45d955cc1f11a89ca00025eb6e9491f380eac408efa2b508889bee3beb12b3b933bd73ae280e30e72f974f5ac803a818d6c710 WHIRLPOOL 20c958f6e10050272afece916ffbad1b1b88a52777836d059451ac886c2f658043d6637b9cabf3da4f0761d5853c5dd4df7a154e4677788515b69b2f4ab99d86 +DIST gitlab-ce-8.13.0.tar.gz 27763918 SHA256 0c4736ec84fe371334a0b7feca34eb6a2a371242c2ed0ba356b201de5c5e4a46 SHA512 e08ce15b6b8658d12c20cb7b522607c6c54880c1e2737f48e4a80f5d3fd8efb10f680b3a4a8c975dbc5237eea2b0f5fef185286d1ea3a7786573fa2bbca4149c WHIRLPOOL 91e4dc8732f3df17ffa81d5fa9ec6b0be8a04c956021ac95c859819643da426b5cafef2d1811cbc3507688179f2645839ae64eac6bb1941fc17076977bdff960 EBUILD gitlab-ce-8.12.0_rc6.ebuild 11943 SHA256 62bcdc0b04fd791be8ecb48529d0c09705a6c843f245dce58f4780b3782f8195 SHA512 8f1cf916b29cc8d8b078ba19658ebd39585eb6d95ed106e8beb64ccdb17bfbe22fcf5af10baa13cc941d0d733cd0ea8f2ee4a9b960459e96c41744a35d6f2c74 WHIRLPOOL 48ce3279bf1f0c5658e726935c01020555f9d1705623ed8e12dd73670a32fa9b316a26aa7ed41786662e363e61f448ef523bb3ea0e65ed2d7653a3cf6ef67fe7 EBUILD gitlab-ce-8.12.7.ebuild 12068 SHA256 5acdce0ee5f3c6cf20a120758ad0c60ec70574d38cc2ee56037b3789d812edfd SHA512 7daf877280f4a8242fa83e1b70d5cabe99aa8bd547d0b4f9a4921c60c44228f508e39a8a4f751b987078c4d680aaff374a055c8ca5882b12f110b232c0006f4e WHIRLPOOL be51f8c53ac45db3c13f179d447665b536df4848a4c63cf5619d2620fbca7bd2701b861f636235d7e746ee7f560eb084e949288f11dceaaef826c138be321625 -EBUILD gitlab-ce-9999.ebuild 12028 SHA256 f3cd5c8a9f8cd80396f81f34689dc1b204e1e84bd98c7f202765b30a366a8d1f SHA512 a64a6c395a67f9b1bd8018cf487620f1d16ef6309ef38530c9470101bddf671abf23c00cc20c8fd5695761244fbc25ac0080e52d47023cd12308abd7430833a5 WHIRLPOOL 8753ee153fc0c73818eeef540921f602008b080f8b273eb466a95f72b34d3bcbb80849bf42146b65602b0ff02c8c7eebe11b717ea585cf993471206698405aed -MISC ChangeLog 8899 SHA256 ea96cff5da871cc200cf1fe220d9879b0b58af928b8a231d7b40472cccef701c SHA512 defd64dd057305dec3775cdc3b27b01e33c17de0c1ac0109807ea0480ae7f7ab144d0a5f1719be5b465c1f58a916c7f88436e43551bcf749660cc11113afd95f WHIRLPOOL 54a5ddbc652d9d7124ed363fadf59ffa7c5d89b9927bd93c3aa5d06adec6f0c33ac04b2399c674f202558af2c5ab0bbd44f9251c589cf30abf2f82bf3c5e4ff4 +EBUILD gitlab-ce-8.13.0.ebuild 11859 SHA256 b90393b330f1048ea73536071793f1897d62e14773bc170600abb9ab9dc0fcc0 SHA512 31c32936dbe355dc9dae68bb5b726822a9f5222796dd11dc95b8907fbb2e316930a95568061557328a9d87b5b5eded5867a1a8d552cd9041f10054140d461426 WHIRLPOOL 2ce6cf02c5b27fe70f00795c16fa3d20f369ba820f8583c90808ac5d6c1d838425d447caaad67b76ebc64e6a3f1b6866ac2e890566dc71504056c20103b8ad97 +EBUILD gitlab-ce-9999.ebuild 12071 SHA256 e2c6e604e897d424ab8a4baa5197f30290a90e8a18a210f15dae77d87af18489 SHA512 4c3ffc018e51610f0619b95a7ef918afa1364a94cb1b5d343dc7af5ee891d26970a7f501b0b8a0bcf258ede9c85c53b74561efcfcf56fd30d5e6f0e363beb8f8 WHIRLPOOL bd562d857ab4136788df6198b23afa3ef21f846d486e08987b8b27f4c4d64e1b5a2e57e2a23ad202c06d4c59d9db80e64ea48e92897903a8fd6e3dd2eb8f667e +MISC ChangeLog 9275 SHA256 c7694501f0e4c960dab3ad7bce1d468951e7efad6238205faf9d466f33a53c5b SHA512 dfc57680613fbaf9cd193e525d71ac0b5c0afe5af2898baf3613f323d5f78cc2046d2287ab2e6d3995c9453c9343d8bcabf984ef62147281be5188627a588f77 WHIRLPOOL 982a30637c724bb633ba2f6514006c6feb9eb1cdf32cf6e10695c184ccecbcf8952aba8c831de64384b7154effaa26fcf5f187a0cc546c06d5d3cdddaf44f3ee MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3 diff --git a/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init b/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init new file mode 100644 index 0000000..6583f1d --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.init @@ -0,0 +1,43 @@ +#!/sbin/openrc-run + +name="GitLab Sidekiq" +description="Sidekiq for GitLab" + +: ${gitlab_user:=@USER@} +: ${gitlab_base:="@GITLAB_BASE@"} +: ${rails_env:=production} + +: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"} +: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"} +: ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"} + +sidekiq_command="/usr/bin/bundle" +sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}" + +depend() { + need redis gitlab-workhorse + use net +} + +start() { + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")" + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? +} + +stop() { + ebegin "Stopping ${name} - Sidekiq" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} + eend $? +} diff --git a/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.service b/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.service new file mode 100644 index 0000000..233a39e --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-8.13.0-sidekiq.service @@ -0,0 +1,27 @@ +##################################################### +# +# GitLab version : 8.13.x - 9999 +# Contributors : davispuh, mtorromeo, axilleas, boeserwolf91, Stefan Tatschner (rumpelsepp) +# Downloaded from : https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/init/systemd +# +#################################################### + +[Unit] +Description=GitLab Sidekiq Worker +Requires=redis.service +Wants=mysqld.service postgresql.service +After=redis.service mysqld.service postgresql.service + +[Service] +Type=forking +User=git +WorkingDirectory=/opt/gitlab +Environment=RAILS_ENV=production +SyslogIdentifier=gitlab-sidekiq +PIDFile=/run/gitlab/sidekiq.pid + +ExecStart=/usr/bin/bundle exec "sidekiq -d -C /etc/gitlab/sidekiq_queues.yml -e production -P /run/gitlab/sidekiq.pid -d -L /var/log/gitlab/sidekiq.log >> /var/log/gitlab/sidekiq.log 2>&1" +ExecStop=/usr/bin/bundle exec "sidekiqctl stop /run/gitlab/sidekiq.pid >> /var/log/gitlab/sidekiq.log 2>&1" + +[Install] +WantedBy=multi-user.target diff --git a/www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init b/www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init new file mode 100644 index 0000000..7a68c6e --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-8.13.0-unicorn.init @@ -0,0 +1,122 @@ +#!/sbin/openrc-run + +extra_started_commands="restartsidekiq" + +name="GitLab" +description="GitLab on Unicorns" +description_restartsidekiq="Restarts Sidekiq only" + +: ${gitlab_user:=@USER@} +: ${gitlab_base:="@GITLAB_BASE@"} +: ${rails_env:=production} + +: ${server_pidfile:="/run/gitlab/unicorn.pid"} + +: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"} +: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"} +: ${sidekiq_config:="/etc/gitlab/sidekiq_queues.yml"} + +: ${mail_room_pidfile:="/run/gitlab/mail_room.pid"} +: ${mail_room_logfile:="/var/log/gitlab/mail_room.log"} +: ${mail_room_config:="/etc/gitlab/mail_room.yml"} + +server_command="/usr/bin/bundle" +server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D" + +sidekiq_command="/usr/bin/bundle" +sidekiq_command_args="exec sidekiq -C ${sidekiq_config} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}" + +mail_room_command="/usr/bin/bundle" +mail_room_command_args="exec mail_room -q -c ${mail_room_config} >> ${mail_room_logfile} 2>&1" + +depend() { + provide gitlab + need redis gitlab-workhorse + use net +} + +start() { + ebegin "Starting ${name} - Unicorn servers" + + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")" + checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")" + + start-stop-daemon --start \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${server_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${server_command} -- ${server_command_args} + eend $? + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? + + if [ -e /etc/default/gitlab ]; then + . /etc/default/gitlab + if [ "${mail_room_enabled}" == "true" ]; then + ebegin "Starting ${name} - mail_room" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${mail_room_pidfile}" -m \ + --env RAILS_ENV=${rails_env} \ + --exec ${mail_room_command} -- ${mail_room_command_args} + eend $? + fi + fi +} + +stop() { + ebegin "Stopping ${name} - mail_room" + start-stop-daemon --stop \ + --signal QUIT \ + --pidfile=${mail_room_pidfile} \ + --exec ${mail_room_command} + eend $? + + ebegin "Stopping ${name} - Sidekiq" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} + eend $? + + ebegin "Stopping ${name} - Unicorn servers" + start-stop-daemon --stop \ + --signal QUIT \ + --pidfile=${server_pidfile} \ + --exec ${server_command} + eend $? +} + +restartsidekiq() { + ebegin "Restarting ${name} - Sidekiq: Stopping" + start-stop-daemon --stop \ + --pidfile=${sidekiq_pidfile} \ + --exec ${sidekiq_command} \ + --progress \ + --retry 180 + + eend $? + + ebegin "Starting ${name} - Sidekiq" + + start-stop-daemon --start \ + --background --quiet \ + --chdir "${gitlab_base}" \ + --user=${gitlab_user} \ + --pidfile="${sidekiq_pidfile}" \ + --env RAILS_ENV=${rails_env} \ + --exec ${sidekiq_command} -- ${sidekiq_command_args} + eend $? +} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild deleted file mode 100644 index 13302a1..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.11.6.ebuild +++ /dev/null @@ -1,386 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" - -inherit eutils ruby-ng user systemd - -MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="410d75139541ee2a2cda04debcdbb6767a9c01bc" - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=${MY_PV} -> ${P}.tar.gz" -RUBY_S="${PN}-${MY_PV}-${MY_GIT_COMMIT}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -COMMON_DEPEND=" - ${GEMS_DEPEND} - ~dev-vcs/gitlab-shell-3.4.0 - >=dev-vcs/git-2.7.4 - ~dev-vcs/gitlab-workhorse-0.7.11 - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" -DEPEND=" - ${CDEPEND} - ${COMMON_DEPEND}" -RDEPEND=" - ${COMMON_DEPEND} - >=dev-db/redis-2.8 - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# fix-redis-config-path: -# Point to the absolute location of redis_config.rb -# -RUBY_PATCHES=( - "01-${PN}-8.7.5-fix-sendmail-config.patch" - "02-${PN}-8.11.0-fix-redis-config-path.patch" -) - -MY_NAME="gitlab" -MY_USER="git" # should be same as in gitlab-shell - -DEST_DIR="/opt/${MY_NAME}" -CONF_DIR="/etc/${MY_NAME}" -LOGS_DIR="/var/log/${MY_NAME}" -TEMP_DIR="/var/tmp/${MY_NAME}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/${MY_PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - 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/|" \ - 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}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - einfo "Cleaning old gems ..." - ${RUBY} /usr/bin/bundle clean - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-workhorse.service" - systemd_dounit "${FILESDIR}/gitlab-mailroom.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq.init - use unicorn && rcscript=gitlab-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|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} -} - -pkg_postinst() { - elog "If this is an update from a previous version, stop your GitLab" - elog "instance and issue the following command to perform all required" - elog "migrations:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog "PLEASE NOTE: It's HIGHLY recommended to backup your database" - elog "before running the config phase. Run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production" - elog - elog "If this was a fresh install, follow these steps:" - elog - elog "1. Configure your GitLab's settings in ${CONF_DIR}/gitlab.yml." - elog - elog "2. Configure your database settings in ${CONF_DIR}/database.yml" - elog " for \"production\" environment." - elog - elog "3. Then you should create a database for your GitLab instance, if you" - elog " haven't done so already." - elog - if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" - elog " Note: You should change your password to something more random..." - elog - fi - elog "4. Finally execute the following command to initialize the environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If you're running GitLab behind an SSL proxy such as nginx or Apache and" - elog "you can't login after the upgrade, be sure to read the section about the" - elog "verification of the CSRF token in GitLab's trouble-shooting guide at" - elog "http://goo.gl/5XGRGv." - if use postgres; then - elog "Please note: As of GitLab 8.6, users of PostgreSQL need to enable the" - elog "`pg_trgm` extension by running the following command as a PostgreSQL" - elog "super user for *every* GitLab database:" - elog " CREATE EXTENSION IF NOT EXISTS pg_trgm;" - elog "For details, see the documentation at the GitLab website." - fi -} - -pkg_config() { - einfo "Checking configuration files" - - 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 - fi - - local email_from="$(ryaml ${CONF_DIR}/gitlab.yml production gitlab email_from)" - local git_home="$(egethome ${MY_USER})" - - # configure Git global settings - if [ ! -e "${git_home}/.gitconfig" ]; then - einfo "Setting git user" - su -l ${MY_USER} -c " - git config --global user.email '${email_from}'; - git config --global user.name 'GitLab'" \ - || die "failed to setup git name and email" - fi - - # determine whether this is an update or a fresh install. we do this by - # checking whether the ${DEST_DIR}/.git directory exists or not - # - if [ -d "${DEST_DIR}/.git" ]; then - local update=true - else - local update=false - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - # FIXME: this line existed in older ebuilds, but the variable is - # never used. what was it for!? - # local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ "${update}" = 'true' ]; then - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - # create dummy git repo as workaround for - # https://github.com/bundler/bundler/issues/2039 - einfo "Initializing dummy git repository to avoid false errors from bundler" - su -l ${MY_USER} -c " - cd ${DEST_DIR} - git init - git add README.md - git commit -m 'Dummy repository'" >/dev/null - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi - elog - elog "If you want to make sure that the install/upgrade was successful, start" - elog "Gitlab now and then run these commands (as root):" - elog - elog " cd /opt/gitlab" - elog " sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production" - elog " sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production" - elog -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.13.0.ebuild similarity index 95% rename from www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.13.0.ebuild index 949ff5a..fb3a840 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.12.0.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.13.0.ebuild @@ -16,7 +16,7 @@ USE_RUBY="ruby21 ruby23" inherit eutils ruby-ng user systemd MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="0864ff999fd77f3efedaab22a2bc549206251703" +MY_GIT_COMMIT="053a0a2ccdc74c2fd2ae400fd73675d0e14b1aba" 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.6.0 + ~dev-vcs/gitlab-shell-3.6.6 >=dev-vcs/git-2.7.4 - ~dev-vcs/gitlab-workhorse-0.8.2 + ~dev-vcs/gitlab-workhorse-0.8.5 kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" DEPEND=" @@ -80,6 +80,9 @@ ruby_add_bdepend " RUBY_PATCHES=( "01-${PN}-8.7.5-fix-sendmail-config.patch" "02-${PN}-8.11.0-fix-redis-config-path.patch" + "03-${PN}-8.12.7-database.yml.patch" + "04-${PN}-8.12.7-fix-check-task.patch" + "05-${PN}-8.12.7-replace-sys-filesystem.patch" ) MY_NAME="gitlab" @@ -90,10 +93,6 @@ CONF_DIR="/etc/${MY_NAME}" LOGS_DIR="/var/log/${MY_NAME}" TEMP_DIR="/var/tmp/${MY_NAME}" -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/${MY_PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailers,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default" - all_ruby_prepare() { # fix paths local satellites_path="${TEMP_DIR}/repo_satellites" @@ -210,21 +209,20 @@ all_ruby_install() { if use systemd ; then ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service" + systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" systemd_dounit "${FILESDIR}/gitlab-unicorn.service" systemd_dounit "${FILESDIR}/gitlab-workhorse.service" systemd_dounit "${FILESDIR}/gitlab-mailroom.service" systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" else - local rcscript=gitlab-sidekiq.init - use unicorn && rcscript=gitlab-unicorn.init + local rcscript=gitlab-8.13.0-sidekiq.init + use unicorn && rcscript=gitlab-8.13.0-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|@QUEUES@|${SIDEKIQ_QUEUES}|" \ "${T}/${rcscript}" \ || die "failed to filter ${rcscript}" @@ -303,6 +301,8 @@ pkg_config() { || die "failed to setup git name and email" fi + su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" + # determine whether this is an update or a fresh install. we do this by # checking whether the ${DEST_DIR}/.git directory exists or not # diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 5749e75..f2b527d 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -216,21 +216,20 @@ all_ruby_install() { if use systemd ; then ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_newunit "${FILESDIR}/gitlab-8.10.6-sidekiq.service" "gitlab-sidekiq.service" + systemd_newunit "${FILESDIR}/gitlab-8.13.0-sidekiq.service" "gitlab-sidekiq.service" systemd_dounit "${FILESDIR}/gitlab-unicorn.service" systemd_dounit "${FILESDIR}/gitlab-workhorse.service" systemd_dounit "${FILESDIR}/gitlab-mailroom.service" systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" else - local rcscript=gitlab-sidekiq.init - use unicorn && rcscript=gitlab-unicorn.init + local rcscript=gitlab-8.13.0-sidekiq.init + use unicorn && rcscript=gitlab-8.13.0-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|@QUEUES@|${SIDEKIQ_QUEUES}|" \ "${T}/${rcscript}" \ || die "failed to filter ${rcscript}" @@ -309,6 +308,8 @@ pkg_config() { || die "failed to setup git name and email" fi + su -l ${MY_USER} -c "git config --global repack.writeBitmaps true" + # determine whether this is an update or a fresh install. we do this by # checking whether the ${DEST_DIR}/.git directory exists or not # From 1783bd8abee3cf6c7da10b2fb7acd4e26e641e7b Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:49:55 +0200 Subject: [PATCH 4/6] dev-vcs/gitlab-shell: purged unneeded ebuilds Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-shell/ChangeLog | 4 + dev-vcs/gitlab-shell/Manifest | 6 +- .../gitlab-shell/gitlab-shell-3.4.0.ebuild | 130 ------------------ .../gitlab-shell/gitlab-shell-3.6.0.ebuild | 130 ------------------ 4 files changed, 5 insertions(+), 265 deletions(-) delete mode 100644 dev-vcs/gitlab-shell/gitlab-shell-3.4.0.ebuild delete mode 100644 dev-vcs/gitlab-shell/gitlab-shell-3.6.0.ebuild diff --git a/dev-vcs/gitlab-shell/ChangeLog b/dev-vcs/gitlab-shell/ChangeLog index c249132..0460ac7 100644 --- a/dev-vcs/gitlab-shell/ChangeLog +++ b/dev-vcs/gitlab-shell/ChangeLog @@ -1,3 +1,7 @@ + 22 Oct 2016; Manuel Friedli -gitlab-shell-3.4.0.ebuild, + -gitlab-shell-3.6.0.ebuild: + dev-vcs/gitlab-shell: purged unneeded ebuilds + *gitlab-shell-3.6.6 (22 Oct 2016) 22 Oct 2016; Manuel Friedli +gitlab-shell-3.6.6.ebuild: diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest index 831a85d..e8677ae 100644 --- a/dev-vcs/gitlab-shell/Manifest +++ b/dev-vcs/gitlab-shell/Manifest @@ -1,13 +1,9 @@ AUX gitlab-shell-3.2.0-config-paths.patch 1826 SHA256 c83db7c37dcac577ce499eab4bb0168253f49d303ba1991fdec90d13cc3fe37a SHA512 7524b6b8cd7cd141a56c468efa303b1d21576ac9e03cb866cbf9dcac34e1b8d4f356333737050e2e5dfeb0f0ad904b3f548c40e1209c1f35054ed2027b1d8271 WHIRLPOOL fdbd2dfe43ff4a2af97227fbf8c4589ca3734ebf0320b7e9c5e8ea39882c49d45815a0ee3c765a141affacbe48f4063987b9664a918e0e216b49ca46a475cc5f -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 -DIST gitlab-shell-3.6.0.tar.gz 74513 SHA256 4ad340fbd295b54ad92558fba9642d88b9759a46b9a5473c6a7d73faf9c4f9ce SHA512 beb2fa68f58adc58d5c6418e2a7dd0d15f007d730595dd8871298105dfec8140d9e14dd27350079f1878279a47b0b2096183c80dfd3c9744fd802332252b2005 WHIRLPOOL 32c6e57361ebdd1e031ea055a985a800a7e4c4f9312476c8b228484f02ba58618aa968ba598c5cc74966824029b12d1ec4c0a55e297d97a35c8b405f287aef66 DIST gitlab-shell-3.6.1.tar.gz 74806 SHA256 180dcce14e9caa9c7f09eefdb2e10189318a0f994c4931fae2acebd92e9e4fa3 SHA512 6f54b0a9ddccabb3971c48301292835ecf953e0a9bb3b9d1d78af416a42e3d2883a157ab02990e748b0e6b02805864c314fe9cd538834ab831f565f0c573ed3a WHIRLPOOL 1219213217d5ec280ee521c4f64328634402c795a4fbd10beac3481f4e622faf03859589ee641bbd34647b057c77bdef0d7e1a2906375c3de21cd6b4739a7826 DIST gitlab-shell-3.6.6.tar.gz 77199 SHA256 db3f54b561bb81059256c634967b181707e11cc25e30b0fa76eb034718d0eaf9 SHA512 d1d15687169f7b151caf3b371d6570099129a2a69d7732e6be7337f70aaef7e36c87e8aa5140e9697c7be36185743bb939d862790b440fc18d7a864d570fcb6b WHIRLPOOL 4161901369cc12a89fb89c41bd98cfc2cfdeb5aac6d317597ae11f10bcd401e4c18148ce9a20f5e967a6fb11559f33aa72c82dff1a52764c5a19bcd0f06250c1 -EBUILD gitlab-shell-3.4.0.ebuild 3653 SHA256 7bf777fc3b5bda03f9a455874f62bb6260eeb73dd8727e4145ed0cda2e283465 SHA512 de5b78133d317155f5764d6888d421c4f2945ccb5972c032c05138344188eb0a0f85817431aa4348e2074667c901f44cf2b575f572aeb2620aab58a32ddba22b WHIRLPOOL e53de830c17bc9c784df06670c6fdc7465ba05ca40de42e4857e5a83421208f9bbb4381c2988fbabc85f86476d5c2b7301123392de132558bdd6f969726a9a57 EBUILD gitlab-shell-3.5.0.ebuild 3653 SHA256 3b73797e283ff4ec30c87d50a54a80cf6895c0c03dedc3ff34087b3037dd9fd5 SHA512 cc235d625f1eabac09822fbca06b706886601e550958338ea5ee7ccfdbbb85e2d96bb348b4ccce532c92d18389c63ddb78bcd77e407f789127fbb3d9ac32d0d9 WHIRLPOOL 4a8bb0ee8a1b547bb8517c300806457187a8fd1855b223cf079784733fdef55e2dd5fa9998da9523bcd3b021aa10d45cc74445bae5bd8f853e3355d6a1d6417a -EBUILD gitlab-shell-3.6.0.ebuild 3653 SHA256 9a71f83a1bb91c904a43807572477ea143098bf2c7d77bf6777a4b783f524002 SHA512 370c559478716fe31376b6607c233c213df7f0abb3a9ecfc66506cfb29088e63600aecd3046cb272ec32dcb33f3b23a70dbaff5eed9cf308e274236d6dff9e67 WHIRLPOOL 0eee77706d9569d37d1b2cf77d0beacb0e72416d06b9bd937fad1115241908c66b12db6b466a3b579411721cf0d56e7f9137977a7b1fd9f983d7c52b0cb9d724 EBUILD gitlab-shell-3.6.1.ebuild 3653 SHA256 c36f3fcec5b4f954c404e4f41a773461971116d7ad2bd484b05ef479c4915ad2 SHA512 fedce05647f773f5a7e54fd8764f8934666a51d9b5e8a5e93201bd504a042ade828cbb0043817b8552bdb4d1cdee6fd2404b17c4e9a7ed3ce75fc41e79c866fd WHIRLPOOL 4853bcfb4dfe1dd152645ce4d572797ba158d5edf53349f3d66489009b10ec2cd7a598beef46bc9b1e104891a3071e1cb9b67471e284b626023a9e1b46b559a8 EBUILD gitlab-shell-3.6.6.ebuild 3653 SHA256 49c383d1d5895069a6783e44d492935879801efd95f57548a81e10df48339038 SHA512 4e6dd5c34a56ed0e1fc45819c93239c61d900304cc8df20855f4e71e4fab234b5e81612f256155022f362f4f9a0959531a3999eb7ece9013914129e4343795cf WHIRLPOOL 92d40a6cb8dd19a42093a746e29ead878eeb9b0c741e23ca3e6213c0a14b820584633db8f2d5ac60cd28da15546232de417db72ccdf8608bc49ac333107f7193 -MISC ChangeLog 1840 SHA256 e8a2f8fe31ce8058afca46a203fcdeb78610d2ccd9622559fd897ba8bcabdb53 SHA512 148492ad184379dbbf02e201fc8892361b411d840334bb16939865f80a2d656eaf860fb1675a464d0c24f0fb5d3c82410d1b0945c2655d0541ed4e5a61f59260 WHIRLPOOL 40d5819a5817782f53a08e71a2b8e9480425d9e45fd2bff5456a6b45937ba35cf2f062a1cd7f6e0f0a002ca6e99b3d2fdbc965d6ffbe0cb8c3fedef226a4be3b +MISC ChangeLog 1999 SHA256 2bc63e08adc90cd5216837c82621c8238a869ab699a3dcf38b568467c9142f9e SHA512 5d6bf2f3c3d312f5813fa035ecf22b0dd7648ec4b99ff38cf409bfc63fc3826ffd063c93ab0b4485e13ddaad89680fec39678c0c0d660280a8a13f69b3518ac5 WHIRLPOOL 904c6056d1b2a59604ae8cd468a288f07354ca2e9e18524682cf02065d0a2d5709698c89287911edb0c0172051ca9fe92e62a74edd37115fde33f6ecfcc1a59e MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-3.4.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-3.4.0.ebuild deleted file mode 100644 index 8abdca5..0000000 --- a/dev-vcs/gitlab-shell/gitlab-shell-3.4.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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="3043b31c458bf720843a84b35c9fbad5c1488c1d" - -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}." -} diff --git a/dev-vcs/gitlab-shell/gitlab-shell-3.6.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-3.6.0.ebuild deleted file mode 100644 index da443c8..0000000 --- a/dev-vcs/gitlab-shell/gitlab-shell-3.6.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -USE_RUBY="ruby21 ruby23" - -inherit eutils ruby-ng user - -MY_PV="v${PV/_/-}" -MY_GIT_COMMIT="894d8c16866b58e74791c933968a5a08c7aeb901" - -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}." -} From be504d9d01fc88835bd8df920a6c8b15b48ab445 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:51:39 +0200 Subject: [PATCH 5/6] www-apps/gitlab-ce: updated dependencies for gitlab-ce-9999 Package-Manager: portage-2.3.0 --- www-apps/gitlab-ce/ChangeLog | 3 +++ www-apps/gitlab-ce/Manifest | 4 ++-- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/www-apps/gitlab-ce/ChangeLog b/www-apps/gitlab-ce/ChangeLog index 9bdea6b..08c2bd0 100644 --- a/www-apps/gitlab-ce/ChangeLog +++ b/www-apps/gitlab-ce/ChangeLog @@ -1,3 +1,6 @@ + 22 Oct 2016; Manuel Friedli gitlab-ce-9999.ebuild: + www-apps/gitlab-ce: updated dependencies for gitlab-ce-9999 + *gitlab-ce-8.13.0 (22 Oct 2016) 22 Oct 2016; Manuel Friedli diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 46f3936..82da63c 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -19,6 +19,6 @@ DIST gitlab-ce-8.13.0.tar.gz 27763918 SHA256 0c4736ec84fe371334a0b7feca34eb6a2a3 EBUILD gitlab-ce-8.12.0_rc6.ebuild 11943 SHA256 62bcdc0b04fd791be8ecb48529d0c09705a6c843f245dce58f4780b3782f8195 SHA512 8f1cf916b29cc8d8b078ba19658ebd39585eb6d95ed106e8beb64ccdb17bfbe22fcf5af10baa13cc941d0d733cd0ea8f2ee4a9b960459e96c41744a35d6f2c74 WHIRLPOOL 48ce3279bf1f0c5658e726935c01020555f9d1705623ed8e12dd73670a32fa9b316a26aa7ed41786662e363e61f448ef523bb3ea0e65ed2d7653a3cf6ef67fe7 EBUILD gitlab-ce-8.12.7.ebuild 12068 SHA256 5acdce0ee5f3c6cf20a120758ad0c60ec70574d38cc2ee56037b3789d812edfd SHA512 7daf877280f4a8242fa83e1b70d5cabe99aa8bd547d0b4f9a4921c60c44228f508e39a8a4f751b987078c4d680aaff374a055c8ca5882b12f110b232c0006f4e WHIRLPOOL be51f8c53ac45db3c13f179d447665b536df4848a4c63cf5619d2620fbca7bd2701b861f636235d7e746ee7f560eb084e949288f11dceaaef826c138be321625 EBUILD gitlab-ce-8.13.0.ebuild 11859 SHA256 b90393b330f1048ea73536071793f1897d62e14773bc170600abb9ab9dc0fcc0 SHA512 31c32936dbe355dc9dae68bb5b726822a9f5222796dd11dc95b8907fbb2e316930a95568061557328a9d87b5b5eded5867a1a8d552cd9041f10054140d461426 WHIRLPOOL 2ce6cf02c5b27fe70f00795c16fa3d20f369ba820f8583c90808ac5d6c1d838425d447caaad67b76ebc64e6a3f1b6866ac2e890566dc71504056c20103b8ad97 -EBUILD gitlab-ce-9999.ebuild 12071 SHA256 e2c6e604e897d424ab8a4baa5197f30290a90e8a18a210f15dae77d87af18489 SHA512 4c3ffc018e51610f0619b95a7ef918afa1364a94cb1b5d343dc7af5ee891d26970a7f501b0b8a0bcf258ede9c85c53b74561efcfcf56fd30d5e6f0e363beb8f8 WHIRLPOOL bd562d857ab4136788df6198b23afa3ef21f846d486e08987b8b27f4c4d64e1b5a2e57e2a23ad202c06d4c59d9db80e64ea48e92897903a8fd6e3dd2eb8f667e -MISC ChangeLog 9275 SHA256 c7694501f0e4c960dab3ad7bce1d468951e7efad6238205faf9d466f33a53c5b SHA512 dfc57680613fbaf9cd193e525d71ac0b5c0afe5af2898baf3613f323d5f78cc2046d2287ab2e6d3995c9453c9343d8bcabf984ef62147281be5188627a588f77 WHIRLPOOL 982a30637c724bb633ba2f6514006c6feb9eb1cdf32cf6e10695c184ccecbcf8952aba8c831de64384b7154effaa26fcf5f187a0cc546c06d5d3cdddaf44f3ee +EBUILD gitlab-ce-9999.ebuild 12071 SHA256 6c265ee4d106ec9315c152a62b33c59c5b40decafc2b16ff0052f30d35a07810 SHA512 04533314f4f8a8b5a9e672267b47ef17020402d06399e515b2eb9a7653c5fc94349a3a4aff32bb22f666b7577a9538c1198edec15f5b026891e4ebf6ba0daffa WHIRLPOOL 9e1c4d2dbcfbd2de03f3cd6731cdd120f72d29ff7581aa40e612f946ec8d0b486d77cb2089706079eedc22792b7f1752f0554256ac9ec8b8241d4877a4fde499 +MISC ChangeLog 9413 SHA256 874a7a307dd11a3dfbcd40d98b4a2c84a72fb7242c41b592de0f35db7d5f67a2 SHA512 27b12b5b99f9a91912ca3fc471ce006ab868423b70a91e2bbd4c8999cce79f728821a77d0f74654ad979f0b7c0cd89a15dce12d81f9f9997666150bd41b1983b WHIRLPOOL e17691cf20178edba80eb75f0ddf8b324d2863f7b9aa128920c0322bc683461da91695924c66018ddef67616b44024426ec8f13c09584f38c90aee36fffc2162 MISC metadata.xml 559 SHA256 6c3f48d3ef57c97bf27790f33ee04bd8de8b01597caa8a2a7a473d6d0a3c5759 SHA512 5aa340b5429795d84cd106ee673fd55a42fd4b0d3299d6b95c6a3e3d50812a9620820a4de5c57d5048af0c3ecec7f575d5856d2f7fadc210aadcbdd4dd040fe1 WHIRLPOOL f3d7b8c0522e09f5156e6bb446bb74e4c75f5da4495ca2ece1eb78afce59307abe01bf3c5dd5344278fcac9e334300d912031c806f51b981591c01bc3588c6f3 diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index f2b527d..83313cf 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -52,9 +52,9 @@ CDEPEND=" virtual/pkgconfig" COMMON_DEPEND=" ${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-3.6.1 + >=dev-vcs/gitlab-shell-3.6.6 >=dev-vcs/git-2.7.4 - >=dev-vcs/gitlab-workhorse-0.8.2 + >=dev-vcs/gitlab-workhorse-0.8.5 kerberos? ( !app-crypt/heimdal ) rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/24 )" DEPEND=" From ccc40791609764d2ff5421253f48158b5a899b43 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 22 Oct 2016 21:53:31 +0200 Subject: [PATCH 6/6] dev-vcs/gitlab-workhorse: purged obsolete ebuilds Package-Manager: portage-2.3.0 --- dev-vcs/gitlab-workhorse/ChangeLog | 6 +++ dev-vcs/gitlab-workhorse/Manifest | 8 +--- .../files/fix-Makefile-0.7.11.patch | 12 ------ .../files/gitlab-workhorse.conf | 11 ------ .../files/gitlab-workhorse.init | 16 -------- .../gitlab-workhorse-0.7.11.ebuild | 37 ------------------ .../gitlab-workhorse-0.8.2.ebuild | 39 ------------------- 7 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.11.patch delete mode 100644 dev-vcs/gitlab-workhorse/files/gitlab-workhorse.conf delete mode 100644 dev-vcs/gitlab-workhorse/files/gitlab-workhorse.init delete mode 100644 dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild delete mode 100644 dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.2.ebuild diff --git a/dev-vcs/gitlab-workhorse/ChangeLog b/dev-vcs/gitlab-workhorse/ChangeLog index a12086e..2b7d9dc 100644 --- a/dev-vcs/gitlab-workhorse/ChangeLog +++ b/dev-vcs/gitlab-workhorse/ChangeLog @@ -1,3 +1,9 @@ + 22 Oct 2016; Manuel Friedli + -files/fix-Makefile-0.7.11.patch, -files/gitlab-workhorse.conf, + -files/gitlab-workhorse.init, -gitlab-workhorse-0.7.11.ebuild, + -gitlab-workhorse-0.8.2.ebuild: + dev-vcs/gitlab-workhorse: purged obsolete ebuilds + *gitlab-workhorse-0.8.5 (22 Oct 2016) 22 Oct 2016; Manuel Friedli diff --git a/dev-vcs/gitlab-workhorse/Manifest b/dev-vcs/gitlab-workhorse/Manifest index f0e610d..173b54c 100644 --- a/dev-vcs/gitlab-workhorse/Manifest +++ b/dev-vcs/gitlab-workhorse/Manifest @@ -1,16 +1,10 @@ -AUX fix-Makefile-0.7.11.patch 380 SHA256 331a8fb441f2f26385ff72993afad04e03f23b81b69d2d2a7d84933f91096503 SHA512 c4c497d98346eac1d80a860957ffcce57b9da1df192a418030d1833711268919a5556b861922006f9af47971c7799e8f67466962479e5cd91b7089ca0668a3b9 WHIRLPOOL 4173604725a22413eec7620f947e986c02cce1a06a9db81a16d06115e7d2e367b34f87370acac6c48a2bb42c9444a92f4f98d830c484afbb9f3e43bc7a252b0a AUX fix-Makefile-0.8.2.patch 354 SHA256 5ad06525d351b433d32569040eac8756aa067860e20f68cea92e59807bbebfbb SHA512 e39e834c3346a75494de0b2daebaa2a2d519c35b5d4f42ffb5a92dcedfca9d2541f523791c744eb3effdcc62503134e3585a9f002425f787727e18614116c670 WHIRLPOOL 39bd515da32f8aa31be1532d5b32f073feaed3cbee2064075c67669c5c683094806e8438b4cf5bf3601de3009b0279787813f78827c25dd3fa7b6c455ab6823c AUX fix-Makefile-0.8.5.patch 354 SHA256 1773a2e9f535c08f602903924b24918553acf563ac9804f79f26f9f58cd915bf SHA512 2fa8ed07e5e2d012452368047b8aef441015f013c92670961d3b1ea7f131eb49379e0817eeb0da38f04ddd6b9aaf0d081bfcc6ed9c5b83c94ef97b1831836b08 WHIRLPOOL 20849d2cbbb2d5feb48255c3e98a0c9a524078fb51c311d09e833056f07a35c938bc82686338f028ade7eb74090c6c84473e6945e9bde99dbe3d2d057b94a7f2 AUX gitlab-workhorse-0.8.2.conf 297 SHA256 8bb99a78197ad22892e4c85496101a39f2c82f6c537f44da8185af54dbb44a38 SHA512 d143489c165ef5e68810bb10d5e97da7ad3be6d53618380231706ec16c3fd8bc3eedbc78a09949479a408646e32aae4cdceaca9b271ba3b816e3449b792c5406 WHIRLPOOL 649d34b60afab816dac559989c9a3b0cb9620c2ac2a7617cfcae8bcc2c421791fa612571f83e6611ec8ab8c26c9c79f9832f4e6a70396497dfc5a40d99bbbef9 AUX gitlab-workhorse-0.8.2.init 681 SHA256 bf3f94853781251629daae935d04294febf317061536624e2c01188dd6688ae7 SHA512 6275abe0910e7327f952dba36827a9083264f76753605767cc11ee7b162fdecef3170783800263bf8acbe891d41e6be9e27b5fcca2a4f035b990c9865aa02647 WHIRLPOOL bc983d0413c0743ef0843a3abb46ee2be78ac6e18b56f96de63b4ea8cb9242f8ef6a96f2d593dbcda33a0a60b7f941f27bd704b7f64a85db7379ef0b42233527 -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.11.tar.bz2 29401 SHA256 54515f030664e33ae3925d9a85c4fe166fb6316752d819f51cb592f553284b4c SHA512 3f8c8b46f60f13a8d747eb92d42db7d7dae133813df34b263ddc87aef04592888532c1f07c9eeed5eb708af8232a2a98a382e056ff184d61547be68ba55da4e9 WHIRLPOOL a4b17b2784e428ea092c76a3a3ba410565fb3c08c47ef542ddcc126785f3eda837b9462311944be1145076fcecc3da51029cef795c3db7b342e8d95606acfde9 DIST gitlab-workhorse-0.8.2.tar.bz2 226124 SHA256 869feddeef18ab01183e2cd969445d5d091cbd09b7e9d98d1c1b505df7c84d62 SHA512 ad9d24e9eaed2644e5703600341aa1af37f69cc902d1dc49b0338dddbb56f987fa9608d447b29419c5e5d7548f4e8fa8f073b76dd9799994fb1464fb766e9da9 WHIRLPOOL 70f605ed70e1696e89ebd0964ded9e47f6401a0da942edf90a9fac4366a67d85e1b8e339cc8928bce5ba84af7ace950e17eaa3d2393ca19f3f39ee9a52cc27c3 DIST gitlab-workhorse-0.8.5.tar.bz2 229807 SHA256 fec50a37d17c359726ac3e0d2bad4ad3431e6bec9aaa6dbf5dcb81bfce469369 SHA512 c149c4cecc1c64c472e38eaae8cf4522a4b19907ef3a9eda4490ddb6cda6083bdbbc1a827cfc2c4d7ac151e3edc4b5dbfb168e2590ea71f12c2836680b2d8033 WHIRLPOOL 21aa589997e934c664fcf3b6cfb19246910a87ec674fbf2fea5a04728bc00248c79b4ed555601af0adbd20a11ca2ba040c1ccb92323acda7bab3da8c37840340 -EBUILD gitlab-workhorse-0.7.11.ebuild 904 SHA256 6623b233fac6d82c6f4b3026daa5c59743ce0243585d16f7d4ba81941c55b68e SHA512 2577c18ea0f0463f032d06a4e7390f78e527f412b9a5811c50d633d1cb818a49de0cc27cc29b9a7aacbf9e703547ca03a2650c2dffda78484e7190774346704c WHIRLPOOL 5652fa188f27dc2c0d03952832f66efef7c3f0b8118957bf1834460e67134ff7b94dc3528818e6a6b00893338bbe6fb13255e7b4b9a8c06f4c539106fd934800 EBUILD gitlab-workhorse-0.8.2-r1.ebuild 950 SHA256 9ac8a68b13fded800fdaa077df3a5a448662d36e88ef144e565719e95d847612 SHA512 0d776e4be9abef95576103a600425dbb9a73d87dd21387b71dd3f54a62ffb7a9f36713f84c8c6222df0f694d8199148c02b884a56a6abb030d5d3fc9cebd6649 WHIRLPOOL b03658ea70cc2a1bc5034699ef6f6fb8d823889438da7f98d8ba728c7a1c56329aa2e934f902a2964f21975e4a3595d0d7011524ccab31fd0c6e52eea1967ea3 -EBUILD gitlab-workhorse-0.8.2.ebuild 938 SHA256 b8115b810a3187671f4e12c63a7558387aa177787fc1a3746417a4f63a1d681d SHA512 77c2aab70351392de04e6b44920b9d1be55a3bdab9592f6f10eff84d5bc3c000fedd6771f6ea4bb13421ffd77c186f43154520d667a694824030bc618fc6467b WHIRLPOOL 676fb6334d2ad7fbdda94a81c6a429278ffc2a0f33d28ff8df3763e63be3ef98b2d670562aaceced4ebc575976b463c0a3eb5d0893e3de9fde198e475ffb2431 EBUILD gitlab-workhorse-0.8.5.ebuild 950 SHA256 259a4406de93bd2849916d537b67103bcbd4247c5e00871a0c4d9f0bfc84ae11 SHA512 b30e842434de5ba6277b7e1cb3bc38240eeba272dc3ace95a1dfc2dac7b63b1a7cc098e4c2e763ec57b4592c66b3b990a903e1d2382613ef1a7acd5346e9a9c5 WHIRLPOOL a8734afda28cd6c76c3ff381d780188a4d79c7abe3ca2f96087cb1e82c0f7e37acf0610ae80eed1123a66da16a53b6d4d5f080588a45d3016d73efcd5dc91b3a -MISC ChangeLog 4041 SHA256 af20b30b12dd42a54babe7d7bde1c11d3262e57aabd18b07a29fc6e6df2c3623 SHA512 bd40c56a051ba6e8b1e664151956a0cfe2756e68df60f77040fd142c51d1971436275590c5ed8389d3046444c9d3ad27c28afb40cf27bc91e2a3a0bd73349c56 WHIRLPOOL 4e4f0a9bc3e77faf20f328ebebced38a81f2fe37c065e23490b379e8056405e8e29298a89e8320bcdd6ec76a41c231a0c3d2e8da75a5081ee10b4a773f53906d +MISC ChangeLog 4311 SHA256 61076db45a47a43aceb9c48b016ccabcc4b92a70b74c5336a3407867958cb21d SHA512 e63962f5116e934ef70b96ede8354d1710918ab4c6e4a72f6f372e0459ec53bfea4e591dd39604b7f3429a32e32bb5f41e3c11c9a757a14a3824c89edaa55ca3 WHIRLPOOL 84ffcc1b65b948a0fa6385f208d8e1444c4f587cb6e786d816b750789a671a9db0155c0f01f09d562651a8f7256ac0d29152d412e0af1599e90021419615572c MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.11.patch b/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.11.patch deleted file mode 100644 index 4ec8b71..0000000 --- a/dev-vcs/gitlab-workhorse/files/fix-Makefile-0.7.11.patch +++ /dev/null @@ -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.11-$(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}" diff --git a/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.conf b/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.conf deleted file mode 100644 index 5191965..0000000 --- a/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.conf +++ /dev/null @@ -1,11 +0,0 @@ -AUTH_BACKEND=http://localhost:8080 -LISTEN_ADDR=localhost:8181 -LISTEN_NETWORK=tcp -LISTEN_UMASK=022 -PPROF_LISTEN_ADDRESS= - -GIT_REPO_PATH=/var/lib/git/repositories - -RUNAS_USER=git -RUNAS_GROUP=${RUNAS_USER} -LOGFILE=/var/log/gitlab/gitlab-workhorse.log diff --git a/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.init b/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.init deleted file mode 100644 index 4426a8e..0000000 --- a/dev-vcs/gitlab-workhorse/files/gitlab-workhorse.init +++ /dev/null @@ -1,16 +0,0 @@ -#!/sbin/openrc-run - -start() { - ebegin "Starting gitlab-workhorse" - start-stop-daemon --start --exec /usr/bin/gitlab-workhorse --pidfile /run/gitlab-workhorse.pid \ - --make-pidfile --background --user ${RUNAS_USER}:${RUNAS_GROUP} --stdout "${LOGFILE}" --stderr "${LOGFILE}" \ - -- -authBackend=${AUTH_BACKEND} -listenAddr=${LISTEN_ADDR} -listenNetwork=${LISTEN_NETWORK} -listenUmask=${LISTEN_UMASK} \ - -pprofListenAddr=${PPROF_LISTEN_ADDR} ${GIT_REPO_PATH} - eend $? -} - -stop() { - ebegin "Stopping gitlab-workhorse" - start-stop-daemon --stop --exec /usr/bin/gitlab-workhorse --pidfile /run/gitlab-workhorse.pid --user ${RUNAS_USER}:${RUNAS_GROUP} - eend $? -} diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild deleted file mode 100644 index 82f865a..0000000 --- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.7.11.ebuild +++ /dev/null @@ -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}-030623b7a0313f3ef5005958082f7bbc104c7763" -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}" -} diff --git a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.2.ebuild b/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.2.ebuild deleted file mode 100644 index 6449fbf..0000000 --- a/dev-vcs/gitlab-workhorse/gitlab-workhorse-0.8.2.ebuild +++ /dev/null @@ -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="06632c751d46de97776f1a5aeb2432fae0f6fd4d" -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}" -}