diff --git a/www-servers/gitaly/ChangeLog b/www-servers/gitaly/ChangeLog index caaffa9..9c7069e 100644 --- a/www-servers/gitaly/ChangeLog +++ b/www-servers/gitaly/ChangeLog @@ -1,3 +1,7 @@ + 08 Jul 2017; Manuel Friedli -gitaly-0.10.0-r1.ebuild, + gitaly-0.11.2.ebuild: + www-servers/gitaly: Add ebuid for gitaly-0.11.2 + *gitaly-0.11.0 (17 Jun 2017) *gitaly-0.11.2 (17 Jun 2017) diff --git a/www-servers/gitaly/Manifest b/www-servers/gitaly/Manifest index ea2bd0e..451765e 100644 --- a/www-servers/gitaly/Manifest +++ b/www-servers/gitaly/Manifest @@ -4,14 +4,12 @@ AUX gitaly-0.10.0.conf 281 SHA256 54a309ecd95a0c907951a36db5542678f9e68c7e354dcc AUX gitaly-0.10.0.init 592 SHA256 31889dd48b19bd84aaeb64f943ea9ff173b7a2291b3f0dd465c08256d2aee9ee SHA512 81db4434946691a714945e2fab06e302c0994805b4b285e916363461160b30c919e9373d10e293eb2163dc46f132d1c6f4a5c9ab50cad3933827833d48a2832b WHIRLPOOL 1d7287c5dd41a8c63070467640bcf6f5c5fd66a03e7a75ddc000ab67860dd1f76098a78edc36af64ebd34deda103f2284bebcb153906a79310ac9808cfe75a76 DIST gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455 DIST gitaly-0.11.0.tar.bz2 1446943 SHA256 fe4b57fbc05038eb297fa650dd41c1ae6049fc974f43aa7b4993f500627d9e5c SHA512 396d680b66812a7be1dfb9d54d24c0b06c5b70b7bc94c9cc4de8c5e7ccc875682efafa063370d1b2e352458e8bc24db77ca7ad127e4c5af37e5e6c415ce3a7ac WHIRLPOOL 6050a67cb97c9f4072ae81a5c5364bd910c15f54853e974e7f62fee8a95ca9c38ed1fc550f4df71fbecd8b314aacad77cf24b67fcd6bf340c68a3db3fe74854c -DIST gitaly-0.11.2.tar.bz2 1465321 SHA256 4273842b37e2cde3d09a60209ff11cec3f235ebcef304d9c90e9e8aabb8691ed SHA512 a59e6786ff2e8f90a26303c7c74a78b0e96bf948f5f3a51a92799a63fb9489cefe95c4d19a9ab86ab37bbc7ff82b94dba844a3b45bba40e9c03bddda261f26d6 WHIRLPOOL 820c1a371051b1ae06c07895c7c5dfa59680785608f238bc6a1729f9d87949d62768a7eb76a09a66f33c962231a108628ff710cbd4b924f798d0c3356686faab DIST gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8 DIST gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34 -EBUILD gitaly-0.10.0-r1.ebuild 925 SHA256 76ab8c1eacd6c99b8f6e6b1456698e886e103cc94c80a3a294adb9b6377ab55e SHA512 b24404dbc5ddaec4582bc4860a8f98387ab2633d58401296d95fcf8965a3f19d2f8c7739e51106b6d87e8926f1fa3c7f5b79a319d255724550b03c34d1a36bdf WHIRLPOOL fe3121a0d18b6183a8d545fcf4afbd93ead65c0150863d2342e08c6f60cdfa583f3427e49aa76cadcdda121409ba164981ef04f3f0dc1f69394492814aedc45b EBUILD gitaly-0.10.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e EBUILD gitaly-0.11.0.ebuild 1595 SHA256 d1431b825cc5d1c3f36d2626298093a6e99fbf2f4704c8089050f85061950043 SHA512 902de6ab0911bee3389f5ef0854419be228070952b65a94e6277c9b22babee6cc9ab77c24007b94dfb51e9014c891c74d4e7723188a6ce58b6e2d187bb4b9b12 WHIRLPOOL 2a8f2a8c6a6361586bc1871d8b8b217b65f827828f6adb3eee56bb4c30d39bd6c9a6b01fb91adf42f870b070e405187f49867237473995c1b338178b96399279 -EBUILD gitaly-0.11.2.ebuild 1595 SHA256 5844c1a6ec52bfae6115786b7311fac3d71dddcab168fba2f27ab237a1e64779 SHA512 acada469faebe85b38e06ecbf180bb99574a839beefa9bdb922b4f73d836c4ab76b05a84964acf9d5bf13aa42defcd0cff7f6c4aefca0c3bb6ea017bfae54643 WHIRLPOOL 5f7dec3007330df462761eb6a73e28f07d954e0095e2033edce7b507a93dc71b62b55272387c0581e926cdffc75345c43a1681a201f8dfb4ad013f1805a1ed49 +EBUILD gitaly-0.11.2.ebuild 925 SHA256 9a89ebc084fbffb4e32d97a9e3db31125f02a6d8f5ab88dc12e9d1abf8fc017c SHA512 c553e5b5dfb4b42f696574e24b53817f59c7a47a5e7bc1a6a2fd25bd0a5e2d97d892d43f7bde4bf3155c60fdb718e6b590bf3c5873c9afd066f1bf5489a254cc WHIRLPOOL d8dfc002baa198a93bded7f2f3360ab05040fe4816876ab8eb91c710ea7433acce5f99280424fbcb72250265db6b586a17c2ccb41842aca4b4c704af0862d316 EBUILD gitaly-0.3.0.ebuild 1593 SHA256 f07387ac6ec3c68d2c4aa8894804caf5a456b8e12e15937d82fda4d2ed864185 SHA512 95d19b0e799195fa5e3d8cc2879c1017503f68aa586a074119441fbbcff28d2cd9d538830a3a2b40a542bdbfa99518f9afd09232907ac7e763d500cf00abe32f WHIRLPOOL 1e3c778ac33e385865a610dfef5ee07841e9a7b91800b94a3a88714caf38084584524b2f120553a9f13ee2df57309fbd8e9b1e119cdbfd2f6cc1749e25f14bcf EBUILD gitaly-0.6.0.ebuild 1593 SHA256 34636529bd1a4523d246062b7218c99b495efd2420287b975bcf6049a1da63ab SHA512 fabbe8f46bf84198d594b3601219996def2461eba6237144cbcc73d71659b3cd29c14487a8bf3cfb3de4c5dafbb93bb9d51ade907ffc76e88bccf22bf7a1859d WHIRLPOOL c6b59a27626121cb5a88aa14f9159edeec6f4e69b9a64851a21c0a9826d00010283a218767090825452abb4ad6ba47381e57b2665c6ef4511224edbf7b988e6e -MISC ChangeLog 605 SHA256 e8f35a4f363611ca88e331ac79ddabe7e6a140d543c405e3f02d343eb7c26c9b SHA512 eff343fb288297aad8ed17a28f00c1365870a8707a38d5ff0c57ed5c84c6942129165f3522ae34df1066729c25b5946dbd6ce8a7f8e68cfd3ffe39f492539bc7 WHIRLPOOL 45361d6dc967150d3bf4cc27733126654b30f6f71fdbb97603c9a995762f6713a277fe3ceb11b1afe38f3c8377238c2e2f70716b84d40b5ca2e8b3842a275f16 +MISC ChangeLog 758 SHA256 367ea94c112c68d7d28a4cbe80862f159bc9bf1f3cad875b7150eab9f8f93679 SHA512 fca1a07d23f1fb11bcb4b7e18f53c1801830a2db4fd88f836f7c41492dc5a00b42ff1c05bdb64decd842cfe5c64bffba5da7e79d009351df1db75876f1918f3a WHIRLPOOL 04de020af62eac8f65b769fa5654e620415a00481f7315cc67bf651c407eb15e36b8c92b28a7670a9b32aebb06cb8274eae53a882296451b23c5b740e9fac49c MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitaly/gitaly-0.10.0-r1.ebuild b/www-servers/gitaly/gitaly-0.10.0-r1.ebuild deleted file mode 100644 index 906b070..0000000 --- a/www-servers/gitaly/gitaly-0.10.0-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" - -EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git" -EGIT_COMMIT="v${PV}" - -inherit eutils git-2 user - -DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." -HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" - -DEPEND=">=dev-lang/go-1.5.1" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.patch" - epatch "${FILESDIR}/0002-${PN}-0.10.0-fix-config.toml.example.patch" -} - -src_install() { - # TODO fowners, fperms on config.toml.example - insinto "/etc/gitlab" - newins "config.toml.example" "gitaly-config.toml" - newconfd "${FILESDIR}/${PN}-0.10.0.conf" "gitlab-gitaly" - newinitd "${FILESDIR}/${PN}-0.10.0.init" "gitlab-gitaly" - into "/usr" - newbin "gitaly" "gitlab-gitaly" -} diff --git a/www-servers/gitaly/gitaly-0.11.2.ebuild b/www-servers/gitaly/gitaly-0.11.2.ebuild index ec88130..4e99481 100644 --- a/www-servers/gitaly/gitaly-0.11.2.ebuild +++ b/www-servers/gitaly/gitaly-0.11.2.ebuild @@ -1,67 +1,34 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ +# $Header: $ -EAPI=6 -inherit eutils golang-build golang-vcs-snapshot user +EAPI="5" -EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." +EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git" +EGIT_COMMIT="v${PV}" -MY_PV="v${PV/_/-}" -MY_GIT_HASH="e8f0485" +inherit eutils git-2 user -DESCRIPTION="Stop relying on NFS for horizontal scaling. Speed up Git access using caching." +DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" -SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=v${PV} -> ${P}.tar.bz2" - -KEYWORDS="~amd64 ~x86 ~arm ~arm64" LICENSE="MIT" -SLOT="0/${PVR}" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm" DEPEND=">=dev-lang/go-1.8.3" +RDEPEND="${DEPEND}" -RESTRICT="test mirror" - -#MY_USER="gitlab_pages" - -pkg_setup() { - eerror "This ebuild is but a dummy placeholder. Gitaly is not yet supported." - die "Gitaly is not yet supported." +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.10.0-fix-Makefile.patch" + epatch "${FILESDIR}/0002-${PN}-0.10.0-fix-config.toml.example.patch" } -#pkg_setup() { -# enewgroup ${MY_USER} -# enewuser ${MY_USER} -1 -1 -1 ${MY_USER} -#} - -#src_prepare() { -# epatch "${FILESDIR}/0001-fix-Makefile-${PV}.patch" -# -# sed -i -E \ -# -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ -# src/gitlab.com/gitlab-org/${PN}/Makefile -# -# eapply_user -#} - -#src_compile() { -# emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all -#} - -#src_install() { -# golang-build_src_install -# dobin bin/* -# dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG -# -# # rc script -# local rcscript="${PN}-0.3.2.init" -# -# cp "${FILESDIR}/${rcscript}" "${T}" || die -# sed -i \ -# -e "s|@USER@|${MY_USER}|g" \ -# "${T}/${rcscript}" \ -# || die "failed to filter ${rcscript}" -# -# newinitd "${T}/${rcscript}" "${PN}" -# newconfd "${FILESDIR}/${PN}-0.3.2.conf" "${PN}" -#} +src_install() { + # TODO fowners, fperms on config.toml.example + insinto "/etc/gitlab" + newins "config.toml.example" "gitaly-config.toml" + newconfd "${FILESDIR}/${PN}-0.10.0.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.10.0.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" +}