gentoo resync : 02.08.2019

2 files changed, 10 insertions, 12 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index bbc7f398f07d..fada58aa0a03 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,9 +1,9 @@
 DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e SHA512 bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
-DIST webmock-3.4.1.gem 115712 BLAKE2B d2a1c9c6984bdc2b47ce67b20496128e387e10d67d54405649610b0062548bb3fb6422a87d867eebdec22add8242997f654d2c70fdbbf70b11e70451583cc610 SHA512 26cc9376a66730a73059c3a8d496f5d7dd82ac18e7a95172d965ef431c8edd1b4698acd76ba12051a5dc0df3399488920280b669c4ae1d28d3d6cc5e1f7dce0e
 DIST webmock-3.5.1.gem 116736 BLAKE2B eb6531dd481588419932a93d091bf2c2802d98a9abe650e892e568f13a642c61ccbf395e293fb0b24b2e96f464902f8311d03a7afe84e917c4780d2da6000a78 SHA512 6096ebe84140e7385ac941c2f63951d19523b2f7e3330fb38181f19c423b4c4d47828d200d8921e02850374b048902191f96f8d693746bcdf284cf0c5eacd924
 DIST webmock-3.6.0.gem 117248 BLAKE2B 251f80c90777deacc24588a947426252522c3b4ec1670e77801391e9ed495cc7790b2f7211abc728ac357b2876fbb16b654fffe410c5aa3e837c46e927f031f7 SHA512 4bb3ed9cf7e67c1560c1835e26275657b28b40e3f95dbe50156ce1960e418519020675b6ed07e80521d85ea0b0e53c22d674b7b17b4c9349ef62c089e6bc7891
+DIST webmock-3.6.2.gem 117760 BLAKE2B 132b700323cbc4e753406ccfcc69375107c1d8546fd71bacf13db614d1818926321e2cd27dfc08670f908e0ac5946b06892138c2701fb1f27cfcf9fb6dd56c3d SHA512 1d6141be90840d01e3d7b8e925e0a981ac715fbca1219dd35edd7cf3bcea1c1da3442aaa131e3586f0827a7b06207314119c1f47e6ae64f11f154c70ba6fc5c2
 EBUILD webmock-2.3.2.ebuild 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
-EBUILD webmock-3.4.1.ebuild 2011 BLAKE2B 698d63b3fbb0b709284749f8a64d8f61212369ac9e5bc2c4e5296baf7b4e99d37ba3984f3a0fa4c550ed4e53ca8f7a139af9a4deff10b547c7236b376aec48d2 SHA512 aaee3d9c2e18d934fcf0f76eacf81ab1d14d67020b3296e3407c3b71a9baa735c0dfdd2344878f1de9e99494564e2798001e9f0e60f7e84929b2315317d9f3ba
 EBUILD webmock-3.5.1.ebuild 2073 BLAKE2B 42d64131855d8937a8c263e480b1bbce34abf325275726cc561330b2613db4d063ec12ce1b089c58cfeda2fb9ecd45e647f774ad2ab894ae9f68460f85455681 SHA512 eed21d9c9828d469a1bdf5981a760fa3001b0867d2a7113f465146fb8407a2131a339a2eb27e3df2833df3d52f8172cbbee862e5773d612a6d2c5613d2247797
 EBUILD webmock-3.6.0.ebuild 2075 BLAKE2B 61eea02d96a1c15354553c7b173da7f2697c4259464d7258b30ea3ba66c90fa342f13fbbd4a075669ba55ac94b660be4b7bd971882d10b25991b1f1c51f0ba0d SHA512 6f728b7c95195a1990d23bfe6e10597287d55d8a8c948b5163f1a7f478d283f63465a6f3c4fd5343ac476f7fc2d201eab75a7a3c8ade9c587cb133a90fae6c92
+EBUILD webmock-3.6.2.ebuild 2046 BLAKE2B 14d4550b298f48974a8f8cff3bec4c8b9617fa0130143064277f79822e5037a49055091cf52deb27857ececf59028411336742d099af7f3867a183801cb01ebb SHA512 09f60ff68edff5d8d31f5634fb7d51d09f4c14eae8653526ea18b89d8f84956d56e14cec7f1f906c6c02209211245d636ef37167fe007f865e4ad439cd6dee30
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.4.1.ebuild b/dev-ruby/webmock/webmock-3.6.2.ebuild
index aa577637add2..ae657834d2fe 100644
--- a/dev-ruby/webmock/webmock-3.4.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.6.2.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 inherit ruby-fakegem
@@ -17,10 +16,10 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~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_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
@@ -28,8 +27,7 @@ ruby_add_bdepend "test? (
 	>=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:3 )"
+	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
 
 all_ruby_prepare() {
 	# Remove bundler support
@@ -40,9 +38,9 @@ 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.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
+	# version is too old. patron's latest version is not compatible.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron}/* || die
 
 	# Avoid httpclient specs that require network access, most likely
 	# because mocking does not fully work.