git: ba88a71f049c - main - net/rubygem-omniauth_openid_connect: update to 0.6.0

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Mon, 03 Apr 2023 10:02:06 UTC
The branch main has been updated by mfechner:

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

commit ba88a71f049c10649686a16ffb3518b29c1f2ff0
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-03-22 07:14:26 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-04-03 10:01:10 +0000

    net/rubygem-omniauth_openid_connect: update to 0.6.0
    
    Remove net/rubygem-gitlab-omniauth-openid-connect as required changes
    are now included upstream in omniauth_openid_connect 0.6.0.
---
 MOVED                                               |  1 +
 net/Makefile                                        |  1 -
 net/rubygem-gitlab-omniauth-openid-connect/Makefile | 21 ---------------------
 net/rubygem-gitlab-omniauth-openid-connect/distinfo |  3 ---
 .../pkg-descr                                       |  1 -
 net/rubygem-omniauth_openid_connect/Makefile        |  6 ++----
 net/rubygem-omniauth_openid_connect/distinfo        |  6 +++---
 7 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/MOVED b/MOVED
index 5884ce588c03..f1eed8ba217d 100644
--- a/MOVED
+++ b/MOVED
@@ -17823,6 +17823,7 @@ graphics/gimp-gmic-plugin||2023-03-21|Has expired: Broken since 2021
 science/InsightToolkit521|science/InsightToolkit|2023-03-21|Retire InsightToolkit521: it was there only to support graphics/elastix
 sysutils/etcupdate||2023-03-21|Part of the base system since FreeBSD 10.0
 devel/freebsd-gcc6||2023-03-22|No longer able to build base system, use GCC 9 or later instead
+net/rubygem-gitlab-omniauth-openid-connect|net/rubygem-omniauth_openid_connect|2023-03-22|Obsolete use net/rubygem-omniauth_openid_connect instead
 japanese/mutt-devel||2023-03-25|Has expired: Broken since 2019
 audio/amarok||2023-03-31|Has expired: No longer actively maintained upstream
 audio/cd2mp3||2023-03-31|Has expired: Depends on deprecated port audio/dagrab, consider using audio/abcde or audio/cyanrip
diff --git a/net/Makefile b/net/Makefile
index 9151d8f0a163..6864b7ad6df2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1283,7 +1283,6 @@
     SUBDIR += rubygem-gitaly
     SUBDIR += rubygem-gitaly-proto
     SUBDIR += rubygem-gitlab-fog-azure-rm
-    SUBDIR += rubygem-gitlab-omniauth-openid-connect
     SUBDIR += rubygem-gitlab_omniauth-ldap
     SUBDIR += rubygem-google-cloud-bigquery
     SUBDIR += rubygem-google-cloud-bigtable
diff --git a/net/rubygem-gitlab-omniauth-openid-connect/Makefile b/net/rubygem-gitlab-omniauth-openid-connect/Makefile
deleted file mode 100644
index 21ffce4209fb..000000000000
--- a/net/rubygem-gitlab-omniauth-openid-connect/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-PORTNAME=	gitlab-omniauth-openid-connect
-PORTVERSION=	0.10.0
-CATEGORIES=	net rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	OpenID Connect Strategy for OmniAuth
-WWW=		https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-RUN_DEPENDS=	rubygem-addressable>=2.7<3.0:www/rubygem-addressable \
-		rubygem-omniauth1>=1.9<3.0:security/rubygem-omniauth1 \
-		rubygem-openid_connect>=1.2<2.0:net/rubygem-openid_connect
-
-USES=		gem
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/net/rubygem-gitlab-omniauth-openid-connect/distinfo b/net/rubygem-gitlab-omniauth-openid-connect/distinfo
deleted file mode 100644
index 0f8212d48dbe..000000000000
--- a/net/rubygem-gitlab-omniauth-openid-connect/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1660285641
-SHA256 (rubygem/gitlab-omniauth-openid-connect-0.10.0.gem) = ea44a23ea93457057bba6a9912e883f5aefab36a941c6c58512c8a7095fb1153
-SIZE (rubygem/gitlab-omniauth-openid-connect-0.10.0.gem) = 23552
diff --git a/net/rubygem-gitlab-omniauth-openid-connect/pkg-descr b/net/rubygem-gitlab-omniauth-openid-connect/pkg-descr
deleted file mode 100644
index dcc7f07f883e..000000000000
--- a/net/rubygem-gitlab-omniauth-openid-connect/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-OpenID Connect Strategy for OmniAuth.
diff --git a/net/rubygem-omniauth_openid_connect/Makefile b/net/rubygem-omniauth_openid_connect/Makefile
index d0437b6371cf..533051a6f145 100644
--- a/net/rubygem-omniauth_openid_connect/Makefile
+++ b/net/rubygem-omniauth_openid_connect/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	omniauth_openid_connect
-PORTVERSION=	0.3.5
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
@@ -11,8 +10,7 @@ WWW=		https://github.com/m0n9oose/omniauth_openid_connect
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-addressable>=2.5<3.0:www/rubygem-addressable \
-		rubygem-omniauth1>=1.9<2.0:security/rubygem-omniauth1 \
+RUN_DEPENDS=	rubygem-omniauth1>=1.9<3:security/rubygem-omniauth1 \
 		rubygem-openid_connect>=1.1<2.0:net/rubygem-openid_connect
 
 USES=		gem
diff --git a/net/rubygem-omniauth_openid_connect/distinfo b/net/rubygem-omniauth_openid_connect/distinfo
index 7af808d1a951..f1be36c8d089 100644
--- a/net/rubygem-omniauth_openid_connect/distinfo
+++ b/net/rubygem-omniauth_openid_connect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592633715
-SHA256 (rubygem/omniauth_openid_connect-0.3.5.gem) = 5c1146f5b5a6a8688043d57413c9e83d94a9039c3ebae4ccf395eff7bc28aef3
-SIZE (rubygem/omniauth_openid_connect-0.3.5.gem) = 20480
+TIMESTAMP = 1676988579
+SHA256 (rubygem/omniauth_openid_connect-0.6.0.gem) = b8e48ca67fdea2dff56cc161855b88707a290ae01125149dbe0f8c94e818cfd3
+SIZE (rubygem/omniauth_openid_connect-0.6.0.gem) = 22528