remove old gitlabhq stuff

10 files changed, 0 insertions, 772 deletions

diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest
deleted file mode 100644
index e0c345b..0000000
--- a/www-apps/gitlabhq/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX gitlab-sidekiq.init 979 SHA256 f9bc02031b0418e4c765fae37bb40cd9e16dbe5b1a7f5c105a2d7ba3568b0195 SHA512 e3311f1110fca02a378a9f74704d9241884a1973e90be1dbd663809b524528eda25e3ad0ac5d20737f6ccd78343582557ac579adb976473f8aabc0320172921f WHIRLPOOL 365d539cceacb5ff9171aa7316ac061ef4b4a8d63e6d4a26395afb841878a08bdd1b9bf2709602dc90f15a1ed5ff8566a0e8239e8ab9184e84814a16993f3aeb
-AUX gitlab-unicorn-6.init 1663 SHA256 ba211c63d559cbca510483d5536d28131e08f67dc8914444a2c85b27c7a92b60 SHA512 a574b3bb5b9af3e3a707045ac6d783bab73bab1db033d07999b3d06789da0853bc3de0bba39a3c154e5b1ab385926ee3ec4487f4c797708a318fa5df22827069 WHIRLPOOL 497cf52ebb4b33cc6bbd81e53d4961878b2ea9dc42bacabf7a32686e52a54c22eed73836705e80714d7b759cfd2ee1929e6aa12083435f265c472270e158f72a
-AUX gitlabhq-6.0.2-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf27955632f340ca67f9d460af840cf34ed60ca574 SHA512 b10d5b8d89927404d25345e17ba37ca4e7848b04c2ca20c5eef14eaac43d9ba14b62ae4c0d532eefaf6f9a2944578e84eb65a3420335d32495855c4807eec356 WHIRLPOOL 66f6443f311f2355ffd4efaea914f462816a1966a715b3b5ffaaa26b41bdced928b9905b8606f06fac3c2ccf20741553cfed2615430287bede01cf376aae2a60
-AUX gitlabhq-6.8.2-email-custom-reply_to.patch 2014 SHA256 7b0a66c3dde960aac805d1b2780be1166135f7b124e1f3a4861fae2f04543c01 SHA512 2c1da90d46ce57dad00df7a55f0af6ab1eca4e09a96580f8482dcff2188d351ce21f1bd366894e64eb1888904f6a8fddc4dec34d88af06e95946c0be834364e2 WHIRLPOOL bf126a9486fab62bdd921459c8d21e13c5de85542dde129e773057ccf9e80662b923f0bc84e2476735c8dafdb5800c6e7249450a37ad04be39d70e766af2ffd3
-AUX gitlabhq-6.8.2-fix-gemfile.patch 2263 SHA256 584966eb3efc63a6102754e165c46d50b037e3ea046a2fe1cfc24b53bf03bdea SHA512 9bd6490e86dcc830c759210dc6ceed101c177cee06bc4427398ed03fba8e128413b4cb04317e081b765df5c39987219c2bc1ce5538479ec39d3bcf5d253bb9e0 WHIRLPOOL 8d9dbafd45d61cb23e3126192666e671b8b8d46bc1898c976aa335fb58546c11885b14e370e45ca5dff01a68de7b555a9ae0a8a325f818c54e4e617704c360dd
-AUX gitlabhq-6.8.2-fix-project-name-regex.patch 1376 SHA256 71f6c2ebbe3af6012cf523535699001d86c4ad925cc7b78d179a3ec7002ddf9b SHA512 c2fe0959486e2bd05b856a8c9f710a89709fee77bf0c490fffcbf2b014223aed761ad1e1ef42ea3412f595066cf109937fb02135ec4c70c64330c48780bb7655 WHIRLPOOL 8003eb841390e5c5edde24b05a408d9982aeaba0cbccbd7824fbd8d469c445be3bcc46e2d58712fa7de0b8d3aabc9e85a33211071a58b9d2a0f43d97eb8b44ba
-AUX gitlabhq-6.8.2-ldap-custom-mapping.patch 3276 SHA256 d335fc980a891a7a24cbb96ec7a4109bb3fc3a89ebc8c797d787e69fff74e7d2 SHA512 7cb523db97986eb94d0feda7be0eb8f400b9df744f25a44a783925059ae97671400bebfbe75b6d803640e4eb828abea193dcde26a2e6d5f103dc9d0913772365 WHIRLPOOL 76d81fd7075bb6dd52b622c6f2147393dd5fcf8e42addb82e9431a019c445f5703a77f31db71a62e05561eb05be8195bf05da0be83cd20db57659a057f7b0481
-DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
-EBUILD gitlabhq-6.8.2.ebuild 10719 SHA256 cf723823af2609d9918dbe91302d7795ba49d57f2861ba98fb3512c05c6160fc SHA512 292f615eba6d5cd0e5b9789a94d114dc4299663fcfd4a4a839f769ae141a4d9deae030b6f69c7ad66da9b39ae9502cb284259515d5f584138ab7f86fbc5860ad WHIRLPOOL e4ec260a9ceecb8f18c44f0ba5ff5707bb40324d9fb17cdc331cd08de668ae818d11d9db7bf6534c03bcbd3b8c9f4dd91af55b1670b830b95636699436e398b4
-MISC metadata.xml 475 SHA256 65a46fa9904c8b7657181e4929f304675a2173e9329aa8fb5d8645515032168f SHA512 b2aa4c167c6287e60bb62a45e3d48fa00a8b080e0f81a966388dd8a1fbc2012f9737d5f02134382e5a0b212b38781c15b0fdf2508fe6b4b7630a8fcebe713065 WHIRLPOOL 5b5f73953ba7b23b7f9590da5f2e22a0930880ceb37eb87c25a8e043943671da1fcf8f561f76d2c262a1f514cb917140c99d77d9f4e448ed260b1a5127603195
diff --git a/www-apps/gitlabhq/files/gitlab-sidekiq.init b/www-apps/gitlabhq/files/gitlab-sidekiq.init
deleted file mode 100644
index 99b2d17..0000000
--- a/www-apps/gitlabhq/files/gitlab-sidekiq.init
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-
-name="GitLab Sidekiq"
-description="Sidekiq for GitLab @SLOT@"
-
-: ${gitlab_user:=@USER@}
-: ${gitlab_base:="@GITLAB_BASE@"}
-: ${rails_env:=production}
-
-: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
-: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
-: ${sidekiq_queues:="@QUEUES@"}
-
-sidekiq_command="/usr/bin/bundle"
-sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
-
-depend() {
-	need redis
-	use net
-}
-
-start() {
-	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
-
-	ebegin "Starting ${name} - Sidekiq"
-
-	start-stop-daemon --start \
-		--background --quiet \
-		--chdir "${gitlab_base}" \
-		--user=${gitlab_user} \
-		--pidfile="${sidekiq_pidfile}" \
-		--env RAILS_ENV=${rails_env} \
-		--exec ${sidekiq_command} -- ${sidekiq_command_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${name} - Sidekiq"
-	start-stop-daemon --stop \
-		--pidfile=${sidekiq_pidfile} \
-		--exec ${sidekiq_command}
-	eend $?
-}
diff --git a/www-apps/gitlabhq/files/gitlab-unicorn-6.init b/www-apps/gitlabhq/files/gitlab-unicorn-6.init
deleted file mode 100644
index 382be7a..0000000
--- a/www-apps/gitlabhq/files/gitlab-unicorn-6.init
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/runscript
-
-name="GitLab-@SLOT@"
-description="GitLab @SLOT@ on Unicorns"
-
-: ${gitlab_user:=@USER@}
-: ${gitlab_base:="@GITLAB_BASE@"}
-: ${rails_env:=production}
-
-: ${server_pidfile:="/run/gitlab/unicorn.pid"}
-
-: ${sidekiq_pidfile:="/run/gitlab/sidekiq.pid"}
-: ${sidekiq_logfile:="@LOGS_DIR@/sidekiq.log"}
-: ${sidekiq_queues:="@QUEUES@"}
-
-server_command="/usr/bin/bundle"
-server_command_args="exec unicorn_rails -c ${gitlab_base}/config/unicorn.rb -E ${rails_env} -D"
-
-sidekiq_command="/usr/bin/bundle"
-sidekiq_command_args="exec sidekiq -q ${sidekiq_queues} -P ${sidekiq_pidfile} -L ${sidekiq_logfile}"
-
-depend() {
-	provide gitlab
-	need redis
-	use net
-}
-
-start() {
-	ebegin "Starting ${name} - Unicorn servers"
-
-	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${server_pidfile}")"
-	checkpath -d -o ${gitlab_user} -m755 "$(dirname "${sidekiq_pidfile}")"
-
-	start-stop-daemon --start \
-		--chdir "${gitlab_base}" \
-		--user=${gitlab_user} \
-		--pidfile="${server_pidfile}" \
-		--env RAILS_ENV=${rails_env} \
-		--exec ${server_command} -- ${server_command_args}
-	eend $?
-
-	ebegin "Starting ${name} - Sidekiq"
-
-	start-stop-daemon --start \
-		--background --quiet \
-		--chdir "${gitlab_base}" \
-		--user=${gitlab_user} \
-		--pidfile="${sidekiq_pidfile}" \
-		--env RAILS_ENV=${rails_env} \
-		--exec ${sidekiq_command} -- ${sidekiq_command_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${name} - Sidekiq"
-	start-stop-daemon --stop \
-		--pidfile=${sidekiq_pidfile} \
-		--exec ${sidekiq_command}
-	eend $?
-
-	ebegin "Stopping ${name} - Unicorn servers"
-	start-stop-daemon --stop \
-		--signal QUIT \
-		--pidfile=${server_pidfile} \
-		--exec ${server_command}
-	eend $?
-}
diff --git a/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch b/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch
deleted file mode 100644
index 0a6e8d9..0000000
--- a/www-apps/gitlabhq/files/gitlabhq-6.0.2-fix-sendmail-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/config/environments/production.rb b/gitlab-6/environments/production.rb
-index 82eb250..10e25e5 100644
---- a/config/environments/production.rb
-+++ b/config/environments/production.rb
-@@ -73,11 +73,10 @@ Gitlab::Application.configure do
-   # config.active_record.auto_explain_threshold_in_seconds = 0.5
- 
-   config.action_mailer.delivery_method = :sendmail
--  # Defaults to:
--  # # config.action_mailer.sendmail_settings = {
--  # #   location: '/usr/sbin/sendmail',
--  # #   arguments: '-i -t'
--  # # }
-+  config.action_mailer.sendmail_settings = {
-+    location: '/usr/sbin/sendmail',
-+    arguments: '-i'
-+  }
-   config.action_mailer.perform_deliveries = true
-   config.action_mailer.raise_delivery_errors = true
- end
diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch
deleted file mode 100644
index 319da52..0000000
--- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-email-custom-reply_to.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur gitlabhq-6.8.2.orig/app/mailers/notify.rb gitlabhq-6.8.2/app/mailers/notify.rb
---- gitlabhq-6.8.2.orig/app/mailers/notify.rb	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/app/mailers/notify.rb	2014-05-21 21:15:49.607758248 +0200
-@@ -16,7 +16,7 @@
-   default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
- 
-   default from: Proc.new { default_sender_address.format }
--  default reply_to: "noreply@#{Gitlab.config.gitlab.host}"
-+  default reply_to: Gitlab.config.gitlab.email_reply_to
- 
-   # Just send email with 2 seconds delay
-   def self.delay
-diff -ur gitlabhq-6.8.2.orig/config/gitlab.yml.example gitlabhq-6.8.2/config/gitlab.yml.example
---- gitlabhq-6.8.2.orig/config/gitlab.yml.example	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/config/gitlab.yml.example	2014-05-21 21:16:46.744345902 +0200
-@@ -37,6 +37,9 @@
-     # Email address used in the "From" field in mails sent by GitLab
-     email_from: gitlab@localhost
- 
-+    # Email address used in the "Reply-To" field in mails send by GitLab (default: no-reply@<host>)
-+    email_reply_to: no-reply@localhost
-+
-     # Email address of your support contact (default: same as email_from)
-     support_email: support@localhost
- 
-diff -ur gitlabhq-6.8.2.orig/config/initializers/1_settings.rb gitlabhq-6.8.2/config/initializers/1_settings.rb
---- gitlabhq-6.8.2.orig/config/initializers/1_settings.rb	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/config/initializers/1_settings.rb	2014-05-21 21:17:24.905406287 +0200
-@@ -78,6 +78,7 @@
- Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
- Settings.gitlab['protocol']   ||= Settings.gitlab.https ? "https" : "http"
- Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
-+Settings.gitlab['email_reply_to'] ||= "no-reply@#{Settings.gitlab.host}"
- Settings.gitlab['support_email']  ||= Settings.gitlab.email_from
- Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
- Settings.gitlab['user']       ||= 'git'
diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch
deleted file mode 100644
index 7bc7218..0000000
--- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-gemfile.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -ur gitlabhq-6.8.2.orig/Gemfile gitlabhq-6.8.2/Gemfile
---- gitlabhq-6.8.2.orig/Gemfile	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/Gemfile	2014-05-22 00:21:48.158938691 +0200
-@@ -142,6 +142,10 @@
- # 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"
- 
-@@ -151,7 +155,6 @@
- gem "sass-rails", '~> 4.0.2'
- gem "coffee-rails"
- gem "uglifier"
--gem "therubyracer"
- gem 'turbolinks'
- gem 'jquery-turbolinks'
- 
-diff -ur gitlabhq-6.8.2.orig/Gemfile.lock gitlabhq-6.8.2/Gemfile.lock
---- gitlabhq-6.8.2.orig/Gemfile.lock	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/Gemfile.lock	2014-05-22 00:24:39.954746019 +0200
-@@ -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:
-@@ -60,7 +67,6 @@
-       json (>= 1.7)
-     celluloid (0.15.2)
-       timers (~> 1.1.0)
--    charlock_holmes (0.6.9.4)
-     cliver (0.2.2)
-     code_analyzer (0.4.3)
-       sexp_processor
-@@ -267,7 +273,6 @@
-       addressable (~> 2.3)
-     letter_opener (1.1.2)
-       launchy (~> 2.2)
--    libv8 (3.16.14.3)
-     listen (2.3.1)
-       celluloid (>= 0.15.2)
-       rb-fsevent (>= 0.9.3)
-@@ -402,7 +407,6 @@
-       redis-store (~> 1.1.0)
-     redis-store (1.1.4)
-       redis (>= 2.2)
--    ref (1.0.5)
-     require_all (1.3.2)
-     rest-client (1.6.7)
-       mime-types (>= 1.16)
-@@ -496,9 +500,6 @@
-     term-ansicolor (1.2.2)
-       tins (~> 0.8)
-     test_after_commit (0.2.2)
--    therubyracer (0.12.0)
--      libv8 (~> 3.16.14.0)
--      ref
-     thin (1.6.1)
-       daemons (>= 1.0.9)
-       eventmachine (>= 1.0.0)
-@@ -567,6 +568,7 @@
-   bootstrap-sass (~> 3.0)
-   capybara
-   carrierwave
-+  charlock_holmes!
-   coffee-rails
-   colored
-   coveralls
-@@ -654,7 +656,6 @@
-   stamp
-   state_machine
-   test_after_commit
--  therubyracer
-   thin
-   tinder (~> 1.9.2)
-   turbolinks
diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch
deleted file mode 100644
index 8f986c1..0000000
--- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-fix-project-name-regex.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur gitlabhq-6.8.2.orig/app/models/project.rb gitlabhq-6.8.2/app/models/project.rb
---- gitlabhq-6.8.2.orig/app/models/project.rb	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/app/models/project.rb	2014-05-21 21:05:09.641976937 +0200
-@@ -90,7 +90,7 @@
-   validates :description, length: { maximum: 2000 }, allow_blank: true
-   validates :name, presence: true, length: { within: 0..255 },
-             format: { with: Gitlab::Regex.project_name_regex,
--                      message: "only letters, digits, spaces & '_' '-' '.' allowed. Letter or digit should be first" }
-+                      message: "only letters, digits, spaces & '_' '-' '.' ':' allowed. Letter or digit should be first" }
-   validates :path, presence: true, length: { within: 0..255 },
-             exclusion: { in: Gitlab::Blacklist.path },
-             format: { with: Gitlab::Regex.path_regex,
-diff -ur gitlabhq-6.8.2.orig/lib/gitlab/regex.rb gitlabhq-6.8.2/lib/gitlab/regex.rb
---- gitlabhq-6.8.2.orig/lib/gitlab/regex.rb	2014-05-12 11:15:38.000000000 +0200
-+++ gitlabhq-6.8.2/lib/gitlab/regex.rb	2014-05-21 21:03:43.872609059 +0200
-@@ -1,3 +1,5 @@
-+# encoding: utf-8
-+
- module Gitlab
-   module Regex
-     extend self
-@@ -7,7 +9,7 @@
-     end
- 
-     def project_name_regex
--      /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
-+      /\A\p{Word}[\p{Word}\-:\. ]*\z/
-     end
- 
-     def name_regex
diff --git a/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch b/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch
deleted file mode 100644
index c8c8f55..0000000
--- a/www-apps/gitlabhq/files/gitlabhq-6.8.2-ldap-custom-mapping.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/Gemfile b/Gemfile
-index fe8e54e..b33a74e 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -36,7 +36,8 @@ gem "gitlab_git", "~> 4.0.0"
- gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
- 
- # LDAP Auth
--gem 'gitlab_omniauth-ldap', '1.0.3', 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'
- 
- # Syntax highlighter
- gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
-diff --git a/Gemfile.lock b/Gemfile.lock
-index d0f185b..46543e3 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -6,6 +6,17 @@ GIT
-     charlock_holmes (0.6.9.4)
- 
- 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)
-+
-+GIT
-   remote: https://github.com/gitlabhq/markup.git
-   revision: 61ade389c1e1c159359338f570d18464a44ddbc4
-   ref: 61ade389c1e1c159359338f570d18464a44ddbc4
-@@ -193,11 +204,6 @@ GEM
-       gitlab-linguist (~> 2.9.5)
-       gitlab-pygments.rb (~> 0.5.4)
-     gitlab_meta (6.0)
--    gitlab_omniauth-ldap (1.0.3)
--      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
-@@ -587,7 +593,7 @@ DEPENDENCIES
-   gitlab-pygments.rb (~> 0.5.4)
-   gitlab_git (~> 4.0.0)
-   gitlab_meta (= 6.0)
--  gitlab_omniauth-ldap (= 1.0.3)
-+  gitlab_omniauth-ldap (= 1.0.4)!
-   gon (~> 5.0.0)
-   grape (~> 0.6.1)
-   grape-entity (~> 0.3.0)
-diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 776d930..a5b96e4 100644
---- a/config/gitlab.yml.example
-+++ b/config/gitlab.yml.example
-@@ -130,6 +130,10 @@ production: &base
-     method: 'ssl' # "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.
-     #
-diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
-index 2539097..739de8e 100644
---- a/config/initializers/devise.rb
-+++ b/config/initializers/devise.rb
-@@ -223,6 +223,7 @@ Devise.setup do |config|
-       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
- 
-diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb
-index 8afd64f..f1f1bea 100644
---- a/lib/gitlab/ldap/user.rb
-+++ b/lib/gitlab/ldap/user.rb
-@@ -97,6 +97,10 @@ module Gitlab
-           '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
diff --git a/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild b/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild
deleted file mode 100644
index 8c89e5b..0000000
--- a/www-apps/gitlabhq/gitlabhq-6.8.2.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-# Mainteiner 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="ruby19 ruby20"
-PYTHON_COMPAT=( python{2_7,3_{1,2,3}} )
-
-inherit eutils python-r1 ruby-ng user
-
-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"
-
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="6"
-KEYWORDS="amd64 x86"
-IUSE="mysql +postgres +unicorn"
-
-## Gems dependencies:
-#   charlock_holmes		dev-libs/icu
-#	grape, capybara		dev-libs/libxml2, dev-libs/libxslt
-#   json				dev-util/ragel
-#   pygments.rb			python 2.7+
-#   execjs				net-libs/nodejs, or any other JS runtime
-#   pg					dev-db/postgresql-base
-#   mysql				virtual/mysql
-#
-GEMS_DEPEND="
-	dev-libs/icu
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-util/ragel
-	net-libs/nodejs
-	postgres? ( dev-db/postgresql-base )
-	mysql? ( virtual/mysql )"
-DEPEND="${GEMS_DEPEND}
-	>=dev-vcs/gitlab-shell-1.8
-	dev-vcs/git"
-RDEPEND="${DEPEND}
-	dev-db/redis
-	virtual/mta"
-ruby_add_bdepend "
-	virtual/rubygems
-	dev-ruby/bundler"
-
-#
-# 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-project-name-regex:
-#     Allow project name to contain non-ASCII characters.
-#
-# fix-sendmail-config:
-#     Fix default settings to work with ssmtp that doesn't know '-t' argument.
-#
-#	"${P}-ldap-custom-mapping.patch"
-RUBY_PATCHES=(
-	"${P}-fix-gemfile.patch"
-	"${P}-fix-project-name-regex.patch"
-	"${PN}-6.0.2-fix-sendmail-config.patch"
-	"${P}-email-custom-reply_to.patch"
-)
-
-MY_NAME="gitlab"
-MY_USER="git"    # should be same as in gitlab-shell
-
-DEST_DIR="/opt/${MY_NAME}-${SLOT}"
-CONF_DIR="/etc/${MY_NAME}-${SLOT}"
-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://github.com/gitlabhq/gitlabhq/blob/v${PV}/script/background_jobs
-SIDEKIQ_QUEUES="post_receive,mailer,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:).*|/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 zzet's stupid migration which expetcs that users are so foolish
-	# to run GitLab with PostgreSQL's superuser...
-	rm db/migrate/20121009205010_postgres_create_integer_cast.rb
-
-	# remove useless files
-	rm -r lib/support/{deploy,init.d}
-	rm -r script/{background_jobs,web}
-	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; do
-		without+="$(use $flag || echo ' '$flag)"
-	done
-	local bundle_args="--deployment ${without:+--without ${without}}"
-
-	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}
-	fperms +x script/{rails,check}
-
-	## RC script ##
-
-	local rcscript=gitlab-sidekiq.init
-	use unicorn && rcscript=gitlab-unicorn-6.init
-
-	cp "${FILESDIR}/${rcscript}" "${T}" || die
-	sed -i \
-		-e "s|@USER@|${MY_USER}|" \
-		-e "s|@SLOT@|${SLOT}|" \
-		-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}-${SLOT}"
-}
-
-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/gitlabhq/metadata.xml b/www-apps/gitlabhq/metadata.xml
deleted file mode 100644
index d68dded..0000000
--- a/www-apps/gitlabhq/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
-	<use>
-		<flag name="mysql">
-			Adds support for the MySQL database.
-		</flag>
-		<flag name="postgres">
-			Adds support for the PostgreSQL database.
-		</flag>
-		<flag name="unicorn">
-			Build with bundled Unicorn server.
-		</flag>
-	</use>
-</pkgmetadata>