gentoo resync : 16.04.2022

3 files changed, 443 insertions, 4 deletions

diff --git a/dev-ruby/nokogiri-diff/Manifest b/dev-ruby/nokogiri-diff/Manifest
index 842de00c1c9f..ff71eae536ae 100644
--- a/dev-ruby/nokogiri-diff/Manifest
+++ b/dev-ruby/nokogiri-diff/Manifest
@@ -1,3 +1,4 @@
+AUX nokogiri-diff-0.2.0-rspec3.patch 14440 BLAKE2B 7df1717f002a958778b3ef96f6ae2eeb8ae32c90bd1a1a4b2ed813d60b935c3bc2f91529f290e57ff06ea0f214b3d3383d0968af64b237631f5f10dd6b1456ab SHA512 156fdb93e15536d0ce963be77b0f24a6a466336fd2765544573c7ec698e2d87cae5b8d4154999c253e64ba09ddd3134ab2e4241cf260f1c97bf20e6a868bc6a8
 DIST nokogiri-diff-0.2.0.gem 8704 BLAKE2B e1df47db2e6e7fcd29eb229245cb9a9a7b31fded319a6fe28d04722f457f0ea7bc19e13ee49b2233f3c072eedf3c83c7e38cd8b19d5ecbc4937f709a9f4cf3a7 SHA512 9b2b6f266c9c7d01153c345567086b4cd1092a5984e6867ea81d15e00467936f296fd5e2c3ab7dc18e44d1dd2af022d250234fb4311a9be80fd3ca32b3d201ca
-EBUILD nokogiri-diff-0.2.0-r3.ebuild 612 BLAKE2B 7b83209d28c1d22fa6c60e19652689ff1651a69fdf64fc29fcf5fbb7208095cb11f0b7bfdd5471d7bc6937d9dc7576ec8067f82463c3453b6566b936d6a930f0 SHA512 b5b9aad916624f6ba1a51d2da97b3c6e94c3b8db780ee4925cecceb007c585c6cbaa26ae82591962191f5670fcf353c20fdcc016062f72e45e414a70da64037d
+EBUILD nokogiri-diff-0.2.0-r3.ebuild 672 BLAKE2B d3ab504abf20ee988983bba3852a7de89f28e8e798784826a7bd30fa969b20bdc809d290844b0f9ea4d2108cbec80cb1d9b000e42530da3a2d9fe3847d79aafb SHA512 0ea667ed710b6394873d14c334a0a21923e73e7fd5fb2ad9cba7bc392e34460f07dcb6b910d6faad3e45f940cb62c5af8aaf9bf03273eb9f5a8a3564f8478bab
 MISC metadata.xml 351 BLAKE2B 3817b4e8114fa8c6d36881c904704a3608f83ca4bb924aba73f54aa8c3662cf130f0fd5463fee37b4130ec3195a9ed74140ccc0912411b5c8c0faa2a1f6e1fa4 SHA512 333c0ec0cbe5dd9ba71889b8a09f7cd65bfd90f5e15aead5cae212b35217b60842330bd2ad3741ec6628429d2f516fa359e44507237633209759fc449eee4da9
