gentoo resync : 22.05.2018

5 files changed, 7 insertions, 69 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 7aeebdbbd41a..7e5b22ab3fc1 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,13 +1,11 @@
 DIST webmock-1.24.6.gem 111104 BLAKE2B 6574d398579dcafe6100d948b0c70fc8a1ca813339e2edb02177dfa0ad11472444d8aeb48b235caa4f85fb4cf4fe746aa77c3b64732ec861ae0d626bda78b8d3 SHA512 9319dcb3c29189403c79870dc8f91f27e099627a9fe5136a98193ee387a6dbcdf72eecb57ec4080faca9575461dfbf4ddecaaf5e1c75cfa60b08732a1d7248cc
 DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e SHA512 bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
-DIST webmock-3.0.1.gem 112640 BLAKE2B 61d74bbc099bdec25e919c07a12824a3bc0761c2b4eaf1180c90bef64856882a69503f10ffc25f153b7d96d6fb2c1699eb0bde8fb94ce41ee0c25f5b47e68dda SHA512 a5924105744a0b09e38501f242f3c19a6c483acdea5792bbe4805d046a4748b9ce8390745837bbf8c8101b1713e62940bda1f9e6b3d63d37b007521c46c521d5
 DIST webmock-3.3.0.gem 114688 BLAKE2B 8306e96cfccbee598f275534effd119e75e3e1729b85936f29b4d4dc118f58c5ed39aa61553cb4c4a7389d704f57e55347d1f54f3cd392610a84683df993cd3b SHA512 589d96c21c1afd05e11f4adc6325d277bbc9a2d25f1ed6176a7b7db88cf94413f470b75fd245faa73ef0a9cb037f52751826b5047f77b41bd03ac72860277902
 DIST webmock-3.4.0.gem 115712 BLAKE2B 85098da0f41f364ca4b329995d6ff6dc2a3a57eca898f030d6a8b316781a13bb1bdd4bfef8649391c80ea2c24a27ae6a05f13b9c725c30a0891c15e06f4b5041 SHA512 fb2472bf018f602436a49ed649302c39d888178a8023e3af0c7b35ae95aaff1c1d0b0d82671ac07bf7d71ee9ec0ab944567ac1640b06fb9505c262b0c3b90558
 DIST webmock-3.4.1.gem 115712 BLAKE2B d2a1c9c6984bdc2b47ce67b20496128e387e10d67d54405649610b0062548bb3fb6422a87d867eebdec22add8242997f654d2c70fdbbf70b11e70451583cc610 SHA512 26cc9376a66730a73059c3a8d496f5d7dd82ac18e7a95172d965ef431c8edd1b4698acd76ba12051a5dc0df3399488920280b669c4ae1d28d3d6cc5e1f7dce0e
 EBUILD webmock-1.24.6.ebuild 1466 BLAKE2B f587bdff85a460a1e915a4bd5c5e0fe2f3861593e0987891dfa5294894bc4003ec1e488955522ef288f7fd8c9702b12f05cc1a24c2155551505be5872f14d900 SHA512 4566f18214c28c0123a244b8ac15f5531fb2a8e2e201d208dd2250b50716d71fcbb9ac39a3e7117987dcdef34582035184784c5da279c6e379cc0f26756232cb
 EBUILD webmock-2.3.2.ebuild 1904 BLAKE2B 252e4dbe833b09e99b348c603130ff9ee26275069c966b7cd220ae14bb3ce57422a49e1169ca55eb7762f8be5a784b9a2d93a216e27229c5ddd00ea680cdbf35 SHA512 59ea58362dec40eb0a0ff66ca584430a20dfd7e2c5af643dede9777359022c2dd7c73b074f706b918f11d915027d9a121b7f5f381ade2db9f7a614e44a93fc0c
