gentoo auto-resync : 18:03:2023 - 00:29:05

5 files changed, 72 insertions, 7 deletions

diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 2b72e2d48775..880e59b575c1 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,3 +1,4 @@
+AUX mocha-1.16.0-ruby32.patch 1889 BLAKE2B ac383ca88d04a78751109cb03a3ab83692cac13b5636974678b0b1bf42ce2fd2f71b8f8c6b1c3c7dde7ca38574120ec2cd68c8ff442dd908b680eb7da5a39e23 SHA512 5abbe4e7dd65201663e6a055936827a60b01213e968be18ac7f960cda66ff88c43a09993375003802dec721808989cc6c35cfbcd73be031de45c6c2cd9410e46
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
 DIST mocha-1.14.0.tar.gz 246015 BLAKE2B 836b678ca0bcbc1860cb185ee6cd5a71bbdeff4698780fdfcffe6fd38196b1291aa6c23a779e7e1e59bd8155d5ec48fbde426ace468f8186e18860f3d3764836 SHA512 41dfd1f9add0b62c8609ec4cdf07ae58580503c81eb40886cae6c97ee5a5109ae5aa6094756c9666985266c83fad38adef7c9c4a2add8ef2b7571c2c1753cfb0
@@ -9,7 +10,7 @@ EBUILD mocha-0.14.0-r1.ebuild 874 BLAKE2B 9cffaa02080f973e929c0f4ec7d5fd85b919fa
 EBUILD mocha-1.13.0.ebuild 998 BLAKE2B 7e906fff5e3dd23b3090303f019a36061f08637ef0c4a5df0b327d11d927823b620af65110a9ca381724a1a32477eface4eb7f7fa44fd6130066bc3bd3555066 SHA512 cfc3fabf625b776878bf6b13c1b4367898f4f8431321aa0b3e9e82a93a4056b80ef1bfb29f4058d14ddcc4efd3033ef4379df829e02278e12601682b0a4d9b21
 EBUILD mocha-1.14.0.ebuild 1012 BLAKE2B f5acf87177fcf4e87b305410f3556957495f8d8ce580f64f9d6c626261bb1772c813bf8d9f892a0660770b98d801079329f90011e4f3860bd58713bc9bfbd79e SHA512 3e13341f1ba652ee376e4adfb16c7687494712079cd96c14439e901226f7c23c38c0ce20097606aaadd3659d364ae85229bdde6a548a8bcce6601db49bcf0714
 EBUILD mocha-1.15.0.ebuild 1005 BLAKE2B d4112df979ff51e79493ef253c47813962efe78afc8d996deca16ada4222f19e81b917e61e1454f94d7bdc7755efcfb8b665a2636c4dd9ad933ab3552ce71654 SHA512 5de42fae1d29880d5073e1d55e4d714b9de4a60c3b9d3fe84c4ceec2a9c039bd1bef082e82548141f47312b5f38a1345dfe8c26eaa95edb7e63d1336180c2f41
-EBUILD mocha-1.16.0.ebuild 1005 BLAKE2B d4112df979ff51e79493ef253c47813962efe78afc8d996deca16ada4222f19e81b917e61e1454f94d7bdc7755efcfb8b665a2636c4dd9ad933ab3552ce71654 SHA512 5de42fae1d29880d5073e1d55e4d714b9de4a60c3b9d3fe84c4ceec2a9c039bd1bef082e82548141f47312b5f38a1345dfe8c26eaa95edb7e63d1336180c2f41
+EBUILD mocha-1.16.0.ebuild 1066 BLAKE2B 813312242cdc94ba8ee76be9971953b43b94c12170ca8f0f2a8b7fde72d17f847a81d82a28c491528fc6d487319baff0a0b83a512b1ce22b2abd898f7122d93d SHA512 2e5f7f732f1733ed5e00b9ae0a323538a517b583f9e30dabcc11958ed74d523c4f727d7b53052ad72e8c1a2563574afd7c91ee9105119eefcf80f77c39e896ef
 EBUILD mocha-2.0.1.ebuild 1022 BLAKE2B 7d07b42341376f838f6c635f9bdb6f1406030bb94d3c42c434f456a88fe55d537e189b9a93452b11c9d12fc8467fabdecf2c7aa10253252929dc468171835f85 SHA512 d9ba69447cc4c039c77379757ee2f3809d56cf0b3e68db55299feb71fb81c6518f704fe7a78f516c5856f2c936c7592150859155f3d01c9da8c017ae3a2e4dea
