gentoo auto-resync : 11:07:2023 - 10:29:18

4 files changed, 80 insertions, 6 deletions

diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 17305058b51a..8fbd974d3fed 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,3 +1,4 @@
+AUX hashie-5.0.0-ruby32-tests.patch 2709 BLAKE2B 8b73b14e52620c37ded00efd23493b9dfaa7ac28463a7df6aec4314f8464ebff78662df7f6246814622790fa0cfaa51603d24a64a048704f6ac20db6a3ab487c SHA512 5ef820e83e1a772902a8e7efbfa4de30cdfdc4b98f0b3e8b19d0b71b2ca2040d553bd9f65f4ebe90319b01942137bc87b1d00b91a417484437edcdd398a921da
 DIST hashie-5.0.0.tar.gz 105224 BLAKE2B f15fd3ecd5dcdf88ea97d4aa5e13d984bbfb4dc54a687b4f166d9d84f07ddc0037f4fe251a4ec4950a5b89aaf4f0e43d11467018d63e3a89ae980ec06caf3dd6 SHA512 fc1f9399895f67af77af7b2d1d993eebd221d2b779781625bf1bbee579547580add7d7d0dbf1791564c8df6764c19617721ae5139ca949c81a316beacfe8c806
-EBUILD hashie-5.0.0.ebuild 1376 BLAKE2B 1cbd1a6b0a940b682206db8997ba26c831f143b23285d0bf254bb9d77652c91c16389688d04d8043029e58ab10e5967e374a92b24b2c0f0005b8283a6c2b1e7a SHA512 ebb7389eea4759d1b2180afcc1d02c95b3dad79b5bbcf629882a2f10d5a37644536fa8de95aed1d2dced7c9704a9b31c55e5fab2d593e50f01ae4489363011bd
-MISC metadata.xml 325 BLAKE2B 8cd81178301b5ba1563cf68c3511986e20d97e58004dcc3b60412662586df2521e874b0c3e0293bf94073fd23ed48f3d3d47bbe1de11b94dedc8a37aaf3f27bd SHA512 b0944b3bb56faa9846c828d3753b0285d8bec6f8ccea3b6573e9975e828aab23aa3fa9ce35c2eca5285fc562d87691cc2da8a8d0764673360ee1127ef84f8180
+EBUILD hashie-5.0.0.ebuild 1425 BLAKE2B ca93e0cba05f422e72f0e2918289a3e58c214a77571a652749f30a47a24da30e266d714d656595363b1a308505d73741be63139ae1ee7f26469cd819d487deb5 SHA512 cbfd14ce79260925a8394d760e9bc8a8bd9540f78a36e1eef2194ac78fb76f90dba3ae7af3ac8355967e1d536ab268b85343d2bb3c2e8666ba54131190367232
+MISC metadata.xml 323 BLAKE2B 3fb2f4f72680d3f59ff7cced2704683c376a7a4ce9004ffddd5142763c86093d985e11482a8f6137737c35f2443c47b54f6e89d7007f0d598b69efa9a3f8979b SHA512 1f215550ab58d0b6afd1c4e3af2b96f675a996585bfbf1265dbfb1c7edf4a35eab05b288529c324d711b4684d2e4eba8c097521440463969965395e942379843
diff --git a/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch b/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch
new file mode 100644
index 000000000000..479e5a876ac2
--- /dev/null
+++ b/dev-ruby/hashie/files/hashie-5.0.0-ruby32-tests.patch
@@ -0,0 +1,71 @@
+From 2b3120ad4a6f54990dfec5b10f5769e3714ab1e8 Mon Sep 17 00:00:00 2001
+From: Peter Goldstein <peter.m.goldstein@gmail.com>
+Date: Fri, 13 Jan 2023 13:53:14 -0500
+Subject: [PATCH] Add Ruby 3.2 to the CI matrix (#571)
+
+* Adds Ruby 3.2 to the CI matrix
+
+* Use object_id rather than trust, as trust is no longer a method on Object in Ruby 3.2.  Condition checked on Psych error based on version of Psych.
+
+* Update danger token
+
+* Add CHANGELOG entry
+
+* Add use of Gem::Version for version comparison
+---
+ .github/workflows/danger.yml |  4 ++--
+ .github/workflows/test.yml   |  1 +
+ CHANGELOG.md                 |  1 +
+ spec/hashie/mash_spec.rb     | 17 ++++++++++++-----
+ spec/hashie/utils_spec.rb    |  2 +-
+ 5 files changed, 17 insertions(+), 8 deletions(-)
+
+diff --git a/spec/hashie/mash_spec.rb b/spec/hashie/mash_spec.rb
+index 03f56683..091748fc 100644
+--- a/spec/hashie/mash_spec.rb
++++ b/spec/hashie/mash_spec.rb
+@@ -137,9 +137,9 @@
+ 
+   include_context 'with a logger' do
+     it 'logs a warning when overriding built-in methods' do
+-      Hashie::Mash.new('trust' => { 'two' => 2 })
++      Hashie::Mash.new('object_id' => { 'two' => 2 })
+ 
+-      expect(logger_output).to match('Hashie::Mash#trust')
++      expect(logger_output).to match('Hashie::Mash#object_id')
+     end
+ 
+     it 'can set keys more than once and does not warn when doing so' do
+@@ -821,9 +821,16 @@ class SubMash < Hashie::Mash
+         expect(mash.company_a.accounts.admin.password).to eq('secret')
+       end
+       it 'can override the value of aliases' do
+-        expect do
+-          Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
+-        end.to raise_error Psych::BadAlias, /base_accounts/
++        require 'psych'
++        if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('5')
++          expect do
++            Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
++          end.to raise_error Psych::AliasesNotEnabled, /Alias parsing was not enabled/
++        else
++          expect do
++            Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml', aliases: false)
++          end.to raise_error Psych::BadAlias, /base_accounts/
++        end
+       end
+     end
+ 
+diff --git a/spec/hashie/utils_spec.rb b/spec/hashie/utils_spec.rb
+index 0499aa7f..c6be23b1 100644
+--- a/spec/hashie/utils_spec.rb
++++ b/spec/hashie/utils_spec.rb
+@@ -7,7 +7,7 @@ def a_method_to_match_against
+ RSpec.describe Hashie::Utils do
+   describe '.method_information' do
+     it 'states the module or class that a native method was defined in' do
+-      bound_method = method(:trust)
++      bound_method = method(:object_id)
+ 
+       message = Hashie::Utils.method_information(bound_method)
+ 
diff --git a/dev-ruby/hashie/hashie-5.0.0.ebuild b/dev-ruby/hashie/hashie-5.0.0.ebuild
index d394d48d49f5..26a0a747e9a6 100644
--- a/dev-ruby/hashie/hashie-5.0.0.ebuild
+++ b/dev-ruby/hashie/hashie-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -17,13 +17,15 @@ inherit ruby-fakegem
 
 DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
 HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hashie/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ruby32-tests.patch" )
+
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashie/metadata.xml b/dev-ruby/hashie/metadata.xml
index 716acc6c5a35..e7c6da67af9b 100644
--- a/dev-ruby/hashie/metadata.xml
+++ b/dev-ruby/hashie/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Gentoo Ruby Project</name>
 </maintainer>
 <upstream>
-	<remote-id type="github">intridea/hashie</remote-id>
+	<remote-id type="github">hashie/hashie</remote-id>
 </upstream>
 </pkgmetadata>