gentoo resync : 29.12.2022

2 files changed, 5 insertions, 11 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 8a171fd1c7d3..4edc65afd582 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,3 +1,3 @@
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
-EBUILD webmock-3.14.0.ebuild 2237 BLAKE2B 3235f6789907f086c6cf329f4e31ed234e4f149c7b3403c626ae73153c1f3667202ad876fdd53d99563dd9a291ae0d51f10a2ccd094e8ebb1502f5bc1a807275 SHA512 0debf00d28dccaf7d1dfaa64133c0d6ee48066cb100551012631b1f53bf66cba62b96eae003aa66545b87342e534420384f809b300e7ff386863369437fa9365
+EBUILD webmock-3.14.0.ebuild 1993 BLAKE2B 3859ccfeb43a7a4a895b2a3c3b49cf1a8c5f0fd5f9dd2374d90393e8c8828a0206e2da676046069560ee6c9526c33e351e7e1271dcdbc4b46ea9f57d21294eac SHA512 03186e23bee7308be8291d9f673f8ab1ba5f1db7f8feceb11a59b1fd7aa60aa3f32052106e946e7b569629c343cd8fef7d0d0ca44eb4299e717ee0000127dad1
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index 14e65474461e..5414fe1d25de 100644
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
@@ -30,7 +30,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
 	>=dev-ruby/test-unit-3.0.0
 	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
 )"
 
 all_ruby_prepare() {
@@ -43,19 +42,14 @@ all_ruby_prepare() {
 	# 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.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+	# 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 httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
 	# Avoid specs that require network access
 	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
 }