-EBUILD mocha-2.0.2.ebuild 1022 BLAKE2B 7d07b42341376f838f6c635f9bdb6f1406030bb94d3c42c434f456a88fe55d537e189b9a93452b11c9d12fc8467fabdecf2c7aa10253252929dc468171835f85 SHA512 d9ba69447cc4c039c77379757ee2f3809d56cf0b3e68db55299feb71fb81c6518f704fe7a78f516c5856f2c936c7592150859155f3d01c9da8c017ae3a2e4dea
-MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
+EBUILD mocha-2.0.2.ebuild 1083 BLAKE2B d3c5125b599526568972d22cb3ac30c6007f89ba7822822ae9669584f5d5470d0a57f6961f139f536a4faadf3d79346d30f380df377165da3c0f4667e9c5ebf7 SHA512 38a90b303b1dcfddf2dfe41ba58d53bac3416f4de7764cc6bb0e72a4cff6ef8f23b0ee088e422fb5424bc73ee9096fae6702ab7427e94fa2225614e959f80df7
+MISC metadata.xml 332 BLAKE2B caf5137da39b091d3da2776b6219400546a5c2ee01d39759471a24a5beaac1f248be271c376f9061c0b1de49d531832b6e6cdf9be53f943d112789a8240feea2 SHA512 af0bd36bc12851a56c49ef645c95b145ef28ec2070b1bcf1fc3629526b91c20aeaa39357e997389e02482ddb19c9f3cb52acb7bb9a2f90142087ef4e874f1bd8
diff --git a/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch b/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch
new file mode 100644
index 000000000000..a4f6b8c2fd7a
--- /dev/null
+++ b/dev-ruby/mocha/files/mocha-1.16.0-ruby32.patch
@@ -0,0 +1,53 @@
+https://github.com/freerange/mocha/commit/ae9fed4a9f2ef6267302494ae0edf515d4a8a921
+https://github.com/freerange/mocha/commit/26b106a540ad57cd73401461451aa2711c541e9d
+
+From ae9fed4a9f2ef6267302494ae0edf515d4a8a921 Mon Sep 17 00:00:00 2001
+From: James Mead <james@floehopper.org>
+Date: Thu, 24 Nov 2022 13:26:15 +0000
+Subject: [PATCH] DRY up regexp_matches test
+
+--- a/test/unit/parameter_matchers/regexp_matches_test.rb
++++ b/test/unit/parameter_matchers/regexp_matches_test.rb
+@@ -32,14 +32,18 @@ def test_should_not_match_on_empty_arguments
+   end
+ 
+   def test_should_not_raise_error_on_argument_that_does_not_respond_to_equals_tilde
+-    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+     matcher = regexp_matches(/oo/)
+     assert_nothing_raised { matcher.matches?([object_not_responding_to_equals_tilde]) }
+   end
+ 
+   def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
+-    object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
+     matcher = regexp_matches(/oo/)
+     assert !matcher.matches?([object_not_responding_to_equals_tilde])
+   end
++
++  private
++
++  def object_not_responding_to_equals_tilde
++    Class.new { undef =~ }.new
++  end
+ end
+
+From 26b106a540ad57cd73401461451aa2711c541e9d Mon Sep 17 00:00:00 2001
+From: James Mead <james@floehopper.org>
+Date: Fri, 25 Nov 2022 09:04:43 +0000
+Subject: [PATCH] Fix regexp_matches tests in Ruby v3.2
+
+Object#~= has been removed from Ruby v3.2 [1].
+
+Closes #590.
+
+[1]: https://bugs.ruby-lang.org/issues/15231
+--- a/test/unit/parameter_matchers/regexp_matches_test.rb
++++ b/test/unit/parameter_matchers/regexp_matches_test.rb
+@@ -44,6 +44,6 @@ def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
+   private
+ 
+   def object_not_responding_to_equals_tilde
+-    Class.new { undef =~ }.new
++    Class.new { undef =~ if respond_to?(:=~) }.new
+   end
+ end
+
diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index daac6fdb7252..73af35f9de54 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">freerange/mocha</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mocha/mocha-1.16.0.ebuild b/dev-ruby/mocha/mocha-1.16.0.ebuild
index 5f825dc0d59e..ea8837619e17 100644
--- a/dev-ruby/mocha/mocha-1.16.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.16.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
 
@@ -26,6 +26,10 @@ IUSE=""
 ruby_add_bdepend "
 	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/mocha-1.16.0-ruby32.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
 
diff --git a/dev-ruby/mocha/mocha-2.0.2.ebuild b/dev-ruby/mocha/mocha-2.0.2.ebuild
index 8b9904e74ec0..7200023417c0 100644
--- a/dev-ruby/mocha/mocha-2.0.2.ebuild
+++ b/dev-ruby/mocha/mocha-2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
 
@@ -26,6 +26,10 @@ ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
 ruby_add_bdepend "
 	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.0-ruby32.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die