gentoo resync : 14.05.2020

5 files changed, 6 insertions, 155 deletions

diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index b912c88c5e91..04129ce87511 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,11 +1,5 @@
-DIST oauth2-1.4.0.tar.gz 21299 BLAKE2B 1fe4640b374450279e556477c23972030d3aecac4c96e9174e57458deaccfbfa012e3bb66fe3db5e845a4004b91b763dab6f68b885ed7c1ddb2710cda29a8486 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300
-DIST oauth2-1.4.1.tar.gz 27946 BLAKE2B e6edd113db26bdad09697c45efa5490bfb49b5c3fafdb7337c5f5c2b135025cc43fe7de450b3e106c6abfb8acb3afd676181ebd6aa1c18f6c5255597b04006df SHA512 14c039d19bcd177506e2f6189797b1791b54bd3fbe53973ad471c44744e3179c02e2f7a855a0cafe332e66819f1708d86c1dd89cbe57668ad642efa49e924b25
-DIST oauth2-1.4.2.tar.gz 27168 BLAKE2B 687149a111247a9636985447e82f5776ed42333e85bea6e0c61ff8f05759ba66dd1d418ca6efd7f1b5de5b56a731f889fc53f3413f5fd426b73ee6d4ef9ca929 SHA512 14075637431c6636a51d49930eae14c0328b0325add4829703d539c70b8cc35285acb02948a90717ab44f9153a0a9425b2d1b6559641b790ec133935904391f6
 DIST oauth2-1.4.3.tar.gz 28278 BLAKE2B 6d0055875073dca48e94a0449a5fff22b7be280c5b2f8e0b5b3234b3c8b079fde0671e211b0eb8d562bfc0cb437917adccb3f13c38450a8cd6a43f0f1a2373a5 SHA512 6ffdc7675ed301cd52e3320c01723fe2530a9dedc2b1fe534b42d01dacb7d4b017d79dbe0f9768f06ed8ace7ba596f9824a38d5509e82d09a3456f3a6b1fe453
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
-EBUILD oauth2-1.4.0-r2.ebuild 1393 BLAKE2B 8d85f689841ea25380c6c22cf8aa2b0abadb615e6df260980901790ea77718f11c28055a47863593f4b13f163d2afa15aa0cd6098c896a946f16f6f22b0822aa SHA512 9b68eedf5b6305ec3c87d441c24a43ea0129afc57bfc7547a0a493ccce0e4ff51052a41811b1f5eef946e8683aae8c32002d1a8bf1bf4bccbeda25397ca9a507
-EBUILD oauth2-1.4.1.ebuild 1407 BLAKE2B 71f2f6bc31fe735d4f9a9f5f8f1f40ea9b4d6ec7fe1663a0851936dd440944e0881248130a51bc350f1ab65cb8c052af68ddb818e1ae513c22924e570905d9dd SHA512 c0f7fb8eee1453e790c815f143c978adc07075f566da7d08e52a63c67e8bd27380e897ac419c14d98c42c3a187736fee9c42c145d95d83494b829ad067e60ac3
-EBUILD oauth2-1.4.2.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
 EBUILD oauth2-1.4.3.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
-EBUILD oauth2-1.4.4.ebuild 1411 BLAKE2B dadd213629a0223a6d540bfc6fd4a1581d9a328ba5be8d28250c3bcc5cc990f307f8a59950b5a55496eb70fb756d3daea3c1d1aa7265e6986e8be01ba492055a SHA512 317937a7c11632ff2665eb52f171196e3022a4d82481048d3017a368335e15760b909c638faa2833b3dbb899a80138c5e81c6ff77fabff2e2c7e7e5a453f0539
+EBUILD oauth2-1.4.4.ebuild 1441 BLAKE2B 429bfa3448a7eea2c5eba926c8834df457f73d31e1c9a3fb54e6739d8fb96228d1968548cd42bd934e8923614fbce8a5304ed7c8f506280d3e2fc82c92d96060 SHA512 b2b07b1348fc2243556ee02e5534317509570d872c75862299a63ec7af04e170a68a135dd6017d5c254959415b958d7f4a3040d821e98043f62824d51997a617
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild b/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
deleted file mode 100644
index 283663a9010b..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/faraday/ s/0.13/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.1.ebuild b/dev-ruby/oauth2/oauth2-1.4.1.ebuild
deleted file mode 100644
index 93742d94245a..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +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_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.2.ebuild b/dev-ruby/oauth2/oauth2-1.4.2.ebuild
deleted file mode 100644
index f046e1a04dd0..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.2.ebuild
+++ /dev/null
@@ -1,49 +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_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
index 97bbd0773f1d..50da772debc5 100644
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
@@ -28,7 +28,11 @@ ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
 	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
 	>=dev-ruby/multi_xml-0.5:0
 	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/rspec-stubbed_env )"
+ruby_add_bdepend "test? (
+	>=dev-ruby/addressable-2.3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-stubbed_env
+)"
 
 all_ruby_prepare() {
 	sed -i -e '/simplecov/,/^  end/ s:^:#:' \