gentoo resync : 30.05.2020

3 files changed, 11 insertions, 19 deletions

diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index bb3035dd1578..99d7a68dd8e8 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,5 @@
-DIST faraday_middleware-0.13.1.tar.gz 25728 BLAKE2B 7899d9115ad4e93ab1dedecfe5147fc425c5f884f66e473870542662b93e616e48392d7c564079fc55dfc7ffc09f5983d8a481894f295b88178d15ac05e2b312 SHA512 ea58c14e4e45cf1118281f42861df2e54c97ed92ab25d1de68a9d9da73b1ace378d464140ac8c0e42c5b36d5b0cd5f760092727c49da26c10b4e2566af9ab768
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
-EBUILD faraday_middleware-0.13.1.ebuild 1804 BLAKE2B 13bcbf5084c41f964f5fea25a7993a7955c6707f56efe0eb42d6438e66f53af60d9d0bd035f1fdb26c156b355ae7e9010cbcbff950202248e7eb7c3953d4ea74 SHA512 650a516e9034f054beabf70ba781deb8ea601926bdf47dde9926d3f5363ca6f2a0447a4a6fd9a505f0aea13fc1a6220c7979868811e6a04893feb6fbf10c65e2
+DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
 EBUILD faraday_middleware-0.14.0.ebuild 1766 BLAKE2B 06dddaf28e89f8fa6be75f51125d472fbbcf2b3e1752e8583785e2930ff737e166fa657314fd4360c06c10ddf481a08c2fa0e7f674ba3d620fb31ff9ce5cf9b0 SHA512 817d213301f0a64684596af1bd4d6878fc3e627955d6b4ad4540ed794623f9f1e26c5e4f671ec326bfa725ca445e577854d498bbea18af1ef6c0cd06a962fb75
-MISC metadata.xml 823 BLAKE2B 3329517a3334e1d682430843b838b09e5deab6f87a485ce05245beccfdfb32c66ccc23cec648074f060162ff107a276007a343950b246140dfc9b1675d63f8ee SHA512 68204a852a7a6eb422d389fdbd15abf5aa2424707329b42d48c0c9aec407a30b9ed0567ae87deffdf1cdccc582c31f9b1fb83bf45569915ff72e351940ffe92f
+EBUILD faraday_middleware-1.0.0.ebuild 1614 BLAKE2B 71dcff66584bdbc21c46687f0c6d236f996e322a7747c3a333216937f0d4166a99d34b3be857560ca65715caeb5dc50fad3b2613acb3c22b600d76a9a3c14b7e SHA512 aea52927254a7c3c25a2b9cdb53f3c9300c53a6cfc5c5ba5d7ce1b46d652ec6b57973af73c712c05d3e1cd713e26f404b69354f0c133ec225fa0e4072924b689
+MISC metadata.xml 729 BLAKE2B 684a1b5173fc890eeb563bafd76307f16fd74207ad0d16b08ea57eeac54e9975dc080dc19341c4cb9afef747d659a41d42cda8a43fa0a5a4f87f835e8cf08c7f SHA512 29fccc8e1b7554d73c75985809b7e9fece60e481f1926f4f8188fec19e32b3c4c02dca2a1fbe30ff2d6264e60a4f88436e3143d5a0137312e396a19dbfe79875
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index d82d4eed3f29..bb5ad693199c 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -19,12 +18,12 @@ HOMEPAGE="https://github.com/lostisland/faraday_middleware"
 SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
 IUSE="+parsexml +oauth +mashify +rashify"
 
 ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-1
+	dev-ruby/faraday:1
 	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
 	oauth? ( >=dev-ruby/simple_oauth-0.1 )
 	mashify? ( >=dev-ruby/hashie-1.2:* )
@@ -35,7 +34,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	dev-ruby/addressable
-	dev-ruby/rake
+	>=dev-ruby/rake-12.3.3
 	dev-ruby/webmock:3
 	dev-ruby/json
 	>=dev-ruby/multi_xml-0.5.3
@@ -45,20 +44,16 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/rash_alt-0.4.3 )"
 
 all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\|brotli\)/ s:^:#:' \
+	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
 		-e '/rspec/ s/>=/~>/' \
 		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rake/ s/, '< 11'//" \
+		-e "/rack/ s/< 2/< 2.1/" \
 		-e "/rack-cache/ s/, '< 1.3'//" \
 		-e "/simple_oauth/ s/, '< 0.3'//" \
 		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unpackaged brotli dependency
-	sed -i -e 's/jruby?/true/' \
-		-e 's/gzip,deflate,br/gzip,deflate/' spec/unit/gzip_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/faraday_middleware/metadata.xml b/dev-ruby/faraday_middleware/metadata.xml
index 308ea2abc418..38d121a1191a 100644
--- a/dev-ruby/faraday_middleware/metadata.xml
+++ b/dev-ruby/faraday_middleware/metadata.xml
@@ -9,9 +9,6 @@
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		A collection of useful Faraday middleware.
-	</longdescription>
 	<use>
 		<flag name="parsexml">Include FaradayMiddleware::ParseXml</flag>
 		<flag name="oauth">Include FaradayMiddleware::OAuth</flag>