Fix GitLab with newer gems

Approved by:	sunpoet, mfechner

5 files changed, 40 insertions, 4 deletions

diff --git a/devel/rubygem-sentry-raven29/Makefile b/devel/rubygem-sentry-raven29/Makefile
index 47a3a12be50e..f22ee69690d4 100644
--- a/devel/rubygem-sentry-raven29/Makefile
+++ b/devel/rubygem-sentry-raven29/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sentry-raven
 PORTVERSION=	2.9.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	29
@@ -20,8 +21,11 @@ USE_RUBY=	yes
 
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/raven
+PLIST_FILES=	bin/raven29
 
 PORTSCOUT=	limit:^2\.9\.
 
+post-patch:
+	@${MV} ${WRKSRC}/exe/raven ${WRKSRC}/exe/raven29
+
 .include <bsd.port.mk>
diff --git a/devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec b/devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec
new file mode 100644
index 000000000000..15c3dbc82e66
--- /dev/null
+++ b/devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec
@@ -0,0 +1,14 @@
+--- sentry-raven.gemspec.orig	2019-12-31 17:31:07 UTC
++++ sentry-raven.gemspec
+@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
+   s.date = "2019-01-22"
+   s.description = "A gem that provides a client interface for the Sentry error logger".freeze
+   s.email = "getsentry@googlegroups.com".freeze
+-  s.executables = ["raven".freeze]
++  s.executables = ["raven29".freeze]
+   s.extra_rdoc_files = ["README.md".freeze, "LICENSE".freeze]
+-  s.files = [".gitignore".freeze, ".gitmodules".freeze, ".rspec".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "changelog.md".freeze, "exe/raven".freeze, "lib/raven.rb".freeze, "lib/raven/backtrace.rb".freeze, "lib/raven/base.rb".freeze, "lib/raven/breadcrumbs.rb".freeze, "lib/raven/breadcrumbs/activesupport.rb".freeze, "lib/raven/breadcrumbs/logger.rb".freeze, "lib/raven/cli.rb".freeze, "lib/raven/client.rb".freeze, "lib/raven/configuration.rb".freeze, "lib/raven/context.rb".freeze, "lib/raven/event.rb".freeze, "lib/raven/instance.rb".freeze, "lib/raven/integrations/delayed_job.rb".freeze, "lib/raven/integrations/rack-timeout.rb".freeze, "lib/raven/integrations/rack.rb".freeze, "lib/raven/integrations/rails.rb".freeze, "lib/raven/integrations/rails/active_job.rb".freeze, "lib/raven/integrations/rails/controller_methods.rb".freeze, "lib/raven/integrations/rails/controller_transaction.rb".freeze, "lib/raven/integrations/rails/overrides/debug_exceptions_catcher.rb".freeze, "lib/raven/integrations/rails/overrides/streaming_reporter.rb".freeze, "lib/raven/integrations/railties.rb".freeze, "lib/raven/integrations/rake.rb".freeze, "lib/raven/integrations/sidekiq.rb".freeze, "lib/raven/integrations/tasks.rb".freeze, "lib/raven/interface.rb".freeze, "lib/raven/interfaces/exception.rb".freeze, "lib/raven/interfaces/http.rb".freeze, "lib/raven/interfaces/message.rb".freeze, "lib/raven/interfaces/single_exception.rb".freeze, "lib/raven/interfaces/stack_trace.rb".freeze, "lib/raven/linecache.rb".freeze, "lib/raven/logger.rb".freeze, "lib/raven/processor.rb".freeze, "lib/raven/processor/cookies.rb".freeze, "lib/raven/processor/http_headers.rb".freeze, "lib/raven/processor/post_data.rb".freeze, "lib/raven/processor/removecircularreferences.rb".freeze, "lib/raven/processor/removestacktrace.rb".freeze, "lib/raven/processor/sanitizedata.rb".freeze, "lib/raven/processor/utf8conversion.rb".freeze, "lib/raven/transports.rb".freeze, "lib/raven/transports/dummy.rb".freeze, "lib/raven/transports/http.rb".freeze, "lib/raven/transports/stdout.rb".freeze, "lib/raven/utils/deep_merge.rb".freeze, "lib/raven/utils/exception_cause_chain.rb".freeze, "lib/raven/utils/real_ip.rb".freeze, "lib/raven/version.rb".freeze, "lib/sentry-raven-without-integrations.rb".freeze, "lib/sentry-raven.rb".freeze, "sentry-raven.gemspec".freeze]
++  s.files = [".gitignore".freeze, ".gitmodules".freeze, ".rspec".freeze, ".rubocop.yml".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "changelog.md".freeze, "exe/raven29".freeze, "lib/raven.rb".freeze, "lib/raven/backtrace.rb".freeze, "lib/raven/base.rb".freeze, "lib/raven/breadcrumbs.rb".freeze, "lib/raven/breadcrumbs/activesupport.rb".freeze, "lib/raven/breadcrumbs/logger.rb".freeze, "lib/raven/cli.rb".freeze, "lib/raven/client.rb".freeze, "lib/raven/configuration.rb".freeze, "lib/raven/context.rb".freeze, "lib/raven/event.rb".freeze, "lib/raven/instance.rb".freeze, "lib/raven/integrations/delayed_job.rb".freeze, "lib/raven/integrations/rack-timeout.rb".freeze, "lib/raven/integrations/rack.rb".freeze, "lib/raven/integrations/rails.rb".freeze, "lib/raven/integrations/rails/active_job.rb".freeze, "lib/raven/integrations/rails/controller_methods.rb".freeze, "lib/raven/integrations/rails/controller_transaction.rb".freeze, "lib/raven/integrations/rails/overrides/debug_exceptions_catcher.rb".freeze, "lib/raven/integrations/rails/overrides/streaming_reporter.rb".freeze, "lib/raven/integrations/railties.rb".freeze, "lib/raven/integrations/rake.rb".freeze, "lib/raven/integrations/sidekiq.rb".freeze, "lib/raven/integrations/tasks.rb".freeze, "lib/raven/interface.rb".freeze, "lib/raven/interfaces/exception.rb".freeze, "lib/raven/interfaces/http.rb".freeze, "lib/raven/interfaces/message.rb".freeze, "lib/raven/interfaces/single_exception.rb".freeze, "lib/raven/interfaces/stack_trace.rb".freeze, "lib/raven/linecache.rb".freeze, "lib/raven/logger.rb".freeze, "lib/raven/processor.rb".freeze, "lib/raven/processor/cookies.rb".freeze, "lib/raven/processor/http_headers.rb".freeze, "lib/raven/processor/post_data.rb".freeze, "lib/raven/processor/removecircularreferences.rb".freeze, "lib/raven/processor/removestacktrace.rb".freeze, "lib/raven/processor/sanitizedata.rb".freeze, "lib/raven/processor/utf8conversion.rb".freeze, "lib/raven/transports.rb".freeze, "lib/raven/transports/dummy.rb".freeze, "lib/raven/transports/http.rb".freeze, "lib/raven/transports/stdout.rb".freeze, "lib/raven/utils/deep_merge.rb".freeze, "lib/raven/utils/exception_cause_chain.rb".freeze, "lib/raven/utils/real_ip.rb".freeze, "lib/raven/version.rb".freeze, "lib/sentry-raven-without-integrations.rb".freeze, "lib/sentry-raven.rb".freeze, "sentry-raven.gemspec".freeze]
+   s.homepage = "https://github.com/getsentry/raven-ruby".freeze
+   s.licenses = ["Apache-2.0".freeze]
+   s.required_ruby_version = Gem::Requirement.new(">= 1.9.0".freeze)
diff --git a/devel/rubygem-sidekiq5/Makefile b/devel/rubygem-sidekiq5/Makefile
index 9838eb4467fc..d5995b85a152 100644
--- a/devel/rubygem-sidekiq5/Makefile
+++ b/devel/rubygem-sidekiq5/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	sidekiq
 PORTVERSION=	5.2.7
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	5
@@ -23,8 +24,12 @@ USE_RUBY=	yes
 
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/sidekiq bin/sidekiqctl
+PLIST_FILES=	bin/sidekiq5 bin/sidekiqctl5
 
 PORTSCOUT=	limit:^5\.
 
