From bf3219404091183f844e040e1b81dc73958f65be Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 17 Oct 2015 00:32:01 +0200 Subject: [PATCH 01/10] renamed everything from gitlabhq to gitlab-ce --- profiles/updates/4Q-2015 | 1 + www-apps/gitlab-ce/Manifest | 24 ++++++++++++++++++ .../files/gitlab-ce-7.13.1-fix-gemfile.patch} | 0 .../files/gitlab-ce-8.0.2-fix-gemfile.patch} | 0 .../gitlab-ce-fix-sendmail-config.patch} | 0 .../files/gitlab-git-http.service | 0 .../files/gitlab-sidekiq-8.init | 0 .../files/gitlab-sidekiq.init | 0 .../files/gitlab-sidekiq.service | 0 .../files/gitlab-unicorn-8.init | 0 .../files/gitlab-unicorn.init | 0 .../files/gitlab-unicorn.service | 0 .../{gitlabhq => gitlab-ce}/files/gitlab.conf | 0 .../gitlab-ce-7.14.3.ebuild} | 3 ++- .../gitlab-ce-8.0.2.ebuild} | 3 ++- .../gitlab-ce-8.0.3.ebuild} | 3 ++- .../gitlab-ce-8.0.4-r1.ebuild} | 3 ++- .../gitlab-ce-8.0.4.ebuild} | 3 ++- .../gitlab-ce-8.0.5.ebuild} | 3 ++- .../gitlab-ce-9999.ebuild} | 0 www-apps/{gitlabhq => gitlab-ce}/metadata.xml | 0 www-apps/gitlabhq/Manifest | 25 ------------------- 22 files changed, 37 insertions(+), 31 deletions(-) create mode 100644 profiles/updates/4Q-2015 create mode 100644 www-apps/gitlab-ce/Manifest rename www-apps/{gitlabhq/files/gitlabhq-7.13.1-fix-gemfile.patch => gitlab-ce/files/gitlab-ce-7.13.1-fix-gemfile.patch} (100%) rename www-apps/{gitlabhq/files/gitlabhq-8.0.2-fix-gemfile.patch => gitlab-ce/files/gitlab-ce-8.0.2-fix-gemfile.patch} (100%) rename www-apps/{gitlabhq/files/gitlabhq-fix-sendmail-config.patch => gitlab-ce/files/gitlab-ce-fix-sendmail-config.patch} (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-git-http.service (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-sidekiq-8.init (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-sidekiq.init (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-sidekiq.service (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-unicorn-8.init (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-unicorn.init (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab-unicorn.service (100%) rename www-apps/{gitlabhq => gitlab-ce}/files/gitlab.conf (100%) rename www-apps/{gitlabhq/gitlabhq-7.14.3.ebuild => gitlab-ce/gitlab-ce-7.14.3.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-8.0.2.ebuild => gitlab-ce/gitlab-ce-8.0.2.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-8.0.4.ebuild => gitlab-ce/gitlab-ce-8.0.3.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-8.0.4-r1.ebuild => gitlab-ce/gitlab-ce-8.0.4-r1.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-8.0.3.ebuild => gitlab-ce/gitlab-ce-8.0.4.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-8.0.5.ebuild => gitlab-ce/gitlab-ce-8.0.5.ebuild} (99%) rename www-apps/{gitlabhq/gitlabhq-9999.ebuild => gitlab-ce/gitlab-ce-9999.ebuild} (100%) rename www-apps/{gitlabhq => gitlab-ce}/metadata.xml (100%) delete mode 100644 www-apps/gitlabhq/Manifest diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015 new file mode 100644 index 0000000..ebe4cc3 --- /dev/null +++ b/profiles/updates/4Q-2015 @@ -0,0 +1 @@ +move www-apps/gitlabhq www-apps/gitlab-ce diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest new file mode 100644 index 0000000..9bce0b8 --- /dev/null +++ b/www-apps/gitlab-ce/Manifest @@ -0,0 +1,24 @@ +AUX gitlab-ce-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0 +AUX gitlab-ce-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1 +AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60 +AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265 +AUX gitlab-sidekiq-8.init 995 SHA256 179f8f9267f8358827c4c70697bf27dac728451ac7b9dbe0637d397850260fc2 SHA512 fca6c3b86788113f50120ada81859535bcdd3524ebf79e495c532049a5e1cb09b44499268b22610707ea4763bd6b380fe8abfad10520cd17b03802264c34f0bc WHIRLPOOL edc9c083447662bebdde5b0bbb97816f15a3122aa5cae966d1df805aac5a81e51a608cb5447283bda222af3bd28519b653a6ca6b34d1eef84abc37fd719e5955 +AUX gitlab-sidekiq.init 972 SHA256 614b405d16e2042d013dae510796620d42461512705fad2a90a7f558e0051c33 SHA512 afd3837ae660d47297c6d65180ae5f3ec6a15c1c8ea23aa5b715ca2fc5b628f3d868adf265c16521e940e5aeb53e4a70a2ec6c0acfacb6b39a1fb5bc669672fd WHIRLPOOL 434ae6e789fc8894a9c83bd538de804784c23072129c79fe0c209848e0c8e1a3d607ce9f7f9da617a25c874ce81d276d010d5ae2d3bf95e25034e9048cbd747a +AUX gitlab-sidekiq.service 1066 SHA256 b9a15ee7498cc5ebecfd51a037ab1e32e66723a1612d5ce9365eefd890b5670e SHA512 33ece22389637b7b4591f4dceedb488fb43a92ca47facb19432f87772bbbf1774d4fb737ace52a6d55533c9e291e343dc56971c6f70fed285a10429d6d97d318 WHIRLPOOL b5a81751b8317bb9244018f9ed82f9793734adbad9983c244429a33d710169eeeed25cdf868d724032866d83bb9676ccbbf616b53363491e15a80e474443f331 +AUX gitlab-unicorn-8.init 1680 SHA256 c74c6db7c7bbce85df66648e20c11215917041577733454c6590dff3aacf7362 SHA512 44461e070b19abb1ddfa297aa995b04412cd367fb252591a7faf871f958e78c92955c78ba51137fcd1933dce896a9d05efdf06cabbf2cbe86e138fb12ead1bdb WHIRLPOOL 313548a006a3431e8116edbf3d0ce8613a9e65e3725ba4fb3683e95ebf2b2afac3801900d372839e6dc9a0004d805b98889c47292e8622e918c73a3a5e2fc0de +AUX gitlab-unicorn.init 1657 SHA256 5fe794938b27d25488affc174e4761f5a3a1f9b15489a05f3839b13e4fd5b5ef SHA512 5e005ec26151afb4cdc8eb83592fad6814bb2a3ac8e9f642de83e70cd8615bdf969803a2479f8f72a70e0ae5ab5559da205965b55b3b4cdfdc9aa74055eef6fe WHIRLPOOL 6c61db597311ac618822fb22d7f51c830e5c011ce8e4c790338b3203a4483f3dd121bbd9cc33d7e1f92a2b0527e59816742f8ef0fd531c4c28c36d886fc94196 +AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792 +AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 +DIST gitlab-ce-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 +DIST gitlab-ce-8.0.2.tar.gz 8238940 SHA256 e17a889f33c85b86744ea7be7cabb69feb340b82a4f01706360a985ceb6fd0f3 SHA512 901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97 WHIRLPOOL 19e9c1f4ea7e0106dea552bc875e2bfd1f518fe6aeefa6934772ebb29ba388eaad0715e36fa53f22fdc7e90203eea380ae62fc0dc8b7ce999efb2ee05d0cc63b +DIST gitlab-ce-8.0.3.tar.gz 8238927 SHA256 b299b100f8963f86aaeab01ad4ba49ac034cf77e803cff0fa710065e3464a049 SHA512 e247b3677ca86f43e665623c3a2602ab33843860537813fa64e3cd33b408698f0482e1ce437a4a30976b0656977f86890173ca044b7d07bfdfda3d269d311802 WHIRLPOOL 710f473d8b6c06fff9e72258102653f24035d5533f257d2d6d842ae0598fb048c6e76f9706e3662a93a9d1ec34ef67a67686fdee7439fb776de686eae19120ea +DIST gitlab-ce-8.0.4.tar.gz 8238901 SHA256 644b4bc98907bb171a1281ae73ac510f1bc6d379d39020f61e1697bb73547ae8 SHA512 41d4e8088221beb4aab731cf0ddccba0be2e4746ece0e33f92ec5488a4ed759f1e18788efed2351f5a643c31f47b4138a33077313b27e4e4567c9e9ad8dc79e5 WHIRLPOOL 08157b0f82150a5245cb2985b704026dab5f6342ab9e080c3149850ea37be5482d2dfc330a8d441957c1d8383528d3e65eb41c70ccfbb4a49e4a442f6f24a56e +DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 +EBUILD gitlab-ce-7.14.3.ebuild 11065 SHA256 7467db73bb02a797716ee404a2c0ea8cf64b1839ec322c2f07f668ba5702da4c SHA512 d1884e08c7cd3013b4962a2453a6120391bbc3dc44fc24bb83134e2d99a5fadfbfa3942fb74c64efa617f7480de1674a3c82aaab8fe4ab7a8fbb7016188d29c1 WHIRLPOOL 5027632c4bd2f4ba4c6d55bd222aa1322751d245571b6b8b6f9bc394fcc7e7f42ac5455cf3d7a2b6a0bbc624f9c7e286e94b101686ff4e1656dc79169d750f9c +EBUILD gitlab-ce-8.0.2.ebuild 11138 SHA256 818e9255e49d922368e4d34b384a1d67825c59de5c7fa3ae453f4932b1107e15 SHA512 d2bcbc3cfca80042b178ca59ed5c73c3361f2e9dc0a23b76f6356c1d412b279df207a86ea06b25ef677918361429e8fb02779ec5f9399ca7c2a7fa9c39d26bae WHIRLPOOL a7812739fef390dec2583acc0c1cc50b0d32d105c0e490b59cc2b7a6878fdadc179895a16eb4642c8dd466cbe1ecbe986fc2e4c85d254501515c3355f450ebdc +EBUILD gitlab-ce-8.0.3.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79 +EBUILD gitlab-ce-8.0.4-r1.ebuild 11221 SHA256 af33dfb570403c56fc940e8f8eb74ef7def9f8ef52d74ae313a79498fe4fcc30 SHA512 38f6cb2b4cb309ddcec73373f41b456a3175c2a5112a818d6bce5c7f1e7e0982adfb53c67d24a6f38f562f6ed247b51a4a9b567ef3a5450d6a47c5011afc104f WHIRLPOOL b6177fde2402cd5525a2f7daa72ada600054bc2816acbf05b4b9d25176d04388bb8ca89ca793d55e52103b0ae38fa9d35024fb3448c115997e45526c09eee5ac +EBUILD gitlab-ce-8.0.4.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79 +EBUILD gitlab-ce-8.0.5.ebuild 11208 SHA256 41cc56507cf3ecc386f397738c4ebe5cac13b6f1e099e00985b9a7959ee08586 SHA512 ffb6c749309c35aae8e04ad553815d9dda324da4d6bc9678e08936f255601658d3977235a815fbea12bcb9c269be98a807f22f32d4bae9e85a2d500f6b771982 WHIRLPOOL 2c7964e82bad883e0ce7f08eea6dc9d84c63a6b5b9a76b412dab78ce1726992812c6376bf02541c02728817a42c71167869595fb73370e914b303faad1ab1568 +EBUILD gitlab-ce-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6 +MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlabhq/files/gitlabhq-7.13.1-fix-gemfile.patch b/www-apps/gitlab-ce/files/gitlab-ce-7.13.1-fix-gemfile.patch similarity index 100% rename from www-apps/gitlabhq/files/gitlabhq-7.13.1-fix-gemfile.patch rename to www-apps/gitlab-ce/files/gitlab-ce-7.13.1-fix-gemfile.patch diff --git a/www-apps/gitlabhq/files/gitlabhq-8.0.2-fix-gemfile.patch b/www-apps/gitlab-ce/files/gitlab-ce-8.0.2-fix-gemfile.patch similarity index 100% rename from www-apps/gitlabhq/files/gitlabhq-8.0.2-fix-gemfile.patch rename to www-apps/gitlab-ce/files/gitlab-ce-8.0.2-fix-gemfile.patch diff --git a/www-apps/gitlabhq/files/gitlabhq-fix-sendmail-config.patch b/www-apps/gitlab-ce/files/gitlab-ce-fix-sendmail-config.patch similarity index 100% rename from www-apps/gitlabhq/files/gitlabhq-fix-sendmail-config.patch rename to www-apps/gitlab-ce/files/gitlab-ce-fix-sendmail-config.patch diff --git a/www-apps/gitlabhq/files/gitlab-git-http.service b/www-apps/gitlab-ce/files/gitlab-git-http.service similarity index 100% rename from www-apps/gitlabhq/files/gitlab-git-http.service rename to www-apps/gitlab-ce/files/gitlab-git-http.service diff --git a/www-apps/gitlabhq/files/gitlab-sidekiq-8.init b/www-apps/gitlab-ce/files/gitlab-sidekiq-8.init similarity index 100% rename from www-apps/gitlabhq/files/gitlab-sidekiq-8.init rename to www-apps/gitlab-ce/files/gitlab-sidekiq-8.init diff --git a/www-apps/gitlabhq/files/gitlab-sidekiq.init b/www-apps/gitlab-ce/files/gitlab-sidekiq.init similarity index 100% rename from www-apps/gitlabhq/files/gitlab-sidekiq.init rename to www-apps/gitlab-ce/files/gitlab-sidekiq.init diff --git a/www-apps/gitlabhq/files/gitlab-sidekiq.service b/www-apps/gitlab-ce/files/gitlab-sidekiq.service similarity index 100% rename from www-apps/gitlabhq/files/gitlab-sidekiq.service rename to www-apps/gitlab-ce/files/gitlab-sidekiq.service diff --git a/www-apps/gitlabhq/files/gitlab-unicorn-8.init b/www-apps/gitlab-ce/files/gitlab-unicorn-8.init similarity index 100% rename from www-apps/gitlabhq/files/gitlab-unicorn-8.init rename to www-apps/gitlab-ce/files/gitlab-unicorn-8.init diff --git a/www-apps/gitlabhq/files/gitlab-unicorn.init b/www-apps/gitlab-ce/files/gitlab-unicorn.init similarity index 100% rename from www-apps/gitlabhq/files/gitlab-unicorn.init rename to www-apps/gitlab-ce/files/gitlab-unicorn.init diff --git a/www-apps/gitlabhq/files/gitlab-unicorn.service b/www-apps/gitlab-ce/files/gitlab-unicorn.service similarity index 100% rename from www-apps/gitlabhq/files/gitlab-unicorn.service rename to www-apps/gitlab-ce/files/gitlab-unicorn.service diff --git a/www-apps/gitlabhq/files/gitlab.conf b/www-apps/gitlab-ce/files/gitlab.conf similarity index 100% rename from www-apps/gitlabhq/files/gitlab.conf rename to www-apps/gitlab-ce/files/gitlab.conf diff --git a/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-7.14.3.ebuild rename to www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild index e946e95..2e0256d 100644 --- a/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v7.11.0.rc2.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-7.11.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-8.0.2.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild index 2fb4fe6..21d05e9 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-8.0.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-8.0.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-8.0.4.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild index 0089875..995eed6 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.4.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-8.0.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-8.0.4-r1.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-8.0.4-r1.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild index 9e42095..9620028 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.4-r1.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-8.0.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-8.0.3.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild index 0089875..995eed6 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-8.0.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-8.0.5.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild similarity index 99% rename from www-apps/gitlabhq/gitlabhq-8.0.5.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild index cdfb4d5..ea251c4 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.5.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild @@ -19,8 +19,9 @@ inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" +MY_PKGNAME="gitlabhq" #SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -#RUBY_S="${PN}-8.0.0" +RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlabhq/gitlabhq-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild similarity index 100% rename from www-apps/gitlabhq/gitlabhq-9999.ebuild rename to www-apps/gitlab-ce/gitlab-ce-9999.ebuild diff --git a/www-apps/gitlabhq/metadata.xml b/www-apps/gitlab-ce/metadata.xml similarity index 100% rename from www-apps/gitlabhq/metadata.xml rename to www-apps/gitlab-ce/metadata.xml diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest deleted file mode 100644 index 1fcd91d..0000000 --- a/www-apps/gitlabhq/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265 -AUX gitlab-sidekiq-8.init 995 SHA256 179f8f9267f8358827c4c70697bf27dac728451ac7b9dbe0637d397850260fc2 SHA512 fca6c3b86788113f50120ada81859535bcdd3524ebf79e495c532049a5e1cb09b44499268b22610707ea4763bd6b380fe8abfad10520cd17b03802264c34f0bc WHIRLPOOL edc9c083447662bebdde5b0bbb97816f15a3122aa5cae966d1df805aac5a81e51a608cb5447283bda222af3bd28519b653a6ca6b34d1eef84abc37fd719e5955 -AUX gitlab-sidekiq.init 972 SHA256 614b405d16e2042d013dae510796620d42461512705fad2a90a7f558e0051c33 SHA512 afd3837ae660d47297c6d65180ae5f3ec6a15c1c8ea23aa5b715ca2fc5b628f3d868adf265c16521e940e5aeb53e4a70a2ec6c0acfacb6b39a1fb5bc669672fd WHIRLPOOL 434ae6e789fc8894a9c83bd538de804784c23072129c79fe0c209848e0c8e1a3d607ce9f7f9da617a25c874ce81d276d010d5ae2d3bf95e25034e9048cbd747a -AUX gitlab-sidekiq.service 1066 SHA256 b9a15ee7498cc5ebecfd51a037ab1e32e66723a1612d5ce9365eefd890b5670e SHA512 33ece22389637b7b4591f4dceedb488fb43a92ca47facb19432f87772bbbf1774d4fb737ace52a6d55533c9e291e343dc56971c6f70fed285a10429d6d97d318 WHIRLPOOL b5a81751b8317bb9244018f9ed82f9793734adbad9983c244429a33d710169eeeed25cdf868d724032866d83bb9676ccbbf616b53363491e15a80e474443f331 -AUX gitlab-unicorn-8.init 1680 SHA256 c74c6db7c7bbce85df66648e20c11215917041577733454c6590dff3aacf7362 SHA512 44461e070b19abb1ddfa297aa995b04412cd367fb252591a7faf871f958e78c92955c78ba51137fcd1933dce896a9d05efdf06cabbf2cbe86e138fb12ead1bdb WHIRLPOOL 313548a006a3431e8116edbf3d0ce8613a9e65e3725ba4fb3683e95ebf2b2afac3801900d372839e6dc9a0004d805b98889c47292e8622e918c73a3a5e2fc0de -AUX gitlab-unicorn.init 1657 SHA256 5fe794938b27d25488affc174e4761f5a3a1f9b15489a05f3839b13e4fd5b5ef SHA512 5e005ec26151afb4cdc8eb83592fad6814bb2a3ac8e9f642de83e70cd8615bdf969803a2479f8f72a70e0ae5ab5559da205965b55b3b4cdfdc9aa74055eef6fe WHIRLPOOL 6c61db597311ac618822fb22d7f51c830e5c011ce8e4c790338b3203a4483f3dd121bbd9cc33d7e1f92a2b0527e59816742f8ef0fd531c4c28c36d886fc94196 -AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792 -AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 -AUX gitlabhq-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0 -AUX gitlabhq-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1 -AUX gitlabhq-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60 -DIST gitlabhq-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 -DIST gitlabhq-8.0.2.tar.gz 8238940 SHA256 e17a889f33c85b86744ea7be7cabb69feb340b82a4f01706360a985ceb6fd0f3 SHA512 901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97 WHIRLPOOL 19e9c1f4ea7e0106dea552bc875e2bfd1f518fe6aeefa6934772ebb29ba388eaad0715e36fa53f22fdc7e90203eea380ae62fc0dc8b7ce999efb2ee05d0cc63b -DIST gitlabhq-8.0.3.tar.gz 8238927 SHA256 b299b100f8963f86aaeab01ad4ba49ac034cf77e803cff0fa710065e3464a049 SHA512 e247b3677ca86f43e665623c3a2602ab33843860537813fa64e3cd33b408698f0482e1ce437a4a30976b0656977f86890173ca044b7d07bfdfda3d269d311802 WHIRLPOOL 710f473d8b6c06fff9e72258102653f24035d5533f257d2d6d842ae0598fb048c6e76f9706e3662a93a9d1ec34ef67a67686fdee7439fb776de686eae19120ea -DIST gitlabhq-8.0.4.tar.gz 8238901 SHA256 644b4bc98907bb171a1281ae73ac510f1bc6d379d39020f61e1697bb73547ae8 SHA512 41d4e8088221beb4aab731cf0ddccba0be2e4746ece0e33f92ec5488a4ed759f1e18788efed2351f5a643c31f47b4138a33077313b27e4e4567c9e9ad8dc79e5 WHIRLPOOL 08157b0f82150a5245cb2985b704026dab5f6342ab9e080c3149850ea37be5482d2dfc330a8d441957c1d8383528d3e65eb41c70ccfbb4a49e4a442f6f24a56e -DIST gitlabhq-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 -EBUILD gitlabhq-7.14.3.ebuild 11037 SHA256 41ef6da353b308ddf94dea245cee85b8fa0a16d15d20cfd210ec8b908ea1a123 SHA512 c88df7c472fef7fc609bc4c4f622dfb7c9d7288a21859b3794305a100be013153a1058cd111c0e880094626b620cda72cc29632661e0c3c4f2b325beec555e97 WHIRLPOOL 795038d6d9443e242175132638bf32bf3bb191ec876f6abc3874ee68fce15c32b86e6574158ab6561c3693ecfce6457a0da619c9405fc447cbebf1c8732ac0e8 -EBUILD gitlabhq-8.0.2.ebuild 11109 SHA256 802e5ec6fdc8a2219d8f812b0541916807fe0793b5874b7cdbafa760ee62e14f SHA512 a70346d7dafc62ccdd5a5fe11b55845d056f0c2fc8ca7c2dd0a6e67d80f91398ce5fda2c7b5f61bb5bf5bc65dd1c5e27d3959dc47de793475e98009c483b25a0 WHIRLPOOL 0df933fe9c57d9b8cca6cf2a8334c91443481942593b214c6ba4781eca70002181367095aa66e50ddce754751c1c71ea8c071d7766a815337a48cb9d7bb1c5fa -EBUILD gitlabhq-8.0.3.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b -EBUILD gitlabhq-8.0.4-r1.ebuild 11192 SHA256 3f4ec010d0d19d331921ceaf49ed197d0ed359cdebc49e44edfcd135ef837ae6 SHA512 f916c54d3891568361aadddf5827e4f631af84e4534399e3e98ec7456d2554d3d817527ee5dd043ab658fc17ee65f91337ad8aa115937b4451afa8f22a15ad66 WHIRLPOOL 5afbebf340525ee64ec8e15f8a6142abe7873d14e09f16cac3a2f0706e3fdf993e39d76c3931d8cecc379aacd28162e7db38e822bc9bd403e84a37653f4b9abc -EBUILD gitlabhq-8.0.4.ebuild 11116 SHA256 7e5335681c66070aacecb1d64f58ef09e8cbd1934e8f7bea4d457c380fbe5029 SHA512 9c77b4ec65ccae2451f47fa50c443e3f6647268f8d6570e9c4f6ced1dfe881ff9f385404545c2db02f93eda8adba898a12eac27276f216da2dea2a164b27b6cd WHIRLPOOL 1bc6d1e7e6d89f03fec11696a905ac26792acc6be2115b348090d499c2dfdeb9cc1db8f257af316d38de6a770e9ebba2a5e6c529013a35f75863a56751a24c2b -EBUILD gitlabhq-8.0.5.ebuild 11179 SHA256 9bda7c4e16f049eba1a2cdc8cb269891ca2759bc530ba0e1d1e76e79dec00bf8 SHA512 1e2c9bc26c98ffde2fd22a482d50c29b7b1c169ba62bdbbf2a6f8007bf77428b2282e076d9431e537d7ae31e70f98cac99e884336942bd3555ea346816c275d4 WHIRLPOOL 49219725b625dfedb6d918c98bfa3ca2cbeeef5851f03953d9fd34bee141f4a0eaf2f8262c42603e7b0f1408e3af6b5ffc56ff1764f6afe6217650fbc58ab378 -EBUILD gitlabhq-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6 -MISC Manifest.orig 11464 SHA256 1d619097e0316f2e1de8f3a79b89c1f0ae7fcdcd779269347b0875a30cab5dd7 SHA512 b527ca3dae3b3cac0ab471339549a784899346a14f7598866a93ef21a56df5a8addec2ff2b7ff2bfb2dc10f7b9a5d668b7c076e5855286326c32860ef2a6f167 WHIRLPOOL 14dd65cdf02ab3c345a5a8316edd348303cba0f586b75f23e369e92e2ec336077490d79d5e3c01f88f592ab6eb1419185e183e4edee5288b04eaeb839eee2630 -MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 From fa536fce31eef1ab9f962913aa51e41e9a15774c Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 17 Oct 2015 00:55:53 +0200 Subject: [PATCH 02/10] fixed patch for gitlab-ce-9999 --- www-apps/gitlab-ce/Manifest | 3 +- .../files/gitlab-ce-9999-fix-gemfile.patch | 56 +++++++++++++++++++ www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 9bce0b8..67f10b1 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,5 +1,6 @@ AUX gitlab-ce-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0 AUX gitlab-ce-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1 +AUX gitlab-ce-9999-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750 AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60 AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265 AUX gitlab-sidekiq-8.init 995 SHA256 179f8f9267f8358827c4c70697bf27dac728451ac7b9dbe0637d397850260fc2 SHA512 fca6c3b86788113f50120ada81859535bcdd3524ebf79e495c532049a5e1cb09b44499268b22610707ea4763bd6b380fe8abfad10520cd17b03802264c34f0bc WHIRLPOOL edc9c083447662bebdde5b0bbb97816f15a3122aa5cae966d1df805aac5a81e51a608cb5447283bda222af3bd28519b653a6ca6b34d1eef84abc37fd719e5955 @@ -20,5 +21,5 @@ EBUILD gitlab-ce-8.0.3.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c27 EBUILD gitlab-ce-8.0.4-r1.ebuild 11221 SHA256 af33dfb570403c56fc940e8f8eb74ef7def9f8ef52d74ae313a79498fe4fcc30 SHA512 38f6cb2b4cb309ddcec73373f41b456a3175c2a5112a818d6bce5c7f1e7e0982adfb53c67d24a6f38f562f6ed247b51a4a9b567ef3a5450d6a47c5011afc104f WHIRLPOOL b6177fde2402cd5525a2f7daa72ada600054bc2816acbf05b4b9d25176d04388bb8ca89ca793d55e52103b0ae38fa9d35024fb3448c115997e45526c09eee5ac EBUILD gitlab-ce-8.0.4.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79 EBUILD gitlab-ce-8.0.5.ebuild 11208 SHA256 41cc56507cf3ecc386f397738c4ebe5cac13b6f1e099e00985b9a7959ee08586 SHA512 ffb6c749309c35aae8e04ad553815d9dda324da4d6bc9678e08936f255601658d3977235a815fbea12bcb9c269be98a807f22f32d4bae9e85a2d500f6b771982 WHIRLPOOL 2c7964e82bad883e0ce7f08eea6dc9d84c63a6b5b9a76b412dab78ce1726992812c6376bf02541c02728817a42c71167869595fb73370e914b303faad1ab1568 -EBUILD gitlab-ce-9999.ebuild 11087 SHA256 565d2f2a530d232bed74ab7c9699788e186d69159e5b201a2b9e9990f558083d SHA512 c8eb9b1a667e78404949835ef92d8ca9ef74738379a0b2de9d64ce3dc0510635f575d43fc13efc52076afd8b85a3955e8614a41503e6ca1deb0847d1f23c2ad2 WHIRLPOOL a9889adc7f162bfc032914252f4f689e417e06b06149695f2f370daa7806bc33ccba6a2767f79d512cd9cc7dcbd8ffbfbdb2a71ec40cb16c2dfbec4900804dc6 +EBUILD gitlab-ce-9999.ebuild 11080 SHA256 f20e17e6f5edc646d6773dea7d303007c4461a9aad82e58e7db0a0d17675037e SHA512 4272e495637acca385055c8aa5b685d6e35fd1b560bb4cf2385dc87a71236150ac567da3a601ff85aad1c7f949096c4bada2493027e1cec44127b84da92bdd8b WHIRLPOOL a9b4d67c55968e2755b04ed55d56e212a81ccdfc676b764ca328c7ee56f5309cb2ffeeff01a42cde617da51e6b0d691efcfc33102953be489a093e2a612e22ff MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch b/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch new file mode 100644 index 0000000..58f345b --- /dev/null +++ b/www-apps/gitlab-ce/files/gitlab-ce-9999-fix-gemfile.patch @@ -0,0 +1,56 @@ +diff --git a/Gemfile b/Gemfile +index 9254ce2..94acb3d 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -174,6 +174,9 @@ gem "underscore-rails", "~> 1.4.4" + # Sanitize user input + gem "sanitize", '~> 2.0' + ++# The newer revision of charlock_holmes that is finally fixed to be compatible with Gentoo ++gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4" ++ + # Protect against bruteforcing + gem "rack-attack", '~> 4.3.0' + +@@ -183,9 +186,6 @@ gem 'ace-rails-ap', '~> 2.0.1' + # Keyboard shortcuts + gem 'mousetrap-rails', '~> 1.4.6' + +-# Detect and convert string character encoding +-gem 'charlock_holmes', '~> 0.6.9.4' +- + gem "sass-rails", '~> 4.0.5' + gem "coffee-rails", '~> 4.1.0' + gem "uglifier", '~> 2.7.2' +diff --git a/Gemfile.lock b/Gemfile.lock +index 5312289..586bd90 100644 +--- a/Gemfile.lock ++++ b/Gemfile.lock +@@ -1,3 +1,10 @@ ++GIT ++ remote: https://github.com/brianmario/charlock_holmes.git ++ revision: dde194609b3513b0d2369ce8f916ae52566154b4 ++ ref: dde194609b3513b0d2369ce8f916ae52566154b4 ++ specs: ++ charlock_holmes (0.6.9.4) ++ + GEM + remote: https://rubygems.org/ + specs: +@@ -108,7 +115,6 @@ GEM + json (>= 1.7) + celluloid (0.16.0) + timers (~> 4.0.0) +- charlock_holmes (0.6.9.4) + chunky_png (1.3.4) + cliver (0.3.2) + coderay (1.1.0) +@@ -800,7 +806,7 @@ DEPENDENCIES + capybara (~> 2.4.0) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.9.0) +- charlock_holmes (~> 0.6.9.4) ++ charlock_holmes! + coffee-rails (~> 4.1.0) + colored (~> 1.2) + colorize (~> 0.5.8) diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 01539e6..866175c 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -75,7 +75,7 @@ ruby_add_bdepend " # Fix default settings to work with ssmtp that doesn't know '-t' argument. # RUBY_PATCHES=( - "${PN}-8.0.2-fix-gemfile.patch" + "${P}-fix-gemfile.patch" "${PN}-fix-sendmail-config.patch" ) From 9786198305ccbd56c88081578ca693ec2aaccf72 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 26 Oct 2015 15:26:20 +0100 Subject: [PATCH 03/10] cleaned up old ebuilds and updated the remaining ones --- www-apps/gitlab-ce/Manifest | 11 +- www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild | 8 +- www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild | 370 ------------------ www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild | 370 ------------------ www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild | 371 ------------------- www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild | 370 ------------------ www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild | 6 +- 7 files changed, 9 insertions(+), 1497 deletions(-) delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 645857f..b47642d 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -13,17 +13,10 @@ AUX gitlab-unicorn.init 1657 SHA256 5fe794938b27d25488affc174e4761f5a3a1f9b15489 AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66baab9fcd9e365c689086b9bd SHA512 0bf9630aa91ed8f590a7bfa42d09b7ba33f6342b43b3d191c792c11157f8926c2a2ac2390eebd8179637e29b5bf68233d4699d62463497a0fd45b9bdbdd9167b WHIRLPOOL fbc709a5550dcc548a35c22c812dafe52ee507f5678b57c22c709ee89a399ae9109e2f56b7a13135d4140f1e024ebc4effe4aa4de13e0f36691da2a0737d9792 AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 DIST gitlab-ce-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 -DIST gitlab-ce-8.0.2.tar.gz 8238940 SHA256 e17a889f33c85b86744ea7be7cabb69feb340b82a4f01706360a985ceb6fd0f3 SHA512 901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97 WHIRLPOOL 19e9c1f4ea7e0106dea552bc875e2bfd1f518fe6aeefa6934772ebb29ba388eaad0715e36fa53f22fdc7e90203eea380ae62fc0dc8b7ce999efb2ee05d0cc63b -DIST gitlab-ce-8.0.3.tar.gz 8238927 SHA256 b299b100f8963f86aaeab01ad4ba49ac034cf77e803cff0fa710065e3464a049 SHA512 e247b3677ca86f43e665623c3a2602ab33843860537813fa64e3cd33b408698f0482e1ce437a4a30976b0656977f86890173ca044b7d07bfdfda3d269d311802 WHIRLPOOL 710f473d8b6c06fff9e72258102653f24035d5533f257d2d6d842ae0598fb048c6e76f9706e3662a93a9d1ec34ef67a67686fdee7439fb776de686eae19120ea -DIST gitlab-ce-8.0.4.tar.gz 8238901 SHA256 644b4bc98907bb171a1281ae73ac510f1bc6d379d39020f61e1697bb73547ae8 SHA512 41d4e8088221beb4aab731cf0ddccba0be2e4746ece0e33f92ec5488a4ed759f1e18788efed2351f5a643c31f47b4138a33077313b27e4e4567c9e9ad8dc79e5 WHIRLPOOL 08157b0f82150a5245cb2985b704026dab5f6342ab9e080c3149850ea37be5482d2dfc330a8d441957c1d8383528d3e65eb41c70ccfbb4a49e4a442f6f24a56e DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 DIST gitlab-ce-8.1.0.tar.gz 8503954 SHA256 f02e599436737b803482f4554abedd743e2f53c8c610e46115f71682da46276a SHA512 40f984a95f679f7695663e1118b119883a466ef0c65ee5aa4eac5053945a4111243c3aecc6181e0b1acf33c4df446ed7169a2e760a2b48596f314967bb3bff5b WHIRLPOOL ef2d418f167623cd17d2b4773d6cdab5f94d693ae4c785b7a621461b330908a680fb2bb4d720ef6ed1de3d80b1aea2e6a612146f9719f248c38e5588132d52dc -EBUILD gitlab-ce-7.14.3.ebuild 11065 SHA256 7467db73bb02a797716ee404a2c0ea8cf64b1839ec322c2f07f668ba5702da4c SHA512 d1884e08c7cd3013b4962a2453a6120391bbc3dc44fc24bb83134e2d99a5fadfbfa3942fb74c64efa617f7480de1674a3c82aaab8fe4ab7a8fbb7016188d29c1 WHIRLPOOL 5027632c4bd2f4ba4c6d55bd222aa1322751d245571b6b8b6f9bc394fcc7e7f42ac5455cf3d7a2b6a0bbc624f9c7e286e94b101686ff4e1656dc79169d750f9c -EBUILD gitlab-ce-8.0.2.ebuild 11138 SHA256 818e9255e49d922368e4d34b384a1d67825c59de5c7fa3ae453f4932b1107e15 SHA512 d2bcbc3cfca80042b178ca59ed5c73c3361f2e9dc0a23b76f6356c1d412b279df207a86ea06b25ef677918361429e8fb02779ec5f9399ca7c2a7fa9c39d26bae WHIRLPOOL a7812739fef390dec2583acc0c1cc50b0d32d105c0e490b59cc2b7a6878fdadc179895a16eb4642c8dd466cbe1ecbe986fc2e4c85d254501515c3355f450ebdc -EBUILD gitlab-ce-8.0.3.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79 -EBUILD gitlab-ce-8.0.4-r1.ebuild 11221 SHA256 af33dfb570403c56fc940e8f8eb74ef7def9f8ef52d74ae313a79498fe4fcc30 SHA512 38f6cb2b4cb309ddcec73373f41b456a3175c2a5112a818d6bce5c7f1e7e0982adfb53c67d24a6f38f562f6ed247b51a4a9b567ef3a5450d6a47c5011afc104f WHIRLPOOL b6177fde2402cd5525a2f7daa72ada600054bc2816acbf05b4b9d25176d04388bb8ca89ca793d55e52103b0ae38fa9d35024fb3448c115997e45526c09eee5ac -EBUILD gitlab-ce-8.0.4.ebuild 11145 SHA256 74baf14d65ff3a898f033356d2b1877a85c275ca0a46fe1fb5ac02e64aa923d7 SHA512 167cdf0189e1654f40db128f460286e20af2f55baa566b13ef97ba0c9bb2e2fc0edf694468e18320306e3e85d14831e11def094f0d9eff4e3c28e50a8dd3c508 WHIRLPOOL 1179dc8bd4e092156d46e9d489777ad71da803da760100526908e80e17b66004832f77ac287aa610e05047d7702f2c1ccf2803ce4b360f88340358415e1f7e79 -EBUILD gitlab-ce-8.0.5.ebuild 11263 SHA256 003c0febc6086e3eab7c9434269f3993d4d7d25aa88073e27ad9012c0af3094d SHA512 23ef13e579f977ae5dcc283a026cfa1df7e47a36911480aa7e50e1a23d3c73977e4409cfe0aff8859e4eebe38c8ff28b46b5b23491136ba384c0c51b086a900d WHIRLPOOL 7f8ef16ac184699f4cb83258e1b0b304b648c7f15250e8832b9b6efd423a78ab5752ae331e6c611179b9d8b90aece0730e3e103635a0c486cf72150df5c7e0ef +EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 +EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a EBUILD gitlab-ce-8.1.0.ebuild 11179 SHA256 f26d0655d2b69866961c8dbb25fdf0b7963073de7c93a8852cf6f683b03a1f03 SHA512 887e450adef7000219926fd3d5653a279faeb1c2f48227db652fc3f0b0cb30d337ab64a39f3d8e0154e5d5d3fb354ab8ba7c14942805042c467385d64e5d9299 WHIRLPOOL eb00cf64fd51a7f6e9df11da335c85894bcb95d4c33b034b31356834d9404708d1d78e9b84cced88f4e1bbe2e4c92144d66b597f31fe3c63483b05f89bb57889 EBUILD gitlab-ce-9999.ebuild 11080 SHA256 f20e17e6f5edc646d6773dea7d303007c4461a9aad82e58e7db0a0d17675037e SHA512 4272e495637acca385055c8aa5b685d6e35fd1b560bb4cf2385dc87a71236150ac567da3a601ff85aad1c7f949096c4bada2493027e1cec44127b84da92bdd8b WHIRLPOOL a9b4d67c55968e2755b04ed55d56e212a81ccdfc676b764ca328c7ee56f5309cb2ffeeff01a42cde617da51e6b0d691efcfc33102953be489a093e2a612e22ff MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild index 2e0256d..64de721 100644 --- a/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-7.14.3.ebuild @@ -16,11 +16,11 @@ PYTHON_COMPAT=( python2_7 ) inherit eutils python-r1 ruby-ng user systemd -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v7.11.0.rc2.tar.gz -> ${P}.tar.gz" + +DESCRIPTION="GitLab is a free project and repository management application" +HOMEPAGE="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}" +SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz" RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" diff --git a/www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild deleted file mode 100644 index 21d05e9..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.0.2.ebuild +++ /dev/null @@ -1,370 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-r1 ruby-ng user systemd - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" -MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -RUBY_S="${MY_PKGNAME}-${PV}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 - dev-vcs/git - =dev-vcs/gitlab-git-http-server-0.2* - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser =dev-libs/libgit2-0.22* )" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${P}-fix-gemfile.patch" - "${PN}-fix-sendmail-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}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-git-http.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq-8.init - use unicorn && rcscript=gitlab-unicorn-8.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi -} - -pkg_postinst() { - 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 initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" - 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." -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - 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 - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - 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 - - if [ ! -d "${DEST_DIR}/.git" ]; then - # 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 - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ -f "${DEST_DIR}/.secret" ]; then - local update=true - - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - local update=false - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild deleted file mode 100644 index 995eed6..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.0.3.ebuild +++ /dev/null @@ -1,370 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-r1 ruby-ng user systemd - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" -MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -RUBY_S="${MY_PKGNAME}-${PV}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 - dev-vcs/git - =dev-vcs/gitlab-git-http-server-0.2* - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser =dev-libs/libgit2-0.22* )" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${PN}-8.0.2-fix-gemfile.patch" - "${PN}-fix-sendmail-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}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-git-http.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq-8.init - use unicorn && rcscript=gitlab-unicorn-8.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi -} - -pkg_postinst() { - 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 initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" - 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." -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - 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 - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - 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 - - if [ ! -d "${DEST_DIR}/.git" ]; then - # 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 - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ -f "${DEST_DIR}/.secret" ]; then - local update=true - - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - local update=false - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild deleted file mode 100644 index 9620028..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.0.4-r1.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-r1 ruby-ng user systemd - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" -MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -RUBY_S="${MY_PKGNAME}-${PV}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 - dev-vcs/git - =dev-vcs/gitlab-git-http-server-0.2* - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser =dev-libs/libgit2-0.22* )" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${PN}-8.0.2-fix-gemfile.patch" - "${PN}-fix-sendmail-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}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-git-http.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq-8.init - use unicorn && rcscript=gitlab-unicorn-8.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi -} - -pkg_postinst() { - 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 initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" - 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." -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - 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 - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - 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 - - if [ ! -d "${DEST_DIR}/.git" ]; then - # 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 - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ -f "${DEST_DIR}/.secret" ]; then - local update=true - - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - local update=false - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild deleted file mode 100644 index 995eed6..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.0.4.ebuild +++ /dev/null @@ -1,370 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-r1 ruby-ng user systemd - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://github.com/gitlabhq/gitlabhq" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" -MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" -RUBY_S="${MY_PKGNAME}-${PV}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 - dev-vcs/git - =dev-vcs/gitlab-git-http-server-0.2* - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser =dev-libs/libgit2-0.22* )" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${PN}-8.0.2-fix-gemfile.patch" - "${PN}-fix-sendmail-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}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-git-http.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq-8.init - use unicorn && rcscript=gitlab-unicorn-8.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi -} - -pkg_postinst() { - 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 initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" - 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." -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - 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 - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - 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 - - if [ ! -d "${DEST_DIR}/.git" ]; then - # 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 - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ -f "${DEST_DIR}/.secret" ]; then - local update=true - - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - local update=false - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} diff --git a/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild index e4e2c5d..a5833fe 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.0.5.ebuild @@ -16,11 +16,11 @@ PYTHON_COMPAT=( python2_7 ) inherit eutils python-r1 ruby-ng user systemd +MY_PKGNAME="gitlabhq" + DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v${PV}.tar.gz -> ${P}.tar.gz" -MY_PKGNAME="gitlabhq" -#SRC_URI="https://github.com/gitlabhq/gitlabhq/archive/v8.0.0.rc1.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz" RUBY_S="${MY_PKGNAME}-${PV}" RESTRICT="mirror" From e67734ec3e57df91e6d9c8525327c96ed3a474ce Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 27 Oct 2015 21:17:12 +0100 Subject: [PATCH 04/10] removed old gitlabhq ebuild --- www-apps/gitlab-ce/Manifest | 2 - www-apps/gitlab-ce/gitlab-ce-8.1.0.ebuild | 372 ---------------------- 2 files changed, 374 deletions(-) delete mode 100644 www-apps/gitlab-ce/gitlab-ce-8.1.0.ebuild diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index c498070..2686746 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -14,11 +14,9 @@ AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66ba AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 DIST gitlab-ce-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 -DIST gitlab-ce-8.1.0.tar.gz 8503954 SHA256 f02e599436737b803482f4554abedd743e2f53c8c610e46115f71682da46276a SHA512 40f984a95f679f7695663e1118b119883a466ef0c65ee5aa4eac5053945a4111243c3aecc6181e0b1acf33c4df446ed7169a2e760a2b48596f314967bb3bff5b WHIRLPOOL ef2d418f167623cd17d2b4773d6cdab5f94d693ae4c785b7a621461b330908a680fb2bb4d720ef6ed1de3d80b1aea2e6a612146f9719f248c38e5588132d52dc DIST gitlab-ce-8.1.2.tar.gz 8503168 SHA256 ab903b0c487aaf43dca4dfd3ac80e76ef344f403c8a02579a285c2658b80bc6c SHA512 f6c2f304c4be6fea6a36bce1ded5ec4352fb84e93922d152481fcc9788d2a505e843d05947962021ddba9629dbf9d55b8931cf576dccf396a561c55a0a16a883 WHIRLPOOL def94175936275e0b8c18c6238e473dae59f235e14c32cdb5c7a886d0f69538db57aee35844234a05b342925364d86aae9737f7c13a55dd2d74dda233af15a61 EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a -EBUILD gitlab-ce-8.1.0.ebuild 11179 SHA256 f26d0655d2b69866961c8dbb25fdf0b7963073de7c93a8852cf6f683b03a1f03 SHA512 887e450adef7000219926fd3d5653a279faeb1c2f48227db652fc3f0b0cb30d337ab64a39f3d8e0154e5d5d3fb354ab8ba7c14942805042c467385d64e5d9299 WHIRLPOOL eb00cf64fd51a7f6e9df11da335c85894bcb95d4c33b034b31356834d9404708d1d78e9b84cced88f4e1bbe2e4c92144d66b597f31fe3c63483b05f89bb57889 EBUILD gitlab-ce-8.1.2.ebuild 11186 SHA256 12209f6c1a378eb554f3b1452157ce744a3ad185c4d616fca264c5bc6c7032a0 SHA512 fd3d7dcc5055dd4bde3665f9af865f59dc1d075bd7c6158009ad35703caecca81129cb3d0a2b35723723cd09b5691dd30c9ca0b2d65d9b67c1639ad5f3f35c48 WHIRLPOOL 409acb3fe089a1ca069a8a56c4ad3d3fa388feadd772ab30b8c5f82cf45c001cf304a23257436fa80e8e9777cdfa98c1355386d99235d21d07d2fee9aa1ef050 EBUILD gitlab-ce-9999.ebuild 11080 SHA256 f20e17e6f5edc646d6773dea7d303007c4461a9aad82e58e7db0a0d17675037e SHA512 4272e495637acca385055c8aa5b685d6e35fd1b560bb4cf2385dc87a71236150ac567da3a601ff85aad1c7f949096c4bada2493027e1cec44127b84da92bdd8b WHIRLPOOL a9b4d67c55968e2755b04ed55d56e212a81ccdfc676b764ca328c7ee56f5309cb2ffeeff01a42cde617da51e6b0d691efcfc33102953be489a093e2a612e22ff MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-8.1.0.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.1.0.ebuild deleted file mode 100644 index e06fde0..0000000 --- a/www-apps/gitlab-ce/gitlab-ce-8.1.0.ebuild +++ /dev/null @@ -1,372 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Maintainer notes: -# - This ebuild uses Bundler to download and install all gems in deployment mode -# (i.e. into isolated directory inside application). That's not Gentoo way how -# it should be done, but GitLab has too many dependencies that it will be too -# difficult to maintain them via ebuilds. -# - -USE_RUBY="ruby21" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-r1 ruby-ng user systemd - -MY_PKGNAME="gitlabhq" - -DESCRIPTION="GitLab is a free project and repository management application" -HOMEPAGE="https://about.gitlab.com/" -SRC_URI="https://github.com/${MY_PKGNAME}/${MY_PKGNAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RUBY_S="${MY_PKGNAME}-${PV}" - -RESTRICT="mirror" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos mysql +postgres +unicorn systemd rugged_use_system_libraries" - -## Gems dependencies: -# charlock_holmes dev-libs/icu -# grape, capybara dev-libs/libxml2, dev-libs/libxslt -# rugged dev-util/cmake, virtual/pkgconfig -# json dev-util/ragel -# pygments.rb python 2.7+ -# execjs net-libs/nodejs, or any other JS runtime -# pg dev-db/postgresql -# mysql virtual/mysql -# -GEMS_DEPEND=" - dev-libs/icu - dev-libs/libxml2 - dev-libs/libxslt - dev-util/ragel - net-libs/nodejs - postgres? ( >=dev-db/postgresql-9.1:* ) - mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 )" -CDEPEND=" - dev-util/cmake - virtual/pkgconfig" -DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 - dev-vcs/git - ~dev-vcs/gitlab-git-http-server-0.3.0 - kerberos? ( !app-crypt/heimdal ) - rugged_use_system_libraries? ( net-libs/http-parser dev-libs/libgit2:0/22 )" -RDEPEND="${DEPEND} - dev-db/redis - virtual/mta - systemd? ( sys-apps/systemd:0= )" -ruby_add_bdepend " - virtual/rubygems - >=dev-ruby/bundler-1.0" - -# -# fix-gemfile: -# Remove therubyracer that doesn't compile well on Gentoo (we're using -# nodejs instead that is faster and better). Also replace broken -# charlock_holmes version with fixed one. -# -# fix-sendmail-config: -# Fix default settings to work with ssmtp that doesn't know '-t' argument. -# -RUBY_PATCHES=( - "${P}-fix-gemfile.patch" - "${PN}-fix-sendmail-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}" - -# When updating ebuild to newer version, check list of the queues in -# https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" - -all_ruby_prepare() { - # fix paths - local satellites_path="${TEMP_DIR}/repo_satellites" - local repos_path=/var/lib/git/repositories - local shell_path=/usr/share/gitlab-shell - sed -i -E \ - -e "/satellites:$/,/\w:$/ s|(\s*path:\s).*|\1${satellites_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*path:\s).*|\1${shell_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*repos_path:\s).*|\1${repos_path}/|" \ - -e "/gitlab_shell:$/,/\w:$/ s|(\s*hooks_path:\s).*|\1${shell_path}/hooks/|" \ - config/gitlab.yml.example || die "failed to filter gitlab.yml.example" - - local run_path=/run/${MY_NAME} - sed -i -E \ - -e "s|/home/git/gitlab/tmp/(pids\|sockets)|${run_path}|" \ - -e "s|/home/git/gitlab/log|${LOGS_DIR}|" \ - -e "s|/home/git/gitlab|${DEST_DIR}|" \ - config/unicorn.rb.example || die "failed to filter unicorn.rb.example" - - sed -i \ - -e "s|/home/git/gitlab/tmp/sockets|${run_path}|" \ - lib/support/nginx/gitlab || die "failed to filter nginx/gitlab" - - # modify default database settings for PostgreSQL - sed -i -E \ - -e 's|(username:).*|\1 gitlab|' \ - -e 's|(password:).*|\1 gitlab|' \ - -e 's|(socket:).*|\1 /run/postgresql/.s.PGSQL.5432|' \ - config/database.yml.postgresql \ - || die "failed to filter database.yml.postgresql" - - # rename config files - mv config/gitlab.yml.example config/gitlab.yml - mv config/unicorn.rb.example config/unicorn.rb - - local dbconf=config/database.yml - if use postgres && ! use mysql; then - mv ${dbconf}.postgresql ${dbconf} - rm ${dbconf}.mysql - elif use mysql && ! use postgres; then - mv ${dbconf}.mysql ${dbconf} - rm ${dbconf}.postgresql - fi - - # remove useless files - rm -r lib/support/{deploy,init.d} - use unicorn || rm config/unicorn.rb -} - -all_ruby_install() { - local dest=${DEST_DIR} - local conf=${CONF_DIR} - local logs=${LOGS_DIR} - local temp=${TEMP_DIR} - - # prepare directories - diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites - - diropts -m755 - dodir ${conf} ${dest}/public/uploads - - dosym ${temp} ${dest}/tmp - dosym ${logs} ${dest}/log - - # install configs - insinto ${conf} - doins -r config/* - dosym ${conf} ${dest}/config - - echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile" - - # remove needless dirs - rm -Rf config tmp log - - # install the rest files - # using cp 'cause doins is slow - cp -Rl * "${D}/${dest}"/ - - # install logrotate config - dodir /etc/logrotate.d - cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF - ${logs}/*.log { - missingok - delaycompress - compress - copytruncate - } - EOF - - ## Install gems via bundler ## - - cd "${D}/${dest}" - - local without="development test aws" - local flag; for flag in mysql postgres unicorn kerberos; do - without+="$(use $flag || echo ' '$flag)" - done - local bundle_args="--deployment ${without:+--without ${without}}" - - use "rugged_use_system_libraries" && export RUGGED_USE_SYSTEM_LIBRARIES="YES" - - einfo "Running bundle install ${bundle_args} ..." - ${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed" - - # clean gems cache - rm -Rf vendor/bundle/ruby/*/cache - rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git - - # fix permissions - fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} - - ## RC script ## - - if use systemd ; then - ewarn "Beware: systemd support has not been tested, use at your own risk!" - systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" - systemd_dounit "${FILESDIR}/gitlab-unicorn.service" - systemd_dounit "${FILESDIR}/gitlab-git-http.service" - systemd_dounit "${FILESDIR}/gitlab-mailroom.service" - systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" - else - local rcscript=gitlab-sidekiq-8.init - use unicorn && rcscript=gitlab-unicorn-8.init - - cp "${FILESDIR}/${rcscript}" "${T}" || die - sed -i \ - -e "s|@USER@|${MY_USER}|" \ - -e "s|@GITLAB_BASE@|${dest}|" \ - -e "s|@LOGS_DIR@|${logs}|" \ - -e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \ - "${T}/${rcscript}" \ - || die "failed to filter ${rcscript}" - - newinitd "${T}/${rcscript}" "${MY_NAME}" - fi -} - -pkg_postinst() { - 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 initlize environment:" - elog " emerge --config \"=${CATEGORY}/${PF}\"" - elog " Note: Do not forget to start Redis server first!" - elog - elog "If this is an update from previous version, it's HIGHLY recommended" - elog "to backup your database before running the config phase!" - 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." -} - -pkg_config() { - local shell_conf='/etc/gitlab-shell.yml' - - 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 - - # check gitlab-shell configuration - if [ -r ${shell_conf} ]; then - local shell_repos_path="$(ryaml ${shell_conf} repos_path)" - local gitlab_repos_path="$(ryaml ${CONF_DIR}/gitlab.yml \ - production gitlab_shell repos_path)" - - if [ ! "${shell_repos_path}" -ef "${gitlab_repos_path}" ]; then - eerror "repos_path in ${CONF_DIR}/gitlab.yml and ${shell_conf}" - eerror "must points to the same location! Fix the repos_path location and" - eerror "run this again."; die - fi - else - ewarn "GitLab Shell checks skipped, could not find config file at" - ewarn "${shell_conf}. Make sure that you have gitlab-shell properly" - ewarn "installed and that repos_path is the same as in GitLab." - 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 - - if [ ! -d "${DEST_DIR}/.git" ]; then - # 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 - fi - - ## Initialize app ## - - local RAILS_ENV="production" - local RUBY=${RUBY:-/usr/bin/ruby} - local BUNDLE="${RUBY} /usr/bin/bundle" - - local dbname="$(ryaml ${CONF_DIR}/database.yml production database)" - - if [ -f "${DEST_DIR}/.secret" ]; then - local update=true - - einfo "Migrating database ..." - exec_rake db:migrate - - # https://github.com/gitlabhq/gitlabhq/issues/5311#issuecomment-31656496 - einfo "Migrating iids ..." - exec_rake migrate_iids - - einfo "Cleaning old precompiled assets ..." - exec_rake assets:clean - - einfo "Cleaning cache ..." - exec_rake cache:clear - else - local update=false - - einfo "Initializing database ..." - exec_rake gitlab:setup - fi - - einfo "Precompiling assests ..." - exec_rake assets:precompile - - if [ "${update}" = 'true' ]; then - ewarn - ewarn "This configuration script runs only common migration tasks." - ewarn "Please read guides on" - ewarn " https://github.com/gitlabhq/gitlabhq/blob/master/doc/update/" - ewarn "for any additional migration tasks specific to your previous GitLab" - ewarn "version." - fi -} - -ryaml() { - ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@" -} - -exec_rake() { - local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}" - - echo " ${command}" - su -l ${MY_USER} -c " - export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8 - cd ${DEST_DIR} - ${command}" \ - || die "failed to run rake $@" -} From 903cb23f5f3f6bb859cad515c4cc8626cfa2420f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 31 Oct 2015 18:09:17 +0100 Subject: [PATCH 05/10] updated ebuild for www-apps/gitlab-ce-9999 --- www-apps/gitlab-ce/Manifest | 2 +- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 2686746..3f12a8a 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -18,5 +18,5 @@ DIST gitlab-ce-8.1.2.tar.gz 8503168 SHA256 ab903b0c487aaf43dca4dfd3ac80e76ef344f EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a EBUILD gitlab-ce-8.1.2.ebuild 11186 SHA256 12209f6c1a378eb554f3b1452157ce744a3ad185c4d616fca264c5bc6c7032a0 SHA512 fd3d7dcc5055dd4bde3665f9af865f59dc1d075bd7c6158009ad35703caecca81129cb3d0a2b35723723cd09b5691dd30c9ca0b2d65d9b67c1639ad5f3f35c48 WHIRLPOOL 409acb3fe089a1ca069a8a56c4ad3d3fa388feadd772ab30b8c5f82cf45c001cf304a23257436fa80e8e9777cdfa98c1355386d99235d21d07d2fee9aa1ef050 -EBUILD gitlab-ce-9999.ebuild 11080 SHA256 f20e17e6f5edc646d6773dea7d303007c4461a9aad82e58e7db0a0d17675037e SHA512 4272e495637acca385055c8aa5b685d6e35fd1b560bb4cf2385dc87a71236150ac567da3a601ff85aad1c7f949096c4bada2493027e1cec44127b84da92bdd8b WHIRLPOOL a9b4d67c55968e2755b04ed55d56e212a81ccdfc676b764ca328c7ee56f5309cb2ffeeff01a42cde617da51e6b0d691efcfc33102953be489a093e2a612e22ff +EBUILD gitlab-ce-9999.ebuild 11076 SHA256 7bd11b1f3b0a04ad72e8ffd28d0a54493dd8a537f8bdebb6c9321064a0c65137 SHA512 26c609abeb3e27af95f11e1b074bbef14fb451ef9761aec023b918c6e9922cb58781b899f3dd1990651abfbde8604d0228f7b083b0933c5fe3beb0c7ddd4f689 WHIRLPOOL e366d51a38f2f17eedba2a90aec2f860d5ee4f282c2602fb2fcefd12bf1f4fa0b8923d15c14bc5dbc3784dd3bb19c4d357ce07db9813d37a13c3e950a480a3b0 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 866175c..03f0bf2 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -18,7 +18,7 @@ inherit eutils git-r3 python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://about.gitlab.com/" -EGIT_REPO_URI="https://gitlab.com/gitlab-org/gitlab-ce.git" +EGIT_REPO_URI="https://gitlab.com/gitlab-org/${PN}.git" EGIT_BRANCH="master" EGIT_CHECKOUT_DIR="${WORKDIR}/all" @@ -52,7 +52,7 @@ CDEPEND=" dev-util/cmake virtual/pkgconfig" DEPEND="${GEMS_DEPEND} - >=dev-vcs/gitlab-shell-2.6.5 + >=dev-vcs/gitlab-shell-2.6.6 dev-vcs/git >=dev-vcs/gitlab-git-http-server-0.3.0 kerberos? ( !app-crypt/heimdal ) From 2c0b76500adb8cff8270cc64380f2c0cc28f219a Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 7 Nov 2015 02:47:56 +0100 Subject: [PATCH 06/10] added ebuild for gitlab-ce-8.1.3 and deleted old version (8.1.2) --- www-apps/gitlab-ce/Manifest | 4 ++-- .../{gitlab-ce-8.1.2.ebuild => gitlab-ce-8.1.3.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename www-apps/gitlab-ce/{gitlab-ce-8.1.2.ebuild => gitlab-ce-8.1.3.ebuild} (100%) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 203a57d..972c350 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -14,9 +14,9 @@ AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66ba AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 DIST gitlab-ce-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 -DIST gitlab-ce-8.1.2.tar.gz 8503168 SHA256 ab903b0c487aaf43dca4dfd3ac80e76ef344f403c8a02579a285c2658b80bc6c SHA512 f6c2f304c4be6fea6a36bce1ded5ec4352fb84e93922d152481fcc9788d2a505e843d05947962021ddba9629dbf9d55b8931cf576dccf396a561c55a0a16a883 WHIRLPOOL def94175936275e0b8c18c6238e473dae59f235e14c32cdb5c7a886d0f69538db57aee35844234a05b342925364d86aae9737f7c13a55dd2d74dda233af15a61 +DIST gitlab-ce-8.1.3.tar.gz 8761928 SHA256 35dba9917762b1760ee9ba8e8e6982a9af0be6cbb5119741334987d167076707 SHA512 81076587a471eefab1e9f5addba254a6b8e4b6eaac2ce7a01885a04adf31687e0cc52ce3919da6390efc34c8bbc54068a473db984b0376239800a09a0675f373 WHIRLPOOL adabf431d94f611c0f52053bb3bf989fdaf210ec74ef389d552f72fde92873722f5857e397a4dc50c2fdc593b8f6ac3257701c4df8c902ac8a9a6ccf0f1c8f7f EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a -EBUILD gitlab-ce-8.1.2.ebuild 11208 SHA256 e9f0316e2fc33cc239ddb0782a873e9d1bf2cbd2433c3eb45cc91b83490bcbf2 SHA512 9c67c837315c9e3e18081a78aa871c265a72a95d9f162b19c6080d940ee2f33dda2a228a63845cf46b574670f3446ca597d90854966fc71582c8ddec371e849c WHIRLPOOL 2bb8e6393be8b69d426a3cda5d84a050b592bbe4abc2c3cc97d6b64ffc4117d9e861faab9d9ffe29ab2d2d202c8a46f0294a56eefe189b0c04bd920366c7ff07 +EBUILD gitlab-ce-8.1.3.ebuild 11208 SHA256 e9f0316e2fc33cc239ddb0782a873e9d1bf2cbd2433c3eb45cc91b83490bcbf2 SHA512 9c67c837315c9e3e18081a78aa871c265a72a95d9f162b19c6080d940ee2f33dda2a228a63845cf46b574670f3446ca597d90854966fc71582c8ddec371e849c WHIRLPOOL 2bb8e6393be8b69d426a3cda5d84a050b592bbe4abc2c3cc97d6b64ffc4117d9e861faab9d9ffe29ab2d2d202c8a46f0294a56eefe189b0c04bd920366c7ff07 EBUILD gitlab-ce-9999.ebuild 11076 SHA256 7bd11b1f3b0a04ad72e8ffd28d0a54493dd8a537f8bdebb6c9321064a0c65137 SHA512 26c609abeb3e27af95f11e1b074bbef14fb451ef9761aec023b918c6e9922cb58781b899f3dd1990651abfbde8604d0228f7b083b0933c5fe3beb0c7ddd4f689 WHIRLPOOL e366d51a38f2f17eedba2a90aec2f860d5ee4f282c2602fb2fcefd12bf1f4fa0b8923d15c14bc5dbc3784dd3bb19c4d357ce07db9813d37a13c3e950a480a3b0 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-8.1.2.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.1.3.ebuild similarity index 100% rename from www-apps/gitlab-ce/gitlab-ce-8.1.2.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.1.3.ebuild From 89b0ad31bc3f80f229f8e1f0138b78cc0895ed63 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 13 Nov 2015 00:47:11 +0100 Subject: [PATCH 07/10] updated gitlab-ce to latest version --- www-apps/gitlab-ce/Manifest | 4 ++-- .../{gitlab-ce-8.1.3.ebuild => gitlab-ce-8.1.4.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename www-apps/gitlab-ce/{gitlab-ce-8.1.3.ebuild => gitlab-ce-8.1.4.ebuild} (100%) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index 972c350..bdbda14 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -14,9 +14,9 @@ AUX gitlab-unicorn.service 773 SHA256 010c9e223a30400d9155b39499eb0d7efad23b66ba AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c101f43ca263 SHA512 909c49fee6d050c1e94b2559ff2a9d54c5c346492be0e2920b50d56d69eaddbed67e3ac12e012d2a9601b5596640ebf33c8dc68fc588a03ca370d963294be37f WHIRLPOOL fa436e8d7d2643d450259d26b6e7b24dae69df47ed22e5ef2a567f37aa785fbf3b0eb1129ae7c8bf8986c29559fc3b744a34064375e5245dce2b10053cd715d9 DIST gitlab-ce-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d31449136e76029daa77e89086539d30c6 SHA512 af9d11f0ed744d0c92c9329ba94fe51534996f18dbb2c110d70912cd3ce9e60c3a127b7c8597c95b010b0e2251f98aabdddc314ddae53ab26a44c19b4ba7a7d7 WHIRLPOOL 6e4bc8c43cbfe215efd21a87a5d0395abde4f9998564fc0295d946ffa6a7021d2b5bc2ea625482fb400088bcc57431b3969a6c9dfa0f2121420356d153d297f0 -DIST gitlab-ce-8.1.3.tar.gz 8761928 SHA256 35dba9917762b1760ee9ba8e8e6982a9af0be6cbb5119741334987d167076707 SHA512 81076587a471eefab1e9f5addba254a6b8e4b6eaac2ce7a01885a04adf31687e0cc52ce3919da6390efc34c8bbc54068a473db984b0376239800a09a0675f373 WHIRLPOOL adabf431d94f611c0f52053bb3bf989fdaf210ec74ef389d552f72fde92873722f5857e397a4dc50c2fdc593b8f6ac3257701c4df8c902ac8a9a6ccf0f1c8f7f +DIST gitlab-ce-8.1.4.tar.gz 8761954 SHA256 619ac3b8c83ac2e3dfa81054b5ae0e76ae81497cf38587410504d6a603181897 SHA512 3973af3480f7e52dc64aec2ef99ff13cac9296fbbc76bfb59387416ee683099109fce361cd1619b4d3fa55032f7e1029b272e07cd15e0b6e353ac6f6c730f2bd WHIRLPOOL d3ce2dfaf013dbd99b023cf9d7ab3494d54d8628093761dd7b9cfe522ac8fb2c00a53d4534843dc292fa38ca1200f2dbe2c376efbd1c40e6e0ca1f9a31762936 EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a -EBUILD gitlab-ce-8.1.3.ebuild 11208 SHA256 e9f0316e2fc33cc239ddb0782a873e9d1bf2cbd2433c3eb45cc91b83490bcbf2 SHA512 9c67c837315c9e3e18081a78aa871c265a72a95d9f162b19c6080d940ee2f33dda2a228a63845cf46b574670f3446ca597d90854966fc71582c8ddec371e849c WHIRLPOOL 2bb8e6393be8b69d426a3cda5d84a050b592bbe4abc2c3cc97d6b64ffc4117d9e861faab9d9ffe29ab2d2d202c8a46f0294a56eefe189b0c04bd920366c7ff07 +EBUILD gitlab-ce-8.1.4.ebuild 11208 SHA256 e9f0316e2fc33cc239ddb0782a873e9d1bf2cbd2433c3eb45cc91b83490bcbf2 SHA512 9c67c837315c9e3e18081a78aa871c265a72a95d9f162b19c6080d940ee2f33dda2a228a63845cf46b574670f3446ca597d90854966fc71582c8ddec371e849c WHIRLPOOL 2bb8e6393be8b69d426a3cda5d84a050b592bbe4abc2c3cc97d6b64ffc4117d9e861faab9d9ffe29ab2d2d202c8a46f0294a56eefe189b0c04bd920366c7ff07 EBUILD gitlab-ce-9999.ebuild 11076 SHA256 7bd11b1f3b0a04ad72e8ffd28d0a54493dd8a537f8bdebb6c9321064a0c65137 SHA512 26c609abeb3e27af95f11e1b074bbef14fb451ef9761aec023b918c6e9922cb58781b899f3dd1990651abfbde8604d0228f7b083b0933c5fe3beb0c7ddd4f689 WHIRLPOOL e366d51a38f2f17eedba2a90aec2f860d5ee4f282c2602fb2fcefd12bf1f4fa0b8923d15c14bc5dbc3784dd3bb19c4d357ce07db9813d37a13c3e950a480a3b0 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-8.1.3.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild similarity index 100% rename from www-apps/gitlab-ce/gitlab-ce-8.1.3.ebuild rename to www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild From 18c4fe8bb554af3b4e5071065c54200d6676f4f3 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 13 Nov 2015 00:51:59 +0100 Subject: [PATCH 08/10] fixed path to patch file --- ....1.0-fix-gemfile.patch => gitlab-ce-8.1.4-fix-gemfile.patch} | 0 www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename www-apps/gitlab-ce/files/{gitlab-ce-8.1.0-fix-gemfile.patch => gitlab-ce-8.1.4-fix-gemfile.patch} (100%) diff --git a/www-apps/gitlab-ce/files/gitlab-ce-8.1.0-fix-gemfile.patch b/www-apps/gitlab-ce/files/gitlab-ce-8.1.4-fix-gemfile.patch similarity index 100% rename from www-apps/gitlab-ce/files/gitlab-ce-8.1.0-fix-gemfile.patch rename to www-apps/gitlab-ce/files/gitlab-ce-8.1.4-fix-gemfile.patch diff --git a/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild index c94b937..e75cd16 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild @@ -76,7 +76,7 @@ ruby_add_bdepend " # Fix default settings to work with ssmtp that doesn't know '-t' argument. # RUBY_PATCHES=( - "${PN}-8.1.2-fix-gemfile.patch" + "${P}-fix-gemfile.patch" "${PN}-fix-sendmail-config.patch" ) From 1aa208a5295b23a3b13b881f9fef91247d3096bf Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 13 Nov 2015 00:54:41 +0100 Subject: [PATCH 09/10] fixed Manifest --- www-apps/gitlab-ce/Manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index bdbda14..dde4300 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -1,6 +1,6 @@ AUX gitlab-ce-7.13.1-fix-gemfile.patch 1478 SHA256 99050e17841670f03e9430e1f0409cb0194b49ef3235b90c13a4bd66a2648ad6 SHA512 9b0ef71867d4049970295f1ac015e3a4917a24c61edab3452f75f9652e21b94f3dd859247bb28622cd032fe33d4ebcec7b262488841540b48e387f11399c9a8b WHIRLPOOL 9db14e3339e1038dbaff9344f3472c6e23209fa6edbeca35c3108723fd39cb93420361ffdade21fc7019a1e873283524db6e38868ee247ca11a5814832083aa0 AUX gitlab-ce-8.0.2-fix-gemfile.patch 1586 SHA256 c91945e0e639b1297519d7165a3aa03fe203a29cde1d195f277be6cba71c67e1 SHA512 6eb15935292902b3090e856e00a972ee2e442eadbf2e42fbde1e4727d75d65e0e06c6be54be8fcd7aeebb5e0616c8d5123f60ebabebd7e02531f0fbc7b03d760 WHIRLPOOL 985e86c5bcb1ea059b41f1f08d3528afd3ab31d71eb81df79a2b454a0e2fb24dbf08b4a1c9197e56864550842baa60599db631bbd2a3603caaea9b7d6743e3d1 -AUX gitlab-ce-8.1.0-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750 +AUX gitlab-ce-8.1.4-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750 AUX gitlab-ce-9999-fix-gemfile.patch 1585 SHA256 5e5a17fe241547f79e9992a43dc87c2be09ef5021072002c5172f9bc84858ab6 SHA512 f7de8760a1da1d8829b8b481fe0dafe0c379476406d2e0eac92b3085d4a95bbaa75124e592e724dd78add6cc603c3622ddffed6a337ac93ed510ec96045d7345 WHIRLPOOL 3dde3a4aad28d70cfcc3f379e6c3e29aa86fb508e18e01722877cb1d842ee8580d1a74ed6d2325f8790e27e38bb7b5ffc50adc265337e1557156c9806314a750 AUX gitlab-ce-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60 AUX gitlab-git-http.service 972 SHA256 752e1b62a6c182d69b097788d4c21672655af92f150aa5ee416efab67c869f28 SHA512 ba6feefd2741fe97c176e00fbbb802fb4bfc9fc71b2d584c3ad44a312f2b01c9fe92d268d26ab18cb9372ad8616a5ca1554f2895297a17d35f6818bd27b8244b WHIRLPOOL c7c7fa598f2bae6f736a5f84aa3e737dd3b3bce8803128b0b17a8375e4e0c528b95bcd88b959c5bb9bd5ca1fd73330170be6fe2680c1a14702073d3c1c15f265 @@ -17,6 +17,6 @@ DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d314491 DIST gitlab-ce-8.1.4.tar.gz 8761954 SHA256 619ac3b8c83ac2e3dfa81054b5ae0e76ae81497cf38587410504d6a603181897 SHA512 3973af3480f7e52dc64aec2ef99ff13cac9296fbbc76bfb59387416ee683099109fce361cd1619b4d3fa55032f7e1029b272e07cd15e0b6e353ac6f6c730f2bd WHIRLPOOL d3ce2dfaf013dbd99b023cf9d7ab3494d54d8628093761dd7b9cfe522ac8fb2c00a53d4534843dc292fa38ca1200f2dbe2c376efbd1c40e6e0ca1f9a31762936 EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a -EBUILD gitlab-ce-8.1.4.ebuild 11208 SHA256 e9f0316e2fc33cc239ddb0782a873e9d1bf2cbd2433c3eb45cc91b83490bcbf2 SHA512 9c67c837315c9e3e18081a78aa871c265a72a95d9f162b19c6080d940ee2f33dda2a228a63845cf46b574670f3446ca597d90854966fc71582c8ddec371e849c WHIRLPOOL 2bb8e6393be8b69d426a3cda5d84a050b592bbe4abc2c3cc97d6b64ffc4117d9e861faab9d9ffe29ab2d2d202c8a46f0294a56eefe189b0c04bd920366c7ff07 +EBUILD gitlab-ce-8.1.4.ebuild 11201 SHA256 90903f88e6909805c2fe73260c0dbafdbb1b0ff2f3a39deebda6fa47dd6a3b2c SHA512 2f94c23af3b5d860511afeae87bef0b2a9c35b630c9d80eede26968e31ead06bfe08fd8688664874b7aafeed538c6f1cbdc72afcfcf01d7671db495e5e12f0a4 WHIRLPOOL 08cd3ec1bae9ef98291c2f7136f475ca5a2f441b9d965df03235699d3768ce723cbb4d4bb05acddd1f6ab208d3e21f6177b3a03b448a012b8ce730d5ed08ce53 EBUILD gitlab-ce-9999.ebuild 11076 SHA256 7bd11b1f3b0a04ad72e8ffd28d0a54493dd8a537f8bdebb6c9321064a0c65137 SHA512 26c609abeb3e27af95f11e1b074bbef14fb451ef9761aec023b918c6e9922cb58781b899f3dd1990651abfbde8604d0228f7b083b0933c5fe3beb0c7ddd4f689 WHIRLPOOL e366d51a38f2f17eedba2a90aec2f860d5ee4f282c2602fb2fcefd12bf1f4fa0b8923d15c14bc5dbc3784dd3bb19c4d357ce07db9813d37a13c3e950a480a3b0 MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 From c8b725e9185a1551dd7df15b94b4f0bfac4085a6 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Fri, 13 Nov 2015 01:25:47 +0100 Subject: [PATCH 10/10] updated and cleaned the ebuilds --- www-apps/gitlab-ce/Manifest | 4 ++-- www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild | 2 +- www-apps/gitlab-ce/gitlab-ce-9999.ebuild | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/www-apps/gitlab-ce/Manifest b/www-apps/gitlab-ce/Manifest index dde4300..225a74b 100644 --- a/www-apps/gitlab-ce/Manifest +++ b/www-apps/gitlab-ce/Manifest @@ -17,6 +17,6 @@ DIST gitlab-ce-8.0.5.tar.gz 8238566 SHA256 476185a191bfe8757ca1a981419ff5d314491 DIST gitlab-ce-8.1.4.tar.gz 8761954 SHA256 619ac3b8c83ac2e3dfa81054b5ae0e76ae81497cf38587410504d6a603181897 SHA512 3973af3480f7e52dc64aec2ef99ff13cac9296fbbc76bfb59387416ee683099109fce361cd1619b4d3fa55032f7e1029b272e07cd15e0b6e353ac6f6c730f2bd WHIRLPOOL d3ce2dfaf013dbd99b023cf9d7ab3494d54d8628093761dd7b9cfe522ac8fb2c00a53d4534843dc292fa38ca1200f2dbe2c376efbd1c40e6e0ca1f9a31762936 EBUILD gitlab-ce-7.14.3.ebuild 10996 SHA256 a632476e8fe87ec1a478d2229f9e27cbe9e7cc86351e411d9f15105178a4c69f SHA512 a8646de0798d7dae299e500e0a42e6b093e229cb666614b895b979decb1d4b6b398ec2b2f1d19e07cc115f2acb16536426d1769b65412bc51349ac1b262b3053 WHIRLPOOL 2ba4e53846507899b3e6ebb38063e11ee92904262b8a6e00817ab50d6634ed0f0b1013f4a0d8a1cbb26e18c4008e5ab457d3cbd0fdc5f92e5c6214cb45c692f5 EBUILD gitlab-ce-8.0.5.ebuild 11185 SHA256 1240818953ae8f61b6c88c91c3c1dd32fb7d03c8a62964f5d3ad2e98ff5dad11 SHA512 fd411dd3cd8a4dd1ee0040438fe5da01f81ccf4f97b7b7b3157fcbb35bfacbfd0eda8754fb01e0061e6b0c5bd0e752b0eaff4d663d11b764623e7baafb4f56da WHIRLPOOL 9514cd8f83c7fbaba82b49352cb9b8e62d1a5317a09bfea85ce945abd1402e634a88f6eb033494729519ac6fc1282c18bfc8224b9bbe6f41ac89a1286b1d5d0a -EBUILD gitlab-ce-8.1.4.ebuild 11201 SHA256 90903f88e6909805c2fe73260c0dbafdbb1b0ff2f3a39deebda6fa47dd6a3b2c SHA512 2f94c23af3b5d860511afeae87bef0b2a9c35b630c9d80eede26968e31ead06bfe08fd8688664874b7aafeed538c6f1cbdc72afcfcf01d7671db495e5e12f0a4 WHIRLPOOL 08cd3ec1bae9ef98291c2f7136f475ca5a2f441b9d965df03235699d3768ce723cbb4d4bb05acddd1f6ab208d3e21f6177b3a03b448a012b8ce730d5ed08ce53 -EBUILD gitlab-ce-9999.ebuild 11076 SHA256 7bd11b1f3b0a04ad72e8ffd28d0a54493dd8a537f8bdebb6c9321064a0c65137 SHA512 26c609abeb3e27af95f11e1b074bbef14fb451ef9761aec023b918c6e9922cb58781b899f3dd1990651abfbde8604d0228f7b083b0933c5fe3beb0c7ddd4f689 WHIRLPOOL e366d51a38f2f17eedba2a90aec2f860d5ee4f282c2602fb2fcefd12bf1f4fa0b8923d15c14bc5dbc3784dd3bb19c4d357ce07db9813d37a13c3e950a480a3b0 +EBUILD gitlab-ce-8.1.4.ebuild 11177 SHA256 6b920132ff2c4926f2ed3edb3fff7cdf3e88c0314f8a0a9c077cdaae9fad4a0e SHA512 617656f6fd52d0c4751e0726983fc7d2c1532e8bc44761dbbe5bfb7f489e18ef66a68769bb0f7736c9d49d536e8103a5486e92869a9bba4d1aa92c4068eedf6e WHIRLPOOL 1c8a0968a1fa7b95ceb47f66610a72585666cc5b2f7f3157d1f5c04f98a2c89d79ac1875a28c57b3116105d2e0af17dabcecaa00159af42166565ae7fa88647e +EBUILD gitlab-ce-9999.ebuild 11205 SHA256 98ded7828728ee917df820820b6b7de4b9ac7fe19ea7cdcf06b6750e59e2315a SHA512 fff34b296c878e4c1c5a861e7be81570e5c00a9aaa9345f5acf3522416fa2b2118f88f6ceab962928214f38e688d85f7347883283fb6ba5a49b6ce2fcc09216e WHIRLPOOL 146b782eac123c399f131709663e3d06523ce5e47a52b461c48664d1311e43b19e3eefc55e6501d44c8a31d53cd4440c24c9c2c48aa0da5b796e44011358e24d MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild b/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild index e75cd16..813fe32 100644 --- a/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-8.1.4.ebuild @@ -149,7 +149,7 @@ all_ruby_install() { # prepare directories diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites + dodir ${logs} ${temp} diropts -m755 dodir ${conf} ${dest}/public/uploads diff --git a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild index 03f0bf2..6403f31 100644 --- a/www-apps/gitlab-ce/gitlab-ce-9999.ebuild +++ b/www-apps/gitlab-ce/gitlab-ce-9999.ebuild @@ -89,7 +89,7 @@ TEMP_DIR="/var/tmp/${MY_NAME}" # When updating ebuild to newer version, check list of the queues in # https://gitlab.com/gitlab-org/gitlab-ce/blob/v${PV}/bin/background_jobs -SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,common,default" +SIDEKIQ_QUEUES="post_receive,mailer,archive_repo,system_hook,project_web_hook,gitlab_shell,incoming_email,runner,common,default" all_ruby_unpack() { git-r3_fetch @@ -153,7 +153,7 @@ all_ruby_install() { # prepare directories diropts -m750 - dodir ${logs} ${temp} ${temp}/repo_satellites + dodir ${logs} ${temp} diropts -m755 dodir ${conf} ${dest}/public/uploads @@ -203,6 +203,7 @@ all_ruby_install() { # clean gems cache rm -Rf vendor/bundle/ruby/*/cache + rm -Rf vendor/bundle/ruby/*/bundler/gems/charlock_holmes-dde194609b35/.git # fix permissions fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs} @@ -214,6 +215,7 @@ all_ruby_install() { systemd_dounit "${FILESDIR}/gitlab-sidekiq.service" systemd_dounit "${FILESDIR}/gitlab-unicorn.service" systemd_dounit "${FILESDIR}/gitlab-git-http.service" + systemd_dounit "${FILESDIR}/gitlab-mailroom.service" systemd_dotmpfilesd "${FILESDIR}/gitlab.conf" else local rcscript=gitlab-sidekiq-8.init