Merge branch 'feature/gitlabhq-7.6' into 'master'

Feature/gitlabhq 7.6 Merge the ebuild for gitlabhq-7.6.2 into master See merge request !3
2015-01-26 18:48:28 +01:00 · 2015-01-26 18:48:28 +01:00 · 497c20f31b
commit 497c20f31b
parent 000317ef9e 35bb131c24
5 changed files with 21 additions and 40 deletions
--- a/dev-vcs/gitlab-shell/Manifest
+++ b/dev-vcs/gitlab-shell/Manifest
@ -17,4 +17,4 @@ EBUILD gitlab-shell-2.0.0.ebuild 3297 SHA256 668c0430dc5783852cfff4588ac1fef2fa0
 EBUILD gitlab-shell-2.0.1.ebuild 3304 SHA256 35c085cd702149462fafe0bdfdb41ab244fe06c6caef3542aceb399d37f334bf SHA512 24725735f67323d5b6cd95f9a54981c20288acea05b07b1b195b62bf9add1b850fb787f4a9fb7749f7103cd932023d3180653dc812a02d6314ec1b674e751449 WHIRLPOOL 8adf08faa3892f2ab5ad03eadab584097f6869a720517fd925f34a05f042410411cb3132df42b1d82c3f5dba68fdb2f76b1f00611747d3f48074d9e69dc9c49f
 EBUILD gitlab-shell-2.3.1-r1.ebuild 3502 SHA256 6c604db35e20522c499f45d5994c421ea08b25313f630af8349441ddae96d757 SHA512 8d492097a53e1314212c263730b5f00f8f53c8d52b1fdc8b6c5d8abed86927f4ff56c2bf04a430dd6aa0b155d4531881d5fbbd7d8948131ec609dc2d7eb41080 WHIRLPOOL 2b491377ffe21cd0706e6c8422e1c5b52530460b08abbc315cb7e172a052f1acfdabc335575b284bd8a9107cc83d4d1411e3afe1294710d4064d14025acf1bb4
 EBUILD gitlab-shell-2.3.1.ebuild 3635 SHA256 d7b6f533145bdf67c3b19bfb2e5d330be77077939d2b75bff73d056c29645dd6 SHA512 b3f1690327682a30fbe166e38ec49171fedec22127db1555195271e4ed949238ad6d1b186dcb4d7a9c31f5c44ad60663e68efb0adfd29f1b9d6e18f58b260954 WHIRLPOOL 2a24f5a92d4a2495b8d4dd7a4182c869e32def571b2e74450659017256be08c02f4a9fa6ff8523c819391b8204aebbac41ecb6d8f5e4198168a34f10348cd73a
