git: deeaa1845fb4 - main - devel/rubygem-pdk: Update to 2.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Feb 2022 01:27:04 UTC
The branch main has been updated by romain:
URL: https://cgit.FreeBSD.org/ports/commit/?id=deeaa1845fb45b3a02f8f8c5bbd6b2949d308625
commit deeaa1845fb45b3a02f8f8c5bbd6b2949d308625
Author: Romain Tartière <romain@FreeBSD.org>
AuthorDate: 2022-02-13 01:25:24 +0000
Commit: Romain Tartière <romain@FreeBSD.org>
CommitDate: 2022-02-13 01:26:52 +0000
devel/rubygem-pdk: Update to 2.4.0
With hat: puppet
---
devel/rubygem-pdk/Makefile | 2 +-
devel/rubygem-pdk/distinfo | 6 +--
.../files/patch-lib_pdk_cli_exec_command.rb | 20 +++++-----
.../files/patch-lib_pdk_util_bundler.rb | 46 +++++++++++-----------
devel/rubygem-pdk/files/patch-pdk.gemspec | 23 ++++++-----
5 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/devel/rubygem-pdk/Makefile b/devel/rubygem-pdk/Makefile
index cd6b75a2d8ba..75c44f377092 100644
--- a/devel/rubygem-pdk/Makefile
+++ b/devel/rubygem-pdk/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pdk
-PORTVERSION= 2.3.0
+PORTVERSION= 2.4.0
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-pdk/distinfo b/devel/rubygem-pdk/distinfo
index 45e9079f9ef3..8693741ecab1 100644
--- a/devel/rubygem-pdk/distinfo
+++ b/devel/rubygem-pdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634880978
-SHA256 (rubygem/pdk-2.3.0.gem) = 9e720e7c488d579b971241b2be84f0e6fb5991eb43714f39baee5add76221b40
-SIZE (rubygem/pdk-2.3.0.gem) = 160256
+TIMESTAMP = 1644714116
+SHA256 (rubygem/pdk-2.4.0.gem) = c42fd2f8c4d1c8e1614648dae2493bf188ba3b7d75966d1c63632d6ea7600651
+SIZE (rubygem/pdk-2.4.0.gem) = 161280
diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb
index acbd22d88129..3b382ad89ec7 100644
--- a/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb
+++ b/devel/rubygem-pdk/files/patch-lib_pdk_cli_exec_command.rb
@@ -1,11 +1,11 @@
---- lib/pdk/cli/exec/command.rb.orig 2021-08-08 20:46:32 UTC
+--- lib/pdk/cli/exec/command.rb.orig 2022-02-13 01:06:51 UTC
+++ lib/pdk/cli/exec/command.rb
-@@ -187,7 +187,7 @@ module PDK
-
- resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home
- gem_path = PDK::Util::RubyVersion.gem_path
-- resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
-+ # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
-
- # Make sure invocation of Ruby prefers our private installation.
- package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil
+@@ -187,7 +187,7 @@ module PDK
+
+ resolved_env['GEM_HOME'] = PDK::Util::RubyVersion.gem_home
+ gem_path = PDK::Util::RubyVersion.gem_path
+- resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
++ # resolved_env['GEM_PATH'] = gem_path.empty? ? resolved_env['GEM_HOME'] : gem_path
+
+ # Make sure invocation of Ruby prefers our private installation.
+ package_binpath = PDK::Util.package_install? ? File.join(PDK::Util.pdk_package_basedir, 'bin') : nil
diff --git a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb
index 247d9ac4baf6..aee8e54bf96f 100644
--- a/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb
+++ b/devel/rubygem-pdk/files/patch-lib_pdk_util_bundler.rb
@@ -1,24 +1,24 @@
---- lib/pdk/util/bundler.rb.orig 2021-08-08 21:11:44 UTC
+--- lib/pdk/util/bundler.rb.orig 2022-02-13 01:09:14 UTC
+++ lib/pdk/util/bundler.rb
-@@ -21,12 +21,7 @@ module PDK
- return
- end
-
-- unless bundle.locked?
-- # Generate initial default Gemfile.lock, either from package cache or
-- # by invoking `bundle lock`
-- bundle.lock!
-- end
--
-+ if bundle.locked?
- # Check if all dependencies will be available once we update the lockfile.
- begin
- original_lockfile = bundle.gemfile_lock
-@@ -40,6 +35,7 @@ module PDK
- end
-
- bundle.update_lock!(with: gem_overrides, local: all_deps_available)
-+ end
-
- # If there are missing dependencies after updating the lockfile, let `bundle install`
- # go out and get them. If the specified puppet gem version points to a remote location
+@@ -21,12 +21,7 @@ module PDK
+ return
+ end
+
+- unless bundle.locked?
+- # Generate initial default Gemfile.lock, either from package cache or
+- # by invoking `bundle lock`
+- bundle.lock!
+- end
+-
++ if bundle.locked?
+ # Check if all dependencies will be available once we update the lockfile.
+ begin
+ original_lockfile = bundle.gemfile_lock
+@@ -40,6 +35,7 @@ module PDK
+ end
+
+ bundle.update_lock!(with: gem_overrides, local: all_deps_available)
++ end
+
+ # If there are missing dependencies after updating the lockfile, let `bundle install`
+ # go out and get them. If the specified puppet gem version points to a remote location
diff --git a/devel/rubygem-pdk/files/patch-pdk.gemspec b/devel/rubygem-pdk/files/patch-pdk.gemspec
index 7d6f8aa5267b..9fc118a79ad3 100644
--- a/devel/rubygem-pdk/files/patch-pdk.gemspec
+++ b/devel/rubygem-pdk/files/patch-pdk.gemspec
@@ -1,4 +1,4 @@
---- pdk.gemspec.orig 2021-08-08 20:47:41 UTC
+--- pdk.gemspec.orig 2022-02-13 01:15:04 UTC
+++ pdk.gemspec
@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
@@ -7,14 +7,15 @@
- s.add_runtime_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
+ s.add_runtime_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.10"])
- s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+- s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
++ s.add_runtime_dependency(%q<diff-lcs>.freeze, [">= 1.4.4"])
s.add_runtime_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
s.add_runtime_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
s.add_runtime_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
- s.add_runtime_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
-- s.add_runtime_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
+- s.add_runtime_dependency(%q<json_pure>.freeze, ["~> 2.5.1"])
+ s.add_runtime_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
-+ s.add_runtime_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
++ s.add_runtime_dependency(%q<json_pure>.freeze, [">= 2.5.1"])
s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.6"])
- s.add_runtime_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
+ s.add_runtime_dependency(%q<pathspec>.freeze, [">= 0.2.1"])
@@ -28,14 +29,15 @@
- s.add_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
+ s.add_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
s.add_dependency(%q<cri>.freeze, ["~> 2.10"])
- s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+- s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
++ s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4"])
s.add_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
s.add_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
- s.add_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
-- s.add_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
+- s.add_dependency(%q<json_pure>.freeze, ["~> 2.5.1"])
+ s.add_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
-+ s.add_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
++ s.add_dependency(%q<json_pure>.freeze, [">= 2.5.1"])
s.add_dependency(%q<minitar>.freeze, ["~> 0.6"])
- s.add_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
+ s.add_dependency(%q<pathspec>.freeze, [">= 0.2.1"])
@@ -49,14 +51,15 @@
- s.add_dependency(%q<childprocess>.freeze, ["~> 4.0.0"])
+ s.add_dependency(%q<childprocess>.freeze, [">= 4.0.0"])
s.add_dependency(%q<cri>.freeze, ["~> 2.10"])
- s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
+- s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4", "< 1.5"])
++ s.add_dependency(%q<diff-lcs>.freeze, [">= 1.4.4"])
s.add_dependency(%q<ffi>.freeze, [">= 1.9.25", "< 2.0.0"])
s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
s.add_dependency(%q<hitimes>.freeze, ["= 2.0.0"])
- s.add_dependency(%q<json-schema>.freeze, ["= 2.8.0"])
-- s.add_dependency(%q<json_pure>.freeze, ["~> 2.1.0"])
+- s.add_dependency(%q<json_pure>.freeze, ["~> 2.5.1"])
+ s.add_dependency(%q<json-schema>.freeze, [">= 2.8.0"])
-+ s.add_dependency(%q<json_pure>.freeze, [">= 2.1.0"])
++ s.add_dependency(%q<json_pure>.freeze, [">= 2.5.1"])
s.add_dependency(%q<minitar>.freeze, ["~> 0.6"])
- s.add_dependency(%q<pathspec>.freeze, ["~> 0.2.1"])
+ s.add_dependency(%q<pathspec>.freeze, [">= 0.2.1"])