gentoo auto-resync : 28:03:2023 - 09:49:10

5 files changed, 121 insertions, 0 deletions

diff --git a/dev-ruby/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index 4e88c3ee0a5c..196be16b6bb2 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,3 +1,7 @@
+AUX flexmock-2.3.6-ruby30-1.patch 921 BLAKE2B 1ef57aa33a78cd385646e0c5ee00e371c1ea27127a3d80fc900ea019c268a46f35a42d8ed27986a3ffe77f587828f02a947962a9575e32c87c28595576adf9f0 SHA512 bb5e27748ca1b9535f3bc00c8f3b27279ce90d517fdf5743ea05bef1d1e1122ba2afb1de4b271ef2966332b8d10b73f74571f506e4ae293af1e12186111a192d
+AUX flexmock-2.3.6-ruby30-2.patch 885 BLAKE2B 07f3f7a9adabf8688995d55afb4084ebc40e66131f47edea82d5172176880c33c51a8e0ca8b76cb17c60499d7cd23f5dd00ba126b3a016224108c116bea7099b SHA512 b4bb9267b07fe5713771d7a1e031d844d60078f37cf490a81fab291db41046275e5e2e18f84642096a76160525dffb8162f3f5b1da8007ba6706d3d726686793
+AUX flexmock-2.3.6-ruby30-3.patch 994 BLAKE2B 956064f45506ab5a6b5374eeabdb8daf7f9e1174cfa527c6399de7e6ccb31c0fc119fd676f7047ad387da736501002e5ae28d94d3f4e624dd844b55211fb9224 SHA512 d271486d2093afb62a1b21201f55c86bd5e8204b6842450036110798d10669958a70c215ff5ffd2d3416f28db2ea87c3f364d9ee6c70170079bac2beadd614c6
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
 EBUILD flexmock-2.3.6-r1.ebuild 1133 BLAKE2B 1e5fb9a6a15a9689b96940a865d1cc20383ed16eab1d4dfb8bb10e1a1c97c60cc8c5bf91cf616475b1e5a7d5cb1078d161913aeea66f841f66a9d700768779ef SHA512 e5c65be24e5ac95185793559d51be62f4e1e82917fe8647fdd1293eefb669d6268fb033aada04449581362cab896d34638ebd260402b313d7a21f0b66f3792f9
+EBUILD flexmock-2.3.6-r2.ebuild 1212 BLAKE2B a09f390a0198351817cd682a368c1992008ff136db8499409d2c310630219d63e5a613a2665d06439ba8e7930e29e5517e3caf4aadcc96d4784f608acccd91c9 SHA512 0ba7206c1e4f46c034bd4a6ab92f6684419014847101abd906bcb28059722e6a4a54cb113fa50298a9c480c2f5a0cbae95696fc01fcdbf9b12c9c7bb22dbd513
 MISC metadata.xml 346 BLAKE2B 80f8ed32e41d3df3b32db9b646a23f2fbe9e037e1b5f058b07d3b270ed002380d17e67903d49d2290ba43b59520d005396575f1fe359c4f41546d1d9bcb6caab SHA512 9d39eaf3912ec47aee2fc5ce85bbb952a71202ef07c5fd6cef1d1645713f46a016d97ea5f8f08f0707fc8bbdf70d49621ad4300d4b14f3fd58de6c022f1f05c3
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch
new file mode 100644
index 000000000000..f43c4d454992
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch
@@ -0,0 +1,25 @@
+From f63ba0916132e16d5eeb1a5c1ad868b0169bf7fc Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:34:25 +0100
+Subject: [PATCH] Properly accept argument and keywords
+
+---
+ lib/flexmock/composite_expectation.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/flexmock/composite_expectation.rb b/lib/flexmock/composite_expectation.rb
+index 370046f..fbc8e54 100644
+--- a/lib/flexmock/composite_expectation.rb
++++ b/lib/flexmock/composite_expectation.rb
+@@ -16,9 +16,9 @@ def add(expectation)
+     end
+ 
+     # Apply the constraint method to all expectations in the composite.
+-    def method_missing(sym, *args, &block)
++    def method_missing(sym, *args, **keywords, &block)
+       @expectations.each do |expectation|
+-        expectation.send(sym, *args, &block)
++        expectation.send(sym, *args, **keywords, &block)
+       end
+       self
+     end
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch
new file mode 100644
index 000000000000..f7964b072df9
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch
@@ -0,0 +1,25 @@
+From b3a2d7984803d70778c1f585ca48fb1fd374e44c Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:34:48 +0100
+Subject: [PATCH] Use binding.source_location for test
+
+Fixes the warning:
+
+    warning: __FILE__ in eval may not return location in binding; use Binding#source_location instead
+---
+ test/test_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index 9eb3310..c4fd622 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -50,7 +50,7 @@ def assert_failure(klass, options={}, &block)
+     # added.
+     def assert_mock_failure(klass, options={}, &block)
+       ex = assert_failure(klass, options, &block)
+-      file = eval("__FILE__", block.binding)
++      file = block.binding.source_location.first
+       assert_matching_line(ex, file, options)
+     end
+ 
diff --git a/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch
new file mode 100644
index 000000000000..2e69627c5060
--- /dev/null
+++ b/dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch
@@ -0,0 +1,23 @@
+From 8a4be2142b37a6ab4b6b8a3f38a07f2b06752acf Mon Sep 17 00:00:00 2001
+From: Daniel Leidert <dleidert@debian.org>
+Date: Mon, 22 Nov 2021 01:35:53 +0100
+Subject: [PATCH] Relax error message on test a bit
+
+---
+ test/partial_mock_test.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/test/partial_mock_test.rb b/test/partial_mock_test.rb
+index 065ecb5..3564db3 100644
+--- a/test/partial_mock_test.rb
++++ b/test/partial_mock_test.rb
+@@ -634,7 +634,8 @@ def test_partial_mocks_leaves_NoMethodError_exceptions_raised_by_the_original_me
+     exception = assert_raises(NameError) do
+         obj.mocked_method
+     end
+-    assert_equal "undefined method `does_not_exist' for #{obj}", exception.message
++    assert(/undefined method `does_not_exist' for #<#<Class:/ === exception.message, 
++        "expected #{exception.message} to match /undefined method `does_not_exist' for #<#<Class:/")
+   end
+ 
+   def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call
diff --git a/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild b/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild
new file mode 100644
index 000000000000..8afc3e2e6d73
--- /dev/null
+++ b/dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="flexmock.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple mock object library for Ruby unit testing"
+HOMEPAGE="https://github.com/doudou/flexmock"
+SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="flexmock"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/flexmock-2.3.6-ruby30-{1,2,3}.patch )
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/rspec:3
+	)"
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
+	${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}