-EBUILD gitlab-shell-2.4.0.ebuild 3517 SHA256 2472686d1345ab662937f68106db980c580a177bd0f0749a3125dc82e0d7cfec SHA512 9e55af71dea179f8fcb5ed0485491058cdc3aad1341c7c1af73a00f82c622d1ebf88f715d45146fe014ca671944b0c4a8e77e0983575fb599cbe55a44d2136f1 WHIRLPOOL 74d62aebb6c59f6242c4f194b3a3a9e45cfd29479f4f64effc665eb6af98ac0fcee65c289edfc65f94671d651babadcbf622a22c67d1a36eaf706adc5bb0281f
+EBUILD gitlab-shell-2.4.0.ebuild 3502 SHA256 6c604db35e20522c499f45d5994c421ea08b25313f630af8349441ddae96d757 SHA512 8d492097a53e1314212c263730b5f00f8f53c8d52b1fdc8b6c5d8abed86927f4ff56c2bf04a430dd6aa0b155d4531881d5fbbd7d8948131ec609dc2d7eb41080 WHIRLPOOL 2b491377ffe21cd0706e6c8422e1c5b52530460b08abbc315cb7e172a052f1acfdabc335575b284bd8a9107cc83d4d1411e3afe1294710d4064d14025acf1bb4
--- a/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild
+++ b/dev-vcs/gitlab-shell/gitlab-shell-2.4.0.ebuild
@ -14,8 +14,7 @@ SRC_URI="https://github.com/gitlabhq/gitlab-shell/archive/v${PV}.tar.gz -> ${P}.

 LICENSE="MIT"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 IUSE=""

 DEPEND=""
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@ -40,7 +40,7 @@ AUX gitlabhq-7.0.0-fix-gemfile.patch 2185 SHA256 48070f5cd7e16ce27abad8e2cf80493
 AUX gitlabhq-7.0.0-ldap-custom-mapping.patch 2708 SHA256 8592744ba8b373b2e89c76d7ceb6c755bd46e2c2de6143b3f1d9967e4b6e5fb3 SHA512 a172444da26ddc9dfebe0c0ead4a2eb73a77ac44dfd9b3dbcf2b3faa679d963db080d2979d707e337b99f8e6384ccfd323f5d6e70921d193e99db75a4ba45b38 WHIRLPOOL d25e1f78342c781d26b84c09bd7eba08b46375c2f353b358f838602253dc2fe57807a437fc0c2891a6bc2893eba0bb278bd605ab8b6c837101a783c84536095b
 AUX gitlabhq-7.1.1-fix-gemfile.patch 2184 SHA256 9ba304baa5a17f1b0637fe243f551ddcc22cf32c3e82b7dc5b1a5cc0c5fc5876 SHA512 db8757874f136fc6a1d138feadbad6f8dfc773446f969b76a4715901dac02c04c978133ef3e9218b9c4a3d0173f53c0d14608ae123ee300a803529cbf232a1d1 WHIRLPOOL 27adf9392f3f1cbc6288afc1aabc174850a689f47f015c9d638b62769607e6e4f5ebe8bcb3811ee189ceeddef7c5bca384b322d15c0008b8867887f26d6188e2
 AUX gitlabhq-7.1.1-fix-project-name-regex.patch 638 SHA256 9f3dfcdc4365422037ecc8854b10e2cf96f4fb9508a6d5214b16c3545ca1353b SHA512 4606eade95b75e31eb791d793e3571c4e998c2d451e1f92ce70fba06e3a29c74a17f2fedba24ded4dbdc6db3da87960890552869fd8790caed26ff6fbb201717 WHIRLPOOL 6470de727d060556cc1413ac23f3c3198035f3cd7b05a291f7dedfcd9071a5afecca57c15f7387a84d9c1830118e47fae4fc72ba2f2e67c346bf18c4dae09865
-AUX gitlabhq-7.6.1-fix-gemfile.patch 3032 SHA256 a97fca0e1f51ed97be469bfd020b014f70c80d5863777c7d299d41f7d4298f9e SHA512 bbbd25b19d4916e75984a44083303b2984052e66b932e604b8aab5dea9c9a2c5f26358b060ac1f1c5b9a0c8f7e834d7a58116be33fbc8cd9cbe8cc3ed937ea32 WHIRLPOOL 483565da0c586bd37afb35538f9a8a6967ebda7b249f28d0bbadd7c48e006957e0535cded04f2505bd4ca6c350cc40d81f3cd22bcacd933ddd67c9cad95ef1b9
+AUX gitlabhq-7.6.2-fix-gemfile.patch 2402 SHA256 9abfdff94da0fe5b6db4d740688af179b93cf56c1ecb915c12bc0a5440295c4b SHA512 ce948a768a0803794e102b062fcdfc7569879f3ac649a1cc86f222053810dc758dbecc41834d06a1f6a3e5e03cf36dcb368e24a47401dfac7f6b8c5197706359 WHIRLPOOL ac7696de8bd143dec22cf3e31807249bd1bb58424edeb8de7745afffa8007ecefd577ce11dfe5de2080d87ab19eb7198ddd2d89f06eb96b5e4c70e2476594f27
 DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
 DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
 DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
