gentoo auto-resync : 09:02:2025 - 00:12:00

3 files changed, 7 insertions, 72 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index ed8fed876f57..14c65b4f702a 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,5 @@
-DIST webmock-3.23.0.tar.gz 129686 BLAKE2B 28210f5836af9b3ad66edf84380c318b055817602ee03001929613678fcad799f1a5efb79e09ec78a4aae74e162d14f8efe80b8917869392c99e590ac9cfac9f SHA512 39e8f85e0bb5ee2a497e3ae88ba8aadbbc72bee304f095c82502662cdb676cf5d00732eb89dcb75ba31ca5ab4fd87011687250df081071f43ea3486214b395ab
-DIST webmock-3.23.1.tar.gz 129740 BLAKE2B 4caa29d6bba6e5f608ecf6d84e16f2cfe0565158a3f26bf98dd78a2706ec4b64e87f4a87733334c586e8cbd5772ccfdd545af526e4a9dde5fb849b2090f76a87 SHA512 db6c551f52dc81feb212d1e5690106d93794feedc8cf716d6e9b8780b53950260999b32e17430ebf4312ab8b2051c034bff718bfada35c176ab3f1bfb521d2e4
 DIST webmock-3.24.0.tar.gz 130722 BLAKE2B ced1cc29e472a2f0f35012c5ebabb7ec2b1bbf7711c394a25433325d98e97abcafb4eb94b7a013bc6e7b7ca9bff80981ea3538693d451264f5444f6156dcef7d SHA512 4fd6e02c4ea4f7031a82f15c2cf222959d6040981440d335f4e186dc8af0b413a14652126c104c384277d78cef718bc05a97dc397dd7d2166ddaafc030efc486
-EBUILD webmock-3.23.0.ebuild 2102 BLAKE2B 54340ba885a04a580a9d10004d9b898db5594f6930ae0e484d51d156420e31421a57af0e6108a9ca84e9a0d3c9fd83162067963b4e65685fb2bb4a01fe81ccb3 SHA512 6db078cae6aeb895bb6b32dc7b4965ddd4f3c59b9f446ca12eff01a604f278f1db5db5e7263b85ecaf2083b59254b6b1cc10ad89d264350bc84ec38b56b61577
-EBUILD webmock-3.23.1.ebuild 2109 BLAKE2B a51cf004c30a44f53ab5af7166ef05df44e4148a722710e2be3dd63c11d105bf202fd1ff67b0449dd73b3612d9f5dac6d10c81d882e1d22fc6ea257fede7c1f7 SHA512 bbb99296fc8913e5e48ad67bb8f6e5c08e5d0a5a70ab002e288ea173c5567e086a82caa8228fe21144f241b6e46ff365c9b66902be17b6112c7d44bbbe683bbe
+DIST webmock-3.25.0.tar.gz 131242 BLAKE2B 80afb85b1853053837d936e3f76ba344e2766124c367fb5ee60edf9433db845346065f2a466d9ac14bb5a4264c4820b26d1b8678f72b9e8cdfbd9f23a08a9efc SHA512 60edd04a17e3aaaf783215f43b87d4a66b65b36522ef3c7520bb064aa9c2965dfb62b2b53d785df77c98522969d534b57d67c49b7719906675ca46013207685b
 EBUILD webmock-3.24.0.ebuild 2102 BLAKE2B 54340ba885a04a580a9d10004d9b898db5594f6930ae0e484d51d156420e31421a57af0e6108a9ca84e9a0d3c9fd83162067963b4e65685fb2bb4a01fe81ccb3 SHA512 6db078cae6aeb895bb6b32dc7b4965ddd4f3c59b9f446ca12eff01a604f278f1db5db5e7263b85ecaf2083b59254b6b1cc10ad89d264350bc84ec38b56b61577
+EBUILD webmock-3.25.0.ebuild 2259 BLAKE2B f1ee4cae74822334593096e9f733fa5b55169377d5ea95b67225dd9e9078c2407e8904d07e01767da633de65dd7391a13101d43b6a4e59fbee2b0b65027505d9 SHA512 1046a485bcd77eaa5e385b600b23c380a62d53fbdd7057c4af63eec2da0dc88b1b0bd69acaabb69736ef42dba1e4ba66af217fde6cf0f7ec249749f269abd5de
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.23.0.ebuild b/dev-ruby/webmock/webmock-3.23.0.ebuild
deleted file mode 100644
index fcbdaa990459..000000000000
--- a/dev-ruby/webmock/webmock-3.23.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="webmock.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-SRC_URI="https://github.com/bblimke/webmock/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.8.0
-	>=dev-ruby/crack-0.3.2
-	>=dev-ruby/hashdiff-0.4.0:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	dev-ruby/rspec-retry
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	dev-ruby/webrick
-)"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	# httpclient is no longer maintained and has various test failures.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\|httpclient\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client,httpclient}/* || die
-
-	# Drop tests for dev-ruby/http for now since this package only works with ruby26
-	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/http_rb/* || die
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.23.1.ebuild b/dev-ruby/webmock/webmock-3.25.0.ebuild
index 475a1b5900b6..c6538b30cf0e 100644
--- a/dev-ruby/webmock/webmock-3.23.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,6 +56,10 @@ all_ruby_prepare() {
 
 	# Avoid specs that require network access
 	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+
+	# Avoid flaky spec
+	sed -e '/should only invoke the after_request callback once/ s/it/xit/' \
+		-i spec/acceptance/net_http/net_http_spec.rb || die
 }
 
 each_ruby_test() {