git: cd3ccf540775 - main - www/gitlab-ce: Update RUN_DEPENDS

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 05 Jun 2023 19:02:01 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cd3ccf5407757430ac5899a4ba0fecd61992a431

commit cd3ccf5407757430ac5899a4ba0fecd61992a431
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-05 18:46:23 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-05 18:49:13 +0000

    www/gitlab-ce: Update RUN_DEPENDS
    
    - Change RUN_DEPENDS from rubygem-aws-sdk-s3 to rubygem-aws-sdk-s31122
    - Change RUN_DEPENDS from rubygem-nokogiri to rubygem-nokogiri114
    - Change RUN_DEPENDS from rubygem-rack227 to rubygem-rack22
    - Bump PORTREVISION for dependency change
---
 www/gitlab-ce/Makefile            |  8 ++++----
 www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 2033b5434acf..84a7195b6ffa 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gitlab-ce
 PORTVERSION=	16.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -121,7 +121,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
 	rubygem-aws-sdk-core3172>=3.172.0<3.173:devel/rubygem-aws-sdk-core3172 \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1.122.0<1.123:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s31122>=1.122.0<1.123:devel/rubygem-aws-sdk-s31122 \
 	rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
 	rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
 	rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
@@ -140,11 +140,11 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
 	rubygem-rouge>=4.1.0<4.2:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
-	rubygem-nokogiri>=1.14.3<1.15:textproc/rubygem-nokogiri \
+	rubygem-nokogiri114>=1.14.3<1.15:textproc/rubygem-nokogiri114 \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
-	rubygem-rack227>=2.2.7<2.3:www/rubygem-rack227 \
+	rubygem-rack22>=2.2.7,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
 	rubygem-puma>=5.6.5<5.7:www/rubygem-puma \
 	rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index c754348f488d..cf6bd0bf11c5 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2023-05-18 16:48:55 UTC
+--- Gemfile.orig	2023-05-22 18:44:12 UTC
 +++ Gemfile
 @@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3'
  gem 'rugged', '~> 1.5'
@@ -38,6 +38,15 @@
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
+@@ -172,7 +172,7 @@ gem 'seed-fu', '~> 2.3.7'
+ gem 'elasticsearch-model', '~> 7.2'
+ gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
+ gem 'elasticsearch-api',   '7.13.3'
+-gem 'aws-sdk-core', '~> 3.172.0'
++gem 'aws-sdk-core', '~> 3.172'
+ gem 'aws-sdk-cloudformation', '~> 1'
+ gem 'aws-sdk-s3', '~> 1.122.0'
+ gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
 @@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4'
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'