gentoo resync : 08.10.2021

4 files changed, 2 insertions, 144 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index cde4e910f767..2ca8ebf1a40a 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,3 @@
-DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
-DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
-EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
-EBUILD webmock-3.13.0.ebuild 2228 BLAKE2B 1ada6f3cac704d1910982f18cf93c1e8d4476bde20f5aab6faad756b252a2c2faa288f187978e6c841c5b1e390b63eef10afc6820f05702cf2a0d069c7d5ac0e SHA512 3c1ffb3a8822ac4fe9665b54ac73a7661fad6eee9c89455ecbc15c58640d20f61917478f1ed683139dca31caf76a93331024e5ef10e951fe9d54047b4aa8c1aa
-EBUILD webmock-3.14.0.ebuild 2221 BLAKE2B 91111eabe39203394a22af2877f9e48f39929ae4d273023ed08e5bde75b21bb4585f8b996c6ca1b777b41b35d908400a75641b533aa22596708914c426129be1 SHA512 d8347fa5d8b2d44a1ada17e7eb842191fdc2daf4a4b99dc71d5eeae9129398676205f9557b3fafb9e5ff7ca93343e6cdd3619399462fa350575e0f8f610c76df
+EBUILD webmock-3.14.0.ebuild 2219 BLAKE2B 48b0fad981181e8805072819fbee69dbbfd39c732e21096ead6a2bdddfbbc10c21cdc882c4a5f0c176afa430e0ca19b65014ea6446f59d2f18e0d0f7bd910549 SHA512 a933fe80cd76b05ac090ba64b26dc8e1457b9574579a2d0570cfcf0c4a3fd8bde9499ed6a69248c291b957a902ef22be191c3213dccec6ac343db20c08935294
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.11.3.ebuild b/dev-ruby/webmock/webmock-3.11.3.ebuild
deleted file mode 100644
index 66f1095e9dca..000000000000
--- a/dev-ruby/webmock/webmock-3.11.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3.6
-	>=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/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-)"
-
-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.
-	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
-
-	# 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
-}
-
-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.13.0.ebuild b/dev-ruby/webmock/webmock-3.13.0.ebuild
deleted file mode 100644
index 37392b1c43dd..000000000000
--- a/dev-ruby/webmock/webmock-3.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3.6
-	>=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/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-)"
-
-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.
-	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
-
-	# 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
-}
-
-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.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index 2753db5ef78b..13090d6562fc 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "