sysutils/rubygem-r10k: Update to 3.11.0

ChangeLog:
https://github.com/puppetlabs/r10k/blob/main/CHANGELOG.mkd#3110

With hat:	puppet

4 files changed, 23 insertions, 21 deletions

diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index 7f3f1eb4d919..c41878b2a7f6 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	r10k
-PORTVERSION=	3.10.0
+PORTVERSION=	3.11.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-colored2>=3.1.2:textproc/rubygem-colored2 \
 		rubygem-cri>=2.15.6:devel/rubygem-cri \
 		rubygem-gettext-setup>=0.24:devel/rubygem-gettext-setup \
+		rubygem-jwt>=2.2:www/rubygem-jwt \
 		rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \
 		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
 		rubygem-puppet_forge>=2.3.0:sysutils/rubygem-puppet_forge
diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo
index 76ed6efc25b3..b685f26f4fa3 100644
--- a/sysutils/rubygem-r10k/distinfo
+++ b/sysutils/rubygem-r10k/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626634105
-SHA256 (rubygem/r10k-3.10.0.gem) = 1f142ab0de42ce63e4b789d67dcec1bf7ce3a252906b3574fcfbcb6b0f0537f2
-SIZE (rubygem/r10k-3.10.0.gem) = 233984
+TIMESTAMP = 1629311525
+SHA256 (rubygem/r10k-3.11.0.gem) = af15ee9e4f676b3ddba0096b9faf2dd38ec2339c517a96ad1e830ff6a04d9f00
+SIZE (rubygem/r10k-3.11.0.gem) = 239616
diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb
index 45512186c151..cf55d5753a63 100644
--- a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb
+++ b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb
@@ -1,6 +1,6 @@
---- lib/r10k/settings.rb.orig	2021-04-30 19:31:49 UTC
+--- lib/r10k/settings.rb.orig	2021-08-18 18:36:31 UTC
 +++ lib/r10k/settings.rb
-@@ -141,8 +141,8 @@ module R10K
+@@ -178,8 +178,8 @@ module R10K
          }),
  
          Definition.new(:puppet_path, {
diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
index 5259c27bac10..937b77e66aec 100644
--- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec
+++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
@@ -1,52 +1,53 @@
---- r10k.gemspec.orig	2021-07-14 21:11:15 UTC
+--- r10k.gemspec.orig	2021-08-18 18:36:32 UTC
 +++ r10k.gemspec
-@@ -24,26 +24,26 @@ Gem::Specification.new do |s|
+@@ -24,13 +24,13 @@ Gem::Specification.new do |s|
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
        s.add_runtime_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -      s.add_runtime_dependency(%q<cri>.freeze, ["= 2.15.10"])
-+      s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.15.10"])
++      s.add_runtime_dependency(%q<cri>.freeze, [">= 2.15.10"])
        s.add_runtime_dependency(%q<log4r>.freeze, ["= 1.1.10"])
        s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.10"])
        s.add_runtime_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
        s.add_runtime_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -      s.add_runtime_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -      s.add_runtime_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
-+      s.add_runtime_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
-+      s.add_runtime_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
++      s.add_runtime_dependency(%q<fast_gettext>.freeze, [">= 1.1.0"])
++      s.add_runtime_dependency(%q<gettext>.freeze, [">= 3.0.2"])
+       s.add_runtime_dependency(%q<jwt>.freeze, ["~> 2.2.3"])
        s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
        s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-       s.add_development_dependency(%q<yard>.freeze, ["~> 0.9.11"])
+@@ -38,13 +38,13 @@ Gem::Specification.new do |s|
        s.add_development_dependency(%q<minitar>.freeze, ["~> 0.9.0"])
      else
        s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -      s.add_dependency(%q<cri>.freeze, ["= 2.15.10"])
-+      s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"])
++      s.add_dependency(%q<cri>.freeze, [">= 2.15.10"])
        s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
        s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
        s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
        s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -      s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -      s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
-+      s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
-+      s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
++      s.add_dependency(%q<fast_gettext>.freeze, [">= 1.1.0"])
++      s.add_dependency(%q<gettext>.freeze, [">= 3.0.2"])
+       s.add_dependency(%q<jwt>.freeze, ["~> 2.2.3"])
        s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
        s.add_dependency(%q<rake>.freeze, [">= 0"])
-       s.add_dependency(%q<yard>.freeze, ["~> 0.9.11"])
-@@ -51,13 +51,13 @@ Gem::Specification.new do |s|
+@@ -53,13 +53,13 @@ Gem::Specification.new do |s|
      end
    else
      s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -    s.add_dependency(%q<cri>.freeze, ["= 2.15.10"])
-+    s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"])
++    s.add_dependency(%q<cri>.freeze, [">= 2.15.10"])
      s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
      s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
      s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
      s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -    s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -    s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
-+    s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
-+    s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
++    s.add_dependency(%q<fast_gettext>.freeze, [">= 1.1.0"])
++    s.add_dependency(%q<gettext>.freeze, [">= 3.0.2"])
+     s.add_dependency(%q<jwt>.freeze, ["~> 2.2.3"])
      s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
      s.add_dependency(%q<rake>.freeze, [">= 0"])
-     s.add_dependency(%q<yard>.freeze, ["~> 0.9.11"])