@ -55,7 +55,7 @@ DIST gitlabhq-7.4.2.tar.gz 4189724 SHA256 b116c49b032e5cd3529698aed3174b6f02748c
 DIST gitlabhq-7.4.3.tar.gz 4189957 SHA256 e03092298526bafb65336a14944570083f96e960f9bdabf8e4e52a403e42a5f8 SHA512 24228e31c7422215309838b1c8c9f24d8b2c77691b480365548ade36be53368bd9cc04e8065386e83b501f8f3f97f365634297a1af2c93c285cddad2f8150af8 WHIRLPOOL 785b6ba8c2c94456c005b7fbca265a762990e24c5164d742d8cb34a0f370c604aec23490ceb034007444ffe65223e163a58364aa01c1d617404a3278ac77f0d7
 DIST gitlabhq-7.5.1.tar.gz 4221894 SHA256 cbaef29b55c35b1428fb4678be76500e7f0c292aa72314fa457d94c61fb5e00d SHA512 fc99100aab666819c06df96fc7979cb108a42249d811482c64473a51ec38e89d325346a4e069666a9130cff9eab21a470e68724cbe53d135bf4dc3b52a6b8930 WHIRLPOOL d86887f196cdc8d2690ff0a788c70994b7192d39b89d47c63a8b0baad8102c22efac3b3dc6556eefba7bb5cb12aaad347e5adb7d9a5a591fd8ca1d7de3a5b493
 DIST gitlabhq-7.5.3.tar.gz 4222058 SHA256 533afcf5b9a0683d2f920a436e552af8d8e953c78d03f150cfb8dcfa0da3112d SHA512 18e9d5ee9d39c8e11101d370228b8edd38ccbfc1b7d768977f3cdd575604d7f72f897484749f9d74988b91f8195c0b9452a47a6f83acb6a7890d4aac9dd9f1a7 WHIRLPOOL 0bf347b12c2d2b5d4bf4bbcd0ff790bccfa100d0ff818a77e0843e3ff1ce87a627cd541bd7e5d8160f0954477809c8539ac1c309c3bcbc0e0b517ad3f30193de
-DIST gitlabhq-7.6.1.tar.gz 4239328 SHA256 96746351fdf05fc39f473930dcef4b25a02d9056c211004fbc14ad796b938cb0 SHA512 fbf807e6d9f5b9c0a6f86c086b6d69f0fd9ff268400432b023093053adf8d8b2e93e32675e0703df5cd00449af308f1fa6f649214d25bb00cd73c62437b60559 WHIRLPOOL 5f252240bf5e6722d7c064c52ce1e79548b2ab908487427aa4fee0dcf74652cd822325f1abb85aff14b83f19417626087fda489180bbbf6c10bdf8035d3ebc01
+DIST gitlabhq-7.6.2.tar.gz 4238734 SHA256 bc8f92dacca6be48c7a34b60a727e0755a44742500164c131dde7b88bedb71f0 SHA512 ecff2159536c72c82e34aadaaa02e2ee29ec494e7caf132665139622dcb6ba94af15295a0a8bbdeb550a9c2777284cd67cf57b7940b49da98e288a48577ba1b0 WHIRLPOOL 8b4fa295e82c9d61cc0c9a0e5e84b65ac2528f4afacada065e37214234b98d6aee90abe9d1599b8827e459f5ad503fccbab00f1d7528b89735f1617f4d55507c
 EBUILD gitlabhq-6.7.5.ebuild 10973 SHA256 d74d454bd9972f15d21a3454e39a78ab042ccb3444cbbedb25da01d40335361b SHA512 b5494ee857055022da0803277d6a8b84d1fa1d9af66a853eedafdd3fa4993dfe4a66962581234333b16f41b6d605cfe6a207a4d2706c90d921fbc54474deb296 WHIRLPOOL 03026c7b7029c8bc7d5e5ad05c38e4b507be6c4f36b488753120d7d0849522a9e557c5b04adcac4c22eced0fbc1432fd16e7447198092b6691ccc529147d9dcf
 EBUILD gitlabhq-6.8.2.ebuild 10595 SHA256 24317d99bb9d0e220c11a37709b1b701b9cd7bf7b9fe3adead666c531569dcf0 SHA512 2f3f5e38b33edfdff35f3888e694984e97d897d7c64c0aa6cc35149d253e7211560dbd918b12e891c0d1d009241e53e255a2a3be91beb5a3954d148c4554315e WHIRLPOOL 4dca44d6e271ec14252e3a4690e6736d64133d3d115ec19b77d37cb5a2a3d3a46e9820dae48df5d7fa79dd0ca9c6b178b9dca85811bc0e78b7964580b0696b59
 EBUILD gitlabhq-6.9.2.ebuild 10616 SHA256 4221acadb5ac65ca3d662a2a560ff6343e04e0ca14dbd1b5bdd8f6a07812f7be SHA512 161c587d219c0dfd54b92805f7378aa7b1750bb25e632a16b67e3d24b28fab95f8f4272d685dfc70f1d7bfb15449a208fbb8b343dd8f902d8855034ed7f855d1 WHIRLPOOL effe560de13a29de88bf42aa927ddc2781373722a0e9a83ebef8942b0128208e35658a6b43d1bdc2d6e2b80c43b836dc8cc431f5d38912c201c789f70076e245
