gentoo resync : 24.12.2018

6 files changed, 13 insertions, 221 deletions

diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index d744ea49ff53..ca8af5d398b4 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,13 +1,7 @@
-DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e09d9e82a73d825c750fdbcfae8161cf803f078b841236a5e18b1849b4cdc34e6adebb9eaea0f0442cd65b2e74 SHA512 966fc419d529a8bba5caa6d3932ee94f7b248110edc880b532860c24abd70cb50182e40b94b4143e26575c6db7ce046fa71ac0d25010385d7f0c3dda87f39439
 DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2eb4d03ac7ad04e1873666db9e2cec1e6eb9887364874ea5f32d0313019d1eada5e05e25e0415bdd5aa2bcfca97 SHA512 25bba07e76a2a8bf02b0c81c045329e72d5911a2aacae56611db33dc25c89bd48bb1b4de9b20c6edc1514d3ceae8b06fca6076c85580533047c222cb30ef8dc7
-DIST faraday-0.15.0.tar.gz 66086 BLAKE2B 5018d8e92b2988b08f4e7a5b0876ca6cd4049c74199ee0356adc48867611fd6d30d884bd3cf3e7703a02c7a6e967f9c47cdc44deb75045b8cee46992977fb834 SHA512 46602d89b1bbf5a41143a9a71fab193642e7c41db39dc1edc0efb99f4a7a924c5a698460a0a4f921f7ce1f73ee8eb12e6d79a08dea02c7142856d0aa1b95b521
-DIST faraday-0.15.1.tar.gz 66461 BLAKE2B 476fa62bf9cf138fd52d0d455d7bdd970d77f0337ec1cf42f7833def9ba77a3e94f0bdbbda4136ac03c5a98465081e3093c6a7a6e193cbd7494a284444516679 SHA512 cb4a14b29b88c356063e2d504e0a93b84b33b6488060a313b2eb6ecbf17eaf09c6fb0e0fabd0bb057623438de2a8538034551d62d719a1c90b6158a768f38a1b
-DIST faraday-0.15.2.tar.gz 66765 BLAKE2B 8cfe4c6c4f2bb1f0a5fd6a196d339118b09d67b8cdac0c258180ea03c39688af17790c7a15fb4dea4dfd4980c039f987464b2ba7e64c04931e9c31ac670c3618 SHA512 5911df09e770c4ee97f2c6c359a4136c268c598cc2f370a3aa112b5710c6c6b7f2704d3094677cd98c44532e3f0d6157df88e1c882d727eec511f4b62a04527c
 DIST faraday-0.15.3.tar.gz 67065 BLAKE2B 7425fb885cb26394ee91098264b5e4e3038a68855b9a55b03a39faca18d4e0cd516fe447b2312538692229bb15df091317ee36aad762937b46c72e16bb19cc8a SHA512 cfc59c44481e4be27504d02bfcbdc3a3783d15940487e72aaba136f5c456d74be6cad5a686e74eed1ad216fbb58db197d04015c2d168abbbaf899c4f855acdbd
-EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
+DIST faraday-0.15.4.tar.gz 67196 BLAKE2B 4e64e834639a6e59c028ee19d72f51ea72fd6b3be5fc63b6fbbec25716dbd735e97d8a05a210dd1a57b740a1dcd76d30a39b59c7034cab8a531f8856dc132b14 SHA512 6d1a8c66bd6e2ce417ce504bf20ea89cf24c46c2b48491aba110d04f273448e0e8f0cf94a0dd5356a13876aa030d41bbfb80b95365ea4b212fd79d8db624128f
 EBUILD faraday-0.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
