From f64dbcb7d43f77879793fb5bf441ec12557b68fa Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Sat, 17 May 2025 15:49:10 +0300 Subject: [PATCH] www/gitlab: switch to gitlab own railties version Fixes some conflicts related to rack and rack-session which are pulled in by railties without any reason. --- databases/rubygem-marginalia/Makefile | 6 +++--- devel/rubygem-gitlab-labkit/Makefile | 5 +++-- devel/rubygem-paper_trail/Makefile | 2 +- devel/rubygem-sentry-rails/Makefile | 4 ++-- graphics/rubygem-invisible_captcha/Makefile | 3 ++- net/rubygem-apollo_upload_server/Makefile | 3 ++- .../rubygem-doorkeeper-device_authorization_grant/Makefile | 3 ++- security/rubygem-doorkeeper-openid_connect/Makefile | 3 ++- security/rubygem-gitlab-cloud-connector/Makefile | 2 +- 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/databases/rubygem-marginalia/Makefile b/databases/rubygem-marginalia/Makefile index 0be937b94511..d6d2da9ccb2b 100644 --- a/databases/rubygem-marginalia/Makefile +++ b/databases/rubygem-marginalia/Makefile @@ -1,6 +1,6 @@ PORTNAME= marginalia PORTVERSION= 1.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases rubygems MASTER_SITES= RG @@ -11,8 +11,8 @@ WWW= https://github.com/basecamp/marginalia LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack70>=2.3:www/rubygem-actionpack70 \ - rubygem-activerecord70>=2.3:databases/rubygem-activerecord70 +RUN_DEPENDS= rubygem-actionpack-gitlab>=2.3:www/rubygem-actionpack-gitlab \ + rubygem-activerecord-gitlab>=2.3:databases/rubygem-activerecord-gitlab USES= cpe gem CPE_VENDOR= ${PORTNAME}_project diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile index 96b700436b26..a8c3b6c18f6e 100644 --- a/devel/rubygem-gitlab-labkit/Makefile +++ b/devel/rubygem-gitlab-labkit/Makefile @@ -1,5 +1,6 @@ PORTNAME= gitlab-labkit PORTVERSION= 0.37.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,8 +11,8 @@ WWW= https://about.gitlab.com/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack70>=5<8.1:www/rubygem-actionpack70 \ - rubygem-activesupport70>=5<8.1:devel/rubygem-activesupport70 \ +RUN_DEPENDS= rubygem-actionpack-gitlab>=5<8.1:www/rubygem-actionpack-gitlab \ + rubygem-activesupport-gitlab>=5<8.1:devel/rubygem-activesupport-gitlab \ rubygem-grpc>=1.62:net/rubygem-grpc \ rubygem-jaeger-client>=1.1.0<1.2:devel/rubygem-jaeger-client \ rubygem-opentracing>=0.4<1:devel/rubygem-opentracing \ diff --git a/devel/rubygem-paper_trail/Makefile b/devel/rubygem-paper_trail/Makefile index d2365f1010f1..1d3270ef2754 100644 --- a/devel/rubygem-paper_trail/Makefile +++ b/devel/rubygem-paper_trail/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/paper-trail-gem/paper_trail LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activerecord70>=5<8:databases/rubygem-activerecord70 \ +RUN_DEPENDS= rubygem-activerecord-gitlab>=5<8:databases/rubygem-activerecord-gitlab \ rubygem-request_store>=1.4<2:devel/rubygem-request_store USES= gem diff --git a/devel/rubygem-sentry-rails/Makefile b/devel/rubygem-sentry-rails/Makefile index 5ceb9394f874..6d62d79cb279 100644 --- a/devel/rubygem-sentry-rails/Makefile +++ b/devel/rubygem-sentry-rails/Makefile @@ -10,8 +10,8 @@ WWW= https://github.com/getsentry/sentry-ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-railties70>=5.0.0:www/rubygem-railties70 \ - rubygem-sentry-ruby>=5.22.4<5.23:devel/rubygem-sentry-ruby +RUN_DEPENDS= rubygem-railties-gitlab>=5.0.0:www/rubygem-railties-gitlab \ + rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby USES= gem diff --git a/graphics/rubygem-invisible_captcha/Makefile b/graphics/rubygem-invisible_captcha/Makefile index 6ecea501011e..00e37dcd82a9 100644 --- a/graphics/rubygem-invisible_captcha/Makefile +++ b/graphics/rubygem-invisible_captcha/Makefile @@ -1,5 +1,6 @@ PORTNAME= invisible_captcha PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -9,7 +10,7 @@ WWW= https://github.com/markets/invisible_captcha LICENSE= MIT -RUN_DEPENDS= rubygem-rails70>=5.2:www/rubygem-rails70 +RUN_DEPENDS= rubygem-rails-gitlab>=5.2:www/rubygem-rails-gitlab USES= gem diff --git a/net/rubygem-apollo_upload_server/Makefile b/net/rubygem-apollo_upload_server/Makefile index 1ba6a42c566e..8d0a4c6d89f0 100644 --- a/net/rubygem-apollo_upload_server/Makefile +++ b/net/rubygem-apollo_upload_server/Makefile @@ -1,5 +1,6 @@ PORTNAME= apollo_upload_server PORTVERSION= 2.1.6 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://github.com/jetruby/apollo_upload_server-ruby LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-actionpack70>=6.1.6:www/rubygem-actionpack70 \ +RUN_DEPENDS= rubygem-actionpack-gitlab>=6.1.6:www/rubygem-actionpack-gitlab \ rubygem-graphql>=1.8:devel/rubygem-graphql USES= gem diff --git a/security/rubygem-doorkeeper-device_authorization_grant/Makefile b/security/rubygem-doorkeeper-device_authorization_grant/Makefile index e19d18ce95f0..603ab9b5ec8f 100644 --- a/security/rubygem-doorkeeper-device_authorization_grant/Makefile +++ b/security/rubygem-doorkeeper-device_authorization_grant/Makefile @@ -1,5 +1,6 @@ PORTNAME= doorkeeper-device_authorization_grant PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://github.com/exop-group/doorkeeper-device_authorization_grant LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -RUN_DEPENDS= rubygem-doorkeeper-rails70>=5.5<6:security/rubygem-doorkeeper-rails70 +RUN_DEPENDS= rubygem-doorkeeper-rails-gitlab>=5.5<6:security/rubygem-doorkeeper-rails-gitlab USES= gem diff --git a/security/rubygem-doorkeeper-openid_connect/Makefile b/security/rubygem-doorkeeper-openid_connect/Makefile index 2811d31b16f4..176de8383ac2 100644 --- a/security/rubygem-doorkeeper-openid_connect/Makefile +++ b/security/rubygem-doorkeeper-openid_connect/Makefile @@ -1,5 +1,6 @@ PORTNAME= doorkeeper-openid_connect PORTVERSION= 1.8.11 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://github.com/doorkeeper-gem/doorkeeper-openid_connect LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-doorkeeper-rails70>=5.5<5.9:security/rubygem-doorkeeper-rails70 \ +RUN_DEPENDS= rubygem-doorkeeper-rails-gitlab>=5.5<5.9:security/rubygem-doorkeeper-rails-gitlab \ rubygem-jwt>=2.5:www/rubygem-jwt \ rubygem-ostruct>=0.5:devel/rubygem-ostruct diff --git a/security/rubygem-gitlab-cloud-connector/Makefile b/security/rubygem-gitlab-cloud-connector/Makefile index 046d719fff89..4272ae569cdb 100644 --- a/security/rubygem-gitlab-cloud-connector/Makefile +++ b/security/rubygem-gitlab-cloud-connector/Makefile @@ -10,7 +10,7 @@ WWW= https://gitlab.com/gitlab-org/cloud-connector/gitlab-cloud-connector LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-activesupport70>=7.0<8:devel/rubygem-activesupport70 \ +RUN_DEPENDS= rubygem-activesupport-gitlab>=7.0<8:devel/rubygem-activesupport-gitlab \ rubygem-jwt29>=2.9.3<2.10:www/rubygem-jwt29 USES= gem