diff --git a/dev-ruby/nokogiri-diff/files/nokogiri-diff-0.2.0-rspec3.patch b/dev-ruby/nokogiri-diff/files/nokogiri-diff-0.2.0-rspec3.patch
new file mode 100644
index 000000000000..c47bda03ec11
--- /dev/null
+++ b/dev-ruby/nokogiri-diff/files/nokogiri-diff-0.2.0-rspec3.patch
@@ -0,0 +1,436 @@
+From 4683f35469dbb69fa291ea35be4e7a74090a8b24 Mon Sep 17 00:00:00 2001
+From: Balasankar C <balasankarc@autistici.org>
+Date: Sat, 28 Nov 2015 17:55:09 +0530
+Subject: [PATCH] Port tests to RSpec 3
+
+---
+ Rakefile            |   2 +-
+ gemspec.yml         |   2 +-
+ spec/diff_spec.rb   | 226 ++++++++++++++++++++++----------------------
+ spec/spec_helper.rb |   2 +-
+ 4 files changed, 116 insertions(+), 116 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index 1b8a92d..7fb967c 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -12,7 +12,7 @@ rescue LoadError => e
+ end
+ 
+ begin
+-  gem 'rspec', '~> 2.4'
++  gem 'rspec', '~> 3.0'
+   require 'rspec/core/rake_task'
+ 
+   RSpec::Core::RakeTask.new
+diff --git a/gemspec.yml b/gemspec.yml
+index 5ae611d..d775248 100644
+--- a/gemspec.yml
++++ b/gemspec.yml
+@@ -18,5 +18,5 @@ dependencies:
+ 
+ development_dependencies:
+   rubygems-tasks: ~> 0.1
+-  rspec: ~> 2.4
++  rspec: ~> 3.0
+   yard: ~> 0.7
+diff --git a/spec/diff_spec.rb b/spec/diff_spec.rb
+index 6450c49..adfaaa8 100644
+--- a/spec/diff_spec.rb
++++ b/spec/diff_spec.rb
+@@ -21,197 +21,197 @@
+   let(:removed_attr)    { Nokogiri::XML('<div><p>one</p></div>') }
+ 
+   it "should add #diff to Nokogiri::XML::Docuemnt" do
+-    doc.should respond_to(:diff)
++    expect(doc).to respond_to(:diff)
+   end
+ 
+   it "should add #diff to Nokogiri::XML::Element" do
+-    added_element.at('div').should respond_to(:diff)
++    expect(added_element.at('div')).to respond_to(:diff)
+   end
+ 
+   it "should add #diff to Nokogiri::XML::Text" do
+-    added_text.at('p/text()').should respond_to(:diff)
++    expect(added_text.at('p/text()')).to respond_to(:diff)
+   end
+ 
+   it "should add #diff to Nokogiri::XML::Attr" do
+-    added_attr.at('p/@id').should respond_to(:diff)
++    expect(added_attr.at('p/@id')).to respond_to(:diff)
+   end
+ 
+   it "should not compare the Document objects" do
+     change = doc.diff(doc).first
+ 
+-    change[0].should == ' '
+-    change[1].should == doc.root
++    expect(change[0]).to eq(' ')
++    expect(change[1]).to eq(doc.root)
+   end
+ 
+   it "should determine when two different documents are identical" do
+-    doc.diff(Nokogiri::XML(contents)).all? { |change,node|
++    expect(doc.diff(Nokogiri::XML(contents)).all? { |change,node|
+       change == ' '
+-    }.should == true
++    }).to eq(true)
+   end
+ 
+   it "should search down within Nokogiri::XML::Document objects" do
+-    doc.diff(changed_text).any? { |change,node|
++    expect(doc.diff(changed_text).any? { |change,node|
+       change != ' '
+-    }.should == true
++    }).to eq(true)
+   end
+ 
+   it "should determine when text nodes are added" do
+     changes = doc.at('div').diff(added_text.at('div')).to_a
+ 
+-    changes.length.should == 4
++    expect(changes.length).to eq(4)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == doc.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(doc.at('div'))
+ 
+-    changes[1][0].should == ' '
+-    changes[1][1].should == doc.at('//p')
++    expect(changes[1][0]).to eq(' ')
++    expect(changes[1][1]).to eq(doc.at('//p'))
+ 
+-    changes[2][0].should == '+'
+-    changes[2][1].should == added_text.at('//div/text()')
++    expect(changes[2][0]).to eq('+')
++    expect(changes[2][1]).to eq(added_text.at('//div/text()'))
+ 
+-    changes[3][0].should == ' '
+-    changes[3][1].should == doc.at('//p/text()')
++    expect(changes[3][0]).to eq(' ')
++    expect(changes[3][1]).to eq(doc.at('//p/text()'))
+   end
+ 
+   it "should determine when elements are added" do
+     changes = doc.at('div').diff(added_element.at('div')).to_a
+ 
+-    changes.length.should == 5
++    expect(changes.length).to eq(5)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == doc.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(doc.at('div'))
+ 
+-    changes[1][0].should == '+'
+-    changes[1][1].should == added_element.at('//p[1]')
++    expect(changes[1][0]).to eq('+')
++    expect(changes[1][1]).to eq(added_element.at('//p[1]'))
+ 
+-    changes[2][0].should == ' '
+-    changes[2][1].should == doc.at('//p')
++    expect(changes[2][0]).to eq(' ')
++    expect(changes[2][1]).to eq(doc.at('//p'))
+ 
+-    changes[3][0].should == '-'
+-    changes[3][1].should == doc.at('//p/text()')
++    expect(changes[3][0]).to eq('-')
++    expect(changes[3][1]).to eq(doc.at('//p/text()'))
+ 
+-    changes[4][0].should == '+'
+-    changes[4][1].should == added_element.at('//p[2]/text()')
++    expect(changes[4][0]).to eq('+')
++    expect(changes[4][1]).to eq(added_element.at('//p[2]/text()'))
+   end
+ 
+   it "should ignore when attribute order changes" do
+     changes = added_attrs.at('p').diff(changed_attr_order.at('p')).to_a
+ 
+-    changes.all? { |change| change[0] == ' ' }.should be_true
++    expect(changes.all? { |change| change[0] == ' ' }).to be_truthy
+   end
+ 
+   it "should determine when attributes are added" do
+     changes = doc.at('p').diff(added_attr.at('p')).to_a
+ 
+-    changes.length.should == 3
++    expect(changes.length).to eq(3)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == doc.at('p')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(doc.at('p'))
+ 
+-    changes[1][0].should == '+'
+-    changes[1][1].should == added_attr.at('//p/@id')
++    expect(changes[1][0]).to eq('+')
++    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
+ 
+-    changes[2][0].should == ' '
+-    changes[2][1].should == doc.at('//p/text()')
++    expect(changes[2][0]).to eq(' ')
++    expect(changes[2][1]).to eq(doc.at('//p/text()'))
+   end
+ 
+   it "should determine when text nodes differ" do
+     changes = doc.at('p').diff(changed_text.at('p')).to_a
+ 
+-    changes.length.should == 3
++    expect(changes.length).to eq(3)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == doc.at('p')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(doc.at('p'))
+ 
+-    changes[1][0].should == '-'
+-    changes[1][1].should == doc.at('//p/text()')
++    expect(changes[1][0]).to eq('-')
++    expect(changes[1][1]).to eq(doc.at('//p/text()'))
+ 
+-    changes[2][0].should == '+'
+-    changes[2][1].should == changed_text.at('//p/text()')
++    expect(changes[2][0]).to eq('+')
++    expect(changes[2][1]).to eq(changed_text.at('//p/text()'))
+   end
+ 
+   it "should determine when element names differ" do
+     changes = doc.at('div').diff(changed_element.at('div')).to_a
+ 
+-    changes.length.should == 3
++    expect(changes.length).to eq(3)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == doc.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(doc.at('div'))
+ 
+-    changes[1][0].should == '-'
+-    changes[1][1].should == doc.at('p')
++    expect(changes[1][0]).to eq('-')
++    expect(changes[1][1]).to eq(doc.at('p'))
+ 
+-    changes[2][0].should == '+'
+-    changes[2][1].should == changed_element.at('span')
++    expect(changes[2][0]).to eq('+')
++    expect(changes[2][1]).to eq(changed_element.at('span'))
+   end
+ 
+   it "should determine when attribute names differ" do
+     changes = added_attr.at('p').diff(changed_attr_name.at('p')).to_a
+ 
+-    changes.length.should == 4
++    expect(changes.length).to eq(4)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == added_attr.at('p')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(added_attr.at('p'))
+ 
+-    changes[1][0].should == '-'
+-    changes[1][1].should == added_attr.at('//p/@id')
++    expect(changes[1][0]).to eq('-')
++    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
+ 
+-    changes[2][0].should == '+'
+-    changes[2][1].should == changed_attr_name.at('//p/@i')
++    expect(changes[2][0]).to eq('+')
++    expect(changes[2][1]).to eq(changed_attr_name.at('//p/@i'))
+ 
+-    changes[3][0].should == ' '
+-    changes[3][1].should == added_attr.at('//p/text()')
++    expect(changes[3][0]).to eq(' ')
++    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
+   end
+ 
+   it "should determine when attribute values differ" do
+     changes = added_attr.at('p').diff(changed_attr_value.at('p')).to_a
+ 
+-    changes.length.should == 4
++    expect(changes.length).to eq(4)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == added_attr.at('p')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(added_attr.at('p'))
+ 
+-    changes[1][0].should == '-'
+-    changes[1][1].should == added_attr.at('//p/@id')
++    expect(changes[1][0]).to eq('-')
++    expect(changes[1][1]).to eq(added_attr.at('//p/@id'))
+ 
+-    changes[2][0].should == '+'
+-    changes[2][1].should == changed_attr_value.at('//p/@id')
++    expect(changes[2][0]).to eq('+')
++    expect(changes[2][1]).to eq(changed_attr_value.at('//p/@id'))
+ 
+-    changes[3][0].should == ' '
+-    changes[3][1].should == added_attr.at('//p/text()')
++    expect(changes[3][0]).to eq(' ')
++    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
+   end
+ 
+   it "should determine when text nodes are removed" do
+     changes = added_text.at('div').diff(removed_text.at('div')).to_a
+ 
+-    changes.length.should == 4
++    expect(changes.length).to eq(4)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == added_text.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(added_text.at('div'))
+ 
+-    changes[1][0].should == ' '
+-    changes[1][1].should == added_text.at('p')
++    expect(changes[1][0]).to eq(' ')
++    expect(changes[1][1]).to eq(added_text.at('p'))
+ 
+-    changes[2][0].should == ' '
+-    changes[2][1].should == added_text.at('//div/text()')
++    expect(changes[2][0]).to eq(' ')
++    expect(changes[2][1]).to eq(added_text.at('//div/text()'))
+ 
+-    changes[3][0].should == '-'
+-    changes[3][1].should == added_text.at('//p/text()')
++    expect(changes[3][0]).to eq('-')
++    expect(changes[3][1]).to eq(added_text.at('//p/text()'))
+   end
+ 
+   it "should determine when elements are removed" do
+     changes = added_element.at('div').diff(removed_element.at('div')).to_a
+ 
+-    changes.length.should == 3
++    expect(changes.length).to eq(3)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == added_element.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(added_element.at('div'))
+ 
+-    changes[1][0].should == '-'
+-    changes[1][1].should == added_element.at('//p[1]')
++    expect(changes[1][0]).to eq('-')
++    expect(changes[1][1]).to eq(added_element.at('//p[1]'))
+ 
+-    changes[2][0].should == '-'
+-    changes[2][1].should == added_element.at('//p[2]')
++    expect(changes[2][0]).to eq('-')
++    expect(changes[2][1]).to eq(added_element.at('//p[2]'))
+   end
+ 
+   it "should ignore when attributes change order" do
+@@ -220,47 +220,47 @@
+   it "should determine when attributes are removed" do
+     changes = added_attr.at('div').diff(removed_attr.at('div')).to_a
+ 
+-    changes.length.should == 4
++    expect(changes.length).to eq(4)
+ 
+-    changes[0][0].should == ' '
+-    changes[0][1].should == added_attr.at('div')
++    expect(changes[0][0]).to eq(' ')
++    expect(changes[0][1]).to eq(added_attr.at('div'))
+ 
+-    changes[1][0].should == ' '
+-    changes[1][1].should == added_attr.at('p')
++    expect(changes[1][0]).to eq(' ')
++    expect(changes[1][1]).to eq(added_attr.at('p'))
+ 
+-    changes[2][0].should == '-'
+-    changes[2][1].should == added_attr.at('//p/@id')
++    expect(changes[2][0]).to eq('-')
++    expect(changes[2][1]).to eq(added_attr.at('//p/@id'))
+ 
+-    changes[3][0].should == ' '
+-    changes[3][1].should == added_attr.at('//p/text()')
++    expect(changes[3][0]).to eq(' ')
++    expect(changes[3][1]).to eq(added_attr.at('//p/text()'))
+   end
+ 
+   context ":added" do
+     it "should determine only when text nodes are added" do
+       changes = doc.at('div').diff(added_text.at('div'), :added => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '+'
+-      changes[0][1].should == added_text.at('//div/text()')
++      expect(changes[0][0]).to eq('+')
++      expect(changes[0][1]).to eq(added_text.at('//div/text()'))
+     end
+ 
+     it "should determine only when elements are added" do
+       changes = doc.at('div').diff(added_element.at('div'), :added => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '+'
+-      changes[0][1].should == added_element.at('//div/p[2]')
++      expect(changes[0][0]).to eq('+')
++      expect(changes[0][1]).to eq(added_element.at('//div/p[2]'))
+     end
+ 
+     it "should determine only when attributes are added" do
+       changes = doc.at('div').diff(added_attr.at('div'), :added => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '+'
+-      changes[0][1].should == added_attr.at('//p/@id')
++      expect(changes[0][0]).to eq('+')
++      expect(changes[0][1]).to eq(added_attr.at('//p/@id'))
+     end
+   end
+ 
+@@ -268,28 +268,28 @@
+     it "should determine only when text nodes are removed" do
+       changes = doc.at('div').diff(removed_text.at('div'), :removed => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '-'
+-      changes[0][1].should == doc.at('//p/text()')
++      expect(changes[0][0]).to eq('-')
++      expect(changes[0][1]).to eq(doc.at('//p/text()'))
+     end
+ 
+     it "should determine only when elements are removed" do
+       changes = doc.at('div').diff(removed_element.at('div'), :removed => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '-'
+-      changes[0][1].should == doc.at('//div/p')
++      expect(changes[0][0]).to eq('-')
++      expect(changes[0][1]).to eq(doc.at('//div/p'))
+     end
+ 
+     it "should determine only when attributes are removed" do
+       changes = added_attr.at('div').diff(removed_attr.at('div'), :removed => true).to_a
+ 
+-      changes.length.should == 1
++      expect(changes.length).to eq(1)
+ 
+-      changes[0][0].should == '-'
+-      changes[0][1].should == added_attr.at('//p/@id')
++      expect(changes[0][0]).to eq('-')
++      expect(changes[0][1]).to eq(added_attr.at('//p/@id'))
+     end
+   end
+ end
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 4b9ecea..5f26cbb 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,2 +1,2 @@
+-gem 'rspec', '~> 2.4'
++gem 'rspec', '~> 3.0'
+ require 'rspec'
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
index ce6a9e2a7a43..c16fa9c3a1cf 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
 
 inherit ruby-fakegem
@@ -18,4 +18,6 @@ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-
 SLOT="0"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-rspec3.patch" )
+
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.5 >=dev-ruby/tdiff-0.3.2"