www/gitlab: fix deeper regression from 8a2d8fae15f9c9986ad48a54e36ad58635c85cb4

Seperate the ports a little bit more.
Patch was mostly provided by sunpoet.

14 files changed, 72 insertions, 12 deletions

diff --git a/devel/Makefile b/devel/Makefile
index d4cd2b55166d..d3bbce936e9f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -7301,6 +7301,7 @@
     SUBDIR += rubygem-google-apis-cloudbilling_v1
     SUBDIR += rubygem-google-apis-cloudkms_v1
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v1
+    SUBDIR += rubygem-google-apis-cloudresourcemanager_v1-gitlab
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v1035
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v2
     SUBDIR += rubygem-google-apis-cloudresourcemanager_v3
diff --git a/devel/rubygem-danger/Makefile b/devel/rubygem-danger/Makefile
index 33c68db066c5..991caabd4c10 100644
--- a/devel/rubygem-danger/Makefile
+++ b/devel/rubygem-danger/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	danger
 PORTVERSION=	9.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -16,7 +16,7 @@ RUN_DEPENDS=	rubygem-claide>=1.0<2:devel/rubygem-claide \
 		rubygem-colored2>=3.1<4:textproc/rubygem-colored2 \
 		rubygem-cork>=0.1<1:devel/rubygem-cork \
 		rubygem-faraday-gitlab>=0.9.0<3.0:www/rubygem-faraday-gitlab \
-		rubygem-faraday-http-cache>=2.0.0<3:www/rubygem-faraday-http-cache \
+		rubygem-faraday-http-cache-gitlab>=2.0.0<3:www/rubygem-faraday-http-cache-gitlab \
 		rubygem-git>=1.13<2:devel/rubygem-git \
 		rubygem-kramdown-gitlab>=2.3<3:textproc/rubygem-kramdown-gitlab \
 		rubygem-kramdown-parser-gfm-gitlab>=1.0<2:textproc/rubygem-kramdown-parser-gfm-gitlab \
diff --git a/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/Makefile b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/Makefile
new file mode 100644
index 000000000000..d0f9f9e5a079
--- /dev/null
+++ b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	google-apis-cloudresourcemanager_v1
+PORTVERSION=	0.31.0
+CATEGORIES=	devel rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Simple REST client for Cloud Resource Manager API V1
+WWW=		https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-cloudresourcemanager_v1 \
+		https://github.com/googleapis/google-api-ruby-client
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/distinfo b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/distinfo
new file mode 100644
index 000000000000..5464094eee39
--- /dev/null
+++ b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1676990465
+SHA256 (rubygem/google-apis-cloudresourcemanager_v1-0.31.0.gem) = f0a472a228c0b9b592741380ce79ead2458ea0066a4b5a78635818b9b62efbbf
+SIZE (rubygem/google-apis-cloudresourcemanager_v1-0.31.0.gem) = 38912
diff --git a/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/pkg-descr b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/pkg-descr
new file mode 100644
index 000000000000..25eb9be54242
--- /dev/null
+++ b/devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab/pkg-descr
@@ -0,0 +1,8 @@
+This is the simple REST client for Cloud Resource Manager API V1. Simple REST
+clients are Ruby client libraries that provide access to Google services via
+their HTTP REST API endpoints. These libraries are generated and updated
+automatically based on the discovery documents published by the service, and
+they handle most concerns such as authentication, pagination, retry, timeouts,
+and logging. You can use this client to access the Cloud Resource Manager API,
+but note that some services may provide a separate modern client that is
+easier to use.
diff --git a/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile b/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
index d655ea9694c6..a451d4e454d3 100644
--- a/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
+++ b/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	google-apis-cloudresourcemanager_v1
 PORTVERSION=	0.31.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	mfechner@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simple REST client for Cloud Resource Manager API V1
 WWW=		https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-cloudresourcemanager_v1 \
 		https://github.com/googleapis/google-api-ruby-client
@@ -12,7 +12,7 @@ WWW=		https://github.com/googleapis/google-api-ruby-client/tree/main/generated/g
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
+RUN_DEPENDS=	rubygem-google-apis-core>=0.9.1<2.0:devel/rubygem-google-apis-core
 
 USES=		gem
 
