gentoo resync : 24.12.2018

3 files changed, 3 insertions, 57 deletions

diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e2a09d1dcd74..974d7d8f236a 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,5 @@
-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.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 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
-EBUILD webmock-3.4.1.ebuild 2040 BLAKE2B aaeb506d1d5dd8c2a52639b80067faaa3ec3a015ebb5bdc453a92f7327907e1445d521c528f572d8dd72a51ef6de8a77b5f71bd1c6d3172a30dc26282e51cf74 SHA512 c578f3119c8e8eaa695f37cf944a27a3e335ed61c03a67f814c74373ffbda423b36f95582f217d598e5f290a7ac73d8c11a1d843605871a9c2122471d8105960
+EBUILD webmock-3.4.1.ebuild 2036 BLAKE2B ef61d4ba1ae9e91db448d5c5de76856956fcbb82d90899deddd88e1e24e8a99bf1d7f6d341b8315501c638766c586e18d9ddcfb2f0a5c2720c036cce61318d1d SHA512 90ca76dd2098cbb303ceff707de48a00fe1d23a6eedb721c156075cf21763700e8e505af062f4f1aa8501553380aa4277c47814605400260fb26b3de6dacb505
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-1.24.6.ebuild b/dev-ruby/webmock/webmock-1.24.6.ebuild
deleted file mode 100644
index c2fe27c55b6a..000000000000
--- a/dev-ruby/webmock/webmock-1.24.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby24 -> code is not compatible
-USE_RUBY="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="0"
-KEYWORDS="amd64 ~arm ~arm64 ~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/rack
-	>=dev-ruby/httpclient-2.2.4
-	>=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
-
-	# 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
-}
-
-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.4.1.ebuild b/dev-ruby/webmock/webmock-3.4.1.ebuild
index 4f773cef98da..0903f6f58536 100644
--- a/dev-ruby/webmock/webmock-3.4.1.ebuild
+++ b/dev-ruby/webmock/webmock-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ 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"