gentoo resync : 25.01.2018

3 files changed, 6 insertions, 66 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e86a3ef4c629..ef29a7906e04 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,13 +1,11 @@
 DIST webmock-1.20.3.gem 99840 BLAKE2B 97c03e0c6b87f23f321658f0cf0328bac3e44c3d3270770335ab4a8938282d9af3f378997c43501b589eaab2154bb31651d5a86ce590b645c25897532ca0f5b3 SHA512 db9d770636dabf95b3a03a6589a259c1d66d875dba0cbcd493acf6bb35649c885139528aa5a8976d7ef438bca761e1063ae0fcf1da5b799e8d45abf1986c000c
 DIST webmock-1.24.6.gem 111104 BLAKE2B 6574d398579dcafe6100d948b0c70fc8a1ca813339e2edb02177dfa0ad11472444d8aeb48b235caa4f85fb4cf4fe746aa77c3b64732ec861ae0d626bda78b8d3 SHA512 9319dcb3c29189403c79870dc8f91f27e099627a9fe5136a98193ee387a6dbcdf72eecb57ec4080faca9575461dfbf4ddecaaf5e1c75cfa60b08732a1d7248cc
-DIST webmock-2.1.0.gem 111616 BLAKE2B fd1583c5050052f234cacf7cba8d99b252b09d5ef777b46b158715d56bdebd94e77ae081e616a9fcaa84fe29115a8663b6ad06f7e6ed228882ef832e87a295a4 SHA512 604318766d1a23e76c03e0f39bcdc28aa0a23cba14bd8b5a3b33894aa30ece1d5ac56456500143745a2751ddc7bd0424ef195c82b78d66b5e28e10d5059facfa
-DIST webmock-2.3.1.gem 111616 BLAKE2B b957d86b4e1df68c62cbcedb87461e3a709c6ca229488a683f18e8bcc49412046c55d2829c319d1c98b2ee89cfa2f2856611cb366bb38ebfe67084c692479a93 SHA512 b51583a67da44a2aa0c616442f03d1066d9e9270b0cb0fbca48c30d06cef4c008c6fe29186951916afc2b8bccec92a510d34f7a537d4d6889b16e2ad779eb627
 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
 EBUILD webmock-1.20.3.ebuild 1660 BLAKE2B b3767cb74310f20c353dc334db87ed92e1e493c253192eed2ff9b6fb6bd686f5f6414150f403a79d59a4ca27e46c151dc24b245a33fbb70035e0fef07cc8ec4b SHA512 37a6e9e64f09e4da7f0728ece05333d7f4f4f23e720b2c038ed0f5595ea8b2c5af5496c204566c543e8a7f4319aeb31e14839b9499e2c038910e6e88579f6eaf
 EBUILD webmock-1.24.6.ebuild 1456 BLAKE2B 1f12d2f7707e6101fce94d251f621c8dad5b6693c34baaba8d338e804cfc2335b4de7fe95fbc5dbe3bb2490245b04f86d239a1b5bd4b96ec759fbc1b5ee9ac8b SHA512 866f3cad0c9a574bfc21f05a87e48c06e4b6a0053e4809c027b392b3d77117af96ff8a9f6b35a71c14c85890442378045867bfb0b3c39cdebfd14175a2aaaea5
-EBUILD webmock-2.1.0.ebuild 1787 BLAKE2B db74f315fe3d4fe30317cb2e30397a838d65b4952d0b10ef5ed309bbaeed09d59811e1834c728d9dc2e2da645c8168c1b202855e3e6ed9078b30de2e7c515f81 SHA512 a32982f49769a09ab25a26264dbbe4eed1b91953d7341da4c8649b64e45c8cc333df255d2a4405d68200aabca2a2271aab1100b7f483e7cc901046d92b3cf494
-EBUILD webmock-2.3.1.ebuild 1873 BLAKE2B ec7ce5e279fcf889d97048f84e2c96c2afadcc18e3883cb4bb8343d3ac19f82df4b8825563792978cc5e19de287b78922521b43baded431cf4bcc82f98f1897a SHA512 592d886e33c19b031bd2ae07b606e3595acd30d163ef2cdb2ddbb2f6c9810d0474ac057a9a263f644884b5e50939a7d8772331903a2806705e13542f5c2646ed
 EBUILD webmock-2.3.2.ebuild 1866 BLAKE2B 2f574e1e4112eba2db2628352bd8c5329d79027c605a067b5912fac6cacc9cd4a947e107834e1b7eb5a496cb4ea8e9384827466f5e0792c86ba3f13810a186d9 SHA512 db08d6460f5dfd2169b9d4cb48a43763e487710460d6e8ae3d1a1e0609a1e33c2cb558bbadf61a72260d06f06337cef84f2250948de7438eca00c496fa6455f4
 EBUILD webmock-3.0.1.ebuild 1873 BLAKE2B 3862da4943bf189fcba2ee9c3aa5664de32f1a7aabe1ec79345e2a41be8c737fa420d020ece69d1f82bf34300cf7138a36d8a8178d18e082a2ffaeb3b8378683 SHA512 b372ef9e38fb810c123f87622c868bf2e586eb1bd627fa28164fd0c029fcf56f9c1b8062599802ed71d5fbac945845a1a511a32ddb0afc26f95c4fd2a2ba9991
+EBUILD webmock-3.3.0.ebuild 1873 BLAKE2B 3ed92b781db87b95d4d5649d12e9f996a824626b1c875136a0d6b18c02420cce10c1a06e66b486a9126e11a1484cd0ef8da9750043b54d8582ece2dc07f9c973 SHA512 60dd68a4523175bb6c830df1e14ccbbef87bce20e2fdec1d20b9b750cb2342a20651594cbf7b55b404e5c547ed434e97cf5f0bf1d4ed37f88738144e722be116
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-2.1.0.ebuild b/dev-ruby/webmock/webmock-2.1.0.ebuild
deleted file mode 100644
index 5c08f91a32e6..000000000000
--- a/dev-ruby/webmock/webmock-2.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-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="2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~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/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
-
-	# 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-2.3.1.ebuild b/dev-ruby/webmock/webmock-3.3.0.ebuild
index 1323145338f2..b71d7065dbe0 100644
--- a/dev-ruby/webmock/webmock-2.3.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
 
@@ -16,7 +16,7 @@ DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requ
 HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="3"
 KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""