-EBUILD webmock-3.0.1.ebuild 1883 BLAKE2B f7c75adb5714716659fe36e30b60022c417578e7a5865cf728d60ed1135ba3890bf5281a1608edfd677970c09413d11dd0399b828bfa71e0b61344d4b3676c3b SHA512 498945faa6f33fefae70996297eeb0a5d201affaf5b39edbdac0df10a77b78ba23ada6b84be70bd0da3fb02911182f6e5c5881625a1518a2024411b99b2f274d
-EBUILD webmock-3.3.0.ebuild 1889 BLAKE2B 9463738e0873db97441cd0388b5cab90be18a6c7f8bc5a69c4845c7eee34329e67d5d53e469037d6e4bcafddba8226cfd05a80b0f245f354013cc91b8df8834a SHA512 775047e6a7a246aac81a22222254b764b61121cfe7f055562197e74b2a77cbec443195edf51feef3b5d34a11f22cb1cdd0e44809d7902e903e56fcd4e43b4c73
-EBUILD webmock-3.4.0.ebuild 1875 BLAKE2B dd7289b1f3d8896641d7468e1cd6b5bb6c01d7e0af21ead48f0247c8bae8926d0146c872f4b01e72ed7f1356c46cb9f3e5a6984c77d4277303e6edb9c9d3721d SHA512 47dffac9a33f4b477ac0ece8fb2d17a1a6e0e1751a86845fa0fe18f6c47ccaeb419a23cb524048322417a59704f3c2b7d20f6e607aad067db7a6a234ee232486
-EBUILD webmock-3.4.1.ebuild 1875 BLAKE2B dd7289b1f3d8896641d7468e1cd6b5bb6c01d7e0af21ead48f0247c8bae8926d0146c872f4b01e72ed7f1356c46cb9f3e5a6984c77d4277303e6edb9c9d3721d SHA512 47dffac9a33f4b477ac0ece8fb2d17a1a6e0e1751a86845fa0fe18f6c47ccaeb419a23cb524048322417a59704f3c2b7d20f6e607aad067db7a6a234ee232486
+EBUILD webmock-3.3.0.ebuild 1890 BLAKE2B d032670314018e0588a6d8faf0c4ae01b89093f48bf56f5d12f3309d3873f9dd5af7bb0cf8403a66247656730b0d2b6b6336f15c5db24c39e350abe9e33bbd38 SHA512 257002e14a6686ece75cd31ef48ec361bc9908e79cfe3e3eddc734b339ab5b32f8a5572acbfd8f34d5338d2ea680b0f77c14d62a3461f5755b9ce2895d50efd2
+EBUILD webmock-3.4.0.ebuild 1890 BLAKE2B d032670314018e0588a6d8faf0c4ae01b89093f48bf56f5d12f3309d3873f9dd5af7bb0cf8403a66247656730b0d2b6b6336f15c5db24c39e350abe9e33bbd38 SHA512 257002e14a6686ece75cd31ef48ec361bc9908e79cfe3e3eddc734b339ab5b32f8a5572acbfd8f34d5338d2ea680b0f77c14d62a3461f5755b9ce2895d50efd2
+EBUILD webmock-3.4.1.ebuild 1890 BLAKE2B d032670314018e0588a6d8faf0c4ae01b89093f48bf56f5d12f3309d3873f9dd5af7bb0cf8403a66247656730b0d2b6b6336f15c5db24c39e350abe9e33bbd38 SHA512 257002e14a6686ece75cd31ef48ec361bc9908e79cfe3e3eddc734b339ab5b32f8a5572acbfd8f34d5338d2ea680b0f77c14d62a3461f5755b9ce2895d50efd2
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.0.1.ebuild b/dev-ruby/webmock/webmock-3.0.1.ebuild
deleted file mode 100644
index c23cf85ffc34..000000000000
--- a/dev-ruby/webmock/webmock-3.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
-
-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
-	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
-
-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.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || 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
-}
-
-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.3.0.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
index c8012a63170d..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.3.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support
diff --git a/dev-ruby/webmock/webmock-3.4.0.ebuild b/dev-ruby/webmock/webmock-3.4.0.ebuild
index fd96b8784366..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.4.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.4.0.ebuild
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support
diff --git a/dev-ruby/webmock/webmock-3.4.1.ebuild b/dev-ruby/webmock/webmock-3.4.1.ebuild
index fd96b8784366..49c52edbb44b 100644
--- a/dev-ruby/webmock/webmock-3.4.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.4.1.ebuild
@@ -29,7 +29,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	>=dev-ruby/httpclient-2.8.0
 	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
+	|| ( dev-ruby/http:3 dev-ruby/http:2.0 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support