[gentoo-commits] repo/gentoo:master commit in: dev-ruby/safe_yaml/files/, dev-ruby/safe_yaml/
commit: 36c63e1de8446c0a465a93e42589a738464b088a
Author: Hans de Graaff gentoo org>
AuthorDate: Tue Sep 19 05:38:20 2023 +
Commit: Hans de Graaff gentoo org>
CommitDate: Tue Sep 19 05:40:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c63e1d
dev-ruby/safe_yaml: remove masked package
Signed-off-by: Hans de Graaff gentoo.org>
dev-ruby/safe_yaml/Manifest| 1 -
.../files/safe_yaml-1.0.5-ruby30-arity.patch | 23
.../safe_yaml-1.0.5-ruby30-openstruct-tests.patch | 69 --
dev-ruby/safe_yaml/metadata.xml| 11
dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild | 40 -
5 files changed, 144 deletions(-)
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
deleted file mode 100644
index ca8a9f884fbf..
--- a/dev-ruby/safe_yaml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST safe_yaml-1.0.5.gem 30720 BLAKE2B
affbf5331cf290c3e7932f53da9b0f488730ae9138f0b28eb1e8e0323c7056635ed73bcadebd52f725895030a153dab13e243d997e84004f5bfac82e82dcebe2
SHA512
d9c8d9c28c3c8708f97cb0545f58152af81056f5e79147424dd7bf625f8e533440d1ed41d6abe2faf84578754823a1215ba28772c2e8593bfcfc397d647187b9
diff --git a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
deleted file mode 100644
index e994a48bbecb..
--- a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Daniel Leidert
-Date: Wed, 1 Dec 2021 18:51:51 +0100
-Subject: Fix Rubx 3 compatibility
-
-Origin:
https://github.com/dtao/safe_yaml/compare/master...paolobrasolin:development
-Bug: https://github.com/dtao/safe_yaml/issues/100
- lib/safe_yaml/safe_to_ruby_visitor.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/safe_yaml/safe_to_ruby_visitor.rb
b/lib/safe_yaml/safe_to_ruby_visitor.rb
-index b980445..5fd71f0 100644
a/lib/safe_yaml/safe_to_ruby_visitor.rb
-+++ b/lib/safe_yaml/safe_to_ruby_visitor.rb
-@@ -4,7 +4,7 @@ module SafeYAML
-
- def initialize(resolver)
- case INITIALIZE_ARITY
-- when 2
-+ when 2, -3
- #
https://github.com/tenderlove/psych/blob/v2.0.0/lib/psych/visitors/to_ruby.rb#L14-L28
- loader = Psych::ClassLoader.new
- scanner = Psych::ScalarScanner.new(loader)
diff --git
a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
deleted file mode 100644
index 9b597276617b..
--- a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Sergio Durigan Junior
-Date: Fri, 28 Jan 2022 16:35:01 -0500
-Subject: Adjust tests to reflect OpenStruct changes on Ruby3.0
-
-Ref.: https://github.com/ruby/psych/issues/540
-
-OpenStruct on Ruby3.0 changed its marshalling/unmarshalling code,
-which is now impacting safe_yaml's testcase. The two adjustments that
-needed to be made are:
-
-- OpenStruct's instance_variable_get will now symbolize its hash keys,
- instead of using strings.
-
-- OpenStruct's to_yaml method will not output the 'table' entity
- anymore.
-
-Signed-off-by: Sergio Durigan Junior
-
-Forwarded: yes, https://github.com/dtao/safe_yaml/pull/102
- spec/safe_yaml_spec.rb | 26 +++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/spec/safe_yaml_spec.rb b/spec/safe_yaml_spec.rb
-index aa701a4..1081173 100644
a/spec/safe_yaml_spec.rb
-+++ b/spec/safe_yaml_spec.rb
-@@ -318,7 +318,13 @@ describe YAML do
- it "will allow objects to be deserialized for whitelisted tags" do
- result = YAML.safe_load("--- !ruby/object:OpenStruct\ntable:\n foo:
bar\n")
- expect(result).to be_a(OpenStruct)
--expect(result.instance_variable_get(:@table)).to eq({ "foo" => "bar"
})
-+if RUBY_VERSION < '3.0'
-+ expect(result.instance_variable_get(:@table)).to eq({ "foo" =>
"bar" })
-+else
-+ # Ruby3.0's OpenStruct will now symbolize the hash key.
-+ # Ref.: https://github.com/ruby/psych/issues/540
-+ expect(result.instance_variable_get(:@table)).to eq({ :foo => "bar"
})
-+end
- end
-
- it "will not deserialize objects without whitelisted tags" do
-@@ -463,10 +469,24 @@ describe YAML do
-
- it "allows the default option to be overridden on a per-call basis" do
- result = safe_load_round_trip(OpenStruct.new(:foo => "bar"),
:whitelisted_tags => [])
-- expect(result).to eq({ "table" => { :foo => "bar" } })
-+ if RUBY_VERSION < '3.0'
-+expect(result).to eq({ "table" => { :foo => "bar" } })
-+ else
-+# Ruby3.0's OpenStruct's to_yaml method doesn't output the
-+# 'table' entity anymore.
-+# Ref.:
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/safe_yaml/files/, dev-ruby/safe_yaml/
commit: ef67bb12821ad41b8f4c6bbbd37a0b90d46904f8
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Mar 31 08:02:59 2023 +
Commit: Hans de Graaff gentoo org>
CommitDate: Sat Apr 1 06:25:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef67bb12
dev-ruby/safe_yaml: update EAPI 7 -> 8, add ruby30
Fix ruby30 compatibility with debian patches. Thanks to matoro for
finding them in the references bug.
Closes: https://bugs.gentoo.org/835405
Signed-off-by: Hans de Graaff gentoo.org>
.../files/safe_yaml-1.0.5-ruby30-arity.patch | 23
.../safe_yaml-1.0.5-ruby30-openstruct-tests.patch | 69 ++
dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild | 40 +
3 files changed, 132 insertions(+)
diff --git a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
new file mode 100644
index ..e994a48bbecb
--- /dev/null
+++ b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
@@ -0,0 +1,23 @@
+From: Daniel Leidert
+Date: Wed, 1 Dec 2021 18:51:51 +0100
+Subject: Fix Rubx 3 compatibility
+
+Origin:
https://github.com/dtao/safe_yaml/compare/master...paolobrasolin:development
+Bug: https://github.com/dtao/safe_yaml/issues/100
+---
+ lib/safe_yaml/safe_to_ruby_visitor.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/safe_yaml/safe_to_ruby_visitor.rb
b/lib/safe_yaml/safe_to_ruby_visitor.rb
+index b980445..5fd71f0 100644
+--- a/lib/safe_yaml/safe_to_ruby_visitor.rb
b/lib/safe_yaml/safe_to_ruby_visitor.rb
+@@ -4,7 +4,7 @@ module SafeYAML
+
+ def initialize(resolver)
+ case INITIALIZE_ARITY
+- when 2
++ when 2, -3
+ #
https://github.com/tenderlove/psych/blob/v2.0.0/lib/psych/visitors/to_ruby.rb#L14-L28
+ loader = Psych::ClassLoader.new
+ scanner = Psych::ScalarScanner.new(loader)
diff --git
a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
new file mode 100644
index ..9b597276617b
--- /dev/null
+++ b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
@@ -0,0 +1,69 @@
+From: Sergio Durigan Junior
+Date: Fri, 28 Jan 2022 16:35:01 -0500
+Subject: Adjust tests to reflect OpenStruct changes on Ruby3.0
+
+Ref.: https://github.com/ruby/psych/issues/540
+
+OpenStruct on Ruby3.0 changed its marshalling/unmarshalling code,
+which is now impacting safe_yaml's testcase. The two adjustments that
+needed to be made are:
+
+- OpenStruct's instance_variable_get will now symbolize its hash keys,
+ instead of using strings.
+
+- OpenStruct's to_yaml method will not output the 'table' entity
+ anymore.
+
+Signed-off-by: Sergio Durigan Junior
+
+Forwarded: yes, https://github.com/dtao/safe_yaml/pull/102
+---
+ spec/safe_yaml_spec.rb | 26 +++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/spec/safe_yaml_spec.rb b/spec/safe_yaml_spec.rb
+index aa701a4..1081173 100644
+--- a/spec/safe_yaml_spec.rb
b/spec/safe_yaml_spec.rb
+@@ -318,7 +318,13 @@ describe YAML do
+ it "will allow objects to be deserialized for whitelisted tags" do
+ result = YAML.safe_load("--- !ruby/object:OpenStruct\ntable:\n foo:
bar\n")
+ expect(result).to be_a(OpenStruct)
+-expect(result.instance_variable_get(:@table)).to eq({ "foo" => "bar"
})
++if RUBY_VERSION < '3.0'
++ expect(result.instance_variable_get(:@table)).to eq({ "foo" =>
"bar" })
++else
++ # Ruby3.0's OpenStruct will now symbolize the hash key.
++ # Ref.: https://github.com/ruby/psych/issues/540
++ expect(result.instance_variable_get(:@table)).to eq({ :foo => "bar"
})
++end
+ end
+
+ it "will not deserialize objects without whitelisted tags" do
+@@ -463,10 +469,24 @@ describe YAML do
+
+ it "allows the default option to be overridden on a per-call basis" do
+ result = safe_load_round_trip(OpenStruct.new(:foo => "bar"),
:whitelisted_tags => [])
+- expect(result).to eq({ "table" => { :foo => "bar" } })
++ if RUBY_VERSION < '3.0'
++expect(result).to eq({ "table" => { :foo => "bar" } })
++ else
++# Ruby3.0's OpenStruct's to_yaml method doesn't output the
++# 'table' entity anymore.
++# Ref.: https://github.com/ruby/psych/issues/540
++expect(result).to eq({ "foo" => "bar" })
++ end
+
+ result = safe_load_round_trip(OpenStruct.new(:foo => "bar"),
:deserialize_symbols => false, :whitelisted_tags => [])
+- expect(result).to eq({ "table" => { ":foo" => "bar" } })
++ if RUBY_VERSION < '3.0'
++expect(result).to eq({ "table" => { ":foo" => "bar" } })
++ else
++# Ruby3.0's OpenStruct's to_yaml method