@ -72,4 +72,4 @@ EBUILD gitlabhq-7.4.3.ebuild 10576 SHA256 7fdcfdfa51e7b2ed8b523879009c0cd19c2734
 EBUILD gitlabhq-7.5.1.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
 EBUILD gitlabhq-7.5.3-r1.ebuild 10907 SHA256 3c8b8cabc75968beda5a351b746ab53c7e644d16c437bc54af51fd62283a1917 SHA512 e42b3605ab405a798467713f723ddff553ecef81b2f16baad9bd93653da15fb23e47aa7f28d5cc93eaabf3e8eeb70201dc6f8ae6192b42da82be0a754e54704d WHIRLPOOL eae1bb4dc43c178f61fd8fe5784c1e02f385969dc7237ce9c140774266f4a583f911617014602c1e72c0f8f525edc7b6e620c748045419640f0f0bdc8dc6f0d3
 EBUILD gitlabhq-7.5.3.ebuild 10904 SHA256 821abc6ca9c2b87f18aa3279068ead6c25ed5d652a0ac725dc5c53a6eb9baf08 SHA512 f0ff1487b022ed7884a4883b4e0fe36229918a3c93ea24ed315da7eda8cbc664974444e4efb7275e26008c5ef75e872d0fe1f76eda43d7aaa2223649faf5d554 WHIRLPOOL a20c720e9ad3a440b89d09df0a02dfef4f63cfab2102a69da20e5f38925daf97f8a8d339e4c9d997e0f0a05b9f71ad3932d6cdc20e6561696d2286bb7d510589
-EBUILD gitlabhq-7.6.1.ebuild 10926 SHA256 ccd50b531f6f406b4cecc349ab4e4414732ceaab881aaaae91ed91f2be206efb SHA512 6bfa1136d32e151f4df836ca5040615ae0be38e3d166fa72332320234edd56349515dafdbb0d2e9e969176570b67a603854b288e726a4b190815c79cf9e03bdc WHIRLPOOL e1f092d7e698229d74fa613b143b8ac15794d09f52c2de7a9d3b54791f1bb0b567b18b82d4ca06748e282de0af7338dbf3e1753ca3acc903a98a644d96df222e
+EBUILD gitlabhq-7.6.2.ebuild 10925 SHA256 99fa5c39f57c1ceaba66105b2de907a2235a8d3a8bf491b530c72604e704af4e SHA512 76362d37692a61024c5d34504fefa10245a8ed3d47a6a7f454ff191dc340bb58addae04b0b392b1e67e8b918a504c1cbee47497c05233d3418d02c8d62e932a4 WHIRLPOOL f47f69b4c06d1a41d2fe38cecbcebc49863a31465b868b3403e89d98b6510ff03cc8562ec6d77159b754c39d36b40d492034796613bdb5b0786f64cab4742d10
--- a/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.6.2-fix-gemfile.patch
@ -1,18 +1,8 @@
 diff --git a/Gemfile b/Gemfile
-index ce9b833..49ddf1a 100644
+index ce9b833..c4bd377 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -28,6 +28,9 @@ gem 'omniauth-google-oauth2'
- gem 'omniauth-twitter'
- gem 'omniauth-github'
- gem 'omniauth-shibboleth'
-+# Version 0.8 does not compile, so let's try tag 0.8.1 from github
-+# This is a dependency of omniauth-kerberos
-+gem "timfel-krb5-auth", '0.8.1.1', :require => 'krb5_auth', :git => "https://github.com/fritteli/krb5-auth.git", :tag => "v0.8.1.1"
- gem 'omniauth-kerberos'
- 
- # Extracting information from a git repository
-@@ -155,6 +158,10 @@ gem "underscore-rails", "~> 1.4.4"
+@@ -155,6 +155,10 @@ gem "underscore-rails", "~> 1.4.4"
 # Sanitize user input
 gem "sanitize", '~> 2.0'
 
