fix the Gemfile.lock for 6.7.5. whatever its problem is ...

www-apps/gitlabhq/Manifest

@@ -26,12 +26,14 @@ AUX gitlabhq-6.6.5-email-custom-reply_to.patch 1617 SHA256 320405e34892d5fc3f1e6
 AUX gitlabhq-6.6.5-fix-gemfile.patch 2161 SHA256 7f1f6fef287a00a0f794ad31a81cced87a5ac6a31e79e27be6530f92d66a2598 SHA512 24bb78ea36886764911af7825c0ade796dbd24ee99ee19e418d4478bc4d4dcbdb4ffcfd63b615a842a320234c4e6b0b851094abdd0c5be0a5cd80308a00d380a WHIRLPOOL 6345e2ec96c52f79545f21fb330e8517925c04f162dc2cbad959c1eb59fd65e89be4cc45d1510ef662e43a26541e840e02742adb9474569a44e80771df773d7f
 AUX gitlabhq-6.6.5-ldap-custom-mapping.patch 3052 SHA256 64e47278393ba4442037bb684a44c1538e671683cfaa9dfcb9bf61e5265da03a SHA512 f1e9ad71e4b95e6cb4f56179d1a9f92b5a2b7c59a425f4c9620c3bb6cd68c9bd2ae4e443f8a29d84455b029d99ba248517b44b1b8e9ddeeca249a6e749bf095f WHIRLPOOL c2045af7b8b766a3e154a1a8fa83a469df4111b352973533f902c16abfeee161d1f4cf88861847f64dad36e39ca65a796598e9d75ddad5a8e9f160707af349a3
 AUX gitlabhq-6.7.5-email-custom-reply_to.patch 1628 SHA256 0a5e1043a453395cc552626072677b6ad6de843980d3f480f6b98469c2f7ccc2 SHA512 7fe754dcfb3e8fb15daad059b4582dcbefb61da2bd12fe73ec5eee4b77ac9a2116e25365fbb3503b76f6048ae707230333a5439a63b59f946e2da37a8cecf92e WHIRLPOOL fca02b390e5edee5a58538f620fc7f5ff7632dcfd3d2b31befc4dcd46338e2345db337ee888dc2b6d7d456bcb426d44989a8a01f4176ac05491712012bc98b23
+AUX gitlabhq-6.7.5-fix-gemfile-lock.patch 830 SHA256 11fccb5c51e49e7994cfce5b9e478625642b8ad23ea301b3989e9e69cf29dff8 SHA512 8578f5651e10dda68c16a7e9065dd86eb5db6278b8a08342d93854a2a8b259782887d6afedf35d61def12190d10f588c4fb5f279b09a5c86ea0fa58f9d3a5df5 WHIRLPOOL 5ca8afa60cd3c86463103b3a5acea236d584ffc662fe07775620b9d656bb37b09dea95523b6edbfa02052aa5983cec70551eec7e213ff5fbac56256f9f1ad180
 AUX gitlabhq-6.7.5-fix-project-name-regex.patch 1148 SHA256 bb0e175e56412aaef647fb0a3cc31f0e1dfdc12983d4195ab9375b2ecd929c46 SHA512 7b9db9068edbf99c9226fecf4ac3154110481a7b69020ee05d1318ee6f4105d53c45ca14317f917825c9769d317a8815830638a371fd8f5d6af031b361bef65a WHIRLPOOL 0c333f523230ec49089017087dce328e79e646efeaec5c9520f541775d717c45cabf3173199405b55b836285d0fa9c27764f250eb7f19fe4f1909514caf879e9