diff --git a/net/rubygem-google-cloud-resource_manager/Makefile b/net/rubygem-google-cloud-resource_manager/Makefile
index 4382e77132f9..7200812c5a7e 100644
--- a/net/rubygem-google-cloud-resource_manager/Makefile
+++ b/net/rubygem-google-cloud-resource_manager/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	google-cloud-resource_manager
 PORTVERSION=	0.38.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -15,8 +15,8 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-google-apis-cloudresourcemanager_v1>=0.1<1:devel/rubygem-google-apis-cloudresourcemanager_v1 \
-		rubygem-google-cloud-core-gitlab>=1.6<2:net/rubygem-google-cloud-core-gitlab \
-		rubygem-googleauth-gitlab>=0.16.2<2.0:security/rubygem-googleauth-gitlab
+		rubygem-google-cloud-core>=1.6<2:net/rubygem-google-cloud-core \
+		rubygem-googleauth>=0.16.2<2.0:security/rubygem-googleauth
 
 USES=		gem
 
diff --git a/www/Makefile b/www/Makefile
index 526e920c3252..4ff4ebef3cb3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2039,6 +2039,7 @@
     SUBDIR += rubygem-faraday-follow_redirects-gitlab
     SUBDIR += rubygem-faraday-gitlab
     SUBDIR += rubygem-faraday-http-cache
+    SUBDIR += rubygem-faraday-http-cache-gitlab
     SUBDIR += rubygem-faraday-httpclient
     SUBDIR += rubygem-faraday-httpclient1
     SUBDIR += rubygem-faraday-multipart
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 265e52f54f05..61d9f0123534 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -123,7 +123,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \
 	rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \
 	rubygem-google-apis-cloudbilling_v1>=0.21.0<0.22:devel/rubygem-google-apis-cloudbilling_v1 \
-	rubygem-google-apis-cloudresourcemanager_v1>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1 \
+	rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \
 	rubygem-google-apis-iam_v1>=0.36.0<0.37:devel/rubygem-google-apis-iam_v1 \
 	rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
 	rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 11630570f69b..6357258c76ae 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		17.6.1
-GITLAB_PORTREVISION=	0
+GITLAB_PORTREVISION=	1
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/rubygem-faraday-http-cache-gitlab/Makefile b/www/rubygem-faraday-http-cache-gitlab/Makefile
new file mode 100644
index 000000000000..331672d8e178
--- /dev/null
+++ b/www/rubygem-faraday-http-cache-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	faraday-http-cache
+PORTVERSION=	2.5.1
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Middleware to handle HTTP caching
+WWW=		https://github.com/sourcelevel/faraday-http-cache
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-faraday-gitlab>=0.8:www/rubygem-faraday-gitlab
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-faraday-http-cache-gitlab/distinfo b/www/rubygem-faraday-http-cache-gitlab/distinfo
new file mode 100644
index 000000000000..6d767d9f91f8
--- /dev/null
+++ b/www/rubygem-faraday-http-cache-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1732275334
+SHA256 (rubygem/faraday-http-cache-2.5.1.gem) = cbfc129a85e1ad8580130189832cf59e7e117d94fe277547d61fc531f7689483
+SIZE (rubygem/faraday-http-cache-2.5.1.gem) = 25600
diff --git a/www/rubygem-faraday-http-cache-gitlab/pkg-descr b/www/rubygem-faraday-http-cache-gitlab/pkg-descr
new file mode 100644
index 000000000000..d4f62e1910d8
--- /dev/null
+++ b/www/rubygem-faraday-http-cache-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+Faraday Http Cache a Faraday middleware that respects HTTP cache,
+by checking expiration and validation of the stored responses.
diff --git a/www/rubygem-faraday-http-cache/Makefile b/www/rubygem-faraday-http-cache/Makefile
index 6de8af57cd1c..6173c5e316d3 100644
--- a/www/rubygem-faraday-http-cache/Makefile
+++ b/www/rubygem-faraday-http-cache/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	faraday-http-cache
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	mfechner@FreeBSD.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Middleware to handle HTTP caching
 WWW=		https://github.com/sourcelevel/faraday-http-cache
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-faraday-gitlab>=0.8:www/rubygem-faraday-gitlab
+RUN_DEPENDS=	rubygem-faraday>=0.8:www/rubygem-faraday
 
 USES=		gem