@ -23,7 +13,7 @@ index ce9b833..49ddf1a 100644
 # Protect against bruteforcing
 gem "rack-attack"
 
-@@ -170,7 +177,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
+@@ -170,7 +174,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
 gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"
@ -32,28 +22,21 @@ index ce9b833..49ddf1a 100644
 gem 'jquery-turbolinks'
 
 diff --git a/Gemfile.lock b/Gemfile.lock
-index a93935f..66e2c22 100644
+index a93935f..98721dc 100644
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -1,3 +1,17 @@
+@@ -1,3 +1,10 @@
 +GIT
 +  remote: https://github.com/brianmario/charlock_holmes.git
 +  revision: dde194609b3513b0d2369ce8f916ae52566154b4
 +  ref: dde194609b3513b0d2369ce8f916ae52566154b4
 +  specs:
 +    charlock_holmes (0.6.9.4)
-+
-+GIT
-+  remote: https://github.com/fritteli/krb5-auth.git
-+  revision: 14e09f7fdd79962b146e0a6513fdb1b8e64c221b
-+  tag: v0.8.1.1
-+  specs:
-+    timfel-krb5-auth (0.8.1.1)
 +
 GEM
   remote: https://rubygems.org/
   specs:
-@@ -62,7 +76,6 @@ GEM
+@@ -62,7 +69,6 @@ GEM
       json (>= 1.7)
     celluloid (0.15.2)
       timers (~> 1.1.0)
@ -61,7 +44,7 @@ index a93935f..66e2c22 100644
     cliver (0.3.2)
     code_analyzer (0.4.3)
       sexp_processor
-@@ -280,7 +293,6 @@ GEM
+@@ -280,7 +286,6 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
@ -69,7 +52,7 @@ index a93935f..66e2c22 100644
     listen (2.3.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
-@@ -426,7 +438,6 @@ GEM
+@@ -426,7 +431,6 @@ GEM
       redis-store (~> 1.1.0)
     redis-store (1.1.4)
       redis (>= 2.2)
@ -77,7 +60,7 @@ index a93935f..66e2c22 100644
     request_store (1.0.5)
     require_all (1.3.2)
     rest-client (1.6.7)
-@@ -525,9 +536,6 @@ GEM
+@@ -525,9 +529,6 @@ GEM
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     test_after_commit (0.2.2)
@ -87,15 +70,16 @@ index a93935f..66e2c22 100644
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
-@@ -536,7 +544,6 @@ GEM
+@@ -536,7 +537,7 @@ GEM
     thread_safe (0.3.4)
     tilt (1.4.1)
     timers (1.1.0)
 -    timfel-krb5-auth (0.8)
+    timfel-krb5-auth (0.8.3)
     tinder (1.9.3)
       eventmachine (~> 1.0)
       faraday (~> 0.8)
-@@ -606,6 +613,7 @@ DEPENDENCIES
+@@ -606,6 +607,7 @@ DEPENDENCIES
   bootstrap-sass (~> 3.0)
   capybara (~> 2.2.1)
   carrierwave
@ -103,13 +87,11 @@ index a93935f..66e2c22 100644
   coffee-rails
   colored
   coveralls
-@@ -704,8 +712,8 @@ DEPENDENCIES
+@@ -704,7 +706,6 @@ DEPENDENCIES
   stamp
   state_machine
   test_after_commit
 -  therubyracer
   thin
-+  timfel-krb5-auth (= 0.8.1.1)!
   tinder (~> 1.9.2)
   turbolinks
-   uglifier
--- a/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.6.2.ebuild
@ -25,8 +25,7 @@ RESTRICT="mirror"

 LICENSE="MIT"
 SLOT="6"
-#KEYWORDS="~amd64 ~x86"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~x86"
 IUSE="mysql +postgres +unicorn systemd"

 ## Gems dependencies:
@ -52,7 +51,8 @@ GEMS_DEPEND="
 	virtual/pkgconfig"
 DEPEND="${GEMS_DEPEND}
 	>=dev-vcs/gitlab-shell-2.4.0
-	dev-vcs/git"
+	dev-vcs/git
+	virtual/krb5"
 RDEPEND="${DEPEND}
 	dev-db/redis
 	virtual/mta