merge revision(s) 44a0a66559ee4a03a84c27feca05e9b1b0f59df8:

	Move to tool/lib/bundled_gem.rb

	---
	 common.mk               |  6 +++---
	 defs/gmake.mk           |  4 ++--
	 tool/gem-unpack.rb      | 53 -----------------------------------------------
	 tool/lib/bundled_gem.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
	 4 files changed, 60 insertions(+), 58 deletions(-)
	 delete mode 100644 tool/gem-unpack.rb
	 create mode 100644 tool/lib/bundled_gem.rb

4 files changed, 9 insertions, 7 deletions

diff --git a/common.mk b/common.mk
index c3a5bfe7ce..9c693c295b 100644
--- a/common.mk
+++ b/common.mk
@@ -1368,16 +1368,16 @@ update-gems$(gnumake:yes=-sequential): PHONY
 extract-gems$(gnumake:yes=-sequential): PHONY
 	$(ECHO) Extracting bundled gem files...
 	$(Q) $(RUNRUBY) -C "$(srcdir)" \
-	    -Itool -rfileutils -rgem-unpack -answ \
+	    -Itool/lib -rfileutils -rbundled_gem -answ \
 	    -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \
 	    -e 'gem, ver, _, rev = *$$F' \
 	    -e 'next if !ver or /^#/=~gem' \
 	    -e 'g = "#{gem}-#{ver}"' \
 	    -e 'if File.directory?("#{d}/#{g}")' \
 	    -e 'elsif rev and File.exist?(gs = "gems/src/#{gem}/#{gem}.gemspec")' \
-	    -e   'Gem.copy(gs, ".bundle")' \
+	    -e   'BundledGem.copy(gs, ".bundle")' \
 	    -e 'else' \
-	    -e   'Gem.unpack("gems/#{g}.gem", ".bundle")' \
+	    -e   'BundledGem.unpack("gems/#{g}.gem", ".bundle")' \
 	    -e 'end' \
 	    -e 'FileUtils.rm_rf("#{d}/#{g}/.github")' \
 	    gems/bundled_gems
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 1b395d60be..e0bcfc1c8d 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -297,8 +297,8 @@ extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))
 .bundle/gems/%: gems/%.gem | .bundle/gems
 	$(ECHO) Extracting bundle gem $*...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
-	    -Itool -rgem-unpack \
-	    -e 'Gem.unpack("gems/$(@F).gem", ".bundle")'
+	    -Itool/lib -rbundled_gem \
+	    -e 'BundledGem.unpack("gems/$(@F).gem", ".bundle")'
 	$(RMALL) "$(srcdir)/$(@:.gem=)/".git*
 
 $(srcdir)/.bundle/gems:
diff --git a/tool/gem-unpack.rb b/tool/lib/bundled_gem.rb
index 6310c3f92a..0b7d52b86a 100644
--- a/tool/gem-unpack.rb
+++ b/tool/lib/bundled_gem.rb
@@ -5,7 +5,9 @@ require 'rubygems/package'
 # This library is used by "make extract-gems" to
 # unpack bundled gem files.
 
-class << Gem
+module BundledGem
+  module_function
+
   def unpack(file, *rest)
     pkg = Gem::Package.new(file)
     prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}
diff --git a/version.h b/version.h
index 2255c186d4..01935eed0e 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 150
+#define RUBY_PATCHLEVEL 151
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10