Re: git: edc8d0390e04 - main - www/gitlab: fix regression from 335fc7c38d61142727cb9f01fd9e401c476e4ad8

From: Po-Chuan Hsieh <sunpoet_at_freebsd.org>
Date: Tue, 26 Nov 2024 19:28:10 UTC
On Fri, Nov 22, 2024 at 9:48 PM Matthias Fechner <mfechner@freebsd.org>
wrote:

> The branch main has been updated by mfechner:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=edc8d0390e04766c7102c04cdba727b8c0fd22d6
>
> commit edc8d0390e04766c7102c04cdba727b8c0fd22d6
> Author:     Matthias Fechner <mfechner@FreeBSD.org>
> AuthorDate: 2024-11-22 12:08:43 +0000
> Commit:     Matthias Fechner <mfechner@FreeBSD.org>
> CommitDate: 2024-11-22 13:15:15 +0000
>
>     www/gitlab: fix regression from
> 335fc7c38d61142727cb9f01fd9e401c476e4ad8
>
>     Gitlab requires net-http 0.4.1:
>     Because faraday >= 2, < 2.5 could not be found in locally installed
> gems
>       and faraday >= 2.5, < 2.12.1 could not be found in locally installed
> gems,
>       faraday >= 2, < 2.12.1 cannot be used.
>     And because faraday >= 2.12.1 depends on faraday-net_http >= 2.0, <
> 3.5,
>       faraday >= 2 requires faraday-net_http >= 2.0, < 3.5.
>     Because faraday-net_http >= 3.4.0 depends on net-http >= 0.5.0
>     and faraday-net_http >= 2.0, < 3.4.0 could not be found in locally
> installed
>     gems,
>       faraday-net_http >= 2.0 requires net-http >= 0.5.0.
>     Thus, faraday >= 2 requires net-http >= 0.5.0.
>     So, because Gemfile depends on faraday ~> 2
>       and Gemfile depends on net-http = 0.4.1,
>       version solving has failed.
>
>     While fixing the problem, moved gitlab used packages to own package
> names with a
>     PKGNAMESUFFIX of `-gitlab`.
>     This should make the gitlab package much more stable if updates in the
> ports are done.
>

At least it breaks net/rubygem-google-cloud-resource_manager.
https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/p6df70458f823_se0bf7bc3b2b/logs/rubygem-google-cloud-resource_manager-0.38.0.log
https://pkg-status.freebsd.org/beefy22/data/141amd64-default/f0a09486b388/logs/rubygem-google-cloud-resource_manager-0.38.0.log


