4 files changed, 15 insertions, 26 deletions

diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index b505da851f3f..44a291540158 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	r10k
-PORTVERSION=	3.3.3
+PORTVERSION=	3.4.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -11,12 +11,12 @@ COMMENT=	Tool for deploying Puppet environments and modules
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-colored>=1.2:textproc/rubygem-colored \
-		rubygem-cri>=2.6.1:devel/rubygem-cri \
-		rubygem-gettext-setup>=0.5:devel/rubygem-gettext-setup \
+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-log4r>=1.1.10:sysutils/rubygem-log4r \
 		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
-		rubygem-puppet_forge>=2.2.8:sysutils/rubygem-puppet_forge
+		rubygem-puppet_forge>=2.3.0:sysutils/rubygem-puppet_forge
 
 USES=		gem shebangfix
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo
index 4c227f627b2a..682b2ed11654 100644
--- a/sysutils/rubygem-r10k/distinfo
+++ b/sysutils/rubygem-r10k/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571759388
-SHA256 (rubygem/r10k-3.3.3.gem) = 4306e4e230aa3e18e6248b9d11fe776f84d1c5dd727fba74cd804c9213899f94
-SIZE (rubygem/r10k-3.3.3.gem) = 208384
+TIMESTAMP = 1578880329
+SHA256 (rubygem/r10k-3.4.0.gem) = a330299192ac7f30e93c8a54b1fb90b249ba67d510214cbf78db424d9025dcc6
+SIZE (rubygem/r10k-3.4.0.gem) = 211968
diff --git a/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb b/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb
deleted file mode 100644
index 5fd36639e8b3..000000000000
--- a/sysutils/rubygem-r10k/files/patch-lib_r10k_action_runner.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/r10k/action/runner.rb.orig
-+++ lib/r10k/action/runner.rb
-@@ -44,7 +44,7 @@
- 
-         overrides = {}
-         overrides[:cachedir] = @opts[:cachedir] unless @opts[:cachedir].nil?
--        overrides[:deploy] = {} if @opts[:'puppet-path'] || @opts[:'generate-types']
-+        overrides[:deploy] = {} if !@opts[:'puppet-path'].nil? || !@opts[:'generate-types'].nil?
-         overrides[:deploy][:puppet_path] = @opts[:'puppet-path'] unless @opts[:'puppet-path'].nil?
-         overrides[:deploy][:generate_types] = @opts[:'generate-types'] unless @opts[:'generate-types'].nil?
- 
diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
index 8ea78786454f..7d2fd1d3456b 100644
--- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec
+++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
@@ -3,27 +3,27 @@
 @@ -24,7 +24,7 @@
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-       s.add_runtime_dependency(%q<colored>.freeze, ["= 1.2"])
+       s.add_runtime_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -      s.add_runtime_dependency(%q<cri>.freeze, ["= 2.15.6"])
 +      s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.15.6"])
        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.2.8"])
+       s.add_runtime_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
 @@ -35,7 +35,7 @@
-       s.add_development_dependency(%q<minitar>.freeze, ["~> 0.6.1"])
+       s.add_development_dependency(%q<minitar>.freeze, ["~> 0.9.0"])
      else
-       s.add_dependency(%q<colored>.freeze, ["= 1.2"])
+       s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -      s.add_dependency(%q<cri>.freeze, ["= 2.15.6"])
 +      s.add_dependency(%q<cri>.freeze, ["~> 2.15.6"])
        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.2.8"])
+       s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
 @@ -47,7 +47,7 @@
      end
    else
-     s.add_dependency(%q<colored>.freeze, ["= 1.2"])
+     s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
 -    s.add_dependency(%q<cri>.freeze, ["= 2.15.6"])
 +    s.add_dependency(%q<cri>.freeze, ["~> 2.15.6"])
      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.2.8"])
+     s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])