-EBUILD faraday-0.15.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
-EBUILD faraday-0.15.1.ebuild 1913 BLAKE2B cfd15b1bdc9ce8a71f4828cf9306ef20b92d246ef3e23dba227d081b2479dbb1448f46445c948d49e420ae07de3ac9175f0bf8993484375c7215c523c5b95089 SHA512 a712106ffba7548c7d5ab0039794c3779107496371a45b8e230241603f800bb95aa3f353ecc916fc1698c7a5240493f03a9378c8eb91b4afbb087de68e536f59
-EBUILD faraday-0.15.2.ebuild 1913 BLAKE2B cfd15b1bdc9ce8a71f4828cf9306ef20b92d246ef3e23dba227d081b2479dbb1448f46445c948d49e420ae07de3ac9175f0bf8993484375c7215c523c5b95089 SHA512 a712106ffba7548c7d5ab0039794c3779107496371a45b8e230241603f800bb95aa3f353ecc916fc1698c7a5240493f03a9378c8eb91b4afbb087de68e536f59
-EBUILD faraday-0.15.3.ebuild 1885 BLAKE2B 9e4817596b2f93e7f41f972ed65c44719687b35d92d37a42798a4083f4d38460376d7a7a05c5c9cc3c492f8b2725a595d3e48d27acdaaeb893c6754c983b5781 SHA512 0bd2ac281734b897be79794cf4bfa2a880f36eae4f6b91c7c003d719d167071991aae6ebd9e8abbcf2893d89326844041a5c4464dba6e401ffadb17cd2c549a0
+EBUILD faraday-0.15.3.ebuild 2014 BLAKE2B 2ddf21327dfc2f04a4ff0461a31fa3cc3528a199a112e86bff697d43e3a810dd595de48cf60d8be86c82d1c7667d75416955964bf048da33ae551cfc4795abe8 SHA512 2b21286bfccf32820b59667aa23d9f519200cc1f143bcfddb8ca6a0b4549c3a9636c7dd59e5bdc6d9c9de42adae745e6a948193313899030f19d3f4d728d21ef
+EBUILD faraday-0.15.4.ebuild 2047 BLAKE2B 1a2b1fe6800179672d9d1ae360a945348c2b71c9f60054b9d825b813d7793467a9404b349c83c119b285c5c98a17d85569859783056962a40ea900d43e4493a3 SHA512 2b7829fb1562edb31d1875786561abec8867606cdf326b61fcf7fa208ba5eeb2e966071fb747315286d08d5e8db29cde5d368065f85d192a26d5766af72f4aeb
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.12.2.ebuild b/dev-ruby/faraday/faraday-0.12.2.ebuild
deleted file mode 100644
index 1de4dadb0f3c..000000000000
--- a/dev-ruby/faraday/faraday-0.12.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.15.0.ebuild b/dev-ruby/faraday/faraday-0.15.0.ebuild
deleted file mode 100644
index c3f9a9825f02..000000000000
--- a/dev-ruby/faraday/faraday-0.15.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.15.2.ebuild b/dev-ruby/faraday/faraday-0.15.2.ebuild
deleted file mode 100644
index a09a39790424..000000000000
--- a/dev-ruby/faraday/faraday-0.15.2.ebuild
+++ /dev/null
@@ -1,69 +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="test"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		dev-ruby/httpclient
-		dev-ruby/rack-test
-		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
-		dev-ruby/patron
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
-	# Remove simplecov and coveralls support, not needed to run tests.
-	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
-		test/helper.rb || die
-
-	# Remove tests for adapters that are not packaged for Gentoo.
-	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.15.3.ebuild b/dev-ruby/faraday/faraday-0.15.3.ebuild
index c12dbcec7c0d..c17052d85c42 100644
--- a/dev-ruby/faraday/faraday-0.15.3.ebuild
+++ b/dev-ruby/faraday/faraday-0.15.3.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
@@ -48,6 +48,9 @@ all_ruby_prepare() {
 	# Remove tests for adapters that are not packaged for Gentoo.
 	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
 
+	# Remove tests against live services
+	sed -i -e '/test_dynamic_no_proxy/askip "live network test"' test/connection_test.rb || die
+
 	# The proxy server is already killed, may be OS X vs Linux issue.
 	sed -i -e '138 s/^/#/' script/test || die
 
diff --git a/dev-ruby/faraday/faraday-0.15.1.ebuild b/dev-ruby/faraday/faraday-0.15.4.ebuild
index a09a39790424..6ea5115a095e 100644
--- a/dev-ruby/faraday/faraday-0.15.1.ebuild
+++ b/dev-ruby/faraday/faraday-0.15.4.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
@@ -31,24 +31,26 @@ ruby_add_bdepend "test? (
 		dev-ruby/httpclient
 		dev-ruby/rack-test
 		dev-ruby/sinatra
-		dev-ruby/net-http-persistent
+		dev-ruby/net-http-persistent >=dev-ruby/connection_pool-2.2.2
 		dev-ruby/patron
 	)"
 
 all_ruby_prepare() {
 	# Remove bundler support.
 	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile test/helper.rb || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile test/helper.rb || die
 	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
 
 	# Remove simplecov and coveralls support, not needed to run tests.
 	sed -i -e '/simplecov/,/^end/ s:^:#:' \
-		-e '1igem "rack", "~>1.0"; require "yaml"' \
 		test/helper.rb || die
 
 	# Remove tests for adapters that are not packaged for Gentoo.
 	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
 
+	# Remove tests against live services
+	sed -i -e '/test_dynamic_no_proxy/askip "live network test"' test/connection_test.rb || die
+
 	# The proxy server is already killed, may be OS X vs Linux issue.
 	sed -i -e '138 s/^/#/' script/test || die