From 3138f9d7dbe440f11be4c321e2fd96aa2153d426 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 6 Nov 2017 22:30:28 +0100 Subject: [PATCH 1/9] dev-vcs/gitlab-runner: Add ebuild for version 10.1.0. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- dev-vcs/gitlab-runner/ChangeLog | 5 + dev-vcs/gitlab-runner/Manifest | 6 +- .../gitlab-runner/gitlab-runner-10.1.0.ebuild | 95 +++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild diff --git a/dev-vcs/gitlab-runner/ChangeLog b/dev-vcs/gitlab-runner/ChangeLog index 61505bd..ed9f75f 100644 --- a/dev-vcs/gitlab-runner/ChangeLog +++ b/dev-vcs/gitlab-runner/ChangeLog @@ -1,3 +1,8 @@ +*gitlab-runner-10.1.0 (06 Nov 2017) + + 06 Nov 2017; Manuel Friedli +gitlab-runner-10.1.0.ebuild: + dev-vcs/gitlab-runner: Add ebuild for version 10.1.0. + 05 Nov 2017; Manuel Friedli gitlab-runner-10.0.2.ebuild: dev-vcs/gitlab-runner: Final fix. diff --git a/dev-vcs/gitlab-runner/Manifest b/dev-vcs/gitlab-runner/Manifest index 5e3e791..e320e63 100644 --- a/dev-vcs/gitlab-runner/Manifest +++ b/dev-vcs/gitlab-runner/Manifest @@ -3,6 +3,10 @@ AUX gitlab-runner-10.0.2.init 666 SHA256 42360338ff935726f6756c442de0fd381e10fb7 DIST gitlab-runner-10.0.2-prebuilt-arm.tar.xz 8548448 SHA256 b73a0690eef09c4f366342f98bec301020d47c16f98ac8a770f373dd81a76b04 SHA512 78919f68bbb31fce1792427b9067491b5ef0a557a184039eedf89110d47e875bc67c0a67fdd3165374c264aa411392dcda31574953e5ffacc2a141eaa85d4626 WHIRLPOOL 59cfe9d085318c3169da969846c216d7eb1b1f1a5ae52808f2721722fc6da48f25c87a1e2f257b7e3d9a0fc8e9d02e43622add867dc3403b2134c45715228ad8 DIST gitlab-runner-10.0.2-prebuilt-x86_64.tar.xz 9562480 SHA256 58c95075273f44ff926823aa9b5bf9fd4cb82c87adc27bef48d5bf985d629992 SHA512 ea9339db46d8e683de42802ec52b499941e189b754bc43f600b673942fbf947941ac2ad7f1d63a938341df7982865595d5dc0557a08db4c78bc64067b2709539 WHIRLPOOL d6c9e66344f7334336031cafdec91dadd8941739584a41c71837fb247b3fb970826f23697758a8a3497e6667d300f1dff0ce8fe146389de0da9d15e2bbd1e78e DIST gitlab-runner-10.0.2.tar.gz 3599514 SHA256 783c1c597a2b9ee78b2396852235010c5432804e8d65b65f49f4e3719f6da4c8 SHA512 9d8cac8441913c77c1b34dcf9f82ab1345d21f6a9553a7f895473289794c85c2675588b38c7cd390615c8e4cd14964c024562132b2b9dd88c9215ea165fc1c3d WHIRLPOOL e471f032040ffa3fbc0566df092425a19b3e9528907e87b49297512d665f187303baf24a918f855ee32fa0b1de3aac922a1ed13c8efcc22027e2fbd11fb2208d +DIST gitlab-runner-10.1.0-prebuilt-arm.tar.xz 8555400 SHA256 9c14a91d5398e8ef99e13b57afa7430aa660791cf8f045e52a4b9566f247f22f SHA512 26bf62162380cf17569b0f2b7bddcd8aa957901ce0bf514657280bdc46bddb192ed6151bc721a56681150703a5af994fd82a632c97978739d7b9ca13be1ff65b WHIRLPOOL f8860789dc8931d4bc7ca7b2acf939bf55aff06e6922806ae4382633c0b98d6d74a02751cad2f8c9e0ae9d43bc2bfdd7f4062b78ea3235d997df540ce1fea4ff +DIST gitlab-runner-10.1.0-prebuilt-x86_64.tar.xz 10449512 SHA256 24f7ac81a210ab46ee0852e7ec258ac0a9d3d14dec12dca5406d459435e60e41 SHA512 1e98c3869632cd3430d8bf78922d9d2ce92a4368458729b6a379f91fb5f19703c8bd3555609ba88b2ec7220851dc0d61bab8b78f398c4e88c77e3de96040c3a7 WHIRLPOOL cd5f1caf8869097f3e121e497734764ba574e62b16c39b620b7d77e7f344416b6b318a1d2f5092a424a1466a0c42cd0f7625c542e116f3fbd6a258e845c4f1fe +DIST gitlab-runner-10.1.0.tar.gz 3607520 SHA256 e180d387670330d2915505d27a7b4c3f5ab2b6d1c8bd5225927d379f8ec2fc29 SHA512 535ac63d2cc5101b5f20bd6d5ecb2ee0c2c20688326251dc86261e8dccb275ddfeaba43e523b3306fd480d01b74aa702f3d91e539f5a73ec8909b62c5fbcbb24 WHIRLPOOL 7f07af502ae0651ef7053edf038ad83f850dbb3a7a5b86dcd1baab1482d03e75bd09e0b064823b869fe30adf5601ebf59042efa21497f4180237d57cf186d1f2 EBUILD gitlab-runner-10.0.2.ebuild 2545 SHA256 59794dd6f33ce0fc0d1c997db7e5e4eaea226485aada8f700e3d183c2284e409 SHA512 4e9e6a93d621f595cc2b20ea4cb49afc0c9c4980b5ba13bec342994596caef0e0272fcd0b2deb087c96beebec283827916aa1b5594337febf592fd0251121327 WHIRLPOOL 5a48199473313fb247f621a8abf146fc794d02316b2cacba77fb3265047cc33115b26f2a21f58fb9648deb85c4c4c1f5190f6f3768bbeb4bc21a1373b5ac52b3 -MISC ChangeLog 691 SHA256 cdaa5676070b93eddc9f2bf67a2d1ff1e7977514127d51ef83cd5ce885424a25 SHA512 12c2abb6b7cb8e1f3d278229e8b521f4f12bf893828b83de14c63c04adc6efc594397af72eab25e2998c8f05e3ba1dbe3d99458d6bbb6ef7177d911ec36a39f7 WHIRLPOOL dea76128001e55787993511322f08be4d4171c1704be6918e98e509901f7243b68b6c1d2cd987578ef6df3570e7615b454a41322e2dac75902fa0148cc3506f8 +EBUILD gitlab-runner-10.1.0.ebuild 2545 SHA256 fecf0891935e503b57e0d0be611f0c7817283ad3254da6241c8c2633600e2283 SHA512 c697e833eb4ebe727328b80620858dcdfc937a93efe61d543de337dc3bf53aaa790df86924223d17b21eba192d069bf485c8208c0506f26006712f92e09b2071 WHIRLPOOL 1f80536a619d20cb23713c099c1e11c1073104141c576269e80e942639e07b8508d37ee4c6694ec752c2e5074ab30642167c7583448ead42c88a5c7cfa26827c +MISC ChangeLog 867 SHA256 4a558bc5c9ee99ee54aa40cab068b9e345b3bf55bd88087506ff365c2e5e922e SHA512 2989fcb1c28d6e78331ea05184b1664181e1efe464a1639f051660a0dea33a7fc3c5e2411c0164c09deff9a98d9bfa2848b613fe855dfd30aa8191bbdb608bad WHIRLPOOL 6ef2a572d277214bf69814b15ae51a559330a5f7be2298917c0cc70a070434fcbf6e8d239bc3c954a87f6fd7d7d17368571f5e057b699227ba026685ea6831ba MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild b/dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild new file mode 100644 index 0000000..257f289 --- /dev/null +++ b/dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-runner" + +GITLAB_COMMIT="c1ecf97f" + +MY_PV="v${PV/_/-}" + +DESCRIPTION="Official GitLab CI Runner written in Go" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz + !docker-build? ( + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-x86_64.tar.xz -> ${P}-prebuilt-x86_64.tar.xz + https://${PN}-downloads.s3.amazonaws.com/${MY_PV}/docker/prebuilt-arm.tar.xz -> ${P}-prebuilt-arm.tar.xz + )" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0" +IUSE="docker-build" + +DEPEND="dev-go/gox + dev-go/go-bindata + docker-build? ( >=app-emulation/docker-1.5 )" + +RESTRICT="mirror test" + +MY_USER="gitlab_runner" +MY_HOME_DIR="/var/lib/gitlab-runner" + +pkg_setup() { + # add required user + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 /bin/bash "${MY_HOME_DIR}" ${MY_USER} +} + +src_prepare() { + default + pushd src/${EGO_PN} || die + if ! use docker-build; then + mkdir -p out/docker || die + cp "${DISTDIR}"/${P}-prebuilt-x86_64.tar.xz out/docker/prebuilt-x86_64.tar.xz || die + cp "${DISTDIR}"/${P}-prebuilt-arm.tar.xz out/docker/prebuilt-arm.tar.xz || die + sed -i -e "s/docker info/echo false/" Makefile || die + else + einfo "You need to have docker running on your system during build time" + einfo "$(docker info)" + fi + sed -i -e "s#./ci/version#echo ${PV}#"\ + -e "s/git rev-parse --short HEAD/echo ${GITLAB_COMMIT}/"\ + -e "/^LATEST_STABLE_TAG/d"\ + -e "s#git show-ref.*\$#echo gentoo)#"\ + -e "s#git describe.*\$#echo 0), 0)#"\ + Makefile || die + popd || die +} + +src_compile() { + emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN} build_current +} + +src_install() { + dobin src/${EGO_PN}/out/binaries/gitlab-runner + dodoc src/${EGO_PN}/README.md src/${EGO_PN}/CHANGELOG.md + + # rc script + newinitd "${FILESDIR}/${PN}-10.0.2.init" "${PN}" + + # conf.d file + local conffile="${PN}-10.0.2.conf" + cp "${FILESDIR}/${conffile}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|" \ + -e "s|@HOME@|${MY_HOME_DIR}|" \ + "${T}/${conffile}" \ + || die "failed to filter ${conffile}" + + newconfd "${T}/${conffile}" "${PN}" + + # config dir + local config_dir="/etc/${PN}" + diropts -m750 + dodir "${config_dir}" + + # home dir + diropts -m755 + dodir "${MY_HOME_DIR}" + + # fix owners + fowners -R ${MY_USER}:${MY_USER} "${config_dir}" "${MY_HOME_DIR}" +} From a11051daf9029cc1a54ddeab338deb356d92dc37 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Nov 2017 00:01:42 +0100 Subject: [PATCH 2/9] dev-vcs/gitlab-shell: Add ebuild for version 5.9.3 and fix deprecated ebuild headers and symlink locations. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- dev-vcs/gitlab-shell/ChangeLog | 10 ++ dev-vcs/gitlab-shell/Manifest | 18 ++- .../gitlab-shell/gitlab-shell-5.0.0.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.0.2.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.0.4.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.1.1.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.3.1.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.8.0.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.9.0.ebuild | 3 +- .../gitlab-shell/gitlab-shell-5.9.3.ebuild | 141 ++++++++++++++++++ 10 files changed, 168 insertions(+), 22 deletions(-) create mode 100644 dev-vcs/gitlab-shell/gitlab-shell-5.9.3.ebuild diff --git a/dev-vcs/gitlab-shell/ChangeLog b/dev-vcs/gitlab-shell/ChangeLog index e23b464..31fa260 100644 --- a/dev-vcs/gitlab-shell/ChangeLog +++ b/dev-vcs/gitlab-shell/ChangeLog @@ -1,3 +1,13 @@ +*gitlab-shell-5.9.3 (06 Nov 2017) + + 06 Nov 2017; Manuel Friedli +gitlab-shell-5.9.3.ebuild, + gitlab-shell-5.0.0.ebuild, gitlab-shell-5.0.2.ebuild, + gitlab-shell-5.0.4.ebuild, gitlab-shell-5.1.1.ebuild, + gitlab-shell-5.3.1.ebuild, gitlab-shell-5.8.0.ebuild, + gitlab-shell-5.9.0.ebuild: + dev-vcs/gitlab-shell: Add ebuild for version 5.9.3 and fix deprecated ebuild + headers and symlink locations. + 17 Sep 2017; Manuel Friedli -gitlab-shell-5.0.5.ebuild, -gitlab-shell-5.4.0.ebuild: dev-vcs/gitlab-shell: Prune unneeded versions. diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest index 10c13e3..4a706da 100644 --- a/dev-vcs/gitlab-shell/Manifest +++ b/dev-vcs/gitlab-shell/Manifest @@ -8,12 +8,14 @@ DIST gitlab-shell-5.1.1.tar.gz 688960 SHA256 33a4b79b0b06ad935a4bcf1ad41ab88882e DIST gitlab-shell-5.3.1.tar.gz 708811 SHA256 989e7976c56d09d455e5e67e587426be2aca71ef2e27541c8654e74aac82f68c SHA512 00c6dde3d7a59c956396988b2f5790291c44fe134812588ab5c03e7612d49c08de2f5fd08a8b4a55a2c95a46db1d0cdb0e07469958d5c0d6c778d0f9dd279afc WHIRLPOOL 266218edb547e2e7fab95982f78d5c2a7057e061a48a854697949214791dab512f4512a57197ce1ac901dd2b97f4e363a39b8cd2ac74f5cb002ffdc38b8fd06a DIST gitlab-shell-5.8.0.tar.gz 718927 SHA256 7c6a02e12ec0efcca23b9200dc18be29a8ce2bf70f9802bb188fc22dbf1875d3 SHA512 f17e4ec95dce29608684de27d9a4f7a3fa69cd25fb68223576a4501ef83fc50bfb74668599672edc8c8d670585b47e22825004cba2227bb4ef6f0e3c27d06b59 WHIRLPOOL 941c5c9daf6e319e44c49af627474e87f33e964bbad0b59b84f90f7b7e8ca82b5f0635102964b9fd7b74f8101b6af6539aa966978468105ad9b004cb2fa76222 DIST gitlab-shell-5.9.0.tar.gz 710920 SHA256 5085b531abd1c3ebbc73c7b77c05e674fe42d975c4d9c64bdc54704c51a15907 SHA512 e89a0f2b97e502b003ee62eacfa520dc248b93cf68a0d2eabae5672ee968ca68fd01839c9195422fb680e341756ec399af0a7654fc4e6fbe7d12f3af3643d2c6 WHIRLPOOL 45bd1f044314de3d093fb6689b5c50ca9243aa097e54f75e15485eda6504ab91975a5e8c4df115a94dfe228d98923ebc5f68e85eb050a95fd71f5927d5a89354 -EBUILD gitlab-shell-5.0.0.ebuild 3653 SHA256 346718615330cb98f84556a65fbac2561c14fab6ed22a42d4fa6cbcb651faa98 SHA512 390c922cc1eebd3dd7fa10e94b58a61a2d7363e19b59cffbd54be40c6fee60a894487c168b42294af5bae772d94c687dd14edf48c50c43696a52e4c8db87088c WHIRLPOOL 1278ab21caa8385e21976bed117ac1428ea2ed08576e20f58c7337ab8e8d565c4bf4742895458373878f19dfc48924f808bb4950303f48ce17af216f797f885a -EBUILD gitlab-shell-5.0.2.ebuild 3653 SHA256 0af6f31c8d068612d618ec4d5959e06e78cd867dfb994079793fb2041803663f SHA512 65eac38adc73d5bec64bb95214a0c9599a72d51b6e4c766881b39087afc0b72b4180fad30b7ee5f46e85949a2d52956475db7b8d52976a12bae7d51681e140e1 WHIRLPOOL 8d406881dfd71e0b3b9168f3fd23766a04dfeecfdf668de9e3298a5650333c851feb6702c8f2134cfe683fd280369481cd53896ec95d1b89f4f9a92d89eb3f7b -EBUILD gitlab-shell-5.0.4.ebuild 3653 SHA256 8e235cbe5a233e0382aadb466ee130c8b76bc3474fdfe175bf27a38d2cb975a0 SHA512 16e3a82a9705dd525fb24d3cb3981c12c2dbf3f944055570b1299cfcd67ad480c3ad69068c4347c61274003c20908bf2918a336d80c7a5148df5418fd1524d8a WHIRLPOOL edab6e46dc3af776db143be3a0009917f55fdcd01528c746bfa69b7acb0135d9880387e46653c31b5a04c60d6aee51efd7773aa2403e1cf0142d4a3e4a380835 -EBUILD gitlab-shell-5.1.1.ebuild 3888 SHA256 9e7c878a166555bdd6c14d1be5929b0363eabe4352073db46e84905937323169 SHA512 4bb335f810619f813e84a20a0861ab3e1fdff1134b829f55bd209e70fcfb43fdac96b9fe011aed1a031b6674518c8b36be13d8fb7c8f9ea9cbc3335e3f0b1edc WHIRLPOOL 0285dacb4e03ede570ed4c5d07153d0c7835e91d7dc7742064021c92ec8d2d04ffc9a6d2baf533f86edf4bd18337658a96297918e38ff6c81ee2291284e9a237 -EBUILD gitlab-shell-5.3.1.ebuild 3888 SHA256 7075b271eeee6da9a8bd9f9e5aaf9c0c9612ab2d27f8399df32628e7bde53fa2 SHA512 b7c567e262e23fdb9f6845b141aa4157d31b86ce115e305f56f30e1673dcd9cb1a4dce82f45a4139ff47008c9072cc743d76f00ab92f4d9fa869dcf4ecd26cc4 WHIRLPOOL e3efacb596afb62d21feffa26e7c2b2947a03e742a55edd1d4f60746395ab6edd636824d14f937d3e66003fdec9b168ebb80ba31a34e9ee6faf8964cca8839e7 -EBUILD gitlab-shell-5.8.0.ebuild 3907 SHA256 fe1bd700fc6964e69296160da0c75dd5193f6a999e6a985b179ddd7587a96560 SHA512 fe3e0c31daed0cdad9beeb9e45c4002b036475db53aed54a8cdfc54363452ec61ec53ada8116b6c4cfdf333678263a552541c59205fb92b47a5c882b70b0ae2a WHIRLPOOL 55a81924b0b8bc81d3e8726ac0a2422245cb83d095643e80564c4e4f81dc2ebbf11218cdf545953f304e44f1c13d1846216eabb4ad6810edcbc2dffc93692707 -EBUILD gitlab-shell-5.9.0.ebuild 3907 SHA256 ef0ff5dad7b058e19c967c4757654133499d13f3a6eb67f1d9f28edde3e554cf SHA512 485d0c228310a4a69810d2370c8c1d57caa004442c5fa3103b4f889d501091c87bd24e440f41b32d1ca5d405f8e0df14568898cfd9b1bbe0bebae388f7c1817b WHIRLPOOL 1649b36d912bc6f56eff4c6fc1d7fc035f740e80f8e467d7b8e3860d12f7b07e82b5a4c4a0cf718ab3a22ff58359f8a1d600d6f3c68e021bb06e743869105df3 -MISC ChangeLog 4802 SHA256 353b8a710e93fe3e570df73ebc982e68a2371226cabdc8ad306a5a6ce8221e5f SHA512 374bd0fb1e95c8277e23d2ba5719595df7afbbce7b5acc978d35dd6cf7780582a9e4075bcb0e4df0ef87eaaf67d2d736d0c023512a6c54e3e267f3f9417fa063 WHIRLPOOL 667835a6bc140d20cf61c9b1eec3a9c96fd99aa5d70edf769f664e73fe2146a00497c3eec9683bf27df4be2dddca2218c2c5adf0e80118bebf14dea0d35b3c37 +DIST gitlab-shell-5.9.3.tar.gz 711416 SHA256 43692b5ba3c9757ad201611b66f199a636e6d4b47c144ebfd5e8d9b9c996e127 SHA512 b58c7eac03152378bba7f965e630669b6d3628edc11e880500eca5a200d93777e164c3f31c1a241c7b5789d3cbbb19944005268c406d4371ccbe90f913be215e WHIRLPOOL 2ab0627c4ab532c6d291b8ebce6e5d34484bef8ac8cf3feee0d2c1ba2a8d7c570b6e36df1b1c6b121a49145d49b6d1a5d8a37a70ca3f8af70f3231125674a3d2 +EBUILD gitlab-shell-5.0.0.ebuild 3654 SHA256 2a3a890e9c7d9dd8af476dd0cdfe480512dacdcbbf53182bd353797c76684256 SHA512 243b7add0a8f737640d46c7c0bd8b0a6c93b1275302d1cd3cfae20cfb77116645a8b384a977ae862941cadb7200f81dc6a6eaf604372fa5a1bfa1761430627e5 WHIRLPOOL b8762ae9c23b2c1a8e322b5b22ece63eaa1421a5cfc53b067b036c61d9c59f84d4a38e4ed95f002be6d5e5c1ce8d9c88d694a8fee5abe1a0b1dda5f4751c2722 +EBUILD gitlab-shell-5.0.2.ebuild 3654 SHA256 9f06b267774f58339770844496a90a7b09af75a3354a28619af90d57e1aaf0d0 SHA512 a972f71789a11fa611d3b591bff438273e764dce6646a912d4f71c968d1f7e9d3350c9589d6b2dad00e300cf350daf1efe617751300ab866eec66a799f2f76a4 WHIRLPOOL 420f705da6d31de25ba4a19979cb2da5ea4275d020a8a6ac0c34792857b2c5f6d0fbe33c0ca7573c5084b062f12fef14b2f73b88db523521d8fffe8f492ffeee +EBUILD gitlab-shell-5.0.4.ebuild 3654 SHA256 6227964f26e195eb914163aba910af177e9d312bccce84783673914c1b6a7341 SHA512 b383072cedf66875317ca90c3daa422e968af6d293bbe2b6efb69e4da91af2ccfc77179ccfa6aa07263ae50f603dab3efc27c36d0c8ac8169b368c9f6474fb75 WHIRLPOOL 9de88e1e7a6d2bc729dbbde54ef40b0046ba698fa1b9874a0751222572eb0d0aa2c9683bc84db44878742d5d4d039d3f96ae893af6a649f73f7c395e932934e4 +EBUILD gitlab-shell-5.1.1.ebuild 3889 SHA256 1ec35ad363ec198c9b53974f3410401b559c56814d747941888b475f19479918 SHA512 fdbc2465617043aa2dc813624e513996c7827831abed242fa9dfb2e943825cf710ba65c0d5882a312af64e154f667a82989a787b63e61d0ea8dd81fb4accf035 WHIRLPOOL 3b231de69ff373868a4acbb4df49a6120b443db20f9ab5ecda9902a6f74539b4534a400f86d8de8564fb1d86f71f02aa48e830c18486e08700bbdc2602d2083f +EBUILD gitlab-shell-5.3.1.ebuild 3889 SHA256 be4349d3faccc8bda7ec85ad68204de0d525feef55ab9159ba293810ab4c7162 SHA512 2922c2271cb66220432ea0c79b74b2b1015cb55eed3c98845bb8ac15ca6ca2846579802bd832e9b3fa188879b613aada0bdeeca47fce29a6c7bf8d51242e7d6e WHIRLPOOL 2f0aea6989a00f07452e4097436596517bee8fab5b557f2a373d185b76eeeef40c8753e32b32d40f08070cba28e7b59ba86278bf665fa9e19260e799f44d5eb0 +EBUILD gitlab-shell-5.8.0.ebuild 3908 SHA256 6f144e30269af1f4b608258da78553f64a1c6fb4e4ad532de4adcc4d93c8962d SHA512 e9131c8d9361a7321837c996b098b515b15cbd93c15067c000a5811d313fb167432bc415a5327a110adc6a92009d52cad78f12311552042c1b214b5df3eae9ba WHIRLPOOL e16d0ea02eceea491c8bc079cd1d4932d83340f1db3a9e249960b57e550ed65903610f0541d89ef616561f83f4c7fc771b1aedd115e48b80c62e72f62d7dbc3a +EBUILD gitlab-shell-5.9.0.ebuild 3908 SHA256 91618dfa168fff385eb362572c8e65e1f72464ea4240b03e60cb554f7c872a8d SHA512 c16e5176dcfc866a696c4b1096b17bf15437ee77db92f28de79990688f146fa38ca2d345d1b3138072626086242f6c3e044a345435ea11ebd0455c3115c8bafe WHIRLPOOL 0b3d586d6c991a20c806ca5a53437aa8eb79eabfa64a26fb839d493052ae2d752dc65ec9626c3c7f62d6de9182d31870eb99c6018f6d490a30962f0b823eccd1 +EBUILD gitlab-shell-5.9.3.ebuild 3908 SHA256 27290b4d2d5ceacaf991026c149ea2e1eaa270959490d9a8850596c8e7b4afed SHA512 daa5328dd238804860f8aa52cc4b09c484fc1477dfa6e60aa2fb424e27cc69121dea2c677e02832613ce0bc0023b9b23fe91c53dd455cbe689c6c09bb342138e WHIRLPOOL 8fa05924b1405f79656da46cfe7d22f1631a10ef19629f75fafdec11fe7b6d6fbc0db80ae2a31c81d3c11a9b412f39aa25234e7d5e318b6f4ebbd305af3f6781 +MISC ChangeLog 5227 SHA256 f658e85652f0f88a212293543397cfe83523effe85b0c431ad92f75b54f72f26 SHA512 32e49113fa8ae098a3802672084815d1c39c65bb1281e76b4a57b9d92e3391b1df2eeb3303d2d7bd9fe6e371778234f997b464a12c2172d08c0d37e9d44a7f25 WHIRLPOOL 402f06333ebfc55611726f4ce5872723770e7244eb9f63070d07b1fe6b674c9b8e5268d9264738abd0f89803d63a29599580c309d5766f74e54f6261bb000ad2 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild index 60a09e6..62729b6 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -87,7 +86,7 @@ all_ruby_install() { # 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" + dosym ../../../opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE" # prepare directories diropts -m750; dodir ${DATA_DIR} diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild index 56ae418..7b834b6 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.2.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -87,7 +86,7 @@ all_ruby_install() { # 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" + dosym ../../../opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE" # prepare directories diropts -m750; dodir ${DATA_DIR} diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild index d415fb2..dbab6bc 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.0.4.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -87,7 +86,7 @@ all_ruby_install() { # 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" + dosym ../../../opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE" # prepare directories diropts -m750; dodir ${DATA_DIR} diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild index 9e6fd6c..e609e23 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -93,7 +92,7 @@ all_ruby_install() { # 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}" + dosym ../../../opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}" # Gitaly stupidly hardcodes the path to config.yml :( MY_CONF_FILE="${DEST_DIR}/config.yml" diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild index 40ca37a..3bfbc17 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.3.1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -93,7 +92,7 @@ all_ruby_install() { # 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}" + dosym ../../../opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}" # Gitaly stupidly hardcodes the path to config.yml :( MY_CONF_FILE="${DEST_DIR}/config.yml" diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.8.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.8.0.ebuild index 27aa8d0..acd7340 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.8.0.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.8.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -95,7 +94,7 @@ all_ruby_install() { # 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}" + dosym ../../../opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}" # Gitaly stupidly hardcodes the path to config.yml :( MY_CONF_FILE="${DEST_DIR}/config.yml" diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.9.0.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.9.0.ebuild index da0f0eb..b0fb1a7 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-5.9.0.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.9.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" @@ -95,7 +94,7 @@ all_ruby_install() { # 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}" + dosym ../../../opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}" # Gitaly stupidly hardcodes the path to config.yml :( MY_CONF_FILE="${DEST_DIR}/config.yml" diff --git a/dev-vcs/gitlab-shell/gitlab-shell-5.9.3.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-5.9.3.ebuild new file mode 100644 index 0000000..cc9501f --- /dev/null +++ b/dev-vcs/gitlab-shell/gitlab-shell-5.9.3.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +USE_RUBY="ruby23" + +inherit eutils ruby-ng user + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="bbda5bd1dd2e841410d73a68fa8cd3a8425159c5" + +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="" + +CDEPEND=">=dev-lang/go-1.8.3" +DEPEND="" +RDEPEND=" + >=dev-vcs/git-2.7.4 + dev-db/redis + virtual/ssh" +ruby_add_bdepend " + virtual/ruby-ssl" + +MERGE_TYPE="binary" + +RUBY_PATCHES=( + "0001-${PN}-4.1.1-config-paths.patch" + "0002-${PN}-5.1.1-Makefile.patch" +) + +RESTRICT="mirror" + +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_compile() { + emake all +} + +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}" + + # Gitaly stupidly hardcodes the path to config.yml :( + MY_CONF_FILE="${DEST_DIR}/config.yml" + dosym "${CONF_FILE}" "${MY_CONF_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 201b1ae7da625e9c6d2e91c06b1af54a79087d8e Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Nov 2017 00:26:30 +0100 Subject: [PATCH 3/9] www-servers/gitlab-gitaly: Add version 0.43.1, fix obsolete inheritance and header. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- www-servers/gitlab-gitaly/ChangeLog | 11 ++++++ www-servers/gitlab-gitaly/Manifest | 18 +++++---- ...italy-0.43.1-fix-config.toml.example.patch | 35 +++++++++++++++++ .../gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild | 1 - .../gitlab-gitaly-0.11.2-r1.ebuild | 3 +- .../gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild | 3 +- .../gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild | 1 - .../gitlab-gitaly-0.35.0-r2.ebuild | 3 +- .../gitlab-gitaly-0.38.0-r1.ebuild | 3 +- .../gitlab-gitaly/gitlab-gitaly-0.43.1.ebuild | 38 +++++++++++++++++++ .../gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild | 1 - 11 files changed, 98 insertions(+), 19 deletions(-) create mode 100644 www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch create mode 100644 www-servers/gitlab-gitaly/gitlab-gitaly-0.43.1.ebuild diff --git a/www-servers/gitlab-gitaly/ChangeLog b/www-servers/gitlab-gitaly/ChangeLog index a506d9a..d684772 100644 --- a/www-servers/gitlab-gitaly/ChangeLog +++ b/www-servers/gitlab-gitaly/ChangeLog @@ -1,3 +1,14 @@ +*gitlab-gitaly-0.43.1 (06 Nov 2017) + + 06 Nov 2017; Manuel Friedli + +files/0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch, + +gitlab-gitaly-0.43.1.ebuild, gitlab-gitaly-0.10.0.ebuild, + gitlab-gitaly-0.11.2-r1.ebuild, gitlab-gitaly-0.21.2.ebuild, + gitlab-gitaly-0.3.0.ebuild, gitlab-gitaly-0.35.0-r2.ebuild, + gitlab-gitaly-0.38.0-r1.ebuild, gitlab-gitaly-0.6.0.ebuild: + www-servers/gitlab-gitaly: Add version 0.43.1, fix obsolete inheritance and + header. + *gitlab-gitaly-0.35.0-r2 (25 Sep 2017) *gitlab-gitaly-0.38.0-r1 (25 Sep 2017) diff --git a/www-servers/gitlab-gitaly/Manifest b/www-servers/gitlab-gitaly/Manifest index 606143a..ea41cf9 100644 --- a/www-servers/gitlab-gitaly/Manifest +++ b/www-servers/gitlab-gitaly/Manifest @@ -2,17 +2,19 @@ AUX 0001-gitlab-gitaly-0.10.0-fix-Makefile.patch 248 SHA256 03b4315da76b4409e990 AUX 0001-gitlab-gitaly-0.23.0-fix-Makefile.patch 253 SHA256 e1a3d0ea2d10145dd9d9b10848fb1731758eb16426ae203fa5a0abab65633380 SHA512 485178891a9589e29f0735bfbb8f1557355881f50498b46185ea6e658214454beed7350aab412699318ee801d8899824177d7d20568e91eb4ddf7562e9e8b9a2 WHIRLPOOL b2088784e30eaf8bb46832cb8454e5a8d2f2eeab00b41ffd021d257b6f19ffc53a420ed7123b1c9b9a83fd8a87184c178a3334d391bc4d85b78b8893245dfc03 AUX 0002-gitlab-gitaly-0.11.2-fix-config.toml.example.patch 700 SHA256 7f5c3f840581c2c2e98741ad6fcb9b486948dbcd80f52f4c45538b9fe9009087 SHA512 e89636c4e38697fad62553e8b07677fdc0fef5b83249ce79f748e1da7300c28514cdbf7a182232ced95222c9578cc9028de5e039b82f31175c22d840c83c0286 WHIRLPOOL 2b9c2b2b96da648b5f71a4ee8940c2a0a148e9005178e012afc73dd7709a5c407e04240adfb96a4ea3d2384248a23682a8d5727c967ddd5368f0d2d3b38d24e5 AUX 0002-gitlab-gitaly-0.35.0-fix-config.toml.example.patch 1015 SHA256 44cd87bb35224634ef9832f2d1e79de2ab27580101665a049eaf20f5ffae590d SHA512 9110e6f42babac04c98227ecfff3a961ec35fe6c487559e5a638676f409dbf6b0b133524b092322085cb7c7c41c5fc729c7b6be80bae10931efd5785172f01b2 WHIRLPOOL 8b0f1aa8c8c9c2ea4a8a5dbfd1e5a00603d587209b0967be82a9d78d0eabe4d350ac44fce80bfc9dac77ea2c0ff5d0f954e8cb4fb50ee778fb636599b1d8456f +AUX 0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch 1095 SHA256 3e9558a127675bca052a9219265572504729380087665f2cd681c44d5545f101 SHA512 1ee6b6a127a6f7e82970c2e4270b42427a88bfbca5ba9d979d6667381d2a6cf934c77cc6e2f47af24a2810e0427285565bc42a0d26c36649a9177b917ac5a424 WHIRLPOOL f96a7dd2952d5a8d7652d5e6966c4e2d85c3a9785e824108068fab158f5871cd1a0ca0f88f563478c4f937ba2d9e3df489611d07c092ff0c4c9b6668f0abb5fb AUX gitlab-gitaly-0.11.2.conf 289 SHA256 da2640e0ac6a3f356d68f2825c78a1965703df292cd6631b2e884e1a9c7ecc87 SHA512 86f2b4dd283de117c3a371a98a1472d248a21a2c931be6644bec2406249e000fe2e55d031b523d6e64fa2eaa3addad27704f338f65cad6b559680c5c327b9614 WHIRLPOOL 18cb38b35c9a79c6eaaa15ed9bbbeb6dc502a0291f3bff2bf1f59a950556c4c3fd3742a4097ab784c1e9a12d2209b336f2bf688b0888e13bb1b7f78219bb6d87 AUX gitlab-gitaly-0.11.2.init 631 SHA256 32257b9e72c2ee201e5104f6eafc134920237f0f5465110edda4778dd92c17a2 SHA512 a0bf57f392a75b1a2875837ec1ad47b61317c6ae530d12e60ae3f62f69b0fb8ef48499b31751fab788df1a6ab842926a73443795a5888258f62e473e2953299a WHIRLPOOL 8185d1927c021be4b3de7c4e0228c68cba558b35c0894c6b17de7f24ebc42dd771593b2d9169f27c5a1ada90e14b2fdb651521ddf39660a77dece586c7f1d348 DIST gitlab-gitaly-0.10.0.tar.bz2 693273 SHA256 44a4a68beb75b464b35fd003cf47a9bc483bb6bbcc8ab4bd4ef87a75329a3747 SHA512 1d7b2d38d68ceaacde03d0ba2cbec19f730527af6a0d56fd92c03f41a4d11c4e5db5c5cc2bd363a8ccfc0f5bf3fb678aec4b17e5996ccc7f1898a78e4598cc1a WHIRLPOOL 737ff05c6992e90eab9ba38a721cf699d87ea1ef84005dbaa16d37ef3c33cec9607571b0421412bba3efd2bf88267ff7d624e57ac92cc08b14c3b8801779c455 DIST gitlab-gitaly-0.3.0.tar.bz2 621097 SHA256 60404ae78b6551e7258a30fa615d7d8c200b84f161ecf904e034db3839391766 SHA512 ad50d15f4a97bf5dd2cc64830840041d8537bd251176eb8964cda3fdb6ef6e1bf3c8b7773516c6e1d51005cc0a718a1bc3ca95fc9ee5d0826c3f9690e1235bb6 WHIRLPOOL 364cdc3407d5fef6ac48a67f8bdd477b75300069be2cbf2567aa73ea7406256ea3c15a27c7a13f92d17c6b63f5923d4e737437bdd3a1e8b808de1832cc9c1af8 DIST gitlab-gitaly-0.6.0.tar.bz2 687192 SHA256 ead87c0da129c075011a55e5b2138febf11fd5146dd62763fc9d4b5d8725840d SHA512 f1e8e337192af02b42087604eb90fab3af73ef3753a07af368b1784462a0c1f8b1d166952b8d4e9c25c93228625195be42b4d3dfad0a70bea0520956acf2522f WHIRLPOOL 283899fb6c3fed332731d06ea42cf76ee5de433849b0784eb78b76391d15ca5feeb36fa9d28f3a90962f378c1c485eb0653a62090dbb6aae8bc87965d534da34 -EBUILD gitlab-gitaly-0.10.0.ebuild 776 SHA256 08e08d43d9ec359f418d13cdfbd7c2560c236f8102cb2cc16739569ad112ac1e SHA512 7be112d99f8dc1353af718bc7551fb5c9e616179ce494853b60f77a099850abc689f25b0587db056ef1dd90dfa90b77cba72d6afb8e663841e0162667d4b7628 WHIRLPOOL ec245d5028174a264730997fa66907a187a7ef58ed4cecfb287bead932b8cbd2f2073311f0b8f5f8c5381e11a4c811dd5738e8bd0d357183f0fb3706e909899d -EBUILD gitlab-gitaly-0.11.2-r1.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059 -EBUILD gitlab-gitaly-0.21.2.ebuild 925 SHA256 5a12499e0abada1e9351fcc25cf2dc882f577d9a0cdcd63a7f1819001664faeb SHA512 9752b120d754e95d96a432315171503329c9562448aad498d3aac091be12fcfbf2c617d74430f6578dbcea613981608d8369acc388f0238a4d29ab7c978c2a28 WHIRLPOOL af91a99bd879fac0fe1c29e5d9fb7a93ca8939bfb0bbf51ea9ddd43dd46867e8e918d1598176d3c85b53e6b9b27d07ff325d5856a3106e2402071870e886c059 -EBUILD gitlab-gitaly-0.3.0.ebuild 776 SHA256 8d916fec7805c40859db18bc558abb8fd87e6d447583a4fec721c2dbe0befd58 SHA512 eb5f0863b236603d39b6afcca772f86a7153f91bacbb49041ffc5efd5f22f0c028966da054ba92e0a30838e09fcf52fcabff40ef8138945c1b585ed234643e52 WHIRLPOOL 265da4265e6e0a3cc7ba2f22a796c6aef639f463e9558223a0eca578bcfe325c97feb42ca697066b7ec88161fa1e64b0dde19a0c17a4b2ed3c6462a863f82ecd -EBUILD gitlab-gitaly-0.35.0-r2.ebuild 1155 SHA256 1fd12e02b2d9dff662480cd603b4c85c2e16c3279323ce8593786a5c333da7d1 SHA512 c9d5ae28e8bf0cd50c71310fd79f371063dbed4c5dc401b82c2edbfcac45df721f9242994a9a4063b374d7d4d14a1326b858eaf193ed128bbea7ccec1554b67e WHIRLPOOL dee3c80c343325693598cc960f18d6ce38f7d6e8c086273b1a13c530d521636f074b0bdda33727c8005ca03d602014f818f9a3b3d40690ce0657f2b6aa878540 -EBUILD gitlab-gitaly-0.38.0-r1.ebuild 1047 SHA256 7dc18979ce780d9b924e0caf31827e7ced1aeebce376aa8e04cd1eab73fa891a SHA512 43401bf4d77b9eb127649e2a4ed13d81b45aa9e3303f029583b189d25297cdc9e6d54a99f54d346f91bcdd6b31a35c011bc76fc2bca9bb3318e4247500a95a4b WHIRLPOOL 54e909f59b29d14950944a8743c80e64cc39e436d92f415cd3356c6a70cc4f65ad25333019e3c6f0b3da6afdd4dbfea7214d42ffe14e0e367ea6bb984e7fcd21 -EBUILD gitlab-gitaly-0.6.0.ebuild 776 SHA256 08e08d43d9ec359f418d13cdfbd7c2560c236f8102cb2cc16739569ad112ac1e SHA512 7be112d99f8dc1353af718bc7551fb5c9e616179ce494853b60f77a099850abc689f25b0587db056ef1dd90dfa90b77cba72d6afb8e663841e0162667d4b7628 WHIRLPOOL ec245d5028174a264730997fa66907a187a7ef58ed4cecfb287bead932b8cbd2f2073311f0b8f5f8c5381e11a4c811dd5738e8bd0d357183f0fb3706e909899d -MISC ChangeLog 3812 SHA256 7d75e5deced4957ef8ab79ced1f0aaca00cb8bee31d0e3ea5416392df87be989 SHA512 06f1ca731518730994ab8b6f9d248586279ebcc2d9949686947d2652e602a5e58d7e3359c540e7231a84a49c0c7f02166cc6f275aa7c57fda1398adf6951f633 WHIRLPOOL 299683d55991db8a72ac227e42a683ab01245df8b025e5c63c090e36e9586e1fdc3f0a2ebef0851bde23e99ab51c93df1b0f5570665b86e1a2970b231b1bf354 +EBUILD gitlab-gitaly-0.10.0.ebuild 769 SHA256 601ca500d12250325bf6f924d53b28cb120cc75da9b9e1d83cd4c9317aa1ee91 SHA512 1263c919fb3c126a0ba5dda2b9da45b0a16b6bb703ec4260b11b40463fcfedd1249389272ab638d25ced351a63c0812c0cbc7ea035f9c2250d2eb79786424c2d WHIRLPOOL 261dfdd551dad839d687b2092027de33e95142e1ed7336fd6513742044ff219353743988aefad8e5da6850a8e1c8d5b44baf08c6702960a829673cfc5580e152 +EBUILD gitlab-gitaly-0.11.2-r1.ebuild 913 SHA256 1c6a2f37b5abbe2cb0c74cf4d93551f6606d5be165914e63f4988f6f4dede49c SHA512 aa1e241273aaf489645359710413b6aee16433a70110a2579153c5cbaec7330462d5014e4912c2e1db620d5eea9c5aabede1ebe449b187f44b90c0dc92e861de WHIRLPOOL e896a1081c2f1e347fc36b829a5cd940c3458f2ce6522d1850583dba3a3a30458a3e209f8c762da06ba5d865784cafde3732e5e60f6a3bf8f6ed99ea3c77d4bd +EBUILD gitlab-gitaly-0.21.2.ebuild 913 SHA256 1c6a2f37b5abbe2cb0c74cf4d93551f6606d5be165914e63f4988f6f4dede49c SHA512 aa1e241273aaf489645359710413b6aee16433a70110a2579153c5cbaec7330462d5014e4912c2e1db620d5eea9c5aabede1ebe449b187f44b90c0dc92e861de WHIRLPOOL e896a1081c2f1e347fc36b829a5cd940c3458f2ce6522d1850583dba3a3a30458a3e209f8c762da06ba5d865784cafde3732e5e60f6a3bf8f6ed99ea3c77d4bd +EBUILD gitlab-gitaly-0.3.0.ebuild 769 SHA256 1d57371bbc733d91a09d10fce9dc9a65f2ed568b65b4f5030a9260e79a576612 SHA512 99d12861b25d061178c93cc7b3db880062bc1b56bf66425b923ddd42a463e004269551e708862bac51a081fe274e6fc48c72cbcabf3c4f77970d0d8c660aa452 WHIRLPOOL 522aa5490ec96a3c992d7ade05471b838ecfc5417950046ee9d9689f9fc30c33ab878fedd50fba02b89df18188dfec8d6c3bc7de3bfcbea316248746d066f804 +EBUILD gitlab-gitaly-0.35.0-r2.ebuild 1143 SHA256 f27758444fefb15b9ea55cc9be68e8b47fdf5c6794b9ed32cadc95690b2dfd62 SHA512 5b7117c6a5c91e0168c495a18c08c815ae423dcebce644264d9161692ede29469c6585acfde682b0d60ccab6efa601a0259d2b44ceb5cc15a26096a2bfc318a8 WHIRLPOOL 8911c39960635981e0baa62cdf3425acc9f7167df940f4c43c52dbe020b208ad3192a01bf5f198ae0777cf5af27cc8e643455b30c1e0be3326a56aab1c3c8e10 +EBUILD gitlab-gitaly-0.38.0-r1.ebuild 1035 SHA256 c667625968e0cb0530679184353724687bc193c0a8166fea0d9f8a516ce6db40 SHA512 e585a18c64a2e8aca2796c45066e1b1113cba9320a47f9af638fce171ac362060edac4216e7259628433e5b5facaebbf876bf807dd99f80ebd8c88e7cb726992 WHIRLPOOL 7f329f60fce603e61ebf90cc2aa0182d58574d449f096f3cf59c4751f1db9d5eb856d1fa0ee67c565d392261e45c784e25a3b4014f9a44857c31ca04af8cb70f +EBUILD gitlab-gitaly-0.43.1.ebuild 1035 SHA256 814eea68a2bb03b9bd4dd63bfaea9dea3c18a558cd19fe96c9a52bd47bca75d4 SHA512 2ea60a116a708f90df7c4e54da9a94e1003cae8267d2c466f23199513b7e5d219444e735f3360c1ab31dfd0e21e0a1cf2cf4760e43f72d2bcb9245c288dcfa95 WHIRLPOOL 039868ec759003a7f4f2497e493ba54dc5c38b78fd3d036aacc471444a66d61e0a20db6159a7e67b30f7747cdb432d2584ef3f29fb7eecd9ccff7f947659e846 +EBUILD gitlab-gitaly-0.6.0.ebuild 769 SHA256 601ca500d12250325bf6f924d53b28cb120cc75da9b9e1d83cd4c9317aa1ee91 SHA512 1263c919fb3c126a0ba5dda2b9da45b0a16b6bb703ec4260b11b40463fcfedd1249389272ab638d25ced351a63c0812c0cbc7ea035f9c2250d2eb79786424c2d WHIRLPOOL 261dfdd551dad839d687b2092027de33e95142e1ed7336fd6513742044ff219353743988aefad8e5da6850a8e1c8d5b44baf08c6702960a829673cfc5580e152 +MISC ChangeLog 4304 SHA256 b167d8049790461e3183f45e5ef85131dcf2f9ab3d7d75d1d64978b183e6c5df SHA512 98d1c528977ec577a152c081658a138e4648e009effeb0c588bd97af56d2c06007c25c5dc1e18bc15f45210c8e2090f56e870b6ee0a714810bb75452a69e87a6 WHIRLPOOL a43f603799af3065e909359f1a1013bc57cc89d345860a7bff0e3619aa3e8713f7811befd93cea7749d58c42c6ac8bf36cd43328cecbf647767ba50047b84437 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch new file mode 100644 index 0000000..d44f89b --- /dev/null +++ b/www-servers/gitlab-gitaly/files/0002-gitlab-gitaly-0.43.1-fix-config.toml.example.patch @@ -0,0 +1,35 @@ +diff --git a/config.toml.example b/config.toml.example +index 69c813c..9d650c3 100644 +--- a/config.toml.example ++++ b/config.toml.example +@@ -1,6 +1,6 @@ + # Example Gitaly configuration file + +-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" ++socket_path = "/run/gitlab/sockets/gitaly.socket" + + # # Optional: listen on a TCP socket. This is insecure (no authentication) + # listen_addr = "localhost:9999" +@@ -16,7 +16,7 @@ socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" + + [[storage]] + name = "default" +-path = "/home/git/repositories" ++path = "/var/lib/git/repositories" + + # # You can optionally configure more storages for this Gitaly instance to serve up + # +@@ -37,11 +37,11 @@ path = "/home/git/repositories" + + [gitaly-ruby] + # The directory where gitaly-ruby is installed +-dir = "/home/git/gitaly/ruby" ++dir = "/var/lib/gitlab-gitaly/ruby" + + [gitlab-shell] + # The directory where gitlab-shell is installed +-dir = "/home/git/gitlab-shell" ++dir = "/usr/share/gitlab-shell" + + # # You can adjust the concurrency of each RPC endpoint + # [[concurrency]] diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild index 5e75fd8..c9193d0 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.10.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild index f5b3267..cead97b 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.11.2-r1.ebuild @@ -1,13 +1,12 @@ # 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 +inherit eutils git-r3 user DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild index f5b3267..cead97b 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.21.2.ebuild @@ -1,13 +1,12 @@ # 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 +inherit eutils git-r3 user DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild index 58b8e80..e7ee715 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.3.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.35.0-r2.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.35.0-r2.ebuild index 4272e81..46dd51b 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.35.0-r2.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.35.0-r2.ebuild @@ -1,13 +1,12 @@ # 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 +inherit eutils git-r3 user DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.38.0-r1.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.38.0-r1.ebuild index 066e9a7..f501b13 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.38.0-r1.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.38.0-r1.ebuild @@ -1,13 +1,12 @@ # 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 +inherit eutils git-r3 user DESCRIPTION="Gitaly is a Git RPC service for handling all the git calls made by GitLab." HOMEPAGE="https://gitlab.com/gitlab-org/gitaly" diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.43.1.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.43.1.ebuild new file mode 100644 index 0000000..8d3f780 --- /dev/null +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.43.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitaly.git" +EGIT_COMMIT="v${PV}" + +inherit eutils git-r3 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.8.3" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/0001-${PN}-0.23.0-fix-Makefile.patch" + epatch "${FILESDIR}/0002-${PN}-0.43.1-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.11.2.conf" "gitlab-gitaly" + newinitd "${FILESDIR}/${PN}-0.11.2.init" "gitlab-gitaly" + into "/usr" + newbin "gitaly" "gitlab-gitaly" + + # install gitaly-ruby + insinto "/var/lib/gitlab-gitaly" + doins -r "ruby" + fperms 0755 /var/lib/gitlab-gitaly/ruby/bin/* +} diff --git a/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild index 5e75fd8..c9193d0 100644 --- a/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild +++ b/www-servers/gitlab-gitaly/gitlab-gitaly-0.6.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user From 78ebaa1c0af54c32dda3afe55a132c3c4e019b80 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 7 Nov 2017 00:49:40 +0100 Subject: [PATCH 4/9] www-servers/gitlab-workhorse: Add version 3.2.0. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- www-servers/gitlab-workhorse/ChangeLog | 9 ++++ www-servers/gitlab-workhorse/Manifest | 16 +++---- .../gitlab-workhorse-1.4.2.ebuild | 1 - .../gitlab-workhorse-1.4.3.ebuild | 1 - .../gitlab-workhorse-2.0.0.ebuild | 1 - .../gitlab-workhorse-2.1.1.ebuild | 1 - .../gitlab-workhorse-2.3.0.ebuild | 1 - .../gitlab-workhorse-3.0.0.ebuild | 1 - .../gitlab-workhorse-3.2.0.ebuild | 42 +++++++++++++++++++ 9 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 www-servers/gitlab-workhorse/gitlab-workhorse-3.2.0.ebuild diff --git a/www-servers/gitlab-workhorse/ChangeLog b/www-servers/gitlab-workhorse/ChangeLog index 7995665..7c7a1d7 100644 --- a/www-servers/gitlab-workhorse/ChangeLog +++ b/www-servers/gitlab-workhorse/ChangeLog @@ -1,3 +1,12 @@ +*gitlab-workhorse-3.2.0 (06 Nov 2017) + + 06 Nov 2017; Manuel Friedli + +gitlab-workhorse-3.2.0.ebuild, gitlab-workhorse-1.4.2.ebuild, + gitlab-workhorse-1.4.3.ebuild, gitlab-workhorse-2.0.0.ebuild, + gitlab-workhorse-2.1.1.ebuild, gitlab-workhorse-2.3.0.ebuild, + gitlab-workhorse-3.0.0.ebuild: + www-servers/gitlab-workhorse: Add version 3.2.0. + *gitlab-workhorse-3.0.0 (25 Jul 2017) 25 Jul 2017; Manuel Friedli diff --git a/www-servers/gitlab-workhorse/Manifest b/www-servers/gitlab-workhorse/Manifest index 967ad88..55e0a51 100644 --- a/www-servers/gitlab-workhorse/Manifest +++ b/www-servers/gitlab-workhorse/Manifest @@ -7,11 +7,13 @@ DIST gitlab-workhorse-2.0.0.tar.bz2 656360 SHA256 4e9864b7885b1102d9eb18e9c4bd3b DIST gitlab-workhorse-2.1.1.tar.bz2 658851 SHA256 ab827cfa89f5d3e711357a0317a022b4d5db4d91c01ad0b80b56120e315da899 SHA512 6a316647faff83352c344cc36ef7fbaf327dfab9b8f893c39e22d4cde7e78fe703680d2851663953ee94b3ac9f55a142b5380ed23f26a7600044a3af2fdea08f WHIRLPOOL abded7f69b1a1ddc1aed3f8a8b1ddae89aa19eaa67ac1be1847f3ad6a0f5a23142f60fee545a358ecf27f2b15d4630eb42ea0b68a7076af9e26ee36d9db1243e DIST gitlab-workhorse-2.3.0.tar.bz2 673735 SHA256 61dc7ea978223a56e5f2e4617195e43c9e3179f0057e416545060143ea90ae0e SHA512 290713086d8c30fbbc80d32b6924368ceffceb08fc9330403250b775bab20454d5843bfd7b37c1d88fa60d1bebd5b14d7e8bb6b3557142b56b1d9ab02ce46aee WHIRLPOOL a1507a68c06d7335e5fdae4cbb91b01ddcc9d7c988758fd892676c6a78c9746c6f1fa89fe369efdd2352f85c7dade00554263e1a969ce10dfc87983c3136bf6f DIST gitlab-workhorse-3.0.0.tar.bz2 678497 SHA256 6a72db70a49c4004881b4e5e727ac088e6b976144466b1e7a5362eb720bcb546 SHA512 25be040a20948a2e82e56e531ed030174a7c0dead542b998a70213aeed4a565eebc6e206fed202d52c538781f25715b93c5dd9708171addb222d13be4c49bb55 WHIRLPOOL 07d3d17bf1d7318fce000fbd8da4d4d8f47040b3ac92efe955ae84ccc9636eb0d8a86816b59caf717848340f53b43d0724bb577d143e2a4524a24eea5e48e33a -EBUILD gitlab-workhorse-1.4.2.ebuild 1019 SHA256 12e00f04075eb815e41640f4ca906ce1aaa833104e79c43f19c1a34c4454ce2c SHA512 8b430448c28ea695502f08928626f628657d58582439c3458370a56dc134c108c24f266a3fe2353b1ecd5082d2e53b985fa998b8919b60f81836579c884555e3 WHIRLPOOL ff37a454aa77734d4cd15b6bc4181a5dc8f1ead2d03710fdc59a514cbaa0a67202ded330021f2c6f763797763b8de94e2ffe86c90cba2336903479abcdfc3437 -EBUILD gitlab-workhorse-1.4.3.ebuild 1019 SHA256 9f04f9b9a1af3b6a14af32fc27143ef98cf8d5ea297c754e2af2f75faab90cf9 SHA512 f38aee3ae9318d4db08a6f5bf55a7d25944ca65d132f23e5638e670a31745381d93a39d9489409ee75de943edf80af555638b2748d3eb7b1b8b0d65d8c02d6e7 WHIRLPOOL 60491062d73591e137a7a6d6875174a7f7c31c6972d104c2dd856ef8513276617e1be97f18679853b86638d92ba87152ca5b3f17c43dee79db2918e3e3139584 -EBUILD gitlab-workhorse-2.0.0.ebuild 1019 SHA256 6b5b1af7f4bb91d6f38b5160ea4a1711392ba42ae296388c72ceeb1e19dabf99 SHA512 aa607720a13052e2fa5e086d3f5fa2bac42dc9a1028940c6c42e9307596439bb89f6405d23a8f2c216ff9a15e2d83be373adddb6598ed84b7b00af872cd8efc3 WHIRLPOOL 9cd700793dbad67c8a88bf7794bc1273e809b8435702c4359b12c25006fa1a08c8d5963ab76ac75bd46d520442b3195a79659718f8c7bca49d7fb5b4c0d9d6b1 -EBUILD gitlab-workhorse-2.1.1.ebuild 1019 SHA256 0b119e55032bf471921e9011cb3a119b45a78000eae87d9ef28b2c314e302793 SHA512 aa571922dec9bf71d48b0ab23356642bf031328fc18c99600221fff5931259a2127e50432e1fd30c8656dec2ec8fa395d8e15c34f65f2a005c08420f26bcf54b WHIRLPOOL daa44b0fc118f2c05b38ddaf96c78aee1a25993c35ec5a71f4647d95ccfc8cd20362de9e6c9331d531ecd81799733953aef4297c1350d4fd223d9b003e75ab04 -EBUILD gitlab-workhorse-2.3.0.ebuild 1019 SHA256 1e7b0b9f7ca61afbdbb525eecb934a858be6bd91ff7ef6614eed2899f207fc8b SHA512 ec98e6aa09ba6245195fa4666fa4174a9ba595922f351dd660c161f419e84dd2c284373a310b55acf986082d175e1659e9396a9c7a3cc324a540b7d67222aaa6 WHIRLPOOL ba7bb5b5a333161bc4a3b04cd00f97893e9e93e63ee505b97d757676520cbbd06d2616be69a248ac81ea3135589fb3f11cd4333f266e1fa293890982d790399e -EBUILD gitlab-workhorse-3.0.0.ebuild 1019 SHA256 c7bffd0014cc64cc92eeb3566d3af38619bb29ccb5b8d755eb3e86d66c088ea0 SHA512 32a35851126f109da9a3ac12b43ae5b654193d7b4fd0b03fa501d810e1cddf03ae0f4004aedf2d9d98ccda7ca99e689e55f67dda19748bf47e76259b5416575c WHIRLPOOL e0c4403800788d653fcaaf827251771f621ccad15633728b731b52c278b2b33b39321356b2620110597dceb18c2754c460d78685f5a79ef6afda030f2aab24fb -MISC ChangeLog 7364 SHA256 1201f257e1f27e1ad998346e9ca64e3ee5a010c1d5525f5a3ddbf0468daa7df4 SHA512 954f059e8fc735abbc463a6a55e084092523384ce64aa157a6aefd94d1ee938414a8e5c20dc4163781ae4781d255cd9378a0afde3a5036e0028cadee987fdad0 WHIRLPOOL f5b327abbae59e6672ebfd4ff229713ff38618752f847432914d2aa227798b25d901dad395e51ebb8ba9aed41f2df5a7d71eefa46a2ac3d28e4bef22cc72ce10 +DIST gitlab-workhorse-3.2.0.tar.bz2 700671 SHA256 4a38d307b7b5a61f74078000614b2b3e2730fd637da5477a58d7f7efe9ce7008 SHA512 6f971f17516d6ed7f74779656813959cfe0d588a9a0bd81f925146f5f2d64104c2b0472032a6d7c0dee3ea3f2755fa8127cee80af717dbc9174d8a12d437df5e WHIRLPOOL 3132f046cbf73ebcc648283f6e9eec38326043166ae2bbca19168801304122c45478f3e8aaf94c1b8af25b9a3a379bc10c7a7ef291fbaa07a108e0e6869c3a8e +EBUILD gitlab-workhorse-1.4.2.ebuild 1012 SHA256 c619e29723a64caea3d7e3105c686e4e138bd35318af847440f14ace48fbb8b7 SHA512 7485fc018ea6cadabdeca8c89787d0c1103c46cb635282d8bc48fd801a693450cd50d3e899f68d29ee3043281551405b5fe9777e1b620ca0519e913f68e8a5b8 WHIRLPOOL 15fa160b642d90b8c13b846428c8ea74ba17617c74aac71ccd434fdadbbf5c8049bfdfd08aec034b1c18c8da10d52a41ec4e10f64da680a5d37f8ecdb90b8d81 +EBUILD gitlab-workhorse-1.4.3.ebuild 1012 SHA256 e82630ed25d51514b4e6638b6f49777ff00cdc2f93a8a7d4d6ab87655b5734d3 SHA512 a760e43573b7e8202f2e5fe6c481fb0376816b3d45ddd93205aa2798f510297632f80341c3e77ad1700f7ddfbac7e591d97834505f71466e7af67a0c5135e527 WHIRLPOOL 8f63a99b538eb4c88e76171bde90ea7bf2ed5b87b9b2e5fe6293fb01b1f6b4f81def5e02307e07896e5f3e0e47b4d550b9d9d28b1991032c608f5bbe0a21eb05 +EBUILD gitlab-workhorse-2.0.0.ebuild 1012 SHA256 4bf03b159710c22996450e9141b42e846e206433cd1f1d3ac52ada84996d8edd SHA512 5899843cbd910cf293f5d33ed4ffbfd5075d54d547d4d9f14d425b12ff81bd95fac54d258239cbae9845f7898daad796e38966a021414e321bd37a4ecbccbfd0 WHIRLPOOL 2c345b6cb8939cf97721701fedb00574699dd3b87a88d726e532c6c3db46c405e2bff2474a84da235b231295aef6e70924f624d35efb0844130f3b2881ae05a2 +EBUILD gitlab-workhorse-2.1.1.ebuild 1012 SHA256 166a2cba843736735ab232b3bd0008b6fc1134884d47293f4b97cd4b2d072f5a SHA512 dca4d6765f4abf738c45917294d58237b94555d7851352518277cddc4fa51cb4118ca21bc8ca64b1db57b562c4665da7fc7d9c8c40ccd51ae408d88ec92cd425 WHIRLPOOL efa7829ff8059517c66a374e74bc9e2e27817ecf92d1845da45d44f7d46561ec5e98cf88de9cfa19a3454d11c8622b639cf48b488cc7b57fa0e03d0cd4dcae0c +EBUILD gitlab-workhorse-2.3.0.ebuild 1012 SHA256 088c7d911e144a8a55889dfcdfab84126d2ee28df1d5a3e566856a1ceb1f0dfc SHA512 d95868b8033f518b96d9401e07a4dbe81b380114e4c5907c89e73f6ca820440d4b7471dded25407d4cc817dbbbcf348943f72c251bebf06c866aa9bc91f1a3ff WHIRLPOOL c4774879016f5952463ad7c231ca42b8e34999aaa7db60e2358e15b3ae864316e559213b8166fde0aeed6afb0fc8aa3ba89ca0b7a1247e19377ebf52c8f0a39f +EBUILD gitlab-workhorse-3.0.0.ebuild 1012 SHA256 cd7d9f593221b3ef2baeea527060ef56178a71332af7a5bdfcd6285c49c9f329 SHA512 7c9d1bf373e2557b6a01f8fecfacf142322fed91cebc462a249f7cb1e02a953d4fd6bce2e8283adb6a9060c9a0cb2e7cb1b99da8a1926210c3d580589643fe0b WHIRLPOOL 61521ad8c87744395ada1300c5d3d237b2b356dd874232f371eb7ed2a6a90b29155cad810953a3f82d872318bbad6fb164fc9ac80a836a9d42326bb651e2a797 +EBUILD gitlab-workhorse-3.2.0.ebuild 1012 SHA256 4dc3f893683d0fab13d4c0d43090df4bdcd5543dff4ca74940999cb797aa7312 SHA512 199d418e6a1e60b183a16f28f08cc20fa67771395d9f2da741227f102d40d71d91a5c27bb8d9741995a2aa117111dbffe6bea9ef854f3c35bb41ed81045ab88d WHIRLPOOL 07f534716e45600c9bb9912c1f7beca402067df7b572965e08e431f922327de541614952b37ec126bcb7bb6ae8d66fe4084f4183d75d2e686fd6888a4b866ea5 +MISC ChangeLog 7733 SHA256 363b495dfa6196da200b85afbd4e97e9bb30a7ce92d8f94fd2d918432d468921 SHA512 1c3fba3339a88816d78f25376d3f69b24d8dea4dd488b614c4013ed46d7867ada6a95745662f5f99790830eedf5f940a62e0a8f8ba6e1422fdfca86a1b721df6 WHIRLPOOL 239fb4cb3a9757164cac2735f96f817c73dfd26534ee58eb4b6a9e895605721f9890b7ca84c1b8b0611e4d7f12ac87432ba8ed6128773b8e356164dc0ce7e95f MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild index 64fb7fe..88322ab 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.2.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild index 4cde17b..d62e920 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-1.4.3.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild index 7f2311f..d81b6b5 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.0.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild index 087a4ea..6b30847 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.1.1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild index 0e4eb77..4e10713 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-2.3.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild index 3b3eea3..418c94b 100644 --- a/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-3.0.0.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI="6" diff --git a/www-servers/gitlab-workhorse/gitlab-workhorse-3.2.0.ebuild b/www-servers/gitlab-workhorse/gitlab-workhorse-3.2.0.ebuild new file mode 100644 index 0000000..ffa4163 --- /dev/null +++ b/www-servers/gitlab-workhorse/gitlab-workhorse-3.2.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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="bf1d9467b9cc938d149690f6ea25d72441221311" +S="${WORKDIR}/${PN}-v${PV}-${MY_GIT_COMMIT}" +RESTRICT="mirror" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~arm ~arm64" + +DEPEND=">=dev-lang/go-1.8.3" + +src_prepare() { + epatch "${FILESDIR}/0001-fix-Makefile.patch" + sed -i -e "s/@@VERSION@@/${PV}/" Makefile + eapply_user +} + +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 db7bf817d27aec167cdb87773cbf41425f910ad4 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Thu, 8 Feb 2018 22:13:30 +0100 Subject: [PATCH 5/9] fix merge conflicts --- www-apps/gitlab-ce/Manifest | 2 ++ www-servers/gitlab-pages/Manifest | 3 +++ 2 files changed, 5 insertions(+) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 0e2bea4..d2fc1d5 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -19,6 +19,7 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1 DIST gitlab-ce-10.0.0_rc3.tar.gz 39936453 SHA256 347840d9beb01f765c4962616e241924b48ec0e3c09b35ff96563d1b509d4375 SHA512 855324e0c351ff1db3bc8823f85768d6968628da1452edc68f63249467eede89ba371e3d2de94a5fca3f31462c3d13dc2a8b3cd467f0647896183ead27492c81 WHIRLPOOL b7e98abb055cb6e884505dd2d49e93031f6722c0fb7cc34470903248de6f8871456deee2e41cf4da27b42dd7b4996111ecac02d568aa44286670edfd07d5cd7a DIST gitlab-ce-10.0.4.tar.gz 40040781 SHA256 eef116f75b64b835402a87e3737a3721143823c7094ded06edf8f9ac974a7ca8 SHA512 346719e7ea8dba4cb55396cfaafc8d70c7145d4de63913dc736c7f21f3f1ac133a1c837c19a3b1131879678a7b5e8b9bb6abb0bf29031802dda6e3b96e0715c0 WHIRLPOOL a62361a9f48911a9bf0244411aa638017f8cd928e6b7fce501da5645b3f1813323abaebb2e7937d3c78bbf2724962575813940222d729b5356e77ff524231d02 DIST gitlab-ce-10.0.7.tar.gz 40049508 SHA256 890eed75ee502cd6c612756815ac8c854eeee3d00ab3d7bf00ee580db8141264 SHA512 770b747a35988b663f1ffe3b05b317839cc66e9c76e64e51673d066787a42acbb688b739fe9fe3a6dc787f2e44d6fbd99388ea0a20f103bedc631ed0054401f4 WHIRLPOOL 0de51582532936620b4140013f87652e7581956fd6e662d83e53ed024699ff70c2c52fbb863f8052c5df36bd5b63cff0cc6fd9372c97ea2265aa1242a2d6afdc +DIST gitlab-ce-10.1.1.tar.gz 41628358 SHA256 e938d447bbdbd9be83fe094e2e3bed49d171a46de1ec9a0a71e7d2b1bb991378 SHA512 a25d0df70be29e0ae0ceac2751e9ced5a8175662e10d409d317c932c80c6bb9fdab4d395d73c9ec7b7a8b558a28bbe86ed2ad20468ade2eb3e988eaa712d79f1 WHIRLPOOL adb15dc70cb35a30784455a28b73188331ee0a6bab5b8bcea21c90973d7763501faf37162e1d4d7dffa41d0c0516fe792dd3423807bf4aa317a861beb02d5467 DIST gitlab-ce-9.0.13.tar.gz 26366204 SHA256 056c98acb558776a2919b1aa501cb5303e66eb3cfe1d54b26988492be1c3816b SHA512 42fae9a01adc1eaac8e59b4ddb5f1d7c11d409dab32b84bf9849eedfed88bf87f7d36d0f9687f253424e2eacdbf83b3560bf9e64baa1533e4b1b6ff6e3be65e7 WHIRLPOOL d5c312d3f63057786ad28b2fba328d7a0593a5140aad617067b0aa0319d741f36ff32e573a436bf663f0f56d820b02fea5e22a430355856268306582fb62396a DIST gitlab-ce-9.1.10.tar.gz 30516975 SHA256 37cfd9dafcfbcd432d7d7a3abc6889bcd35321fc00b717f4810bf432791b0243 SHA512 81a7b9836aafcb348b6c38d8c19917053fc7a6adc6328d4b05215aa3d5c698adb708068d36bdc82df61e5b2d6b269c0ba8682b4994fa4a36b98fabe5b17e5f07 WHIRLPOOL b0affc921e0b41faabe354805fbcbd56a5839f7eeb880c00c2f10b68b0f2865b8e39ed58cfd99f6b6d0f2517bd465ff3f227fc6f17e1c1e17128299f21a911f2 DIST gitlab-ce-9.2.10.tar.gz 30988788 SHA256 a30e9d08d08433713df958d447a76cf2ed16344c7de56614f2849e8caad3e3b5 SHA512 fd4602c86edaf3060e1f5b8c8d6c5e4d40ec64f7f3d2519008b8c096720016c9a0dc6357bc464e72e4b52b25bd12ab26a4166898fba608383b4e4647ad49782c WHIRLPOOL f6b79e71f906c461ed89bd23bd537ae640b55c6727d7275e16ecb3b7349957f1461138d8fef5163137cabae59dccfdd8c4b22bd425800bf2eee3b732fd9a2908 @@ -28,6 +29,7 @@ DIST gitlab-ce-9.5.9.tar.gz 36464622 SHA256 0ef546feae5d66347e4a662332c329e29664 EBUILD gitlab-ce-10.0.0_rc3.ebuild 13508 SHA256 bb22763056e0686ff308db2bc14e55ed74c4af247eab55f4ba4502ac0fa3f210 SHA512 99f298076aff75183d68b9969e99bba1898501554aa08448539c154b021040d3af7b6f2bac3704511b3b83af7c39d7e42530142a6c5061078ea82fb93aafcbae WHIRLPOOL 129b9b2a0e4d512947c2be0b3143ece02d870f790f9425d5408191aef53e0631bb001390b2438a2f0d4a38b38a679af0909a9df1f9c9a4e3d7448f32110cb997 EBUILD gitlab-ce-10.0.4.ebuild 13526 SHA256 0fa438ddcca42b2ec6090bdb587635c8e82c9d4fb515427f24b264ab4b70db64 SHA512 dd84a68b17bd5ee193f55519bf83d52385e372dbde672915b4a799d30ecf08e2dd004946fbf73acaefcafce9af20355538a5c0d453ee52f7009deb8403001fe4 WHIRLPOOL db04a3db49544333341a4fbd1b1d3ce49e58106b91da12de0b5b2cfeece52876ce6845e6e8b0fd8048fe40ad3b02e78efc191e716fda52a576c959569a9527d5 EBUILD gitlab-ce-10.0.7.ebuild 13526 SHA256 258085d5365f3c65aed09ea9515bcf453ee2d6f91368401a885376337b2b0c27 SHA512 2ae1bb85618e73b3765323d0f6e8d2ac35aa471c1051b1559c752d567a7d7e4c1f4e5dd3558e20f5b5ee73d75a29da27914a39333ddf2e6e3818b8ae4496e57b WHIRLPOOL cc299c60414881559d80970d1c78b35ed3bd9d9c59a5ad8aaaf51c676109d72616f048f2c80c4bd125c889a35fb45a2f2e48ae7a2db68979805820de2a0df5ae +EBUILD gitlab-ce-10.1.1.ebuild 13708 SHA256 7a520ab8e941e465add0166146fe5e91ade4a80d1b29e3c15e03b0d712c18e0b SHA512 280c8f8a46599e6b25ba6bfbb861b95f4eb892aeedd1459bf1669a532638a309fe7ac64b886e596c9b8b5cadb30f7ed224cb641b3ad6da16708498596125e946 WHIRLPOOL 709eedc354d5d7bd36d1f08ebad94b7247563e0a219263bb84406a238f0126577f554376e732691860539de610bf7c4b1ade46854c2f8e924a2529940387e9b0 EBUILD gitlab-ce-9.0.13.ebuild 13139 SHA256 ecdcd1d6ca3999eb4b299628bac4c97a231cfcf682569cc1a0c11241cfcb6099 SHA512 8a6b8f3f05f54a752d57651b34ba4f6310e6695ea6eea1bbebe4a1dd38aa9ea0e9030bd59448a886918e20ea81f1b167236712e21fb6c43b7fb50b79565e2d87 WHIRLPOOL 0873a646dcb208e8c006e0e587fc03003594fd00e790e22d89839c9ffb8b7403a2df7b306ddfb817ea10a32e58d095d97989591de18ca78782bd468ae1fb8bc7 EBUILD gitlab-ce-9.1.10.ebuild 13295 SHA256 a69c179d072e76597091d825956bc308a25757a95406444a95a4ccbe9fe8ee9e SHA512 cc01ae887bce9e838eb020c7b414de4f80c5cc94762bd7c65fc5f6ab732b3ac7447f3f136b054557a5a93d09ed946b821d027fe29d7fdeea6eaaa6fc336cf394 WHIRLPOOL 1778e46da386704fbecc9e62769b9ab6ccdb40ee1028ef33607b4668e3fafbd0996ff4397128d8320098e3bf5c8f1d47a227e3c61a73a26a63663223790c8107 EBUILD gitlab-ce-9.2.10.ebuild 13040 SHA256 ace7b7561f499e43c19284153358b718275ac55792650391f39fa4ab89941c20 SHA512 22c8723251fefd50739ac082f04c377543f659720346cd29680d4956a2d6a37bb27b2c6beb723c09f49d7e478375e6679940f63f43c644564155a0eaffe300ed WHIRLPOOL 9601c5fcdc9b8d753a58ea4b4606957f3d09e63834335703896f55b16c41df7b81ef00b64e57f4409322789dcaa3745d60b31a973950c99037895d71a38ddaf2 diff --git a/www-servers/gitlab-pages/Manifest b/www-servers/gitlab-pages/Manifest index e1e166b..a643d16 100644 --- a/www-servers/gitlab-pages/Manifest +++ b/www-servers/gitlab-pages/Manifest @@ -1,5 +1,6 @@ AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 AUX 0001-fix-Makefile-0.4.0.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 +AUX 0001-fix-Makefile-0.6.0.patch 830 SHA256 ad084ee3f83a3ee8097bd80e8990e00c927f109f8c712da67712c76b7ef91bda SHA512 221a7504396a96711da3852bbf71791f1a7b849121f6a24c2582e917b4966597d10291dea439cec91539f3a9ad599bcb34252e3a08a7214bd3d642181b07f723 WHIRLPOOL a46e2289a86560f223db0dd4e1c3c493497bb10bdeaa1d3b5faf24eb11674074fd25f35cd7df9670e4769be4d3e7ea97b4cc1cced3cef4dedc25a980bdeb6b60 AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301 AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0 DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1bd76ea305902e4885746280755c3ea0 SHA512 9ff1d51655c0af93eca0b3a7e5cf250ce9a6787b3bc5eabcb59207ca3af13b6972bbebbc9c4a05bc1056cd12d6ad4c4bc30700efb656a2b9cfedf71ef57666e2 WHIRLPOOL 064625dfbfd428da5ecbf7ceb0532ff16e61ef9fbdbe1f4f72824e06ca21a93266a3d5eeec730f6423cb9d5d26d99fc6dbb568f30a79c4a691a0fdb08301c1cf @@ -7,10 +8,12 @@ DIST gitlab-pages-0.4.1.tar.bz2 206039 SHA256 ed856e1d549597b5f1b7aa5d006538aa4d DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e5273899518b83529c787c0a5f724161005ca786 SHA512 74e4cd810712d1506b927f75b63dc4fca09802097579d456cfada94f06c59b05f5e11309dc6fbd0f4c701243933688afa89ef8c1cf921f15536f505c7dec99f4 WHIRLPOOL 0f352db3977565b7c41609dcbed9161fcc99398fc56aa535255a69d12169b75b985410964a9adce60ed9eb8b88a68128dac9a9528f85ec62bae468fb8907e182 DIST gitlab-pages-0.4.4.tar.bz2 209229 SHA256 e3024edf56a61e8705f4fb5db2141087f16db1fe550d116e950137b92b201720 SHA512 5618e659ddd91a3398cd7eb00e38292e3bc88b31af91c02815dfe810a5a478d7eb2314430478e4e2971f36a44ac37a2c9ed01bd357d1f8737a8a63fc697821e7 WHIRLPOOL 52cec732705285e2270ad1fda43088ce0c6e0dbf652f7cc29e77dd68cb23ebe913c0c71af0337a59f77f351b207e79469bdbcf5531f6ee6714695af0d08c3497 DIST gitlab-pages-0.5.1.tar.bz2 224270 SHA256 b61ed9c12baf197dfd466342301ccb3160fbfe8fe61270a31a72e5503504f50b SHA512 973615efb54290c0d6b41455d91bf6343d8b09687565b8ad5e72cd69faea99cc3819c3aabea9e7cb94414a61835104e052affb1072ed62b1e2f343517eb94184 WHIRLPOOL 421500d5f0cee352a95dd59e9b799a9b3fd6b7639c656bd54fa601e061ddaa5062fa0b6a567bfce2543dcf9755b824a81362171c779db2f3f238faf760a6c472 +DIST gitlab-pages-0.6.0.tar.bz2 237765 SHA256 2bd99b5c4a1ad05ac02f17f5b450c308d1ef5936ff2e44be706705df8376c41b SHA512 935572062268c8a8429634377e02060f55feb2dfbd6b16e4487c1c4043dff435c304798dd2097f381f1c2e175c21d840e2dee76851dc9e03eeaa49d2b003900d WHIRLPOOL 01541d143a9511911cdd7c0c97d63cc48c682b19392c96ae429d98eeba6aba220e811d4da6826da2d417439202a33fc7a0deb16a9dda8a5a65f0e6b0fa9adf54 EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3 EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53 EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039 EBUILD gitlab-pages-0.4.4.ebuild 1436 SHA256 8f496c129cd8bff8dca1d882713ed9f460458bb887c34a2926c03e4057e893d6 SHA512 a4c90b718ef63888e454c4a48949a9713dfa44f354556a840f6e78b86e46d90f5c922c83ea3b2b35fdb5ab5168f6cdff1004666e3dba0b6acee95aecde040afb WHIRLPOOL d18824f792e1b541f833e3fcedd049956f8177bd4c5cdf75dc6e6e28aa983be69a7475d82b6a1427a87619d288321533019aad0802cce1bfbc118a1c76644b47 EBUILD gitlab-pages-0.5.1.ebuild 1436 SHA256 4832678c91a3ac6f68894a9512ee60e2037600a26d7883d72bf77857781c823f SHA512 9395ed1bed70268b5db9540491a2b16bad0f85aaf2b0f32c3307cc0f1acbbb7aa59b44d059d45621dac9ee7d1bf97b4fe0b3f8083001099b09a14b358c52ae37 WHIRLPOOL b3fc7ad05039d1a0e652ed0224c3e6ff76d4ae9bf1ef8114503e7cb73cb35a0e4de7550a06b108ee284e294e31c691872d6587ca58ebf6a9bed6b169de391903 +EBUILD gitlab-pages-0.6.0.ebuild 1449 SHA256 222470c87b9b2746fc32f6524f5b97f898b7d872eb68ad6f46234a34631a2d6a SHA512 097bb10d29c4304b86d1e492a24c68c34ebda1df606306a3802896884d65a27eda0f1264198e71da57e8ce9aa94be70c5dfb8639c87e814af46c094c83c1a059 WHIRLPOOL 8476550cddec6c25a2dacebfbb8043d2237c0a0c235509039dc9296de7175859ca4b7919ac10a20052190e8bc10287e08938efb92c4dae9fda461278ae5d14be MISC ChangeLog 2227 SHA256 c1084119d1a8d5b58d8916b3c8270cfb8aced8d761c777b4be7c9ec942914ff0 SHA512 d66a020879462cacba6ed0e7118db12426b5d5ec3256dbc4dca78e80db87bf513b900557f672c4445734970435184b50790b3b9fe90ba930ef4e6cf526e82cd6 WHIRLPOOL 5b95f489d4cf4f3f278c3277efda3482da83b527fc23c2036c635145fb8ac77d21ed9299646295438aacc88a410e796d6e5c9f73561941731a6fa9019c73b8f9 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 From 7d3995dae812572266daf2f8af8ce6649f6c05b2 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 9 Feb 2018 00:40:45 +0100 Subject: [PATCH 6/9] gitlab-ce: Update 10.1.1 -> 10.1.7 --- www-apps/gitlab-ce/Manifest | 4 +- www-apps/gitlab-ce/gitlab-ce-10.1.7.ebuild | 435 +++++++++++++++++++++ 2 files changed, 437 insertions(+), 2 deletions(-) create mode 100644 www-apps/gitlab-ce/gitlab-ce-10.1.7.ebuild diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index d2fc1d5..80d079e 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -19,7 +19,7 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1 DIST gitlab-ce-10.0.0_rc3.tar.gz 39936453 SHA256 347840d9beb01f765c4962616e241924b48ec0e3c09b35ff96563d1b509d4375 SHA512 855324e0c351ff1db3bc8823f85768d6968628da1452edc68f63249467eede89ba371e3d2de94a5fca3f31462c3d13dc2a8b3cd467f0647896183ead27492c81 WHIRLPOOL b7e98abb055cb6e884505dd2d49e93031f6722c0fb7cc34470903248de6f8871456deee2e41cf4da27b42dd7b4996111ecac02d568aa44286670edfd07d5cd7a DIST gitlab-ce-10.0.4.tar.gz 40040781 SHA256 eef116f75b64b835402a87e3737a3721143823c7094ded06edf8f9ac974a7ca8 SHA512 346719e7ea8dba4cb55396cfaafc8d70c7145d4de63913dc736c7f21f3f1ac133a1c837c19a3b1131879678a7b5e8b9bb6abb0bf29031802dda6e3b96e0715c0 WHIRLPOOL a62361a9f48911a9bf0244411aa638017f8cd928e6b7fce501da5645b3f1813323abaebb2e7937d3c78bbf2724962575813940222d729b5356e77ff524231d02 DIST gitlab-ce-10.0.7.tar.gz 40049508 SHA256 890eed75ee502cd6c612756815ac8c854eeee3d00ab3d7bf00ee580db8141264 SHA512 770b747a35988b663f1ffe3b05b317839cc66e9c76e64e51673d066787a42acbb688b739fe9fe3a6dc787f2e44d6fbd99388ea0a20f103bedc631ed0054401f4 WHIRLPOOL 0de51582532936620b4140013f87652e7581956fd6e662d83e53ed024699ff70c2c52fbb863f8052c5df36bd5b63cff0cc6fd9372c97ea2265aa1242a2d6afdc -DIST gitlab-ce-10.1.1.tar.gz 41628358 SHA256 e938d447bbdbd9be83fe094e2e3bed49d171a46de1ec9a0a71e7d2b1bb991378 SHA512 a25d0df70be29e0ae0ceac2751e9ced5a8175662e10d409d317c932c80c6bb9fdab4d395d73c9ec7b7a8b558a28bbe86ed2ad20468ade2eb3e988eaa712d79f1 WHIRLPOOL adb15dc70cb35a30784455a28b73188331ee0a6bab5b8bcea21c90973d7763501faf37162e1d4d7dffa41d0c0516fe792dd3423807bf4aa317a861beb02d5467 +DIST gitlab-ce-10.1.7.tar.gz 41749804 SHA256 d04dca23289adad80ba239d993aa67dcd14f50a1b935d91136247124e8b5f1f9 SHA512 3ebf8ab1e57ef82caeef940264a6f755e091717879d7ac36ce786155440ebd1264fa3320012cea4d1e6c319926a818cfcb19740fb765f069d5d18841ac1c0a21 WHIRLPOOL c91234ffd82c5e7380afbb49e3a6cd848d7744dc299dfe039fa02485e4d831fc24247e7613d5dd20d4e9752015f59c0638ea95f4eaa96afe50e8748eca0a7ad5 DIST gitlab-ce-9.0.13.tar.gz 26366204 SHA256 056c98acb558776a2919b1aa501cb5303e66eb3cfe1d54b26988492be1c3816b SHA512 42fae9a01adc1eaac8e59b4ddb5f1d7c11d409dab32b84bf9849eedfed88bf87f7d36d0f9687f253424e2eacdbf83b3560bf9e64baa1533e4b1b6ff6e3be65e7 WHIRLPOOL d5c312d3f63057786ad28b2fba328d7a0593a5140aad617067b0aa0319d741f36ff32e573a436bf663f0f56d820b02fea5e22a430355856268306582fb62396a DIST gitlab-ce-9.1.10.tar.gz 30516975 SHA256 37cfd9dafcfbcd432d7d7a3abc6889bcd35321fc00b717f4810bf432791b0243 SHA512 81a7b9836aafcb348b6c38d8c19917053fc7a6adc6328d4b05215aa3d5c698adb708068d36bdc82df61e5b2d6b269c0ba8682b4994fa4a36b98fabe5b17e5f07 WHIRLPOOL b0affc921e0b41faabe354805fbcbd56a5839f7eeb880c00c2f10b68b0f2865b8e39ed58cfd99f6b6d0f2517bd465ff3f227fc6f17e1c1e17128299f21a911f2 DIST gitlab-ce-9.2.10.tar.gz 30988788 SHA256 a30e9d08d08433713df958d447a76cf2ed16344c7de56614f2849e8caad3e3b5 SHA512 fd4602c86edaf3060e1f5b8c8d6c5e4d40ec64f7f3d2519008b8c096720016c9a0dc6357bc464e72e4b52b25bd12ab26a4166898fba608383b4e4647ad49782c WHIRLPOOL f6b79e71f906c461ed89bd23bd537ae640b55c6727d7275e16ecb3b7349957f1461138d8fef5163137cabae59dccfdd8c4b22bd425800bf2eee3b732fd9a2908 @@ -29,7 +29,7 @@ DIST gitlab-ce-9.5.9.tar.gz 36464622 SHA256 0ef546feae5d66347e4a662332c329e29664 EBUILD gitlab-ce-10.0.0_rc3.ebuild 13508 SHA256 bb22763056e0686ff308db2bc14e55ed74c4af247eab55f4ba4502ac0fa3f210 SHA512 99f298076aff75183d68b9969e99bba1898501554aa08448539c154b021040d3af7b6f2bac3704511b3b83af7c39d7e42530142a6c5061078ea82fb93aafcbae WHIRLPOOL 129b9b2a0e4d512947c2be0b3143ece02d870f790f9425d5408191aef53e0631bb001390b2438a2f0d4a38b38a679af0909a9df1f9c9a4e3d7448f32110cb997 EBUILD gitlab-ce-10.0.4.ebuild 13526 SHA256 0fa438ddcca42b2ec6090bdb587635c8e82c9d4fb515427f24b264ab4b70db64 SHA512 dd84a68b17bd5ee193f55519bf83d52385e372dbde672915b4a799d30ecf08e2dd004946fbf73acaefcafce9af20355538a5c0d453ee52f7009deb8403001fe4 WHIRLPOOL db04a3db49544333341a4fbd1b1d3ce49e58106b91da12de0b5b2cfeece52876ce6845e6e8b0fd8048fe40ad3b02e78efc191e716fda52a576c959569a9527d5 EBUILD gitlab-ce-10.0.7.ebuild 13526 SHA256 258085d5365f3c65aed09ea9515bcf453ee2d6f91368401a885376337b2b0c27 SHA512 2ae1bb85618e73b3765323d0f6e8d2ac35aa471c1051b1559c752d567a7d7e4c1f4e5dd3558e20f5b5ee73d75a29da27914a39333ddf2e6e3818b8ae4496e57b WHIRLPOOL cc299c60414881559d80970d1c78b35ed3bd9d9c59a5ad8aaaf51c676109d72616f048f2c80c4bd125c889a35fb45a2f2e48ae7a2db68979805820de2a0df5ae -EBUILD gitlab-ce-10.1.1.ebuild 13708 SHA256 7a520ab8e941e465add0166146fe5e91ade4a80d1b29e3c15e03b0d712c18e0b SHA512 280c8f8a46599e6b25ba6bfbb861b95f4eb892aeedd1459bf1669a532638a309fe7ac64b886e596c9b8b5cadb30f7ed224cb641b3ad6da16708498596125e946 WHIRLPOOL 709eedc354d5d7bd36d1f08ebad94b7247563e0a219263bb84406a238f0126577f554376e732691860539de610bf7c4b1ade46854c2f8e924a2529940387e9b0 +EBUILD gitlab-ce-10.1.7.ebuild 13679 SHA256 9c1bec7e86d46422f87baecaece80197c506b758eab28fd85fc214512ff67e3c SHA512 6958f3f67b7d8729519175337b5e411b9d32fa3e7348105870d5f35c938e905cc60e7af23802b1b5835610c72e9a76ca50c229f5d862403ffd5065e82ee39d25 WHIRLPOOL 6caf644203291c7903f7c67a93e3f11a3f8d632e01384390742bc8b1fc4068e494f750c44817f0143a0f6eeaadbb4a7243c4194397fded59956363b49bd32ae4 EBUILD gitlab-ce-9.0.13.ebuild 13139 SHA256 ecdcd1d6ca3999eb4b299628bac4c97a231cfcf682569cc1a0c11241cfcb6099 SHA512 8a6b8f3f05f54a752d57651b34ba4f6310e6695ea6eea1bbebe4a1dd38aa9ea0e9030bd59448a886918e20ea81f1b167236712e21fb6c43b7fb50b79565e2d87 WHIRLPOOL 0873a646dcb208e8c006e0e587fc03003594fd00e790e22d89839c9ffb8b7403a2df7b306ddfb817ea10a32e58d095d97989591de18ca78782bd468ae1fb8bc7 EBUILD gitlab-ce-9.1.10.ebuild 13295 SHA256 a69c179d072e76597091d825956bc308a25757a95406444a95a4ccbe9fe8ee9e SHA512 cc01ae887bce9e838eb020c7b414de4f80c5cc94762bd7c65fc5f6ab732b3ac7447f3f136b054557a5a93d09ed946b821d027fe29d7fdeea6eaaa6fc336cf394 WHIRLPOOL 1778e46da386704fbecc9e62769b9ab6ccdb40ee1028ef33607b4668e3fafbd0996ff4397128d8320098e3bf5c8f1d47a227e3c61a73a26a63663223790c8107 EBUILD gitlab-ce-9.2.10.ebuild 13040 SHA256 ace7b7561f499e43c19284153358b718275ac55792650391f39fa4ab89941c20 SHA512 22c8723251fefd50739ac082f04c377543f659720346cd29680d4956a2d6a37bb27b2c6beb723c09f49d7e478375e6679940f63f43c644564155a0eaffe300ed WHIRLPOOL 9601c5fcdc9b8d753a58ea4b4606957f3d09e63834335703896f55b16c41df7b81ef00b64e57f4409322789dcaa3745d60b31a973950c99037895d71a38ddaf2 diff --git a/www-apps/gitlab-ce/gitlab-ce-10.1.7.ebuild b/www-apps/gitlab-ce/gitlab-ce-10.1.7.ebuild new file mode 100644 index 0000000..7c91a89 --- /dev/null +++ b/www-apps/gitlab-ce/gitlab-ce-10.1.7.ebuild @@ -0,0 +1,435 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# 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="ruby23" + +inherit eutils ruby-ng user systemd + +MY_PV="v${PV/_/-}" +MY_GIT_COMMIT="d3016d86a9c0855d94e2da53b9512974a7795b8f" + +GITLAB_GITALY_VERSION="0.43.1" +GITLAB_PAGES_VERSION="0.6.0" +GITLAB_SHELL_VERSION="5.9.3" +GITLAB_WORKHORSE_VERSION="3.2.0" + +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 ~arm64" +IUSE="kerberos mysql +postgres +unicorn systemd pages 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-libs/re2 + dev-util/ragel + >=net-libs/nodejs-4.3.0 + >=sys-apps/yarn-0.17.0 + postgres? ( >=dev-db/postgresql-9.6:* ) + mysql? ( virtual/mysql ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake + virtual/pkgconfig" +COMMON_DEPEND=" + ${GEMS_DEPEND} + ~dev-vcs/gitlab-shell-${GITLAB_SHELL_VERSION} + >=dev-vcs/git-2.8.4 + ~www-servers/gitlab-workhorse-${GITLAB_WORKHORSE_VERSION} + kerberos? ( !app-crypt/heimdal ) + rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/26 ) + pages? ( ~www-servers/gitlab-pages-${GITLAB_PAGES_VERSION} ) + ~www-servers/gitlab-gitaly-${GITLAB_GITALY_VERSION}" +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.15.4" + +# +# 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 +# +PATCHES=( + "${FILESDIR}/01-${PN}-8.7.5-fix-sendmail-config.patch" + "${FILESDIR}/02-${PN}-9.0.0-fix-redis-config-path.patch" + "${FILESDIR}/03-${PN}-9.4.0-database.yml.patch" + "${FILESDIR}/04-${PN}-9.3.0-fix-check-task.patch" + "${FILESDIR}/05-${PN}-9.0.0-replace-sys-filesystem.patch" + "${FILESDIR}/06-${PN}-8.17.0-fix-webpack-config.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}" + +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 + local run_path=/run/${MY_NAME} + + 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/|" \ + -e "/path: \\/home\\/git\\/repositories\\/$/ s|/home/git/repositories/|/var/lib/git/repositories/|" \ + -e "/gitaly_address:/ s|/home/git/gitlab/tmp/sockets/private/|${run_path}/sockets/|" \ + config/gitlab.yml.example || die "failed to filter gitlab.yml.example" + + sed -i -E \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ + -e "s|/home/git/gitlab/log|${LOGS_DIR}|g" \ + -e "s|/home/git/gitlab|${DEST_DIR}|g" \ + config/unicorn.rb.example || die "failed to filter unicorn.rb.example" + + sed -i \ + -e "s|/home/git/gitlab/tmp|${run_path}|g" \ + 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}"/ + 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.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-9.3.5-sidekiq.init + use unicorn && rcscript=gitlab-9.3.5-unicorn.init + + cp "${FILESDIR}/${rcscript}" "${T}" || die + sed -i \ + -e "s|@USER@|${MY_USER}|g" \ + -e "s|@GITLAB_BASE@|${dest}|g" \ + -e "s|@LOGS_DIR@|${logs}|g" \ + "${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 + if use mysql ; then + ewarn "You must grant the GitLab user permissions the following on the database:" + ewarn " mysql -u root -p -e \\" + ewarn " \"GRANT TRIGGER ON \`gitlab\`.* TO 'gitlab'@'localhost';\"" + ewarn "PLEASE also read this document about needed migrations on MySQL:" + ewarn + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + ewarn + ewarn "Failing to follow those instructions may make the config phase fail!" + 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 + + 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 + # + if [ -d "${DEST_DIR}/.git" ]; then + local update=true + else + local update=false + fi + + if use mysql ; then + ewarn "Please only proceed if you've read and understood the following page:" + ewarn "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/database_mysql.md" + if [ "${update}" = 'true' ]; then + ewarn "Failing to follow those instructions may cause the upgrade to fail" + fi + ewarn + ewarn "Press any key to continue, or abort with Ctrl+C" + read + fi + + ## Initialize app ## + + local RAILS_ENV="production" + local RUBY=${RUBY:-/usr/bin/ruby} + local BUNDLE="${RUBY} /usr/bin/bundle" + + if [ "${update}" = 'true' ]; then + einfo "Migrating database ..." + exec_rake db:migrate + + einfo "Compiling GetText PO files ..." + exec_rake gettext:compile + + # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 + einfo "Migrating iids ..." + exec_rake migrate_iids + + einfo "Installing npm modules ..." + exec_rake yarn:install + + einfo "Cleaning old precompiled assets ..." + exec_rake gitlab: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 + + einfo "Compiling GetText PO files ..." + exec_rake gettext:pack + exec_rake gettext:po_to_json + + einfo "Installing npm modules ..." + exec_rake yarn:install + fi + + einfo "Precompiling assests ..." + exec_rake gitlab:assets:compile + + 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 + if ! use systemd ; then + elog "You may also run" + elog " /etc/init.d/gitlab check" + elog " for convenience." + fi +} + +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} NODE_ENV=${RAILS_ENV}" + + echo " ${command}" + su -l ${MY_USER} -c " + export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8; export NODE_PATH=${DEST_DIR}/node_modules + cd ${DEST_DIR} + ${command}" \ + || die "failed to run rake $@" +} From 7a457ed31ee6f335a359dce835244abb2acd58e2 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 9 Feb 2018 02:47:24 +0100 Subject: [PATCH 7/9] it compiles!!! --- www-servers/gitlab-pages/Manifest | 3 +- .../files/0001-fix-Makefile-0.6.0.patch | 18 +++++ .../gitlab-pages/gitlab-pages-0.6.0.ebuild | 68 +++++++++++++++++++ .../gitlab-pages-0.6.0.ebuild.bak | 62 +++++++++++++++++ 4 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch create mode 100644 www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild create mode 100644 www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak diff --git a/www-servers/gitlab-pages/Manifest b/www-servers/gitlab-pages/Manifest index a643d16..7d93c0d 100644 --- a/www-servers/gitlab-pages/Manifest +++ b/www-servers/gitlab-pages/Manifest @@ -14,6 +14,7 @@ EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c0249 EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039 EBUILD gitlab-pages-0.4.4.ebuild 1436 SHA256 8f496c129cd8bff8dca1d882713ed9f460458bb887c34a2926c03e4057e893d6 SHA512 a4c90b718ef63888e454c4a48949a9713dfa44f354556a840f6e78b86e46d90f5c922c83ea3b2b35fdb5ab5168f6cdff1004666e3dba0b6acee95aecde040afb WHIRLPOOL d18824f792e1b541f833e3fcedd049956f8177bd4c5cdf75dc6e6e28aa983be69a7475d82b6a1427a87619d288321533019aad0802cce1bfbc118a1c76644b47 EBUILD gitlab-pages-0.5.1.ebuild 1436 SHA256 4832678c91a3ac6f68894a9512ee60e2037600a26d7883d72bf77857781c823f SHA512 9395ed1bed70268b5db9540491a2b16bad0f85aaf2b0f32c3307cc0f1acbbb7aa59b44d059d45621dac9ee7d1bf97b4fe0b3f8083001099b09a14b358c52ae37 WHIRLPOOL b3fc7ad05039d1a0e652ed0224c3e6ff76d4ae9bf1ef8114503e7cb73cb35a0e4de7550a06b108ee284e294e31c691872d6587ca58ebf6a9bed6b169de391903 -EBUILD gitlab-pages-0.6.0.ebuild 1449 SHA256 222470c87b9b2746fc32f6524f5b97f898b7d872eb68ad6f46234a34631a2d6a SHA512 097bb10d29c4304b86d1e492a24c68c34ebda1df606306a3802896884d65a27eda0f1264198e71da57e8ce9aa94be70c5dfb8639c87e814af46c094c83c1a059 WHIRLPOOL 8476550cddec6c25a2dacebfbb8043d2237c0a0c235509039dc9296de7175859ca4b7919ac10a20052190e8bc10287e08938efb92c4dae9fda461278ae5d14be +EBUILD gitlab-pages-0.6.0.ebuild 1797 SHA256 5c463ae69f757e284d1b399dfc883af0c0b2ab44068a144d43c8648b94b3e5b6 SHA512 2bcd33d643adbcafcbdea8a01c53a98fe60bb65ca894214b939ef0e8b2ae85db2bd39b658794a89c38d30b0d2a6a3a28e5be674d6eec384bcae4ccc0be4ca962 WHIRLPOOL 95ea32b9b49bcf05fd21ac2b77182c735401f8e42a0c3cafc06f7ca3c002b69fcf22658b6f856ce83a697bc5389890c034cc2df06f9d354b01eadab3ffdfb140 MISC ChangeLog 2227 SHA256 c1084119d1a8d5b58d8916b3c8270cfb8aced8d761c777b4be7c9ec942914ff0 SHA512 d66a020879462cacba6ed0e7118db12426b5d5ec3256dbc4dca78e80db87bf513b900557f672c4445734970435184b50790b3b9fe90ba930ef4e6cf526e82cd6 WHIRLPOOL 5b95f489d4cf4f3f278c3277efda3482da83b527fc23c2036c635145fb8ac77d21ed9299646295438aacc88a410e796d6e5c9f73561941731a6fa9019c73b8f9 +MISC gitlab-pages-0.6.0.ebuild.bak 1449 SHA256 222470c87b9b2746fc32f6524f5b97f898b7d872eb68ad6f46234a34631a2d6a SHA512 097bb10d29c4304b86d1e492a24c68c34ebda1df606306a3802896884d65a27eda0f1264198e71da57e8ce9aa94be70c5dfb8639c87e814af46c094c83c1a059 WHIRLPOOL 8476550cddec6c25a2dacebfbb8043d2237c0a0c235509039dc9296de7175859ca4b7919ac10a20052190e8bc10287e08938efb92c4dae9fda461278ae5d14be MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch b/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch new file mode 100644 index 0000000..3cc1ec9 --- /dev/null +++ b/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch @@ -0,0 +1,18 @@ +diff --git a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk +index 309083f..b9f3bc1 100644 +--- a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk ++++ b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk +@@ -1,12 +1,6 @@ +-REVISION := $(shell git rev-parse --short HEAD || echo unknown) +-LAST_TAG := $(shell git describe --tags --abbrev=0) +-COMMITS := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`) ++REVISION := @@REVISION@@ + VERSION := $(shell cat VERSION) + +-ifneq (v$(VERSION),$(LAST_TAG)) +- VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION)) +-endif +- + VERSION_FLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.REVISION=$(REVISION)"' + + # cd into the GOPATH to workaround ./... not following symlinks diff --git a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild new file mode 100644 index 0000000..68c85d8 --- /dev/null +++ b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." + +EGIT_COMMIT="15c938ca" +MY_PV="v${PV/_/-}" +SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=${MY_PV} -> ${P}.tar.bz2" + +EGO_BUILD_FLAGS="-ldflags '-X main.Version ${PV} -X main.REVISION ${EGIT_COMMIT}'" + +inherit eutils golang-build golang-vcs-snapshot user + +DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages" + +KEYWORDS="~amd64 ~x86 ~arm ~arm64" +LICENSE="MIT" +SLOT="0/${PVR}" + +DEPEND=">=dev-lang/go-1.8.3" + +RESTRICT="test mirror" + +MY_USER="gitlab_pages" + +pkg_setup() { + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 -1 -1 ${MY_USER} +} + +#src_prepare() { +# epatch "${FILESDIR}/0001-fix-Makefile-0.6.0.patch" +# +# sed -i -E \ +# -e "s/@@REVISION@@/${EGIT_COMMIT}/" \ +# src/gitlab.com/gitlab-org/${PN}/Makefile.internal.mk +# +# eapply_user +#} + +src_compile() { +# emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all + # silly golang-build_src_compile doesn't work. some crap about + # escaping ... + ego_pn_check + env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -work -x -ldflags "-X main.Version=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}" || die +} + +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}" +} diff --git a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak new file mode 100644 index 0000000..5e56029 --- /dev/null +++ b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit eutils golang-build golang-vcs-snapshot user + +EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." + +MY_PV="v${PV/_/-}" +MY_GIT_HASH="15c938ca" + +DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI" +HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages" +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}" + +DEPEND=">=dev-lang/go-1.8.3" + +RESTRICT="test mirror" + +MY_USER="gitlab_pages" + +pkg_setup() { + enewgroup ${MY_USER} + enewuser ${MY_USER} -1 -1 -1 ${MY_USER} +} + +src_prepare() { + epatch "${FILESDIR}/0001-fix-Makefile-0.6.0.patch" + + sed -i -E \ + -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ + src/gitlab.com/gitlab-org/${PN}/Makefile.internal.mk + + 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}" +} From 81f04b4d5e3a60a2ca18841d582db4023e85ea0d Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 9 Feb 2018 03:30:09 +0100 Subject: [PATCH 8/9] www-servers/gitlab-pages: Add working ebuild for version 0.6.0. Finally! Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- www-servers/gitlab-pages/ChangeLog | 7 +++ www-servers/gitlab-pages/Manifest | 16 +++-- .../files/0001-fix-Makefile-0.6.0.patch | 18 ------ .../gitlab-pages/gitlab-pages-0.4.0.ebuild | 3 +- .../gitlab-pages/gitlab-pages-0.4.1.ebuild | 3 +- .../gitlab-pages/gitlab-pages-0.4.2-r1.ebuild | 3 +- .../gitlab-pages/gitlab-pages-0.4.4.ebuild | 3 +- .../gitlab-pages/gitlab-pages-0.5.1.ebuild | 3 +- .../gitlab-pages/gitlab-pages-0.6.0.ebuild | 31 +++++----- .../gitlab-pages-0.6.0.ebuild.bak | 62 ------------------- 10 files changed, 34 insertions(+), 115 deletions(-) delete mode 100644 www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch delete mode 100644 www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak diff --git a/www-servers/gitlab-pages/ChangeLog b/www-servers/gitlab-pages/ChangeLog index 2ee9781..833ef7f 100644 --- a/www-servers/gitlab-pages/ChangeLog +++ b/www-servers/gitlab-pages/ChangeLog @@ -1,3 +1,10 @@ + 09 Feb 2018; Manuel Friedli + -files/0001-fix-Makefile-0.6.0.patch, -gitlab-pages-0.6.0.ebuild.bak, + gitlab-pages-0.4.0.ebuild, gitlab-pages-0.4.1.ebuild, + gitlab-pages-0.4.2-r1.ebuild, gitlab-pages-0.4.4.ebuild, + gitlab-pages-0.5.1.ebuild, gitlab-pages-0.6.0.ebuild: + www-servers/gitlab-pages: Add working ebuild for version 0.6.0. Finally! + 17 Sep 2017; Manuel Friedli -gitlab-pages-0.5.0.ebuild: www-servers/gitlab-pages: Prune unneeded ebuild. diff --git a/www-servers/gitlab-pages/Manifest b/www-servers/gitlab-pages/Manifest index 7d93c0d..d88ca21 100644 --- a/www-servers/gitlab-pages/Manifest +++ b/www-servers/gitlab-pages/Manifest @@ -1,6 +1,5 @@ AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 AUX 0001-fix-Makefile-0.4.0.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3 -AUX 0001-fix-Makefile-0.6.0.patch 830 SHA256 ad084ee3f83a3ee8097bd80e8990e00c927f109f8c712da67712c76b7ef91bda SHA512 221a7504396a96711da3852bbf71791f1a7b849121f6a24c2582e917b4966597d10291dea439cec91539f3a9ad599bcb34252e3a08a7214bd3d642181b07f723 WHIRLPOOL a46e2289a86560f223db0dd4e1c3c493497bb10bdeaa1d3b5faf24eb11674074fd25f35cd7df9670e4769be4d3e7ea97b4cc1cced3cef4dedc25a980bdeb6b60 AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301 AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0 DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1bd76ea305902e4885746280755c3ea0 SHA512 9ff1d51655c0af93eca0b3a7e5cf250ce9a6787b3bc5eabcb59207ca3af13b6972bbebbc9c4a05bc1056cd12d6ad4c4bc30700efb656a2b9cfedf71ef57666e2 WHIRLPOOL 064625dfbfd428da5ecbf7ceb0532ff16e61ef9fbdbe1f4f72824e06ca21a93266a3d5eeec730f6423cb9d5d26d99fc6dbb568f30a79c4a691a0fdb08301c1cf @@ -9,12 +8,11 @@ DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e527389951 DIST gitlab-pages-0.4.4.tar.bz2 209229 SHA256 e3024edf56a61e8705f4fb5db2141087f16db1fe550d116e950137b92b201720 SHA512 5618e659ddd91a3398cd7eb00e38292e3bc88b31af91c02815dfe810a5a478d7eb2314430478e4e2971f36a44ac37a2c9ed01bd357d1f8737a8a63fc697821e7 WHIRLPOOL 52cec732705285e2270ad1fda43088ce0c6e0dbf652f7cc29e77dd68cb23ebe913c0c71af0337a59f77f351b207e79469bdbcf5531f6ee6714695af0d08c3497 DIST gitlab-pages-0.5.1.tar.bz2 224270 SHA256 b61ed9c12baf197dfd466342301ccb3160fbfe8fe61270a31a72e5503504f50b SHA512 973615efb54290c0d6b41455d91bf6343d8b09687565b8ad5e72cd69faea99cc3819c3aabea9e7cb94414a61835104e052affb1072ed62b1e2f343517eb94184 WHIRLPOOL 421500d5f0cee352a95dd59e9b799a9b3fd6b7639c656bd54fa601e061ddaa5062fa0b6a567bfce2543dcf9755b824a81362171c779db2f3f238faf760a6c472 DIST gitlab-pages-0.6.0.tar.bz2 237765 SHA256 2bd99b5c4a1ad05ac02f17f5b450c308d1ef5936ff2e44be706705df8376c41b SHA512 935572062268c8a8429634377e02060f55feb2dfbd6b16e4487c1c4043dff435c304798dd2097f381f1c2e175c21d840e2dee76851dc9e03eeaa49d2b003900d WHIRLPOOL 01541d143a9511911cdd7c0c97d63cc48c682b19392c96ae429d98eeba6aba220e811d4da6826da2d417439202a33fc7a0deb16a9dda8a5a65f0e6b0fa9adf54 -EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3 -EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53 -EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039 -EBUILD gitlab-pages-0.4.4.ebuild 1436 SHA256 8f496c129cd8bff8dca1d882713ed9f460458bb887c34a2926c03e4057e893d6 SHA512 a4c90b718ef63888e454c4a48949a9713dfa44f354556a840f6e78b86e46d90f5c922c83ea3b2b35fdb5ab5168f6cdff1004666e3dba0b6acee95aecde040afb WHIRLPOOL d18824f792e1b541f833e3fcedd049956f8177bd4c5cdf75dc6e6e28aa983be69a7475d82b6a1427a87619d288321533019aad0802cce1bfbc118a1c76644b47 -EBUILD gitlab-pages-0.5.1.ebuild 1436 SHA256 4832678c91a3ac6f68894a9512ee60e2037600a26d7883d72bf77857781c823f SHA512 9395ed1bed70268b5db9540491a2b16bad0f85aaf2b0f32c3307cc0f1acbbb7aa59b44d059d45621dac9ee7d1bf97b4fe0b3f8083001099b09a14b358c52ae37 WHIRLPOOL b3fc7ad05039d1a0e652ed0224c3e6ff76d4ae9bf1ef8114503e7cb73cb35a0e4de7550a06b108ee284e294e31c691872d6587ca58ebf6a9bed6b169de391903 -EBUILD gitlab-pages-0.6.0.ebuild 1797 SHA256 5c463ae69f757e284d1b399dfc883af0c0b2ab44068a144d43c8648b94b3e5b6 SHA512 2bcd33d643adbcafcbdea8a01c53a98fe60bb65ca894214b939ef0e8b2ae85db2bd39b658794a89c38d30b0d2a6a3a28e5be674d6eec384bcae4ccc0be4ca962 WHIRLPOOL 95ea32b9b49bcf05fd21ac2b77182c735401f8e42a0c3cafc06f7ca3c002b69fcf22658b6f856ce83a697bc5389890c034cc2df06f9d354b01eadab3ffdfb140 -MISC ChangeLog 2227 SHA256 c1084119d1a8d5b58d8916b3c8270cfb8aced8d761c777b4be7c9ec942914ff0 SHA512 d66a020879462cacba6ed0e7118db12426b5d5ec3256dbc4dca78e80db87bf513b900557f672c4445734970435184b50790b3b9fe90ba930ef4e6cf526e82cd6 WHIRLPOOL 5b95f489d4cf4f3f278c3277efda3482da83b527fc23c2036c635145fb8ac77d21ed9299646295438aacc88a410e796d6e5c9f73561941731a6fa9019c73b8f9 -MISC gitlab-pages-0.6.0.ebuild.bak 1449 SHA256 222470c87b9b2746fc32f6524f5b97f898b7d872eb68ad6f46234a34631a2d6a SHA512 097bb10d29c4304b86d1e492a24c68c34ebda1df606306a3802896884d65a27eda0f1264198e71da57e8ce9aa94be70c5dfb8639c87e814af46c094c83c1a059 WHIRLPOOL 8476550cddec6c25a2dacebfbb8043d2237c0a0c235509039dc9296de7175859ca4b7919ac10a20052190e8bc10287e08938efb92c4dae9fda461278ae5d14be +EBUILD gitlab-pages-0.4.0.ebuild 1937 SHA256 a6252e17b9a61dc39dce932e58c0c8071ade36127c38935346feeb9c3ec3a453 SHA512 bc6fbec72653225b22b1a9b559872f6df801629f87fce39aba26e096b30a995c844b2443cabffc157e89f0b961b150ff5c48c628bc7d7c448b763003d6eec9bc WHIRLPOOL 0b2a0e2de2d4719efd5d32cb7252402f46d6957c1166a8b8515a45a2e4cc3d209bc1079d6fbacb07dd17f7cf90359e71612bfe8c4eb7c4a3f1d3d9f3beb7a556 +EBUILD gitlab-pages-0.4.1.ebuild 1937 SHA256 5013b00300c4a3f0e3cdf00aee18409cbd0f18e413fe0ecf8c343402ccc9015c SHA512 fdb22d842d465abca85aa9860be1d2072ef023f15a604d5e3a16fcf3e5941a6f87f8783899e38b0e118347246a8d285f62ff1f19fa57200d1cc5551b3aa932f4 WHIRLPOOL f5733133d13d01652f36c32489ca1a688fb56d83aa50f65bcd4691389c337f827f2003555cac0a4d71ffd2f2c10746dd5d57953278d688ca19041c9f34c6c2fc +EBUILD gitlab-pages-0.4.2-r1.ebuild 1427 SHA256 70a53b600d498736734ff44c51fd468113bcdcc6f76fad58e49482f7c2b7acbb SHA512 b9954da56a2ed1e95cfeb9cf3554377a08e44f3b069c77f85bfe11d10203957aa4ca29a87e19fd3dabd372c6f5900db68f4ff146ca160eecbabdb82f1be3ff83 WHIRLPOOL 958d5775fb2fc0df06adbcf51af950587235202f3fc2e80cad2102c17d0709da03212010a5907343cf112fe49fd669eec02066a1613d2600095c69e40634ed0a +EBUILD gitlab-pages-0.4.4.ebuild 1429 SHA256 7cb07e955aa0b73c88258c0c33125346e37e66f273fbede3e637cda08cadb1c2 SHA512 5d7ad52cfa4be4c1998b67ec59b7fbd727f477163fc1766806e5a2d0fec7131ae8cb5eb7c30161cdae1a88207098d526d5a84532dd1d2cdcd55e639950e6f169 WHIRLPOOL 1ae33c7f518e2cd3800e3b817aba46786df8ede9690b1dcd7c7710bd882795ffa3fc2cb1c0eb01a0da1ee65e074d020885e9ea8a1a74a4696ec09709f4bb5432 +EBUILD gitlab-pages-0.5.1.ebuild 1429 SHA256 be42145727bdc839161d6ac74bde5f59f7b69d2c204988e328d6ad2f02ee8704 SHA512 a585ab78624455480bd11ae599bc299a27e99b905b5fd686d71c0c06c157b937e63a46235fdbca758e47a938612b202d1887ef8749c5bd7c3abcf2fa5f48dfee WHIRLPOOL 57d1ace304dc994b27eb1d550885de5356cb2ce07e1d80c7a3c4f1c425115e59bce9220470e8ad9808b1f38d7bcd028ddd43dd04424f8556355417c81ec78a00 +EBUILD gitlab-pages-0.6.0.ebuild 1800 SHA256 7522d58e9b03a923f2e39cd6607c978485fcf3bd5d031f22c5c1831ffa81bb4f SHA512 487381485e2a9cecd8c7dc7a553ab5d107a49db9c77cd0c3d77c97c8e65f43207e6e5fe853959fed2df085a9047ee55b0ea332b8e507338b6ab44004bc7173db WHIRLPOOL efb8a378df194d37b6e59663b488aaa1608b7650489b160d59e98eada7e9f5328287f99843db7e2ebbfeaceaf2ebffc0863ffae915cc8c8f5b7e0a6a66a7206c +MISC ChangeLog 2598 SHA256 a002afebd0b3184390ad83a94408116069396ad3902cfbcb1ac97bb31656f6ae SHA512 eb3a66abf26896211f5ae048c07ac015e7cb6e907585568ddb01c4e01f239f8234bdcf2f171f8fb368a5ee21ae95f8a301ab599c6eda42f3eff2ef5520e707a6 WHIRLPOOL 9f6bf0edbda91a3ad2b58722f9bd7d7e0a962892dd2f2263ecf13dd515b1397a08948f0d695d65e78b545d97950072b7ae79d646908e69a920cb8b27be0b2c32 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch b/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch deleted file mode 100644 index 3cc1ec9..0000000 --- a/www-servers/gitlab-pages/files/0001-fix-Makefile-0.6.0.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk -index 309083f..b9f3bc1 100644 ---- a/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk -+++ b/src/gitlab.com/gitlab-org/gitlab-pages/Makefile.internal.mk -@@ -1,12 +1,6 @@ --REVISION := $(shell git rev-parse --short HEAD || echo unknown) --LAST_TAG := $(shell git describe --tags --abbrev=0) --COMMITS := $(shell echo `git log --oneline $(LAST_TAG)..HEAD | wc -l`) -+REVISION := @@REVISION@@ - VERSION := $(shell cat VERSION) - --ifneq (v$(VERSION),$(LAST_TAG)) -- VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION)) --endif -- - VERSION_FLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.REVISION=$(REVISION)"' - - # cd into the GOPATH to workaround ./... not following symlinks diff --git a/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild index e2b5c93..273a553 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.4.0.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild index 51e2bcc..be4b880 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.4.1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild index 0478b06..f4e2cb7 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.4.2-r1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-pages/gitlab-pages-0.4.4.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.4.4.ebuild index 885e133..41d3377 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.4.4.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.4.4.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-pages/gitlab-pages-0.5.1.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.5.1.ebuild index 58b39a3..719ad49 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.5.1.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.5.1.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 inherit eutils golang-build golang-vcs-snapshot user diff --git a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild index 68c85d8..b464a6c 100644 --- a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild +++ b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=6 EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." @@ -9,7 +8,7 @@ EGIT_COMMIT="15c938ca" MY_PV="v${PV/_/-}" SRC_URI="https://gitlab.com/gitlab-org/${PN}/repository/archive.tar.bz2?ref=${MY_PV} -> ${P}.tar.bz2" -EGO_BUILD_FLAGS="-ldflags '-X main.Version ${PV} -X main.REVISION ${EGIT_COMMIT}'" +EGO_BUILD_FLAGS="-ldflags '-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}'" inherit eutils golang-build golang-vcs-snapshot user @@ -31,26 +30,26 @@ pkg_setup() { enewuser ${MY_USER} -1 -1 -1 ${MY_USER} } -#src_prepare() { -# epatch "${FILESDIR}/0001-fix-Makefile-0.6.0.patch" -# -# sed -i -E \ -# -e "s/@@REVISION@@/${EGIT_COMMIT}/" \ -# src/gitlab.com/gitlab-org/${PN}/Makefile.internal.mk -# -# eapply_user -#} - src_compile() { -# emake GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" RELEASE=true -C src/${EGO_PN%/*} all # silly golang-build_src_compile doesn't work. some crap about # escaping ... ego_pn_check - env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -work -x -ldflags "-X main.Version=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}" || die + set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go build -v -work -x -ldflags "-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}" + echo "$@" + "$@" || die } src_install() { - golang-build_src_install + # silly golang-build_src_install doesn't work. some crap about + # escaping ... + ego_pn_check + set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \ + go install -v -work -x -ldflags "-X main.VERSION=${PV} -X main.REVISION=${EGIT_COMMIT}" "${EGO_PN}" + echo "$@" + "$@" || die + golang_install_pkgs + dobin bin/* dodoc src/${EGO_PN%/*}/README.md src/${EGO_PN%/*}/CHANGELOG diff --git a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak b/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak deleted file mode 100644 index 5e56029..0000000 --- a/www-servers/gitlab-pages/gitlab-pages-0.6.0.ebuild.bak +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils golang-build golang-vcs-snapshot user - -EGO_PN="gitlab.com/gitlab-org/gitlab-pages/..." - -MY_PV="v${PV/_/-}" -MY_GIT_HASH="15c938ca" - -DESCRIPTION="Simple HTTP server written in Go made to serve GitLab Pages with CNAMEs and SNI" -HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-pages" -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}" - -DEPEND=">=dev-lang/go-1.8.3" - -RESTRICT="test mirror" - -MY_USER="gitlab_pages" - -pkg_setup() { - enewgroup ${MY_USER} - enewuser ${MY_USER} -1 -1 -1 ${MY_USER} -} - -src_prepare() { - epatch "${FILESDIR}/0001-fix-Makefile-0.6.0.patch" - - sed -i -E \ - -e "s/@@REVISION@@/${MY_GIT_HASH}/" \ - src/gitlab.com/gitlab-org/${PN}/Makefile.internal.mk - - 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}" -} From 38e2a2ecdf5bfcdfa18a2f47ab4cb62eef42b569 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 9 Feb 2018 09:02:06 +0100 Subject: [PATCH 9/9] dev-vcs/gitlab-runner: Add ebuild for verison 10.1.1 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- dev-vcs/gitlab-runner/ChangeLog | 6 ++++++ dev-vcs/gitlab-runner/Manifest | 10 +++++----- ...unner-10.1.0.ebuild => gitlab-runner-10.1.1.ebuild} | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) rename dev-vcs/gitlab-runner/{gitlab-runner-10.1.0.ebuild => gitlab-runner-10.1.1.ebuild} (97%) diff --git a/dev-vcs/gitlab-runner/ChangeLog b/dev-vcs/gitlab-runner/ChangeLog index ed9f75f..79b8872 100644 --- a/dev-vcs/gitlab-runner/ChangeLog +++ b/dev-vcs/gitlab-runner/ChangeLog @@ -1,3 +1,9 @@ +*gitlab-runner-10.1.1 (09 Feb 2018) + + 09 Feb 2018; Manuel Friedli +gitlab-runner-10.1.1.ebuild, + -gitlab-runner-10.1.0.ebuild: + dev-vcs/gitlab-runner: Add ebuild for verison 10.1.1 + *gitlab-runner-10.1.0 (06 Nov 2017) 06 Nov 2017; Manuel Friedli +gitlab-runner-10.1.0.ebuild: diff --git a/dev-vcs/gitlab-runner/Manifest b/dev-vcs/gitlab-runner/Manifest index e320e63..71f4633 100644 --- a/dev-vcs/gitlab-runner/Manifest +++ b/dev-vcs/gitlab-runner/Manifest @@ -3,10 +3,10 @@ AUX gitlab-runner-10.0.2.init 666 SHA256 42360338ff935726f6756c442de0fd381e10fb7 DIST gitlab-runner-10.0.2-prebuilt-arm.tar.xz 8548448 SHA256 b73a0690eef09c4f366342f98bec301020d47c16f98ac8a770f373dd81a76b04 SHA512 78919f68bbb31fce1792427b9067491b5ef0a557a184039eedf89110d47e875bc67c0a67fdd3165374c264aa411392dcda31574953e5ffacc2a141eaa85d4626 WHIRLPOOL 59cfe9d085318c3169da969846c216d7eb1b1f1a5ae52808f2721722fc6da48f25c87a1e2f257b7e3d9a0fc8e9d02e43622add867dc3403b2134c45715228ad8 DIST gitlab-runner-10.0.2-prebuilt-x86_64.tar.xz 9562480 SHA256 58c95075273f44ff926823aa9b5bf9fd4cb82c87adc27bef48d5bf985d629992 SHA512 ea9339db46d8e683de42802ec52b499941e189b754bc43f600b673942fbf947941ac2ad7f1d63a938341df7982865595d5dc0557a08db4c78bc64067b2709539 WHIRLPOOL d6c9e66344f7334336031cafdec91dadd8941739584a41c71837fb247b3fb970826f23697758a8a3497e6667d300f1dff0ce8fe146389de0da9d15e2bbd1e78e DIST gitlab-runner-10.0.2.tar.gz 3599514 SHA256 783c1c597a2b9ee78b2396852235010c5432804e8d65b65f49f4e3719f6da4c8 SHA512 9d8cac8441913c77c1b34dcf9f82ab1345d21f6a9553a7f895473289794c85c2675588b38c7cd390615c8e4cd14964c024562132b2b9dd88c9215ea165fc1c3d WHIRLPOOL e471f032040ffa3fbc0566df092425a19b3e9528907e87b49297512d665f187303baf24a918f855ee32fa0b1de3aac922a1ed13c8efcc22027e2fbd11fb2208d -DIST gitlab-runner-10.1.0-prebuilt-arm.tar.xz 8555400 SHA256 9c14a91d5398e8ef99e13b57afa7430aa660791cf8f045e52a4b9566f247f22f SHA512 26bf62162380cf17569b0f2b7bddcd8aa957901ce0bf514657280bdc46bddb192ed6151bc721a56681150703a5af994fd82a632c97978739d7b9ca13be1ff65b WHIRLPOOL f8860789dc8931d4bc7ca7b2acf939bf55aff06e6922806ae4382633c0b98d6d74a02751cad2f8c9e0ae9d43bc2bfdd7f4062b78ea3235d997df540ce1fea4ff -DIST gitlab-runner-10.1.0-prebuilt-x86_64.tar.xz 10449512 SHA256 24f7ac81a210ab46ee0852e7ec258ac0a9d3d14dec12dca5406d459435e60e41 SHA512 1e98c3869632cd3430d8bf78922d9d2ce92a4368458729b6a379f91fb5f19703c8bd3555609ba88b2ec7220851dc0d61bab8b78f398c4e88c77e3de96040c3a7 WHIRLPOOL cd5f1caf8869097f3e121e497734764ba574e62b16c39b620b7d77e7f344416b6b318a1d2f5092a424a1466a0c42cd0f7625c542e116f3fbd6a258e845c4f1fe -DIST gitlab-runner-10.1.0.tar.gz 3607520 SHA256 e180d387670330d2915505d27a7b4c3f5ab2b6d1c8bd5225927d379f8ec2fc29 SHA512 535ac63d2cc5101b5f20bd6d5ecb2ee0c2c20688326251dc86261e8dccb275ddfeaba43e523b3306fd480d01b74aa702f3d91e539f5a73ec8909b62c5fbcbb24 WHIRLPOOL 7f07af502ae0651ef7053edf038ad83f850dbb3a7a5b86dcd1baab1482d03e75bd09e0b064823b869fe30adf5601ebf59042efa21497f4180237d57cf186d1f2 +DIST gitlab-runner-10.1.1-prebuilt-arm.tar.xz 8557920 SHA256 b6d898276b3fce934a95e1ce1d91f518069c1792cab789a68e39f9ee1aa79a31 SHA512 bfebc71ac3e88f827557c3f0d207d5f97ffae8b7e8043ed0090eb16098cb6132dfe7babf694bde201fa07cd3eb19e1be25ec5b09e718e4e94d40cc7e9b87705c WHIRLPOOL 58dd2bdddf95a316f9daf85a8ac50ab4ef3ff4adee1ff1971fdf2afdbc4e0fdc70edbd3831d8aec2f8f2740b3f5da551dce30697dd0a42efebc02f9810bd60a3 +DIST gitlab-runner-10.1.1-prebuilt-x86_64.tar.xz 10469000 SHA256 398452fe5e1fdf8fafb5fde48336ea8f9de7fb09aec67b7f4851f7e6bec0de5f SHA512 714008d90f626eeff1471f5f44c9a9d4c9387e054a60ca8b454787f807591d611591e83757fb1f8aff5a70fa2afc285751f783a7ac729757f8d2c47e54242d3b WHIRLPOOL cdba3e037f458dfe8a65238b4173eaa86e70353eeab7918ad6af7ff54a405073922761d29fdb64f1840301be7dca4f60cc184f9a3e50ff85cb259e765aec4aa1 +DIST gitlab-runner-10.1.1.tar.gz 3607287 SHA256 f5bcc173e9694589ee199d9ff7da38c2996ecce8b121066982dda6f8b5a4ed43 SHA512 1a541637d3e1ff447c810fc8a6c51546fd39b98d643f5464629f3fa2fa87b38672a20653408344057fe7076a0b9661e75b3b05d96f665faf2b862f64f0ba9dfe WHIRLPOOL e6b1cd42ec24e281b27a4c2d438270433e4e760c10900f2834b29437ae4a1ed84cc82f8e64f968499045496179d80a397a8e25ce0a1b77dcbe6015a583cb97a9 EBUILD gitlab-runner-10.0.2.ebuild 2545 SHA256 59794dd6f33ce0fc0d1c997db7e5e4eaea226485aada8f700e3d183c2284e409 SHA512 4e9e6a93d621f595cc2b20ea4cb49afc0c9c4980b5ba13bec342994596caef0e0272fcd0b2deb087c96beebec283827916aa1b5594337febf592fd0251121327 WHIRLPOOL 5a48199473313fb247f621a8abf146fc794d02316b2cacba77fb3265047cc33115b26f2a21f58fb9648deb85c4c4c1f5190f6f3768bbeb4bc21a1373b5ac52b3 -EBUILD gitlab-runner-10.1.0.ebuild 2545 SHA256 fecf0891935e503b57e0d0be611f0c7817283ad3254da6241c8c2633600e2283 SHA512 c697e833eb4ebe727328b80620858dcdfc937a93efe61d543de337dc3bf53aaa790df86924223d17b21eba192d069bf485c8208c0506f26006712f92e09b2071 WHIRLPOOL 1f80536a619d20cb23713c099c1e11c1073104141c576269e80e942639e07b8508d37ee4c6694ec752c2e5074ab30642167c7583448ead42c88a5c7cfa26827c -MISC ChangeLog 867 SHA256 4a558bc5c9ee99ee54aa40cab068b9e345b3bf55bd88087506ff365c2e5e922e SHA512 2989fcb1c28d6e78331ea05184b1664181e1efe464a1639f051660a0dea33a7fc3c5e2411c0164c09deff9a98d9bfa2848b613fe855dfd30aa8191bbdb608bad WHIRLPOOL 6ef2a572d277214bf69814b15ae51a559330a5f7be2298917c0cc70a070434fcbf6e8d239bc3c954a87f6fd7d7d17368571f5e057b699227ba026685ea6831ba +EBUILD gitlab-runner-10.1.1.ebuild 2545 SHA256 7bdf62baddd6a43ee546937f8c87d10bdfda809ddbfd901471c62908c4363165 SHA512 543c36ea54fbfe74e755c17bf0660a9fac7d2841aee17ad99e95816d89606b4934aebee5a6e98621803a4f10a0342c2e9a41d69898c60da202655d1e1da1926c WHIRLPOOL 68f73d719fad6c9c8b849d664f9efb01af27877904e0360515374eb2b1c10f22058e8ae2081faf34f0058dac7579558b8309b089746f802bef0668243ada47e5 +MISC ChangeLog 1074 SHA256 315f7fdd93797e3935d61e17cd7d430e3df445d751fc26cb4d03adf27a1111c9 SHA512 0236d63ffe27f09d4be6af41e2cbf727ac641b3bbca8faa63b41a2ec56c092a0aca548adbe3a25646110dd1bdaf17daf3d45293ea82bc7773e9d1037e290219d WHIRLPOOL 83af0d384116aee290c58311e4c4f73fe9e99659ee8738184294183dcf28f895af73a0da73865e7eadec874bc471b26914fb3546c9f68cc4387e992ef2cdffa6 MISC metadata.xml 329 SHA256 f0ae08a64aa32a07486e744ce11ac5448770b7320454015bcd065e312fcb5e9c SHA512 11e4eaf25633c5979e5243350bdf2ddc6d9dca06ab54ec38359591f1d002ea2a224e53b3e6c4ac53b5b2e795a87769fdbd97c547b008272e0a1491141f422e5d WHIRLPOOL ab2c1cb3d9aff1f757b49633f94d4b98da4b83dadab12ab8d869f9e1f6763b3125010147472e58e910e7fc42da262dbd69a1bf3939f3720a79ab4329184b4c35 diff --git a/dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild b/dev-vcs/gitlab-runner/gitlab-runner-10.1.1.ebuild similarity index 97% rename from dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild rename to dev-vcs/gitlab-runner/gitlab-runner-10.1.1.ebuild index 257f289..ca877b1 100644 --- a/dev-vcs/gitlab-runner/gitlab-runner-10.1.0.ebuild +++ b/dev-vcs/gitlab-runner/gitlab-runner-10.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot user EGO_PN="gitlab.com/gitlab-org/gitlab-runner" -GITLAB_COMMIT="c1ecf97f" +GITLAB_COMMIT="a0152c4c" MY_PV="v${PV/_/-}"