> ---
>  MOVED                                              |  4 ++
>  devel/Makefile                                     | 13 ++++--
>  devel/rubygem-danger/Makefile                      |  5 ++-
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  2 +
>  devel/rubygem-gapic-common-gitlab/Makefile         | 26 ++++++++++++
>  devel/rubygem-gapic-common-gitlab/distinfo         |  3 ++
>  devel/rubygem-gapic-common-gitlab/pkg-descr        |  1 +
>  .../Makefile                                       |  4 +-
>  .../distinfo                                       |  0
>  .../pkg-descr                                      |  0
>  devel/rubygem-google-apis-cloudbilling_v1/Makefile |  3 +-
>  .../Makefile                                       |  3 +-
>  .../Makefile                                       |  9 ++--
>  .../distinfo                                       |  2 +-
>  .../pkg-descr                                      |  2 -
>  devel/rubygem-google-apis-container_v1/Makefile    |  3 +-
>  .../rubygem-google-apis-container_v1beta1/Makefile |  3 +-
>  devel/rubygem-google-apis-core-gitlab/Makefile     | 27 ++++++++++++
>  devel/rubygem-google-apis-core-gitlab/distinfo     |  3 ++
>  devel/rubygem-google-apis-core-gitlab/pkg-descr    |  5 +++
>  devel/rubygem-google-apis-iam_v1/Makefile          |  3 +-
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  7 ++++
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  7 ++++
>  .../rubygem-google-apis-pubsub_v1-gitlab/Makefile  | 21 ++++++++++
>  .../rubygem-google-apis-pubsub_v1-gitlab/distinfo  |  3 ++
>  .../rubygem-google-apis-pubsub_v1-gitlab/pkg-descr |  7 ++++
>  devel/rubygem-google-apis-serviceusage_v1/Makefile |  3 +-
>  .../Makefile                                       |  6 +--
>  .../distinfo                                       |  0
>  .../pkg-descr                                      |  0
>  .../rubygem-google-apis-storage_v1-gitlab/Makefile | 21 ++++++++++
>  .../rubygem-google-apis-storage_v1-gitlab/distinfo |  3 ++
>  .../pkg-descr                                      |  7 ++++
>  devel/rubygem-graphlient/Makefile                  |  3 +-
>  devel/rubygem-licensee/Makefile                    |  3 +-
>  devel/rubygem-webfinger/Makefile                   |  5 ++-
>  dns/Makefile                                       |  1 +
>  dns/rubygem-google-apis-dns_v1-gitlab/Makefile     | 21 ++++++++++
>  dns/rubygem-google-apis-dns_v1-gitlab/distinfo     |  3 ++
>  dns/rubygem-google-apis-dns_v1-gitlab/pkg-descr    |  7 ++++
>  mail/rubygem-gitlab-mail_room/Makefile             |  3 +-
>  net/Makefile                                       | 13 ++++++
>  net/rubygem-fog-google-gitlab/Makefile             | 33 +++++++++++++++
>  net/rubygem-fog-google-gitlab/distinfo             |  3 ++
>  net/rubygem-fog-google-gitlab/files/patch-gemspec  | 11 +++++
>  net/rubygem-fog-google-gitlab/pkg-descr            |  2 +
>  net/rubygem-gitlab-fog-azure-rm/Makefile           |  7 ++--
>  net/rubygem-google-cloud-compute-v1/Makefile       |  3 +-
>  net/rubygem-google-cloud-core-gitlab/Makefile      | 24 +++++++++++
>  net/rubygem-google-cloud-core-gitlab/distinfo      |  3 ++
>  net/rubygem-google-cloud-core-gitlab/pkg-descr     |  2 +
>  net/rubygem-google-cloud-env-gitlab/Makefile       | 20 +++++++++
>  net/rubygem-google-cloud-env-gitlab/distinfo       |  3 ++
>  net/rubygem-google-cloud-env-gitlab/pkg-descr      |  2 +
>  net/rubygem-google-cloud-location-gitlab/Makefile  | 23 +++++++++++
>  net/rubygem-google-cloud-location-gitlab/distinfo  |  3 ++
>  net/rubygem-google-cloud-location-gitlab/pkg-descr |  4 ++
>  net/rubygem-google-cloud-storage-gitlab/Makefile   | 29 +++++++++++++
>  net/rubygem-google-cloud-storage-gitlab/distinfo   |  3 ++
>  .../files/patch-gemspec                            | 11 +++++
>  net/rubygem-google-cloud-storage-gitlab/pkg-descr  |  3 ++
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  3 ++
>  .../Makefile                                       | 24 +++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  3 ++
>  net/rubygem-oauth2-gitlab/Makefile                 | 25 +++++++++++
>  net/rubygem-oauth2-gitlab/distinfo                 |  3 ++
>  net/rubygem-oauth2-gitlab/pkg-descr                |  4 ++
>  net/rubygem-octokit-gitlab/Makefile                | 22 ++++++++++
>  net/rubygem-octokit-gitlab/distinfo                |  3 ++
>  net/rubygem-octokit-gitlab/pkg-descr               |  2 +
>  net/rubygem-omniauth-auth0-gitlab/Makefile         | 20 +++++++++
>  net/rubygem-omniauth-auth0-gitlab/distinfo         |  3 ++
>  net/rubygem-omniauth-auth0-gitlab/pkg-descr        |  6 +++
>  .../Makefile                                       |  3 +-
>  net/rubygem-omniauth-github-gitlab/Makefile        | 20 +++++++++
>  net/rubygem-omniauth-github-gitlab/distinfo        |  3 ++
>  net/rubygem-omniauth-github-gitlab/pkg-descr       |  1 +
>  net/rubygem-omniauth-google-oauth2-gitlab/Makefile | 22 ++++++++++
>  net/rubygem-omniauth-google-oauth2-gitlab/distinfo |  3 ++
>  .../pkg-descr                                      |  1 +
>  net/rubygem-omniauth-oauth2-gitlab/Makefile        | 21 ++++++++++
>  net/rubygem-omniauth-oauth2-gitlab/distinfo        |  3 ++
>  .../files/patch-gemspec                            | 15 +++++++
>  net/rubygem-omniauth-oauth2-gitlab/pkg-descr       |  1 +
>  net/rubygem-openid_connect/Makefile                |  9 ++--
>  security/Makefile                                  |  5 +++
>  security/rubygem-acme-client-gitlab/Makefile       | 24 +++++++++++
>  security/rubygem-acme-client-gitlab/distinfo       |  3 ++
>  security/rubygem-acme-client-gitlab/pkg-descr      |  1 +
>  security/rubygem-googleauth-gitlab/Makefile        | 25 +++++++++++
>  security/rubygem-googleauth-gitlab/distinfo        |  3 ++
>  security/rubygem-googleauth-gitlab/pkg-descr       |  5 +++
>  security/rubygem-omniauth-alicloud/Makefile        |  3 +-
>  .../rubygem-omniauth-atlassian-oauth2/Makefile     |  6 +--
>  .../Makefile                                       | 24 +++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      | 16 ++++++++
>  security/rubygem-rack-oauth2-gitlab/Makefile       | 25 +++++++++++
>  security/rubygem-rack-oauth2-gitlab/distinfo       |  3 ++
>  security/rubygem-rack-oauth2-gitlab/pkg-descr      |  2 +
>  security/rubygem-signet-gitlab/Makefile            | 23 +++++++++++
>  security/rubygem-signet-gitlab/distinfo            |  3 ++
>  security/rubygem-signet-gitlab/pkg-descr           |  1 +
>  textproc/Makefile                                  |  6 ++-
>  textproc/rubygem-elasticsearch-api-gitlab/Makefile | 20 +++++++++
>  textproc/rubygem-elasticsearch-api-gitlab/distinfo |  3 ++
>  .../rubygem-elasticsearch-api-gitlab/pkg-descr     |  2 +
>  textproc/rubygem-elasticsearch-gitlab/Makefile     | 24 +++++++++++
>  textproc/rubygem-elasticsearch-gitlab/distinfo     |  3 ++
>  textproc/rubygem-elasticsearch-gitlab/pkg-descr    |  5 +++
>  .../Makefile                                       |  4 +-
>  .../distinfo                                       |  0
>  .../pkg-descr                                      |  0
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  2 +
>  .../Makefile                                       |  5 ++-
>  textproc/rubygem-google-cloud-profiler-v2/Makefile |  3 +-
>  textproc/rubygem-rouge-gitlab/Makefile             | 22 ++++++++++
>  textproc/rubygem-rouge-gitlab/distinfo             |  3 ++
>  textproc/rubygem-rouge-gitlab/pkg-descr            |  2 +
>  www/Makefile                                       |  7 ++++
>  www/gitlab/Makefile                                | 48
> +++++++++++-----------
>  .../Makefile                                       | 20 +++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  5 +++
>  www/rubygem-faraday-gitlab/Makefile                | 24 +++++++++++
>  www/rubygem-faraday-gitlab/distinfo                |  3 ++
>  www/rubygem-faraday-gitlab/pkg-descr               |  3 ++
>  www/rubygem-faraday-http-cache/Makefile            |  4 +-
>  www/rubygem-faraday-http-cache/distinfo            |  6 +--
>  www/rubygem-faraday-net_http-gitlab/Makefile       | 20 +++++++++
>  www/rubygem-faraday-net_http-gitlab/distinfo       |  3 ++
>  www/rubygem-faraday-net_http-gitlab/pkg-descr      |  4 ++
>  .../Makefile                                       | 21 ++++++++++
>  .../distinfo                                       |  3 ++
>  .../pkg-descr                                      |  2 +
>  www/rubygem-faraday-retry-gitlab/Makefile          | 20 +++++++++
>  www/rubygem-faraday-retry-gitlab/distinfo          |  3 ++
>  www/rubygem-faraday-retry-gitlab/pkg-descr         |  7 ++++
>  www/rubygem-faraday-typhoeus-gitlab/Makefile       | 21 ++++++++++
>  www/rubygem-faraday-typhoeus-gitlab/distinfo       |  3 ++
>  www/rubygem-faraday-typhoeus-gitlab/pkg-descr      |  2 +
>  www/rubygem-json-jwt-gitlab/Makefile               | 25 +++++++++++
>  www/rubygem-json-jwt-gitlab/distinfo               |  3 ++
>  www/rubygem-json-jwt-gitlab/pkg-descr              |  2 +
>  www/rubygem-swd/Makefile                           |  5 ++-
>  156 files changed, 1263 insertions(+), 80 deletions(-)
>
> diff --git a/MOVED b/MOVED
> index 49f5fce0416c..9598eb845bc9 100644
> --- a/MOVED
> +++ b/MOVED
> @@ -3722,3 +3722,7 @@ sysutils/ztop|filesystems/ztop|2024-11-13|Moved to
> new category filesystems
>  devel/b2|devel/py-b2|2024-11-14|Add py- prefix
>  misc/morse||2024-11-14|Project discontinued upstream
>  games/minetest|games/luanti|2024-11-17|Chase upstream rename
> +devel/rubygem-google-apis-compute_v1_057|devel/rubygem-google-apis-compute_v1-gitlab|2024-11-22|Renamed
> to devel/rubygem-google-apis-compute_v1-gitlab
> +devel/rubygem-google-apis-sqladmin_v1beta4_041|devel/rubygem-google-apis-sqladmin_v1beta4-gitlab|2024-11-22|Renamed
> to devel/rubygem-google-apis-sqladmin_v1beta4-gitlab
> +devel/rubygem-google-apis-androidpublisher_v3034|devel/rubygem-google-apis-androidpublisher_v3-gitlab|2024-11-22|Renamed
> to devel/rubygem-google-apis-androidpublisher_v3-gitlab
> +textproc/rubygem-elasticsearch-model713|textproc/rubygem-elasticsearch-model-gitlab|2024-11-22|Renamed
> to textproc/rubygem-elasticsearch-model-gitlab
> diff --git a/devel/Makefile b/devel/Makefile
> index d203a595eec8..3812c0ac7b8a 100644
> --- a/devel/Makefile
> +++ b/devel/Makefile
> @@ -7186,6 +7186,7 @@
>      SUBDIR += rubygem-faraday-excon
>      SUBDIR += rubygem-faraday-excon1
>      SUBDIR += rubygem-faraday_middleware-aws-sigv4
> +    SUBDIR += rubygem-faraday_middleware-aws-sigv4-gitlab
>      SUBDIR += rubygem-faraday_middleware-aws-sigv403
>      SUBDIR += rubygem-faraday_middleware-multi_json
>      SUBDIR += rubygem-fast-stemmer
> @@ -7240,6 +7241,7 @@
>      SUBDIR += rubygem-fuubar
>      SUBDIR += rubygem-fuzzy_match
>      SUBDIR += rubygem-gapic-common
> +    SUBDIR += rubygem-gapic-common-gitlab
>      SUBDIR += rubygem-gdata
>      SUBDIR += rubygem-gem-compare
>      SUBDIR += rubygem-gem_plugin
> @@ -7288,7 +7290,7 @@
>      SUBDIR += rubygem-google-api-client
>      SUBDIR += rubygem-google-apis-admin_directory_v1
>      SUBDIR += rubygem-google-apis-androidpublisher_v3
> -    SUBDIR += rubygem-google-apis-androidpublisher_v3034
> +    SUBDIR += rubygem-google-apis-androidpublisher_v3-gitlab
>      SUBDIR += rubygem-google-apis-bigquery_v2
>      SUBDIR += rubygem-google-apis-cloudbilling_v1
>      SUBDIR += rubygem-google-apis-cloudkms_v1
> @@ -7297,10 +7299,11 @@
>      SUBDIR += rubygem-google-apis-cloudresourcemanager_v2
>      SUBDIR += rubygem-google-apis-cloudresourcemanager_v3
>      SUBDIR += rubygem-google-apis-compute_v1
> -    SUBDIR += rubygem-google-apis-compute_v1_057
> +    SUBDIR += rubygem-google-apis-compute_v1-gitlab
>      SUBDIR += rubygem-google-apis-container_v1
>      SUBDIR += rubygem-google-apis-container_v1beta1
>      SUBDIR += rubygem-google-apis-core
> +    SUBDIR += rubygem-google-apis-core-gitlab
>      SUBDIR += rubygem-google-apis-core011
>      SUBDIR += rubygem-google-apis-discovery_v1
>      SUBDIR += rubygem-google-apis-drive_v3
> @@ -7310,14 +7313,18 @@
>      SUBDIR += rubygem-google-apis-iam_v2
>      SUBDIR += rubygem-google-apis-iam_v2beta
>      SUBDIR += rubygem-google-apis-iamcredentials_v1
> +    SUBDIR += rubygem-google-apis-iamcredentials_v1-gitlab
>      SUBDIR += rubygem-google-apis-monitoring_v3
> +    SUBDIR += rubygem-google-apis-monitoring_v3-gitlab
>      SUBDIR += rubygem-google-apis-playcustomapp_v1
>      SUBDIR += rubygem-google-apis-pubsub_v1
> +    SUBDIR += rubygem-google-apis-pubsub_v1-gitlab
>      SUBDIR += rubygem-google-apis-serviceusage_v1
>      SUBDIR += rubygem-google-apis-sheets_v4
>      SUBDIR += rubygem-google-apis-sqladmin_v1beta4
> -    SUBDIR += rubygem-google-apis-sqladmin_v1beta4_041
> +    SUBDIR += rubygem-google-apis-sqladmin_v1beta4-gitlab
>      SUBDIR += rubygem-google-apis-storage_v1
> +    SUBDIR += rubygem-google-apis-storage_v1-gitlab
>      SUBDIR += rubygem-google-cloud-common
>      SUBDIR += rubygem-google-iam-credentials
>      SUBDIR += rubygem-google-iam-credentials-v1
> diff --git a/devel/rubygem-danger/Makefile b/devel/rubygem-danger/Makefile
> index 88b2d52f61a7..46a09b5145f3 100644
> --- a/devel/rubygem-danger/Makefile
> +++ b/devel/rubygem-danger/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      danger
>  PORTVERSION=   9.5.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -14,12 +15,12 @@ RUN_DEPENDS=
> rubygem-claide>=1.0<2:devel/rubygem-claide \
>                 rubygem-claide-plugins>=0.9.2:devel/rubygem-claide-plugins
> \
>                 rubygem-colored2>=3.1<4:textproc/rubygem-colored2 \
>                 rubygem-cork>=0.1<1:devel/rubygem-cork \
> -               rubygem-faraday>=0.9.0<3.0:www/rubygem-faraday \
> +
>  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-git>=1.13<2:devel/rubygem-git \
>                 rubygem-kramdown>=2.3<3:textproc/rubygem-kramdown \
>
> rubygem-kramdown-parser-gfm>=1.0<2:textproc/rubygem-kramdown-parser-gfm \
> -               rubygem-octokit>=4:net/rubygem-octokit \
> +               rubygem-octokit-gitlab>=4:net/rubygem-octokit-gitlab \
>                 rubygem-terminal-table>=1<4:textproc/rubygem-terminal-table
>
>  USES=          gem
> diff --git a/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/Makefile
> b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/Makefile
> new file mode 100644
> index 000000000000..dbb86e7b5f6a
> --- /dev/null
> +++ b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      faraday_middleware-aws-sigv4
> +PORTVERSION=   1.0.1
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Faraday middleware for AWS Signature Version 4
> +WWW=           https://github.com/winebarrel/faraday_middleware-aws-sigv4
> +
> +LICENSE=       MIT
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.txt
> +
> +RUN_DEPENDS=   rubygem-aws-sigv4>=1.0<2:devel/rubygem-aws-sigv4 \
> +               rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/distinfo
> b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/distinfo
> new file mode 100644
> index 000000000000..fd51432adce0
> --- /dev/null
> +++ b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1664768108
> +SHA256 (rubygem/faraday_middleware-aws-sigv4-1.0.1.gem) =
> a001ea4f687ca1c60bad8f2a627196905ce3dbf285e461dc153240e92eaabe8f
> +SIZE (rubygem/faraday_middleware-aws-sigv4-1.0.1.gem) = 8704
> diff --git a/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/pkg-descr
> b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..98fce76b1722
> --- /dev/null
> +++ b/devel/rubygem-faraday_middleware-aws-sigv4-gitlab/pkg-descr
> @@ -0,0 +1,2 @@
> +FaradayMiddleware::AwsSigV4 is a faraday middleware for AWS Signature
> Version 4
> +using aws-sigv4.
> diff --git a/devel/rubygem-gapic-common-gitlab/Makefile
> b/devel/rubygem-gapic-common-gitlab/Makefile
> new file mode 100644
> index 000000000000..2815e46e740b
> --- /dev/null
> +++ b/devel/rubygem-gapic-common-gitlab/Makefile
> @@ -0,0 +1,26 @@
> +PORTNAME=      gapic-common
> +PORTVERSION=   0.23.0
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Common code for GAPIC-generated API clients
> +WWW=
> https://github.com/googleapis/gapic-generator-ruby/tree/master/gapic-common
> \
> +               https://github.com/googleapis/gapic-generator-ruby
> +
> +LICENSE=       APACHE20
> +
> +RUN_DEPENDS=   rubygem-faraday-gitlab>=1.9<3:www/rubygem-faraday-gitlab \
> +
>  rubygem-faraday-retry-gitlab>=1.0<3:www/rubygem-faraday-retry-gitlab \
> +
>  rubygem-google-protobuf>=3.25<5.0:devel/rubygem-google-protobuf \
> +
>  rubygem-googleapis-common-protos>=1.6<2:devel/rubygem-googleapis-common-protos
> \
> +
>  rubygem-googleapis-common-protos-types>=1.15<2:devel/rubygem-googleapis-common-protos-types
> \
> +
>  rubygem-googleauth-gitlab>=1.11<2:security/rubygem-googleauth-gitlab \
> +               rubygem-grpc>=1.65<2:net/rubygem-grpc
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-gapic-common-gitlab/distinfo
> b/devel/rubygem-gapic-common-gitlab/distinfo
> new file mode 100644
> index 000000000000..22728a332802
> --- /dev/null
> +++ b/devel/rubygem-gapic-common-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1729927057
> +SHA256 (rubygem/gapic-common-0.23.0.gem) =
> 331f483bc6ff9768808058562f765fa57d1d90c678af41a4225309936083ab44
> +SIZE (rubygem/gapic-common-0.23.0.gem) = 39424
> diff --git a/devel/rubygem-gapic-common-gitlab/pkg-descr
> b/devel/rubygem-gapic-common-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..9273ffbe8825
> --- /dev/null
> +++ b/devel/rubygem-gapic-common-gitlab/pkg-descr
> @@ -0,0 +1 @@
> +Create Ruby clients from a protocol buffer description of an API.
> diff --git a/devel/rubygem-google-apis-androidpublisher_v3034/Makefile
> b/devel/rubygem-google-apis-androidpublisher_v3-gitlab/Makefile
> similarity index 76%
> rename from devel/rubygem-google-apis-androidpublisher_v3034/Makefile
> rename to devel/rubygem-google-apis-androidpublisher_v3-gitlab/Makefile
> index 28d8efccba86..d65e09cf2abc 100644
> --- a/devel/rubygem-google-apis-androidpublisher_v3034/Makefile
> +++ b/devel/rubygem-google-apis-androidpublisher_v3-gitlab/Makefile
> @@ -2,7 +2,7 @@ PORTNAME=       google-apis-androidpublisher_v3
>  PORTVERSION=   0.34.0
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
> -PKGNAMESUFFIX= 034
> +PKGNAMESUFFIX= -gitlab
>
>  MAINTAINER=    mfechner@FreeBSD.org
>  COMMENT=       Simple REST client for Google Play Android API V3
> @@ -11,7 +11,7 @@ WWW=
> https://github.com/google/google-api-ruby-client
>  LICENSE=       APACHE20
>  LICENSE_FILE=  ${WRKSRC}/LICENSE.md
>
> -RUN_DEPENDS=
>  rubygem-google-apis-core>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-androidpublisher_v3034/distinfo
> b/devel/rubygem-google-apis-androidpublisher_v3-gitlab/distinfo
> similarity index 100%
> rename from devel/rubygem-google-apis-androidpublisher_v3034/distinfo
> rename to devel/rubygem-google-apis-androidpublisher_v3-gitlab/distinfo
> diff --git a/devel/rubygem-google-apis-androidpublisher_v3034/pkg-descr
> b/devel/rubygem-google-apis-androidpublisher_v3-gitlab/pkg-descr
> similarity index 100%
> rename from devel/rubygem-google-apis-androidpublisher_v3034/pkg-descr
> rename to devel/rubygem-google-apis-androidpublisher_v3-gitlab/pkg-descr
> diff --git a/devel/rubygem-google-apis-cloudbilling_v1/Makefile
> b/devel/rubygem-google-apis-cloudbilling_v1/Makefile
> index b3ca2aeea526..4cbc895f6a22 100644
> --- a/devel/rubygem-google-apis-cloudbilling_v1/Makefile
> +++ b/devel/rubygem-google-apis-cloudbilling_v1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-cloudbilling_v1
>  PORTVERSION=   0.21.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
> b/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
> index 231b251835bd..d655ea9694c6 100644
> --- a/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
> +++ b/devel/rubygem-google-apis-cloudresourcemanager_v1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-cloudresourcemanager_v1
>  PORTVERSION=   0.31.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-compute_v1_057/Makefile
> b/devel/rubygem-google-apis-compute_v1-gitlab/Makefile
> similarity index 62%
> rename from devel/rubygem-google-apis-compute_v1_057/Makefile
> rename to devel/rubygem-google-apis-compute_v1-gitlab/Makefile
> index 8a9793c00b07..aab12406dc58 100644
> --- a/devel/rubygem-google-apis-compute_v1_057/Makefile
> +++ b/devel/rubygem-google-apis-compute_v1-gitlab/Makefile
> @@ -2,21 +2,20 @@ PORTNAME=     google-apis-compute_v1
>  PORTVERSION=   0.57.0
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
> -PKGNAMESUFFIX= _057
> +PKGNAMESUFFIX= -gitlab
>
>  MAINTAINER=    mfechner@FreeBSD.org
>  COMMENT=       Simple REST client for Compute Engine API V1
> -WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-compute_v1
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-compute_v1
> \
> +               https://github.com/googleapis/google-api-ruby-client
>
>  LICENSE=       APACHE20
>  LICENSE_FILE=  ${WRKSRC}/LICENSE.md
>
> -RUN_DEPENDS=
>  rubygem-google-apis-core>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
>  NO_ARCH=       yes
>
> -PORTSCOUT=     limit:^0\.57\.
> -
>  .include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-compute_v1_057/distinfo
> b/devel/rubygem-google-apis-compute_v1-gitlab/distinfo
> similarity index 88%
> rename from devel/rubygem-google-apis-compute_v1_057/distinfo
> rename to devel/rubygem-google-apis-compute_v1-gitlab/distinfo
> index 55db42b70b21..e4821641873e 100644
> --- a/devel/rubygem-google-apis-compute_v1_057/distinfo
> +++ b/devel/rubygem-google-apis-compute_v1-gitlab/distinfo
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1677223056
> +TIMESTAMP = 1732268340
>  SHA256 (rubygem/google-apis-compute_v1-0.57.0.gem) =
> 404514548abc3a44f5e96393d6a6d588d287548ecb6f5a886ad76e1beea78068
>  SIZE (rubygem/google-apis-compute_v1-0.57.0.gem) = 389632
> diff --git a/devel/rubygem-google-apis-compute_v1_057/pkg-descr
> b/devel/rubygem-google-apis-compute_v1-gitlab/pkg-descr
> similarity index 85%
> rename from devel/rubygem-google-apis-compute_v1_057/pkg-descr
> rename to devel/rubygem-google-apis-compute_v1-gitlab/pkg-descr
> index cec6edee2ee3..d1e667192e09 100644
> --- a/devel/rubygem-google-apis-compute_v1_057/pkg-descr
> +++ b/devel/rubygem-google-apis-compute_v1-gitlab/pkg-descr
> @@ -5,5 +5,3 @@ provides:
>  - Integration with the googleauth gem for authentication using OAuth, API
> keys,
>    and service accounts.
>  - Control of retry, pagination, and timeouts.
> -
> -See also: https://github.com/googleapis/google-api-ruby-client
> diff --git a/devel/rubygem-google-apis-container_v1/Makefile
> b/devel/rubygem-google-apis-container_v1/Makefile
> index 4668629469e9..d9a5b45221f5 100644
> --- a/devel/rubygem-google-apis-container_v1/Makefile
> +++ b/devel/rubygem-google-apis-container_v1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-container_v1
>  PORTVERSION=   0.43.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -10,7 +11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-container_v1beta1/Makefile
> b/devel/rubygem-google-apis-container_v1beta1/Makefile
> index c938b1bd124c..362e25d896c2 100644
> --- a/devel/rubygem-google-apis-container_v1beta1/Makefile
> +++ b/devel/rubygem-google-apis-container_v1beta1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-container_v1beta1
>  PORTVERSION=   0.43.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -10,7 +11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-core-gitlab/Makefile
> b/devel/rubygem-google-apis-core-gitlab/Makefile
> new file mode 100644
> index 000000000000..a2a828ac6b1a
> --- /dev/null
> +++ b/devel/rubygem-google-apis-core-gitlab/Makefile
> @@ -0,0 +1,27 @@
> +PORTNAME=      google-apis-core
> +PORTVERSION=   0.15.1
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Common utility and base classes for legacy Google REST
> clients
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/google-apis-core
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=   rubygem-addressable>=2.5.1<3:www/rubygem-addressable \
> +
>  rubygem-googleauth-gitlab>=1.9<2:security/rubygem-googleauth-gitlab \
> +               rubygem-httpclient>=2.8.3<3.0:www/rubygem-httpclient \
> +               rubygem-mini_mime>=1.0<2:mail/rubygem-mini_mime \
> +               rubygem-mutex_m>=0:devel/rubygem-mutex_m \
> +
>  rubygem-representable>=3.0<4:textproc/rubygem-representable \
> +               rubygem-retriable>=2.0<4.0:devel/rubygem-retriable
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-core-gitlab/distinfo
> b/devel/rubygem-google-apis-core-gitlab/distinfo
> new file mode 100644
> index 000000000000..9b8d9030b307
> --- /dev/null
> +++ b/devel/rubygem-google-apis-core-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1722711311
> +SHA256 (rubygem/google-apis-core-0.15.1.gem) =
> 91484122791af5b2f3d3f4297912748febe2b5d704d04ad54cbf5df87339a71a
> +SIZE (rubygem/google-apis-core-0.15.1.gem) = 36352
> diff --git a/devel/rubygem-google-apis-core-gitlab/pkg-descr
> b/devel/rubygem-google-apis-core-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..d537f564f9fc
> --- /dev/null
> +++ b/devel/rubygem-google-apis-core-gitlab/pkg-descr
> @@ -0,0 +1,5 @@
> +This library implements the code generator used by legacy REST clients for
> +Google APIs. It automatically generates client gems given discovery
> documents.
> +Google-managed clients for publicly-available APIs are maintained using
> this
> +tool, and users may also use it to generate clients for private or
> early-access
> +APIs.
> diff --git a/devel/rubygem-google-apis-iam_v1/Makefile
> b/devel/rubygem-google-apis-iam_v1/Makefile
> index beca5166bc4b..b1597921a593 100644
> --- a/devel/rubygem-google-apis-iam_v1/Makefile
> +++ b/devel/rubygem-google-apis-iam_v1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-iam_v1
>  PORTVERSION=   0.36.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -10,7 +11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-iamcredentials_v1-gitlab/Makefile
> b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/Makefile
> new file mode 100644
> index 000000000000..7e6ffec12817
> --- /dev/null
> +++ b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      google-apis-iamcredentials_v1
> +PORTVERSION=   0.22.0
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Simple REST client for IAM Service Account Credentials API
> V1
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-iamcredentials_v1
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.15.0<2.0:devel/rubygem-google-apis-core-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-iamcredentials_v1-gitlab/distinfo
> b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/distinfo
> new file mode 100644
> index 000000000000..36bb20d87daa
> --- /dev/null
> +++ b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1730724854
> +SHA256 (rubygem/google-apis-iamcredentials_v1-0.22.0.gem) =
> 38c1de913d541802398841a124bb5592f1bae71119b5aede5369647eee7a3dad
> +SIZE (rubygem/google-apis-iamcredentials_v1-0.22.0.gem) = 15872
> diff --git a/devel/rubygem-google-apis-iamcredentials_v1-gitlab/pkg-descr
> b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..dc709512f5d1
> --- /dev/null
> +++ b/devel/rubygem-google-apis-iamcredentials_v1-gitlab/pkg-descr
> @@ -0,0 +1,7 @@
> +This is a simple client library for version V1 of the IAM Service Account
> +Credentials API. It provides:
> +- A client object that connects to the HTTP/JSON REST endpoint for the
> service.
> +- Ruby objects for data structures related to the service.
> +- Integration with the googleauth gem for authentication using OAuth, API
> keys,
> +  and service accounts.
> +- Control of retry, pagination, and timeouts.
> diff --git a/devel/rubygem-google-apis-monitoring_v3-gitlab/Makefile
> b/devel/rubygem-google-apis-monitoring_v3-gitlab/Makefile
> new file mode 100644
> index 000000000000..967e40a14fb4
> --- /dev/null
> +++ b/devel/rubygem-google-apis-monitoring_v3-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      google-apis-monitoring_v3
> +PORTVERSION=   0.71.0
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Simple REST client for Cloud Monitoring API V3
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-monitoring_v3
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.15.0<2.0:devel/rubygem-google-apis-core-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-monitoring_v3-gitlab/distinfo
> b/devel/rubygem-google-apis-monitoring_v3-gitlab/distinfo
> new file mode 100644
> index 000000000000..9e2c77800863
> --- /dev/null
> +++ b/devel/rubygem-google-apis-monitoring_v3-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1730257805
> +SHA256 (rubygem/google-apis-monitoring_v3-0.71.0.gem) =
> 1a682bf871e45c82cd44c7416d7611e2a528692ec78bc3817fb4378701d1f3e3
> +SIZE (rubygem/google-apis-monitoring_v3-0.71.0.gem) = 83968
> diff --git a/devel/rubygem-google-apis-monitoring_v3-gitlab/pkg-descr
> b/devel/rubygem-google-apis-monitoring_v3-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..c32251f7b5cf
> --- /dev/null
> +++ b/devel/rubygem-google-apis-monitoring_v3-gitlab/pkg-descr
> @@ -0,0 +1,7 @@
> +This is a simple client library for version V3 of the Cloud Monitoring
> API. It
> +provides:
> +- A client object that connects to the HTTP/JSON REST endpoint for the
> service.
> +- Ruby objects for data structures related to the service.
> +- Integration with the googleauth gem for authentication using OAuth, API
> keys,
> +  and service accounts.
> +- Control of retry, pagination, and timeouts.
> diff --git a/devel/rubygem-google-apis-pubsub_v1-gitlab/Makefile
> b/devel/rubygem-google-apis-pubsub_v1-gitlab/Makefile
> new file mode 100644
> index 000000000000..a08efe7ea335
> --- /dev/null
> +++ b/devel/rubygem-google-apis-pubsub_v1-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      google-apis-pubsub_v1
> +PORTVERSION=   0.56.0
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Simple REST client for Cloud Pub/Sub API V1
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-pubsub_v1
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.15.0<2.0:devel/rubygem-google-apis-core-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-pubsub_v1-gitlab/distinfo
> b/devel/rubygem-google-apis-pubsub_v1-gitlab/distinfo
> new file mode 100644
> index 000000000000..f2a57f9ecfd8
> --- /dev/null
> +++ b/devel/rubygem-google-apis-pubsub_v1-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1728632680
> +SHA256 (rubygem/google-apis-pubsub_v1-0.56.0.gem) =
> b6dea0f8eb2a53d59d7d600ffaf2974f537a3ba46ce0d7c90788352f2c9b1bcb
> +SIZE (rubygem/google-apis-pubsub_v1-0.56.0.gem) = 41472
> diff --git a/devel/rubygem-google-apis-pubsub_v1-gitlab/pkg-descr
> b/devel/rubygem-google-apis-pubsub_v1-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..700f29c3f1ca
> --- /dev/null
> +++ b/devel/rubygem-google-apis-pubsub_v1-gitlab/pkg-descr
> @@ -0,0 +1,7 @@
> +This is a simple client library for version V1 of the Cloud Pub/Sub API.
> It
> +provides:
> +- A client object that connects to the HTTP/JSON REST endpoint for the
> service.
> +- Ruby objects for data structures related to the service.
> +- Integration with the googleauth gem for authentication using OAuth, API
> keys,
> +  and service accounts.
> +- Control of retry, pagination, and timeouts.
> diff --git a/devel/rubygem-google-apis-serviceusage_v1/Makefile
> b/devel/rubygem-google-apis-serviceusage_v1/Makefile
> index 23ca84162459..424f000e0b54 100644
> --- a/devel/rubygem-google-apis-serviceusage_v1/Makefile
> +++ b/devel/rubygem-google-apis-serviceusage_v1/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      google-apis-serviceusage_v1
>  PORTVERSION=   0.28.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -10,7 +11,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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
> diff --git a/devel/rubygem-google-apis-sqladmin_v1beta4_041/Makefile
> b/devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/Makefile
> similarity index 76%
> rename from devel/rubygem-google-apis-sqladmin_v1beta4_041/Makefile
> rename to devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/Makefile
> index a4760b554520..15e4e02cd170 100644
> --- a/devel/rubygem-google-apis-sqladmin_v1beta4_041/Makefile
> +++ b/devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/Makefile
> @@ -2,7 +2,7 @@ PORTNAME=       google-apis-sqladmin_v1beta4
>  PORTVERSION=   0.41.0
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
> -PKGNAMESUFFIX= _041
> +PKGNAMESUFFIX= -gitlab
>
>  MAINTAINER=    mfechner@FreeBSD.org
>  COMMENT=       Simple REST client for Cloud SQL Admin API V1beta4
> @@ -11,12 +11,10 @@ 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>=0.9.1<2.0:devel/rubygem-google-apis-core
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.9.1<2.0:devel/rubygem-google-apis-core-gitlab
>
>  USES=          gem
>
>  NO_ARCH=       yes
>
> -PORTSCOUT=     limit:0\.41\.
> -
>  .include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-sqladmin_v1beta4_041/distinfo
> b/devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/distinfo
> similarity index 100%
> rename from devel/rubygem-google-apis-sqladmin_v1beta4_041/distinfo
> rename to devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/distinfo
> diff --git a/devel/rubygem-google-apis-sqladmin_v1beta4_041/pkg-descr
> b/devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/pkg-descr
> similarity index 100%
> rename from devel/rubygem-google-apis-sqladmin_v1beta4_041/pkg-descr
> rename to devel/rubygem-google-apis-sqladmin_v1beta4-gitlab/pkg-descr
> diff --git a/devel/rubygem-google-apis-storage_v1-gitlab/Makefile
> b/devel/rubygem-google-apis-storage_v1-gitlab/Makefile
> new file mode 100644
> index 000000000000..8960f6e7c695
> --- /dev/null
> +++ b/devel/rubygem-google-apis-storage_v1-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      google-apis-storage_v1
> +PORTVERSION=   0.47.0
> +CATEGORIES=    devel rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Simple REST client for Cloud Storage JSON API V1
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-storage_v1
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.15.0<2.0:devel/rubygem-google-apis-core-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/devel/rubygem-google-apis-storage_v1-gitlab/distinfo
> b/devel/rubygem-google-apis-storage_v1-gitlab/distinfo
> new file mode 100644
> index 000000000000..63f039280369
> --- /dev/null
> +++ b/devel/rubygem-google-apis-storage_v1-gitlab/distinfo
> @@ -0,0 +1,3 @@
> +TIMESTAMP = 1729509194
> +SHA256 (rubygem/google-apis-storage_v1-0.47.0.gem) =
> 0c75864c5d9604dd6841ec9e0ea30c74d50f64e6329300ea435b34fce5f75278
> +SIZE (rubygem/google-apis-storage_v1-0.47.0.gem) = 52736
> diff --git a/devel/rubygem-google-apis-storage_v1-gitlab/pkg-descr
> b/devel/rubygem-google-apis-storage_v1-gitlab/pkg-descr
> new file mode 100644
> index 000000000000..f17223b196c5
> --- /dev/null
> +++ b/devel/rubygem-google-apis-storage_v1-gitlab/pkg-descr
> @@ -0,0 +1,7 @@
> +This is a simple client library for version V1 of the Cloud Storage JSON
> API. It
> +provides:
> +- A client object that connects to the HTTP/JSON REST endpoint for the
> service.
> +- Ruby objects for data structures related to the service.
> +- Integration with the googleauth gem for authentication using OAuth, API
> keys,
> +  and service accounts.
> +- Control of retry, pagination, and timeouts.
> diff --git a/devel/rubygem-graphlient/Makefile
> b/devel/rubygem-graphlient/Makefile
> index 31f087df16eb..3d11dc8405c8 100644
> --- a/devel/rubygem-graphlient/Makefile
> +++ b/devel/rubygem-graphlient/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      graphlient
>  PORTVERSION=   0.8.0
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -9,7 +10,7 @@ WWW=           https://github.com/ashkan18/graphlient
>
>  LICENSE=       MIT
>
> -RUN_DEPENDS=   rubygem-faraday>=2.0<3:www/rubygem-faraday \
> +RUN_DEPENDS=   rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \
>                 rubygem-graphql-client>=0:devel/rubygem-graphql-client
>
>  USES=          gem
> diff --git a/devel/rubygem-licensee/Makefile
> b/devel/rubygem-licensee/Makefile
> index 3028e4843078..c66e851cce5f 100644
> --- a/devel/rubygem-licensee/Makefile
> +++ b/devel/rubygem-licensee/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      licensee
>  PORTVERSION=   9.17.1
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -11,7 +12,7 @@ LICENSE=      MIT
>  LICENSE_FILE=  ${WRKSRC}/LICENSE.md
>
>  RUN_DEPENDS=   rubygem-dotenv>=2.0<4:misc/rubygem-dotenv \
> -               rubygem-octokit>=4.20<10:net/rubygem-octokit \
> +               rubygem-octokit-gitlab>=4.20<10:net/rubygem-octokit-gitlab
> \
>
> rubygem-reverse_markdown>=1.0<3:textproc/rubygem-reverse_markdown \
>                 rubygem-rugged>=0.24<2.0:devel/rubygem-rugged \
>                 rubygem-thor>=0.19<2.0:devel/rubygem-thor
> diff --git a/devel/rubygem-webfinger/Makefile
> b/devel/rubygem-webfinger/Makefile
> index 345caf3156b7..407294e80cea 100644
> --- a/devel/rubygem-webfinger/Makefile
> +++ b/devel/rubygem-webfinger/Makefile
> @@ -1,5 +1,6 @@
>  PORTNAME=      webfinger
>  PORTVERSION=   2.1.3
> +PORTREVISION=  1
>  CATEGORIES=    devel rubygems
>  MASTER_SITES=  RG
>
> @@ -11,8 +12,8 @@ LICENSE=      MIT
>  LICENSE_FILE=  ${WRKSRC}/LICENSE.txt
>
>  RUN_DEPENDS=   rubygem-activesupport70>=3.0:devel/rubygem-activesupport70
> \
> -               rubygem-faraday>=2.0<3:www/rubygem-faraday \
> -
>  rubygem-faraday-follow_redirects>=0:www/rubygem-faraday-follow_redirects
> +               rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \
> +
>  rubygem-faraday-follow_redirects-gitlab>=0:www/rubygem-faraday-follow_redirects-gitlab
>
>  USES=          gem
>
> diff --git a/dns/Makefile b/dns/Makefile
> index 27a1a0852d38..b6a724d92c5f 100644
> --- a/dns/Makefile
> +++ b/dns/Makefile
> @@ -209,6 +209,7 @@
>      SUBDIR += rubygem-dnsruby
>      SUBDIR += rubygem-gitlab-net-dns
>      SUBDIR += rubygem-google-apis-dns_v1
> +    SUBDIR += rubygem-google-apis-dns_v1-gitlab
>      SUBDIR += rubygem-google-cloud-dns
>      SUBDIR += rubygem-idn-ruby
>      SUBDIR += rubygem-net-dns
> diff --git a/dns/rubygem-google-apis-dns_v1-gitlab/Makefile
> b/dns/rubygem-google-apis-dns_v1-gitlab/Makefile
> new file mode 100644
> index 000000000000..b7d92b8159fa
> --- /dev/null
> +++ b/dns/rubygem-google-apis-dns_v1-gitlab/Makefile
> @@ -0,0 +1,21 @@
> +PORTNAME=      google-apis-dns_v1
> +PORTVERSION=   0.44.0
> +CATEGORIES=    dns rubygems
> +MASTER_SITES=  RG
> +PKGNAMESUFFIX= -gitlab
> +
> +MAINTAINER=    mfechner@FreeBSD.org
> +COMMENT=       Simple REST client for Cloud DNS API V1
> +WWW=
> https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-dns_v1
> \
> +               https://github.com/googleapis/google-api-ruby-client
> +
> +LICENSE=       APACHE20
> +LICENSE_FILE=  ${WRKSRC}/LICENSE.md
> +
> +RUN_DEPENDS=
>  rubygem-google-apis-core-gitlab>=0.15.0<2.0:devel/rubygem-google-apis-core-gitlab
> +
> +USES=          gem
> +
> +NO_ARCH=       yes
> +
> +.include <bsd.port.mk>
> diff --git a/dns/rubygem-google-apis-dns_v1-gitlab/distinfo
> b/dns/rubygem-google-apis-dns_v1-gitlab/distinfo
> new file mode 100644
> index 000000000000..f16e2e066c71
> --- /dev/null
> +++ b/dns/rubygem-google-apis-dns_v1-gitlab/distinfo
> @@ -0,0 +1,3 @@
> *** 2035 LINES SKIPPED ***
>