Commit edc8d039 authored by Matthias Fechner's avatar Matthias Fechner
Browse files

www/gitlab: fix regression from 335fc7c3

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.
parent 2c08bdde
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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
+10 −3
Original line number Diff line number Diff line
@@ -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
+3 −2
Original line number Diff line number Diff line
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
+21 −0
Original line number Diff line number Diff line
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>
+3 −0
Original line number Diff line number Diff line
TIMESTAMP = 1664768108
SHA256 (rubygem/faraday_middleware-aws-sigv4-1.0.1.gem) = a001ea4f687ca1c60bad8f2a627196905ce3dbf285e461dc153240e92eaabe8f
SIZE (rubygem/faraday_middleware-aws-sigv4-1.0.1.gem) = 8704
Loading