-
Notifications
You must be signed in to change notification settings - Fork 734
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
These are fixes Ruby 3.0 Changes were compiled against all dependencies of devel/ruby-gems and they all built cleanly. There are five known build failures, all prexisting: * devel/rubygem-xdg5: requires Ruby 3.0 * devel/rubygem-xdg: requires Ruby 3.1 * graphics/rubygem-objectdetect: port explicitly marked broken * mail/rubygem-tmail: port explicitly marked broken * science/cdcl: marked broken, unfetchable Plus, science/rubygem-ruby-dcl gets skipped because of science/cdcl PR: 258108 Approved by: ruby (zi@)
- Loading branch information
Showing
94 changed files
with
1,191 additions
and
1,342 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
--- fpm.gemspec.orig 2019-12-03 09:44:49 UTC | ||
--- fpm.gemspec.orig 2021-10-27 13:27:35 UTC | ||
+++ fpm.gemspec | ||
@@ -25,13 +25,12 @@ | ||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then | ||
s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"]) | ||
s.add_runtime_dependency(%q<cabin>.freeze, [">= 0.6.0"]) | ||
- s.add_runtime_dependency(%q<backports>.freeze, [">= 2.6.2"]) | ||
s.add_runtime_dependency(%q<arr-pm>.freeze, ["~> 0.0.10"]) | ||
- s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0.0"]) | ||
- s.add_runtime_dependency(%q<childprocess>.freeze, ["= 0.9.0"]) | ||
+ s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0"]) | ||
+ s.add_runtime_dependency(%q<childprocess>.freeze, [">= 0.9.0"]) | ||
s.add_runtime_dependency(%q<ffi>.freeze, [">= 0"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 10"]) | ||
- s.add_runtime_dependency(%q<ruby-xz>.freeze, ["~> 0.2.3"]) | ||
+ s.add_runtime_dependency(%q<ruby-xz>.freeze, [">= 0.2.3"]) | ||
s.add_runtime_dependency(%q<pleaserun>.freeze, ["~> 0.0.29"]) | ||
s.add_runtime_dependency(%q<stud>.freeze, [">= 0"]) | ||
s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0.0"]) | ||
@@ -26,13 +26,12 @@ Gem::Specification.new do |s| | ||
if s.respond_to? :add_runtime_dependency then | ||
s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"]) | ||
s.add_runtime_dependency(%q<cabin>.freeze, [">= 0.6.0"]) | ||
- s.add_runtime_dependency(%q<backports>.freeze, [">= 2.6.2"]) | ||
s.add_runtime_dependency(%q<arr-pm>.freeze, ["~> 0.0.10"]) | ||
- s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0.0"]) | ||
- s.add_runtime_dependency(%q<childprocess>.freeze, ["= 0.9.0"]) | ||
+ s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0"]) | ||
+ s.add_runtime_dependency(%q<childprocess>.freeze, [">= 0.9.0"]) | ||
s.add_runtime_dependency(%q<ffi>.freeze, [">= 0"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 10"]) | ||
- s.add_runtime_dependency(%q<ruby-xz>.freeze, ["~> 0.2.3"]) | ||
+ s.add_runtime_dependency(%q<ruby-xz>.freeze, [">= 0.2.3"]) | ||
s.add_runtime_dependency(%q<pleaserun>.freeze, ["~> 0.0.29"]) | ||
s.add_runtime_dependency(%q<stud>.freeze, [">= 0"]) | ||
s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0.0"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- minitar-cli.gemspec.orig 2019-09-05 12:53:52 UTC | ||
--- minitar-cli.gemspec.orig 2021-10-25 11:37:09 UTC | ||
+++ minitar-cli.gemspec | ||
@@ -25,7 +25,7 @@ Gem::Specification.new do |s| | ||
s.specification_version = 4 | ||
@@ -26,7 +26,7 @@ Gem::Specification.new do |s| | ||
end | ||
|
||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then | ||
- s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.8.0"]) | ||
+ s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.8"]) | ||
s.add_runtime_dependency(%q<powerbar>.freeze, ["~> 1.0"]) | ||
s.add_development_dependency(%q<minitest>.freeze, ["~> 5.11"]) | ||
s.add_development_dependency(%q<hoe-doofus>.freeze, ["~> 1.0"]) | ||
if s.respond_to? :add_runtime_dependency then | ||
- s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.8.0"]) | ||
+ s.add_runtime_dependency(%q<minitar>.freeze, ["~> 0.8"]) | ||
s.add_runtime_dependency(%q<powerbar>.freeze, ["~> 1.0"]) | ||
s.add_development_dependency(%q<minitest>.freeze, ["~> 5.11"]) | ||
s.add_development_dependency(%q<hoe-doofus>.freeze, ["~> 1.0"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- dm-types.gemspec.orig 2016-03-31 16:07:46 UTC | ||
--- dm-types.gemspec.orig 2021-10-25 11:50:56 UTC | ||
+++ dm-types.gemspec | ||
@@ -25,7 +25,7 @@ Gem::Specification.new do |s| | ||
s.add_runtime_dependency(%q<fastercsv>.freeze, ["~> 1.5"]) | ||
s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.0"]) | ||
s.add_runtime_dependency(%q<json>.freeze, ["~> 1.6"]) | ||
- s.add_runtime_dependency(%q<stringex>.freeze, ["~> 1.4"]) | ||
+ s.add_runtime_dependency(%q<stringex>.freeze, [">= 1.4"]) | ||
s.add_runtime_dependency(%q<uuidtools>.freeze, ["~> 2.1"]) | ||
s.add_runtime_dependency(%q<dm-core>.freeze, ["~> 1.2.0"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 0.9"]) | ||
@@ -26,7 +26,7 @@ Gem::Specification.new do |s| | ||
s.add_runtime_dependency(%q<fastercsv>.freeze, ["~> 1.5"]) | ||
s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.0"]) | ||
s.add_runtime_dependency(%q<json>.freeze, ["~> 1.6"]) | ||
- s.add_runtime_dependency(%q<stringex>.freeze, ["~> 1.4"]) | ||
+ s.add_runtime_dependency(%q<stringex>.freeze, [">= 1.4"]) | ||
s.add_runtime_dependency(%q<uuidtools>.freeze, ["~> 2.1"]) | ||
s.add_runtime_dependency(%q<dm-core>.freeze, ["~> 1.2.0"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 0.9"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- shellplay.gemspec.orig 2019-07-14 18:13:28 UTC | ||
--- shellplay.gemspec.orig 2021-10-25 11:51:29 UTC | ||
+++ shellplay.gemspec | ||
@@ -24,7 +24,7 @@ Gem::Specification.new do |s| | ||
s.specification_version = 4 | ||
@@ -25,7 +25,7 @@ Gem::Specification.new do |s| | ||
end | ||
|
||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then | ||
- s.add_runtime_dependency(%q<paint>.freeze, ["~> 2.0.0"]) | ||
+ s.add_runtime_dependency(%q<paint>.freeze, ["~> 2.0"]) | ||
s.add_runtime_dependency(%q<cliprompt>.freeze, ["~> 0.1.2"]) | ||
s.add_runtime_dependency(%q<configstruct>.freeze, ["~> 0.1.0"]) | ||
s.add_runtime_dependency(%q<shell2html>.freeze, ["~> 0.0.6"]) | ||
if s.respond_to? :add_runtime_dependency then | ||
- s.add_runtime_dependency(%q<paint>.freeze, ["~> 2.0.0"]) | ||
+ s.add_runtime_dependency(%q<paint>.freeze, ["~> 2.0"]) | ||
s.add_runtime_dependency(%q<cliprompt>.freeze, ["~> 0.1.2"]) | ||
s.add_runtime_dependency(%q<configstruct>.freeze, ["~> 0.1.0"]) | ||
s.add_runtime_dependency(%q<shell2html>.freeze, ["~> 0.0.6"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
TIMESTAMP = 1602602939 | ||
SHA256 (ruby/rubygems-3.0.8.tgz) = d9d3fa3f6fed192f408e551617f64cc615024edc70828b45edf88b0591987263 | ||
SIZE (ruby/rubygems-3.0.8.tgz) = 888058 | ||
TIMESTAMP = 1645107035 | ||
SHA256 (ruby/rubygems-3.3.7.tgz) = 537475b3a75d4989a9f61c552c7249001a617e84e6cdfb533ff19ecfdeeaf183 | ||
SIZE (ruby/rubygems-3.3.7.tgz) = 1265681 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
commit b110d12e9c3bd2d153886681ff42c53c59ecd12d | ||
Author: Thibault Jouan <tj@a13.fr> | ||
AuthorDate: Mon Oct 11 23:54:27 2021 +0000 | ||
Commit: Thibault Jouan <tj@a13.fr> | ||
CommitDate: Wed Oct 13 11:49:25 2021 +0000 | ||
|
||
Prevent bundler installation | ||
|
||
Since RubyGems 3.1 the `setup' command also installs bundler and the | ||
`USE_BUNDLER_FOR_GEMDEPS' environment variable has been removed. | ||
|
||
We have to manually patch this command to remove bundler installation. | ||
|
||
diff --git lib/rubygems/commands/setup_command.rb lib/rubygems/commands/setup_command.rb | ||
index 2f7f29575..8fef1c539 100644 | ||
--- lib/rubygems/commands/setup_command.rb | ||
+++ lib/rubygems/commands/setup_command.rb | ||
@@ -180,8 +180,6 @@ def execute | ||
# Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir) | ||
remove_old_man_files man_dir if man_dir && File.exist?(man_dir) | ||
|
||
- install_default_bundler_gem bin_dir | ||
- | ||
if mode = options[:dir_mode] | ||
@mkdirs.uniq! | ||
File.chmod(mode, @mkdirs) | ||
@@ -311,7 +309,6 @@ def shebang | ||
|
||
def install_lib(lib_dir) | ||
libs = { 'RubyGems' => 'lib' } | ||
- libs['Bundler'] = 'bundler/lib' | ||
libs.each do |tool, path| | ||
say "Installing #{tool}" if @verbose | ||
|
||
@@ -520,7 +517,6 @@ def remove_old_bin_files(bin_dir) | ||
|
||
def remove_old_lib_files(lib_dir) | ||
lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' } | ||
- lib_dirs[File.join(lib_dir, 'bundler')] = 'bundler/lib/bundler' | ||
lib_dirs.each do |old_lib_dir, new_lib_dir| | ||
lib_files = files_in(new_lib_dir) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- activesupport.gemspec.orig 2018-02-14 14:06:12 UTC | ||
--- activesupport.gemspec.orig 2021-10-25 11:52:00 UTC | ||
+++ activesupport.gemspec | ||
@@ -23,7 +23,7 @@ Gem::Specification.new do |s| | ||
s.specification_version = 4 | ||
@@ -24,7 +24,7 @@ Gem::Specification.new do |s| | ||
end | ||
|
||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then | ||
- s.add_runtime_dependency(%q<i18n>.freeze, ["~> 0.7"]) | ||
+ s.add_runtime_dependency(%q<i18n>.freeze, [">= 0.7"]) | ||
s.add_runtime_dependency(%q<tzinfo>.freeze, ["~> 1.1"]) | ||
s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.1"]) | ||
s.add_runtime_dependency(%q<thread_safe>.freeze, ["~> 0.3", ">= 0.3.4"]) | ||
if s.respond_to? :add_runtime_dependency then | ||
- s.add_runtime_dependency(%q<i18n>.freeze, ["~> 0.7"]) | ||
+ s.add_runtime_dependency(%q<i18n>.freeze, [">= 0.7"]) | ||
s.add_runtime_dependency(%q<tzinfo>.freeze, ["~> 1.1"]) | ||
s.add_runtime_dependency(%q<minitest>.freeze, ["~> 5.1"]) | ||
s.add_runtime_dependency(%q<thread_safe>.freeze, ["~> 0.3", ">= 0.3.4"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
--- astrolabe.gemspec.orig 2021-01-03 21:07:21 UTC | ||
--- astrolabe.gemspec.orig 2021-10-25 11:52:08 UTC | ||
+++ astrolabe.gemspec | ||
@@ -22,7 +22,7 @@ Gem::Specification.new do |s| | ||
s.specification_version = 4 | ||
@@ -23,7 +23,7 @@ Gem::Specification.new do |s| | ||
end | ||
|
||
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then | ||
- s.add_runtime_dependency(%q<parser>.freeze, ["~> 2.2"]) | ||
+ s.add_runtime_dependency(%q<parser>.freeze, [">= 2.2"]) | ||
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.6"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 10.3"]) | ||
s.add_development_dependency(%q<yard>.freeze, ["~> 0.8"]) | ||
if s.respond_to? :add_runtime_dependency then | ||
- s.add_runtime_dependency(%q<parser>.freeze, ["~> 2.2"]) | ||
+ s.add_runtime_dependency(%q<parser>.freeze, [">= 2.2"]) | ||
s.add_development_dependency(%q<bundler>.freeze, ["~> 1.6"]) | ||
s.add_development_dependency(%q<rake>.freeze, ["~> 10.3"]) | ||
s.add_development_dependency(%q<yard>.freeze, ["~> 0.8"]) |
Oops, something went wrong.