gentoo resync : 30.05.2020

4 files changed, 9 insertions, 80 deletions

diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index c7bf5f0e80f2..8f2c569133c6 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,11 +1,6 @@
-DIST octokit-4.14.0.tar.gz 3068165 BLAKE2B e50efa246273422daf5aed8e619465886962d361d129a310974c21bbc683c7444ee99e3dc01c184497683d07a48d852c006ab56c6cd4bea8660f16e7ec5eee98 SHA512 2aff18492c0207b8c7ced23adf0e76260d2976331563e22f7a130445b19b816a00281a86b4161d6709025d058c848ef3f7d1a5c64323954f8c03a59be6f6b132
-DIST octokit-4.15.0.tar.gz 3089749 BLAKE2B d10df675c067f0bfc86bd78aa05e48fb37bdf8d4d5f9317d7463838ec9e870380bc503eb621a02a332b6a26bc1780c5d77955b93c695e18674c792b01aa702c3 SHA512 8616dc97c2aee68ee5919045446ad34d3122bda71f0a9e48a7ef3c04ef2e706bb59f7bd344de9f21f912a927aedfdad11f73119e52f62729173d04f052a0c972
-DIST octokit-4.16.0.tar.gz 3090415 BLAKE2B e6f2addd8e85bc5de685fa644dca607a0f1b15fc007a6525c56605204b8423170918364892ac1c11fb200891aa489c563c52761ae622b847309a9cef3500cc31 SHA512 562b62714022d36d16b0e7f728f1b43ae76ed9f57bc7e74a8805519818f4c7203e0cba71e99202e5fabc8af150f26897f2fdc35e8bd2d09e3b1e578cae5d2bbe
 DIST octokit-4.17.0.tar.gz 3090364 BLAKE2B 42545bdaca8ecbbc3a3e78e70d535c634f20741651d41dfec254dd68254acbc82a992c93314b871d6bae7b4ca8321339b888fe7b5b7349fe9b48dbf6904f4524 SHA512 da6a90e77991d17697424da22c9481027f23f5ecb52e294748fe62c3a7c228412a276a01e6816b201e597b73f271b83e70c4d86ff9ea40c0204dae5c30df929a
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
-EBUILD octokit-4.14.0.ebuild 871 BLAKE2B 680ffc68ed44702d91aa03fa167b90ed724887e9e6115fa6623509c5ea7f166f08db2489ed12134f303a12efb965bdc293e2344dcaa648cd5f447311992d8a6d SHA512 4352d8e8421f01448fc585c039ea9973028ff3151e3949bb2ba628577d723f7f7b72e7629abc5156ec1eb9c04128c61e09c15ead8a9f435fe71701c71832d883
-EBUILD octokit-4.15.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
-EBUILD octokit-4.16.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
 EBUILD octokit-4.17.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
+EBUILD octokit-4.18.0-r1.ebuild 926 BLAKE2B 57d6d75d183e2a451b361f99096cce94f19d19526381bbf03b4310966af43510fc670c659e9826557eeda143922887c70b37bdafaf2c54b396b89f2e8c964e8c SHA512 13ea7f71fbad7a4aa1e1940c51562914ec2c37a82afadde9fe58ef86a2d09edf42f0ca0d316ac2d3ce29932c3861878c7b46b5db5ea40467913cd3d2c044976c
 EBUILD octokit-4.18.0.ebuild 916 BLAKE2B f31fe1ecb2508b059ade36e017a53e3d4e62f126a14a30fe69939160f49c93d54c4c15b30027f51132bbbc0cccf0d4814500c49a017faebcf4069c15a9b62a03 SHA512 e87ef4c75d0150b41f38e58ef979d229c0d68181c6c8352f16c69f99b8196f11219e1b74bcaeeb35e6599a238261038359ec5f346963e7ccd8d634176b9dd9a8
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.14.0.ebuild b/dev-ruby/octokit/octokit-4.14.0.ebuild
deleted file mode 100644
index b1c8864589a7..000000000000
--- a/dev-ruby/octokit/octokit-4.14.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend ">=dev-ruby/sawyer-0.8.0"
-ruby_add_bdepend "test? ( dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.16.0.ebuild b/dev-ruby/octokit/octokit-4.16.0.ebuild
deleted file mode 100644
index 469e4b38183e..000000000000
--- a/dev-ruby/octokit/octokit-4.16.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	>=dev-ruby/sawyer-0.8.0
-"
-
-ruby_add_bdepend "test? ( dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.15.0.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 469e4b38183e..0b3ff206b168 100644
--- a/dev-ruby/octokit/octokit-4.15.0.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -17,21 +17,25 @@ SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RUBY_S=octokit.rb-${PV}
 
 ruby_add_rdepend "
 	>=dev-ruby/faraday-0.9
-	>=dev-ruby/sawyer-0.8.0
+	=dev-ruby/sawyer-0.8*
 "
 
-ruby_add_bdepend "test? ( dev-ruby/mime-types
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
 	dev-ruby/vcr:3
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
-	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
 }