+AUX gitlabhq-6.7.5-ldap-custom-mapping.patch 2992 SHA256 0fa8d8225552b0a2305f2876399272ced64ae7c3c7af1fed9b59a4b74448d5b7 SHA512 d62c7560c4472faf2c08c5a6700f0dfe58e945f376c0bccef4593849c16d30c8adf3ce8b856fe69c944afbaf75b1d957ae411bba766d87b0fdbba8c8c8172d2d WHIRLPOOL 8e0e2165adb5d3a87ca254550d8072829c74e3bdb34e86bcbb47af3009bb0a2d21e24cda91e489148d20d543c4d8310267527233d57dcc4fe94770167f4fef11
 AUX gitlabhq-6.8.2-fix-gemfile.patch 2073 SHA256 6cccaba8d4483e4e8390ec518e474e2137985d490163cfcc0cef090fc80e0277 SHA512 75c21c7c5103d13009427739d591a268b7d9d43add0a3d0c2f3188a054c0963a4b525c024664732ad6ff5429adddfde49d98b74285a0de21c351143692839b73 WHIRLPOOL 4ec488ae566c5781eff17cead6c83002ef4a5055c02f3bf07ed8955985a8e3b7fe61fd4b5b116e4cb74787fb4b3f9caa820a9c67b297c007eed7f0be2d461261
 AUX gitlabhq-6.8.2-ldap-custom-mapping.patch 2579 SHA256 82aaae2c64554e9c00dfb8f1d66884512f509752c74b03fe430d3ba7e7a5c18d SHA512 82e1900473b96d0067b477f76fae7445dc000a520bebe0f9cbdd7e02063b146005aa63594f508e3a592e89b04ac26b425b8a186bbd474b538c918d74c6abb9a7 WHIRLPOOL 953ddf4b70a9caf29afeaee50939c3bc3ec4a4f53cb484f50f151e7a8d6ab2d03303deb4c26c931fa836fa84b5935522630ffed7d266fcd9cb6982a6148e6882
 DIST gitlabhq-6.6.5.tar.gz 10240388 SHA256 70c2c50ab903b7173ccbb32d2c7f3db9a89a4a005d5515ef9ed5d935193dca2e SHA512 38d2395eabb4607b40798de0c6e9aa7fb6ecfe482b6f7d1a5cc2350c1cf04d939ae2487834d159419d01c24e82b818920f7b1999df444cb473c99d9fc40244da WHIRLPOOL ce684cac1ca27ae51f25277cba1c62fa389150ccd83ae83d5d91a17cf4e183e8af7928431000924f0dcb03505045cad850a05e6b2ac4fa001a488e73a4b09971
 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
 EBUILD gitlabhq-6.6.5.ebuild 10786 SHA256 7aba88de5bc37d19161828401d39385dcd96914b50f7504dad5068aa966b2a73 SHA512 7284a4b0aad4f2b2fc0373c4348c846e2a59a3227d4defbb1e1fc17a71fdf5f4a7aa7f5a58528110bec0325ec544fa8490ed1c9b7d359db5ea060df64895382d WHIRLPOOL 79b1d4c9fe08d150f58709642951ee8ae49313a660ceaeeb8af6b23b6a70730fbe517fe3ca1466d11d5f95e56f1d597d66517601ef40b1414b99e08168ba53ba
-EBUILD gitlabhq-6.7.5.ebuild 10795 SHA256 d5da5a477f75068f41ac54bbc73f53a46a2f6263d816d9496409184d329bda46 SHA512 f39c8e85a087a484b25f5a3fadb29dd03022859982b3ce15bb2728256e1902ac58d3557cbac89eaf89edaa340326812d61adb4f077b92fe183c28872e727d435 WHIRLPOOL ab59badccc1097d198aaf05a287530dba6efaa7b46c8004cf87e3f9937cddd56ff717405b8481603d257a9898d293fd5be3eeddce9d4e90d802689b2b1923597
+EBUILD gitlabhq-6.7.5.ebuild 10819 SHA256 0c0ce98637a5b6b865988f90be2de5943141ff557384204c274ff01050d94d4a SHA512 7d5b09f5ebd704c2bce9393be13b911d690bae7846211962e3e3fccf67f1c9a0d1020582313cb8aac6ffad0b6f502a21f37b7d6332c6f6a83a88e7d7b2f1236f WHIRLPOOL c431d10695feca8730f741ce11fb59b649e94a43d86dd5f0d73658a969f23bf6beb9b90f7b083025d33aceb30c759fd180d0b89c4869fded221302ec763d1723
 EBUILD gitlabhq-6.8.2.ebuild 10757 SHA256 21406fa35f286cf7dd4d7c407e4c589042858c7005e0b122239d3c47bc924711 SHA512 69b0ffeeeecdce24c25737e04f45ccd70fed03464e632dcb0e04dceb3de1c887ef1fc108e3022279250142c9a73ceb485e75d096f70ab08fd507d830d74c776d WHIRLPOOL 66e2f0defb19af17ed37f5b6d8face04c511a0ef01132e3c89044b8a6ec15ac7e53233645a1854245840f77696c9bf044acf3664fc50e6498400c3a38349cdf7

www-apps/gitlabhq/files/gitlabhq-6.7.5-fix-gemfile-lock.patch

@@ -0,0 +1,27 @@
+--- Gemfile.lock.orig	2014-05-23 17:42:33.510000000 +0200
++++ Gemfile.lock	2014-05-23 17:45:31.320000000 +0200
+@@ -22,15 +22,15 @@
+       multi_json (>= 1.3.2)
+ 
+ GIT
+- remote: https://github.com/jirutka/omniauth-ldap.git
+- revision: b55852bfc9b46ecf790a2c5526386702350eab89
+- ref: b55852bfc9b46ecf790a2c5526386702350eab89
+- specs:
+-   gitlab_omniauth-ldap (1.0.4)
+-     net-ldap (~> 0.3.1)
+-     omniauth (~> 1.0)
+-     pyu-ruby-sasl (~> 0.0.3.1)
+-     rubyntlm (~> 0.1.1)
++  remote: https://github.com/jirutka/omniauth-ldap.git
++  revision: b55852bfc9b46ecf790a2c5526386702350eab89
++  ref: b55852bfc9b46ecf790a2c5526386702350eab89
++  specs:
++    gitlab_omniauth-ldap (1.0.4)
++      net-ldap (~> 0.3.1)
++      omniauth (~> 1.0)
++      pyu-ruby-sasl (~> 0.0.3.1)
++      rubyntlm (~> 0.1.1)
+ 
+ GEM
+   remote: https://rubygems.org/

