git: d58bf9b03722 - main - sysutils/rubygem-r10k: Update to 3.9.0

[Romain Tartière]

The branch main has been updated by romain:

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

commit d58bf9b03722674e0d86078bdebc5252050598ee
Author:     Romain Tartière <romain at FreeBSD.org>
AuthorDate: 2021-04-30 18:59:23 +0000
Commit:     Romain Tartière <romain at FreeBSD.org>
CommitDate: 2021-05-01 00:15:59 +0000

    sysutils/rubygem-r10k: Update to 3.9.0
    
    ChangeLog:
    https://github.com/puppetlabs/r10k/blob/main/CHANGELOG.mkd#390
    
    With hat:       puppet
---
 sysutils/rubygem-r10k/Makefile                     |  2 +-
 sysutils/rubygem-r10k/distinfo                     |  6 ++---
 .../rubygem-r10k/files/patch-lib_r10k_settings.rb  |  4 ++--
 sysutils/rubygem-r10k/files/patch-r10k.gemspec     | 28 +++++-----------------
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index dc5d93b4b283..8e0eb79a5b18 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	r10k
-PORTVERSION=	3.8.0
+PORTVERSION=	3.9.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo
index 583c63292456..77198bc4e080 100644
--- a/sysutils/rubygem-r10k/distinfo
+++ b/sysutils/rubygem-r10k/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613634087
-SHA256 (rubygem/r10k-3.8.0.gem) = c6866d24d8baa4ed34fbc9f7d0d1ea3ff4aa8d39d9a03e05839f39aeaa99b86e
-SIZE (rubygem/r10k-3.8.0.gem) = 221184
+TIMESTAMP = 1619809156
+SHA256 (rubygem/r10k-3.9.0.gem) = 855a183b8392a40d0c5856e0f79be3c5aa2d72880c0baedcfb94b36ab7a37b01
+SIZE (rubygem/r10k-3.9.0.gem) = 224768
diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_settings.rb
index a06f2a4cc07c..45512186c151 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
+--- lib/r10k/settings.rb.orig	2021-04-30 19:31:49 UTC
 +++ lib/r10k/settings.rb
-@@ -123,8 +123,8 @@
+@@ -141,8 +141,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 84928235f7a2..94479378fc88 100644
--- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec
+++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
@@ -1,12 +1,6 @@
---- r10k.gemspec.orig
+--- r10k.gemspec.orig	2021-04-30 19:31:50 UTC
 +++ r10k.gemspec
-@@ -24,26 +24,26 @@
- 
-     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", "< 3.0.0"])
-+      s.add_runtime_dependency(%q<cri>.freeze, [">= 2.15.9", "< 3.0.0"])
-       s.add_runtime_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
        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"])
@@ -17,12 +11,7 @@
        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"])
-       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", "< 3.0.0"])
-+      s.add_dependency(%q<cri>.freeze, [">= 2.15.9", "< 3.0.0"])
-       s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
        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"])
@@ -33,18 +22,13 @@
        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 @@
-     end
-   else
-     s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
--    s.add_dependency(%q<cri>.freeze, [">= 2.15.10", "< 3.0.0"])
-+    s.add_dependency(%q<cri>.freeze, [">= 2.15.9", "< 3.0.0"])
-     s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
+@@ -56,8 +56,8 @@ Gem::Specification.new do |s|
      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<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<rspec>.freeze, ["~> 3.1"])
      s.add_dependency(%q<rake>.freeze, [">= 0"])