Add lang/ruby30 (Ruby 3.0.0 Preview 1)

PR:		250131
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
Reviewed by:	meta (myself)
Relnotes:	https://www.ruby-lang.org/en/news/2020/09/25/ruby-3-0-0-preview1-released/

6 files changed, 257 insertions, 0 deletions

diff --git a/lang/ruby30/files/patch-configure.ac b/lang/ruby30/files/patch-configure.ac
new file mode 100644
index 000000000000..170a9f3a9fe8
--- /dev/null
+++ b/lang/ruby30/files/patch-configure.ac
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2018-12-28 12:03:09 UTC
++++ configure.ac
+@@ -2678,7 +2678,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
+ 			: ${LDSHARED='$(CC) -shared'}
+ 			AS_IF([test "$rb_cv_binary_elf" = yes], [
+ 			    LDFLAGS="$LDFLAGS -rdynamic"
+-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
++			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
+ 			], [
+ 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
+ 			])
+@@ -3163,6 +3163,7 @@ AS_CASE("$enable_shared", [yes], [
+     [freebsd*|dragonfly*], [
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
+ 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
++	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
+ 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+ 	    LIBRUBY_ALIASES=''
diff --git a/lang/ruby30/files/patch-lib_mkmf.rb b/lang/ruby30/files/patch-lib_mkmf.rb
new file mode 100644
index 000000000000..f333fdfd2e67
--- /dev/null
+++ b/lang/ruby30/files/patch-lib_mkmf.rb
@@ -0,0 +1,11 @@
+--- lib/mkmf.rb.orig	2018-10-09 14:09:35 UTC
++++ lib/mkmf.rb
+@@ -234,7 +234,7 @@ module MakeMakefile
+   end
+   $extmk ||= false
+   if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
+-    $topdir = $hdrdir
++    $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/"
+     $top_srcdir = $hdrdir
+     $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
+   elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h")
diff --git a/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb b/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb
new file mode 100644
index 000000000000..1152e4201544
--- /dev/null
+++ b/lang/ruby30/files/patch-lib_rdoc_generator_json__index.rb
@@ -0,0 +1,20 @@
+--- lib/rdoc/generator/json_index.rb.orig	2017-11-27 10:45:24 UTC
++++ lib/rdoc/generator/json_index.rb
+@@ -175,7 +175,7 @@ class RDoc::Generator::JsonIndex
+     debug_msg "Writing gzipped search index to %s" % outfile
+ 
+     Zlib::GzipWriter.open(outfile) do |gz|
+-      gz.mtime = File.mtime(search_index_file)
++      gz.mtime = 1
+       gz.orig_name = search_index_file.basename.to_s
+       gz.write search_index
+       gz.close
+@@ -193,7 +193,7 @@ class RDoc::Generator::JsonIndex
+         debug_msg "Writing gzipped file to %s" % outfile
+ 
+         Zlib::GzipWriter.open(outfile) do |gz|
+-          gz.mtime = File.mtime(dest)
++          gz.mtime = 1
+           gz.orig_name = dest.basename.to_s
+           gz.write data
+           gz.close
diff --git a/lang/ruby30/files/patch-tool_mkconfig.rb b/lang/ruby30/files/patch-tool_mkconfig.rb
new file mode 100644
index 000000000000..2b9c106e5a61
--- /dev/null
+++ b/lang/ruby30/files/patch-tool_mkconfig.rb
@@ -0,0 +1,14 @@
+--- tool/mkconfig.rb.orig	2019-12-25 09:50:58 UTC
++++ tool/mkconfig.rb
+@@ -160,8 +160,9 @@ def vars.expand(val, config = self)
+   val.replace(newval) unless newval == val
+   val
+ end
+-prefix = vars.expand(vars["prefix"] ||= "")
+-rubyarchdir = vars.expand(vars["rubyarchdir"] ||= "")
++prefix = vars.expand(vars["rubyarchdir"])
++major, minor, *rest = RUBY_VERSION.split('.')
++rubyarchdir = "/lib/ruby/#{major}.#{minor}/#{arch}"
+ relative_archdir = rubyarchdir.rindex(prefix, 0) ? rubyarchdir[prefix.size..-1] : rubyarchdir
+ 
+ puts %[\
diff --git a/lang/ruby30/files/patch-tool_rbinstall.rb b/lang/ruby30/files/patch-tool_rbinstall.rb
new file mode 100644
index 000000000000..9e02a2c30733
--- /dev/null
+++ b/lang/ruby30/files/patch-tool_rbinstall.rb
@@ -0,0 +1,150 @@
+--- tool/rbinstall.rb.orig	2020-10-02 17:47:07 UTC
++++ tool/rbinstall.rb
+@@ -864,147 +864,6 @@ end
+ 
+ # :startdoc:
+ 
+-install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
+-  install_default_gem('lib', srcdir)
+-end
+-install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
+-  install_default_gem('ext', srcdir)
+-end
+-
+-def load_gemspec(file)
+-  file = File.realpath(file)
+-  code = File.read(file, encoding: "utf-8:-")
+-  code.gsub!(/`git.*?`/m, '""')
+-  code.gsub!(/%x\[git.*?\]/m, '""')
+-  spec = eval(code, binding, file)
+-  unless Gem::Specification === spec
+-    raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
+-  end
+-  spec.loaded_from = file
+-  spec
+-end
+-
+-def install_default_gem(dir, srcdir)
+-  gem_dir = Gem.default_dir
+-  install_dir = with_destdir(gem_dir)
+-  prepare "default gems from #{dir}", gem_dir
+-  makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+-
+-  default_spec_dir = Gem.default_specifications_dir
+-
+-  gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src|
+-    spec = load_gemspec(src)
+-    file_collector = RbInstall::Specs::FileCollector.new(src)
+-    files = file_collector.collect
+-    next if files.empty?
+-    spec.files = files
+-    spec
+-  }
+-  gems.compact.sort_by(&:name).each do |gemspec|
+-    old_gemspecs = Dir[File.join(with_destdir(default_spec_dir), "#{gemspec.name}-*.gemspec")]
+-    if old_gemspecs.size > 0
+-      old_gemspecs.each {|spec| rm spec }
+-    end
+-
+-    full_name = "#{gemspec.name}-#{gemspec.version}"
+-
+-    puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
+-    gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
+-    open_for_install(gemspec_path, $data_mode) do
+-      gemspec.to_ruby.gsub(/.*\0.*\n/, '')
+-    end
+-
+-    specific_gem_dir = File.join(gem_dir, 'gems', full_name)
+-
+-    makedirs(specific_gem_dir)
+-
+-    unless gemspec.executables.empty? then
+-      bin_dir = File.join(specific_gem_dir, gemspec.bindir)
+-      makedirs(bin_dir)
+-
+-      gemspec.executables.map {|exec|
+-        install File.join(srcdir, 'libexec', exec),
+-                File.join(bin_dir, exec)
+-      }
+-    end
+-  end
+-end
+-
+-install?(:ext, :comm, :gem, :'bundled-gems') do
+-  gem_dir = Gem.default_dir
+-  install_dir = with_destdir(gem_dir)
+-  prepare "bundled gems", gem_dir
+-  makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
+-  installed_gems = {}
+-  options = {
+-    :install_dir => install_dir,
+-    :bin_dir => with_destdir(bindir),
+-    :domain => :local,
+-    :ignore_dependencies => true,
+-    :dir_mode => $dir_mode,
+-    :data_mode => $data_mode,
+-    :prog_mode => $script_mode,
+-    :wrappers => true,
+-    :format_executable => true,
+-  }
+-  gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
+-  extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
+-  File.foreach("#{srcdir}/gems/bundled_gems") do |name|
+-    next if /^\s*(?:#|$)/ =~ name
+-    next unless /^(\S+)\s+(\S+).*/ =~ name
+-    gem_name = "#$1-#$2"
+-    path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
+-    next unless File.exist?(path)
+-    spec = load_gemspec(path)
+-    next unless spec.platform == Gem::Platform::RUBY
+-    next unless spec.full_name == gem_name
+-    spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
+-    if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
+-      spec.extensions[0] ||= "-"
+-    end
+-    package = RbInstall::DirPackage.new spec
+-    ins = RbInstall::UnpackedInstaller.new(package, options)
+-    puts "#{INDENT}#{spec.name} #{spec.version}"
+-    ins.install
+-    unless $dryrun
+-      File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
+-    end
+-    unless spec.extensions.empty?
+-      install_recursive(ext, spec.extension_dir)
+-    end
+-    installed_gems[spec.full_name] = true
+-  end
+-  installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
+-  unless installed_gems.empty?
+-    prepare "bundled gem cache", gem_dir+"/cache"
+-    install installed_gems, gem_dir+"/cache"
+-  end
+-  next if gems.empty?
+-  if defined?(Zlib)
+-    Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
+-    silent = Gem::SilentUI.new
+-    gems.each do |gem|
+-      package = Gem::Package.new(gem)
+-      inst = RbInstall::GemInstaller.new(package, options)
+-      inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
+-      begin
+-        Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
+-      rescue Gem::InstallError
+-        next
+-      end
+-      gemname = File.basename(gem)
+-      puts "#{INDENT}#{gemname}"
+-    end
+-    # fix directory permissions
+-    # TODO: Gem.install should accept :dir_mode option or something
+-    File.chmod($dir_mode, *Dir.glob(install_dir+"/**/"))
+-    # fix .gemspec permissions
+-    File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec"))
+-  else
+-    puts "skip installing bundled gems because of lacking zlib"
+-  end
+-end
+-
+ parse_args()
+ 
+ include FileUtils
diff --git a/lang/ruby30/files/patch-upstream-bug17191 b/lang/ruby30/files/patch-upstream-bug17191
new file mode 100644
index 000000000000..0de7aa99a73b
--- /dev/null
+++ b/lang/ruby30/files/patch-upstream-bug17191
@@ -0,0 +1,43 @@
+From a9ff39087092b21059fca046ace9ca87770692a4 Mon Sep 17 00:00:00 2001
+From: Nobuyoshi Nakada <nobu@ruby-lang.org>
+Date: Tue, 29 Sep 2020 13:41:59 +0900
+Subject: [PATCH] Fixed installation failure [Bug #17191]
+
+Try update and extract bundled gems only when baseruby is
+available.  It should be done only when installing from
+developemental build and not from the tarball, but it is not
+obvious to differentiate them.
+---
+ common.mk     | 2 +-
+ defs/gmake.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git common.mk common.mk
+index 603429bd35..509f09c1fe 100644
+--- common.mk
++++ common.mk
+@@ -1296,7 +1296,7 @@ update-config_files: PHONY
+ 	    config.guess config.sub
+ 
+ refresh-gems: update-bundled_gems prepare-gems
+-prepare-gems: update-gems extract-gems
++prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems)
+ 
+ update-gems$(gnumake:yes=-nongnumake): PHONY
+ 	$(ECHO) Downloading bundled gem files...
+diff --git defs/gmake.mk defs/gmake.mk
+index 7e9566fee6..31af44a4f1 100644
+--- defs/gmake.mk
++++ defs/gmake.mk
+@@ -246,7 +246,7 @@ HELP_EXTRA_TASKS = \
+ 	"  update-github:       merge master branch and push it to Pull Request [PR=1234]" \
+ 	""
+ 
+-extract-gems: update-gems
++extract-gems: $(HAVE_BASERUBY:yes=update-gems)
+ 
+ BUNDLED_GEMS := $(shell sed '/^[ 	]*\#/d;/^[ 	]*$$/d;s/[ 	][ 	]*/-/;s/[ 	].*//' $(srcdir)/gems/bundled_gems)
+ 
+-- 
+2.28.0
+