+post-patch:
+	@${MV} ${WRKSRC}/bin/sidekiq ${WRKSRC}/bin/sidekiq5
+	@${MV} ${WRKSRC}/bin/sidekiqctl ${WRKSRC}/bin/sidekiqctl5
+
 .include <bsd.port.mk>
diff --git a/devel/rubygem-sidekiq5/files/patch-sidekiq.gemspec b/devel/rubygem-sidekiq5/files/patch-sidekiq.gemspec
new file mode 100644
index 000000000000..4c3bb591310c
--- /dev/null
+++ b/devel/rubygem-sidekiq5/files/patch-sidekiq.gemspec
@@ -0,0 +1,13 @@
+--- sidekiq.gemspec.orig	2019-12-31 16:03:53 UTC
++++ sidekiq.gemspec
+@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
+   s.date = "2019-04-22"
+   s.description = "Simple, efficient background processing for Ruby.".freeze
+   s.email = ["mperham@gmail.com".freeze]
+-  s.executables = ["sidekiq".freeze, "sidekiqctl".freeze]
+-  s.files = [".circleci/config.yml".freeze, ".github/contributing.md".freeze, ".github/issue_template.md".freeze, ".gitignore".freeze, ".travis.yml".freeze, "3.0-Upgrade.md".freeze, "4.0-Upgrade.md".freeze, "5.0-Upgrade.md".freeze, "COMM-LICENSE".freeze, "Changes.md".freeze, "Ent-Changes.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "Pro-2.0-Upgrade.md".freeze, "Pro-3.0-Upgrade.md".freeze, "Pro-4.0-Upgrade.md".freeze, "Pro-Changes.md".freeze, "README.md".freeze, "Rakefile".freeze, "bin/sidekiq".freeze, "bin/sidekiqctl".freeze, "bin/sidekiqload".freeze, "code_of_conduct.md".freeze, "lib/generators/sidekiq/templates/worker.rb.erb".freeze, "lib/generators/sidekiq/templates/worker_spec.rb.erb".freeze, "lib/generators/sidekiq/templates/worker_test.rb.erb".freeze, "lib/generators/sidekiq/worker_generator.rb".freeze, "lib/sidekiq.rb".freeze, "lib/sidekiq/api.rb".freeze, "lib/sidekiq/cli.rb".freeze, "lib/sidekiq/client.rb".freeze, "lib/sidekiq/core_ext.rb".freeze, "lib/sidekiq/ctl.rb".freeze, "lib/sidekiq/delay.rb".freeze, "lib/sidekiq/exception_handler.rb".freeze, "lib/sidekiq/extensions/action_mailer.rb".freeze, "lib/sidekiq/extensions/active_record.rb".freeze, "lib/sidekiq/extensions/class_methods.rb".freeze, "lib/sidekiq/extensions/generic_proxy.rb".freeze, "lib/sidekiq/fetch.rb".freeze, "lib/sidekiq/job_logger.rb".freeze, "lib/sidekiq/job_retry.rb".freeze, "lib/sidekiq/launcher.rb".freeze, "lib/sidekiq/logging.rb".freeze, "lib/sidekiq/manager.rb".freeze, "lib/sidekiq/middleware/chain.rb".freeze, "lib/sidekiq/middleware/i18n.rb".freeze, "lib/sidekiq/middleware/server/active_record.rb".freeze, "lib/sidekiq/paginator.rb".freeze, "lib/sidekiq/processor.rb".freeze, "lib/sidekiq/rails.rb".freeze, "lib/sidekiq/redis_connection.rb".freeze, "lib/sidekiq/scheduled.rb".freeze, "lib/sidekiq/testing.rb".freeze, "lib/sidekiq/testing/inline.rb".freeze, "lib/sidekiq/util.rb".freeze, "lib/sidekiq/version.rb".freeze, "lib/sidekiq/web.rb".freeze, "lib/sidekiq/web/action.rb".freeze, "lib/sidekiq/web/application.rb".freeze, "lib/sidekiq/web/helpers.rb".freeze, "lib/sidekiq/web/router.rb".freeze, "lib/sidekiq/worker.rb".freeze, "sidekiq.gemspec".freeze, "web/assets/images/favicon.ico".freeze, "web/assets/images/logo.png".freeze, "web/assets/images/status.png".freeze, "web/assets/javascripts/application.js".freeze, "web/assets/javascripts/dashboard.js".freeze, "web/assets/stylesheets/application-rtl.css".freeze, "web/assets/stylesheets/application.css".freeze, "web/assets/stylesheets/bootstrap-rtl.min.css".freeze, "web/assets/stylesheets/bootstrap.css".freeze, "web/locales/ar.yml".freeze, "web/locales/cs.yml".freeze, "web/locales/da.yml".freeze, "web/locales/de.yml".freeze, "web/locales/el.yml".freeze, "web/locales/en.yml".freeze, "web/locales/es.yml".freeze, "web/locales/fa.yml".freeze, "web/locales/fr.yml".freeze, "web/locales/he.yml".freeze, "web/locales/hi.yml".freeze, "web/locales/it.yml".freeze, "web/locales/ja.yml".freeze, "web/locales/ko.yml".freeze, "web/locales/nb.yml".freeze, "web/locales/nl.yml".freeze, "web/locales/pl.yml".freeze, "web/locales/pt-br.yml".freeze, "web/locales/pt.yml".freeze, "web/locales/ru.yml".freeze, "web/locales/sv.yml".freeze, "web/locales/ta.yml".freeze, "web/locales/uk.yml".freeze, "web/locales/ur.yml".freeze, "web/locales/zh-cn.yml".freeze, "web/locales/zh-tw.yml".freeze, "web/views/_footer.erb".freeze, "web/views/_job_info.erb".freeze, "web/views/_nav.erb".freeze, "web/views/_paging.erb".freeze, "web/views/_poll_link.erb".freeze, "web/views/_status.erb".freeze, "web/views/_summary.erb".freeze, "web/views/busy.erb".freeze, "web/views/dashboard.erb".freeze, "web/views/dead.erb".freeze, "web/views/layout.erb".freeze, "web/views/morgue.erb".freeze, "web/views/queue.erb".freeze, "web/views/queues.erb".freeze, "web/views/retries.erb".freeze, "web/views/retry.erb".freeze, "web/views/scheduled.erb".freeze, "web/views/scheduled_job_info.erb".freeze]
++  s.executables = ["sidekiq5".freeze, "sidekiqctl5".freeze]
++  s.files = [".circleci/config.yml".freeze, ".github/contributing.md".freeze, ".github/issue_template.md".freeze, ".gitignore".freeze, ".travis.yml".freeze, "3.0-Upgrade.md".freeze, "4.0-Upgrade.md".freeze, "5.0-Upgrade.md".freeze, "COMM-LICENSE".freeze, "Changes.md".freeze, "Ent-Changes.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "Pro-2.0-Upgrade.md".freeze, "Pro-3.0-Upgrade.md".freeze, "Pro-4.0-Upgrade.md".freeze, "Pro-Changes.md".freeze, "README.md".freeze, "Rakefile".freeze, "bin/sidekiq5".freeze, "bin/sidekiqctl5".freeze, "bin/sidekiqload".freeze, "code_of_conduct.md".freeze, "lib/generators/sidekiq/templates/worker.rb.erb".freeze, "lib/generators/sidekiq/templates/worker_spec.rb.erb".freeze, "lib/generators/sidekiq/templates/worker_test.rb.erb".freeze, "lib/generators/sidekiq/worker_generator.rb".freeze, "lib/sidekiq.rb".freeze, "lib/sidekiq/api.rb".freeze, "lib/sidekiq/cli.rb".freeze, "lib/sidekiq/client.rb".freeze, "lib/sidekiq/core_ext.rb".freeze, "lib/sidekiq/ctl.rb".freeze, "lib/sidekiq/delay.rb".freeze, "lib/sidekiq/exception_handler.rb".freeze, "lib/sidekiq/extensions/action_mailer.rb".freeze, "lib/sidekiq/extensions/active_record.rb".freeze, "lib/sidekiq/extensions/class_methods.rb".freeze, "lib/sidekiq/extensions/generic_proxy.rb".freeze, "lib/sidekiq/fetch.rb".freeze, "lib/sidekiq/job_logger.rb".freeze, "lib/sidekiq/job_retry.rb".freeze, "lib/sidekiq/launcher.rb".freeze, "lib/sidekiq/logging.rb".freeze, "lib/sidekiq/manager.rb".freeze, "lib/sidekiq/middleware/chain.rb".freeze, "lib/sidekiq/middleware/i18n.rb".freeze, "lib/sidekiq/middleware/server/active_record.rb".freeze, "lib/sidekiq/paginator.rb".freeze, "lib/sidekiq/processor.rb".freeze, "lib/sidekiq/rails.rb".freeze, "lib/sidekiq/redis_connection.rb".freeze, "lib/sidekiq/scheduled.rb".freeze, "lib/sidekiq/testing.rb".freeze, "lib/sidekiq/testing/inline.rb".freeze, "lib/sidekiq/util.rb".freeze, "lib/sidekiq/version.rb".freeze, "lib/sidekiq/web.rb".freeze, "lib/sidekiq/web/action.rb".freeze, "lib/sidekiq/web/application.rb".freeze, "lib/sidekiq/web/helpers.rb".freeze, "lib/sidekiq/web/router.rb".freeze, "lib/sidekiq/worker.rb".freeze, "sidekiq.gemspec".freeze, "web/assets/images/favicon.ico".freeze, "web/assets/images/logo.png".freeze, "web/assets/images/status.png".freeze, "web/assets/javascripts/application.js".freeze, "web/assets/javascripts/dashboard.js".freeze, "web/assets/stylesheets/application-rtl.css".freeze, "web/assets/stylesheets/application.css".freeze, "web/assets/stylesheets/bootstrap-rtl.min.css".freeze, "web/assets/stylesheets/bootstrap.css".freeze, "web/locales/ar.yml".freeze, "web/locales/cs.yml".freeze, "web/locales/da.yml".freeze, "web/locales/de.yml".freeze, "web/locales/el.yml".freeze, "web/locales/en.yml".freeze, "web/locales/es.yml".freeze, "web/locales/fa.yml".freeze, "web/locales/fr.yml".freeze, "web/locales/he.yml".freeze, "web/locales/hi.yml".freeze, "web/locales/it.yml".freeze, "web/locales/ja.yml".freeze, "web/locales/ko.yml".freeze, "web/locales/nb.yml".freeze, "web/locales/nl.yml".freeze, "web/locales/pl.yml".freeze, "web/locales/pt-br.yml".freeze, "web/locales/pt.yml".freeze, "web/locales/ru.yml".freeze, "web/locales/sv.yml".freeze, "web/locales/ta.yml".freeze, "web/locales/uk.yml".freeze, "web/locales/ur.yml".freeze, "web/locales/zh-cn.yml".freeze, "web/locales/zh-tw.yml".freeze, "web/views/_footer.erb".freeze, "web/views/_job_info.erb".freeze, "web/views/_nav.erb".freeze, "web/views/_paging.erb".freeze, "web/views/_poll_link.erb".freeze, "web/views/_status.erb".freeze, "web/views/_summary.erb".freeze, "web/views/busy.erb".freeze, "web/views/dashboard.erb".freeze, "web/views/dead.erb".freeze, "web/views/layout.erb".freeze, "web/views/morgue.erb".freeze, "web/views/queue.erb".freeze, "web/views/queues.erb".freeze, "web/views/retries.erb".freeze, "web/views/retry.erb".freeze, "web/views/scheduled.erb".freeze, "web/views/scheduled_job_info.erb".freeze]
+   s.homepage = "http://sidekiq.org".freeze
+   s.licenses = ["LGPL-3.0".freeze]
+   s.required_ruby_version = Gem::Requirement.new(">= 2.2.2".freeze)
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 8e738f5f4b1f..f954cf633c6c 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-ce
 PORTVERSION=	12.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -129,7 +129,7 @@ MY_DEPENDS=	git>=2.22.2:devel/git \
 	rubygem-sidekiq5>=5.2.7<5.3.0:devel/rubygem-sidekiq5 \
 	rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \
 	rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \
-	rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \
+	rubygem-gitlab-sidekiq-fetcher=0.5.2_1:devel/rubygem-gitlab-sidekiq-fetcher \
 	rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \
 	rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \
 	rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \