gentoo resync : 25.01.2018

3 files changed, 3 insertions, 71 deletions

diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 19470d0da787..0be7b622482f 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -3,6 +3,5 @@ DIST faraday-0.12.2.tar.gz 62809 BLAKE2B 4dcd60192df36e1b9766eab3bcbacd729239b0e
 DIST faraday-0.9.2.tar.gz 57013 BLAKE2B b153188e32ab385c22b011a916125088f56e8dc4ddd5f5fec3b7d0b8fab23900dff4610c642dbe80db0989244952f938d3dfeac0a022493855d6e4ba778d2482 SHA512 12c4ead8dca6baf6292291943ea1aab1a534509bf92c6e0a621c1c69e3493480fced68aa529d8678847028f2fc2a7672411df7e4d09e65a5e764c957fed1ee72
 EBUILD faraday-0.11.0.ebuild 1894 BLAKE2B 42b66ab1eff06f53738c22f7bf0fa8fe4e0e1a170354fd5c9f4a9d7cfdcaf7a155b956e716bd3d5a5cb81c5170a5c67002410dc1061335d23a4c5af870b3a3ee SHA512 7effae5fbd3d5d896e246584cd405bad0e24a934c48955ca49e2dee5db7006560d2655cb74583f98493b2fbf0b7acd322bdfc7286a7c2f3fd12cdd28e74fd3d6
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
-EBUILD faraday-0.9.2-r1.ebuild 1845 BLAKE2B 605eaa1d214c621acb01ab3c580cd3e9863aad6805e4f136cca0e97d834d6e605090d63d69efb6736990a5495e0a75f9c0e0e58cfbe7bd9958c2ca42f040ed40 SHA512 4a977c5aa9ec0187a88b1a8804c5ad94ffaf485f5307c8ab45c01194efc4018bc8f59a8a896b26be15d74be4d94e2b3ee9f0bc5aa9f6636ba6467db01549be60
-EBUILD faraday-0.9.2-r2.ebuild 1842 BLAKE2B 23f7aa9286e6349f4b4ebf422fb03ceed30c91ccfafcef1655a7943dd281c741f09bdb2ee6a465347240f3b5078ad763540d81473fd2eced21dde4aa45c30a51 SHA512 3d67866fd7dbe5b51e1463fea1911833952ab3a9bf2ace4c0882252aa01c986156c47e7a76ed1582b1a3d8615233cab5d62e9995027b1d5f155ab7bb9ad7e0b1
+EBUILD faraday-0.9.2-r2.ebuild 1852 BLAKE2B 224eb26b782e7f9dd3ddb581e171327808a6de0f0d3b033043f795436e78320798ebe64894fe0fa94385d63eb3aa340ba2733383e2d722c4cf695c97b419c7ec SHA512 a3a63ff39b478748b03ecbf3ff3a59246d51b1f421655893c6432c3fb5f4da7218ab772ca6e8900a260d2d5e6d8a920edfd06d0656328a9f1b182a8a3314925b
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild b/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
deleted file mode 100644
index 7c79c02e334d..000000000000
--- a/dev-ruby/faraday/faraday-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-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:^:#:' 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.9.2-r2.ebuild b/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
index 673d327b9a79..b30965657cf1 100644
--- a/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
+++ b/dev-ruby/faraday/faraday-0.9.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"