From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67BEA1586A0 for ; Sun, 26 Mar 2023 10:42:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59277E07D3; Sun, 26 Mar 2023 10:42:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DA90E07D3 for ; Sun, 26 Mar 2023 10:42:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF2173411A0 for ; Sun, 26 Mar 2023 10:42:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E8D58E5 for ; Sun, 26 Mar 2023 10:42:36 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1679827352.08de07e693f0c6eebf15a466d5f673c066bcdeb9.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/flexmock/files/, dev-ruby/flexmock/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-1.patch dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-2.patch dev-ruby/flexmock/files/flexmock-2.3.6-ruby30-3.patch dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild X-VCS-Directories: dev-ruby/flexmock/ dev-ruby/flexmock/files/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 08de07e693f0c6eebf15a466d5f673c066bcdeb9 X-VCS-Branch: master Date: Sun, 26 Mar 2023 10:42:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a9e5f09-cf8a-44b4-9544-d66570270ed0 X-Archives-Hash: 6032713087e35f1f00ee7f9554ac3ddd commit: 08de07e693f0c6eebf15a466d5f673c066bcdeb9 Author: Hans de Graaff gentoo org> AuthorDate: Sun Mar 26 09:23:55 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Mar 26 10:42:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08de07e6 dev-ruby/flexmock: add ruby30, ruby31, ruby32 Use debian patches from upstream pull request that is still pending. Signed-off-by: Hans de Graaff gentoo.org> .../flexmock/files/flexmock-2.3.6-ruby30-1.patch | 25 ++++++++++++ .../flexmock/files/flexmock-2.3.6-ruby30-2.patch | 25 ++++++++++++ .../flexmock/files/flexmock-2.3.6-ruby30-3.patch | 23 +++++++++++ dev-ruby/flexmock/flexmock-2.3.6-r2.ebuild | 44 ++++++++++++++++++++++ 4 files changed, 117 insertions(+) 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 +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 +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 +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 #<#5.0"' test/test_helper.rb || die + + sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die +}