www-apps/gitlabhq/files/gitlabhq-6.7.5-ldap-custom-mapping.patch

@@ -0,0 +1,89 @@
+--- Gemfile.orig	2014-05-18 18:41:03.150000000 +0200
++++ Gemfile	2014-05-18 18:41:42.840000000 +0200
+@@ -35,7 +35,8 @@
+ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
+ 
+ # LDAP Auth
+-gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
++# Patched for attributes mapping customization
++gem 'gitlab_omniauth-ldap', '1.0.4', require: 'omniauth-ldap', git: 'https://github.com/jirutka/omniauth-ldap.git', ref: 'b55852bfc9b46ecf790a2c5526386702350eab89'
+ 
+ # Git Wiki
+ gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
+--- Gemfile.lock.orig	2014-05-23 17:37:14.650000000 +0200
++++ Gemfile.lock	2014-05-23 17:38:48.570000000 +0200
+@@ -21,6 +21,17 @@
+       activesupport
+       multi_json (>= 1.3.2)
+ 
++GIT
++ remote: https://github.com/jirutka/omniauth-ldap.git
++ revision: b55852bfc9b46ecf790a2c5526386702350eab89
++ ref: b55852bfc9b46ecf790a2c5526386702350eab89
++ specs:
++   gitlab_omniauth-ldap (1.0.4)
++     net-ldap (~> 0.3.1)
++     omniauth (~> 1.0)
++     pyu-ruby-sasl (~> 0.0.3.1)
++     rubyntlm (~> 0.1.1)
++
+ GEM
+   remote: https://rubygems.org/
+   specs:
+@@ -190,11 +201,6 @@
+       gitlab-linguist (~> 3.0.0)
+       rugged (~> 0.19.0)
+     gitlab_meta (6.0)
+-    gitlab_omniauth-ldap (1.0.4)
+-      net-ldap (~> 0.3.1)
+-      omniauth (~> 1.0)
+-      pyu-ruby-sasl (~> 0.0.3.1)
+-      rubyntlm (~> 0.1.1)
+     gon (5.0.1)
+       actionpack (>= 2.3.0)
+       json
+@@ -588,7 +594,7 @@
+   gitlab-linguist (~> 3.0.0)
+   gitlab_git (~> 5.4.0)
+   gitlab_meta (= 6.0)
+-  gitlab_omniauth-ldap (= 1.0.4)
++  gitlab_omniauth-ldap (= 1.0.4)!
+   gon (~> 5.0.0)
+   grape (~> 0.6.1)
+   grape-entity (~> 0.3.0)
+--- config/gitlab.yml.example.orig	2014-05-18 18:44:01.500000000 +0200
++++ config/gitlab.yml.example	2014-05-18 18:44:44.250000000 +0200
+@@ -127,6 +127,10 @@
+     method: 'ssl' # "tls" or "ssl" or "plain"
+     bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
+     password: '_the_password_of_the_bind_user'
++    mapping:
++      username: 'uid'
++      name: 'cn'
++      email: 'mail'
+     # If allow_username_or_email_login is enabled, GitLab will ignore everything
+     # after the first '@' in the LDAP username submitted by the user on login.
+     #
+--- config/initializers/devise.rb.orig	2014-05-18 18:45:35.080000000 +0200
++++ config/initializers/devise.rb	2014-05-18 18:46:06.530000000 +0200
+@@ -223,6 +223,7 @@
+       method:   Gitlab.config.ldap['method'],
+       bind_dn:  Gitlab.config.ldap['bind_dn'],
+       password: Gitlab.config.ldap['password'],
++      mapping:  Gitlab.config.ldap['mapping'],
+       name_proc: email_stripping_proc
+   end
+ 
+--- lib/gitlab/ldap/user.rb.orig	2014-05-18 18:46:48.820000000 +0200
++++ lib/gitlab/ldap/user.rb	2014-05-18 18:47:22.240000000 +0200
+@@ -97,6 +97,10 @@
+           'ldap'
+         end
+ 
++        def username
++          (auth.info.username || auth.info.nickname).to_s.force_encoding('utf-8')
++        end
++
+         def raise_error(message)
+           raise OmniAuth::Error, "(LDAP) " + message
+         end

www-apps/gitlabhq/gitlabhq-6.7.5.ebuild

@@ -71,8 +71,9 @@ RUBY_PATCHES=(
 	"${P}-fix-project-name-regex.patch"
 	"${PN}-6.0.2-fix-sendmail-config.patch"
 	"${PN}-6.5.1-fix-ldap-dn-case.patch"
-	"${PN}-6.6.5-ldap-custom-mapping.patch"
+	"${P}-ldap-custom-mapping.patch"
 	"${P}-email-custom-reply_to.patch"
+	"${P}-fix-gemfile-lock.patch"
 )
 
 MY_NAME="gitlab"