gentoo resync : 23.09.2020

3 files changed, 6 insertions, 50 deletions

diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index a584bdd25d0a..3869e093e9c9 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,7 +1,5 @@
-DIST acme-client-2.0.4.tar.gz 206295 BLAKE2B 5758a940e91036de04183ace9d076649cce220e18c92abbbf683026fd4fc1d05b3d2c735553648daac0f57f5e4c5c865679607d38f663af7623bd60fac99eff1 SHA512 3e8998ddedc69c6d2a15927be278ef055d1be0fe906c499504ecba811189e5ebbd9c1f54df8692bc0135766dfc8cfbd80f27ee345eab8bcd0126fac62be33742
-DIST acme-client-2.0.5.tar.gz 162456 BLAKE2B e01ffd790f404e0ac7a5fe42ef6d4819387dc810bb5c6856e51810b125f5020c3790003eb99e9560ab1618d7d3a420b63e4c1de9cc98e97a4a742ade6bfde54f SHA512 f2f59f2536a5de918147c3b26285c9498eaf082f67d8e3c96036b61a05e3c265a37d7e23f91c03ef7a02ca99bcfec755bc0a9e2bf766ee7b6ffaae1ad1b7c4ab
 DIST acme-client-2.0.6.tar.gz 162500 BLAKE2B a32b2d0361d202a6a799e5ed61eb310ec51971a7a7e3e5747c0ca37a597114d1964cf336d053277cc45ae91640c706e39a1e70d5dfe77abea5bddd1055c5a0b8 SHA512 aeb2102971f4d09b07f7b9a793ce9a5e35bed77fa50f3c74558e85a81023e6ebe6317e56f5297e8b26fdaedfdb95041b73240a812d849828fdd99c4dc93684de
-EBUILD acme-client-2.0.4.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
-EBUILD acme-client-2.0.5.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
+DIST acme-client-2.0.7.tar.gz 177325 BLAKE2B 607de0c4512f4f369ea3725e8a4116082bfa6b069121c9a5af0cf893cabefc9eb0c05a581d3773f8e8d5023b5a250956b5d596c2c11bab116f75e3e35d96ac78 SHA512 1c77c3380e861976e7e3d1d05d5642fa9bd2275182a41a7de6645b07a61a4055b00cbc6723d633e939458754dbee88802793ad7de80163df9e713996c4e5b378
 EBUILD acme-client-2.0.6.ebuild 968 BLAKE2B 43870427ec3f23e90cb6c69e16baac817641c2860a0930accf3aa21a21075ae4722927002ce94ef8a7d890a458c62a0473b2fdd7887ac944f10d688ff47ef2f8 SHA512 c3b0ca3f9056f2fbc8d924acf2dc3d33d468a18c30a36eb97d097c38462b381178187d61a8f60c04d09df42e2235ef69339441f65d9c93d1e1549b6ddee764ad
+EBUILD acme-client-2.0.7.ebuild 809 BLAKE2B 60fae8740790a7bd14968a03b6c9a65de09c0a45b3d56c8e691eb037f1ffe2176dbf98db555fc76febcc705e3e6c34ad23411ff24164b6e4d0627b9bb9599740 SHA512 9daa30d72fb8ea3e157b1416667402cfe648b9879a32685950f2d2ecd9f22220782886d701bf79e4c32e7bc9e6f52616d9c4cbe39bb2f658d903c13720a5ccf9
 MISC metadata.xml 450 BLAKE2B 981b78d9bd544a21e79ee4cb05bcca1fa3d1c1b85191280a0dc6479c02b34b59fdaff4b07c6e1a30c0dde292374c1b11c69eb781fbe4ef0ab7e0b7bc9bfc1c59 SHA512 eef055abe907321efdcc317ccdb7613ce860e9e41cbf2eac0bde436ca41f6470de49400f837bd0bea0f98ce115ab27938acf95c926d18d1f80b415dd97cbefb5
diff --git a/dev-ruby/acme-client/acme-client-2.0.5.ebuild b/dev-ruby/acme-client/acme-client-2.0.5.ebuild
deleted file mode 100644
index 24a1c78f83c9..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
-	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/acme-client/acme-client-2.0.4.ebuild b/dev-ruby/acme-client/acme-client-2.0.7.ebuild
index 24a1c78f83c9..0ab0d2e5eb9a 100644
--- a/dev-ruby/acme-client/acme-client-2.0.4.ebuild
+++ b/dev-ruby/acme-client/acme-client-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -23,17 +23,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
+ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
 
 ruby_add_bdepend "test? (
 	>=dev-ruby/vcr-2.9.3
-	dev-ruby/webmock
+	>=dev-ruby/webmock-3.8:3
 )"
 
 all_ruby_prepare() {
-	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
-	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
-
 	# Avoid dependency on git
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }