Fix broken tests. Install documentation. Fix broken dependencies. Remove code that modifies the scripts since we don't use or install them.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 41 insertions, 15 deletions

diff --git a/dev-ruby/faraday_middleware/ChangeLog b/dev-ruby/faraday_middleware/ChangeLog
index 59dde4e71de4..ae295413e6cf 100644
--- a/dev-ruby/faraday_middleware/ChangeLog
+++ b/dev-ruby/faraday_middleware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/faraday_middleware
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog,v 1.1 2015/05/24 22:56:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/ChangeLog,v 1.2 2015/05/25 05:14:26 graaff Exp $
+
+  25 May 2015; Hans de Graaff <graaff@gentoo.org>
+  faraday_middleware-0.9.1.ebuild:
+  Fix broken tests. Install documentation. Fix broken dependencies. Remove code
+  that modifies the scripts since we don't use or install them.
 
 *faraday_middleware-0.9.1 (24 May 2015)
 
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index dd9c987eaf0c..d8d50e7daf23 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST faraday_middleware-0.9.1.tar.gz 20960 SHA256 2d0b7b205e46712addeb6f8c154e7376c4d3c17ed6fb214d79172e94f1b6ab73 SHA512 208f3f62354d2b3b6767e49be6a07f8610a1791678915e2ca24573b6e1179a02f9fdad41c171516497789e410765812f537a6c6b8249227a5f6e5bc1c4b37855 WHIRLPOOL e2b18b099fd7c37cc25fd5fa704218a2c2cc30605ad897af5963824d1257f9e1ec7114352c233bed13354cfca33e2deb2d28ba563f9baad8f5c0d5f50d912a67
-EBUILD faraday_middleware-0.9.1.ebuild 1168 SHA256 a0465f22eb3a84f5048c8ca8043314d1830ab4b716f46c71030642303104262f SHA512 ec5eaea687c88b817241fdc38a0ee1acd9487a538658107728bd4f41d0076442483e29b69b08fc64918229c476e7b8ad35ba472a9011bd825ccfaa42c3c7f0d6 WHIRLPOOL 16e2f297dc33f5f4a650640e030bbe7cc17d5a4a84ae5cebe123c0207b14f1cca1bbb1acdd304961fdbd0352f7cea02be9225290fba353bc67271bf4ae24aab0
-MISC ChangeLog 427 SHA256 a7852521647b840512f5d428fef752c6ea8806e8b31c9440c55d93a189f8fbe0 SHA512 c15a98d0178a00e4a026fcdf8bb83a446ea5f83e7aaddf4511883967746c4b54b481146c4cefeb13007aab2a6bcf6b236a2469cce3e657413d23b5fb369a98aa WHIRLPOOL 1fdfa7c7f38dc1b04637bdfb2984d254217d5aabc9363533e92ca223128af9ad4b32dcc4b343032a328d3544f6f70c8613a697ab9925296762c23429e2f81d6a
+EBUILD faraday_middleware-0.9.1.ebuild 1412 SHA256 90a4b7f859e9c386c63d819042256442472e0c676129ad104831f92c17f5018d SHA512 39a5933b0e55146b8e2b3319d91bdfe7213c9a9af8b0454650aeeae316f25f666ff82a249f4b3605ef9a25da78bc1ec4f143ce6c444be58a145d0a4de443a16b WHIRLPOOL 144d5d34f8429566b6e3a32eb2c3bc5e44549823a42093b559eee8d5b9c61a51d39801abe8bfd1533099969869143ba2d896604af63d0b27d511db5732767de5
+MISC ChangeLog 656 SHA256 dd33f6ece47e438e257e28d278cda9fbd65e224fc6e0717651dfed905dca416c SHA512 7f8a672f48a2139b539d3918368ed5fdf2e2794c3493b9603ff891b34cd4cf265891de5651acd5656bb560a61610c8c5bd9abea7b38b897285075ddd0c9ff35c WHIRLPOOL a682b296fa08675a42d88887236a66811eaa6730f73dc9a09ee793180e7872273450b7e8526a4934d3c424136a6e7febeb0205cb72a7990e279072622d3777c8
 MISC metadata.xml 622 SHA256 06326e3e96bc4e21778f51a92aeebbac91f923a0cb8d844cbe417728e804e3d3 SHA512 532569953f866494e7bf8ca9a122aded7e830348385b497f3b74f8291164b7daf4aef3d59871df27157ebe185710e578011f642dc5b24f457aa87c69820b1bdf WHIRLPOOL 32d68846527d2069c3fd58ac41685e39c10665c30f88c3761722061fadba8a0fad545ef3cb9c36930ccac42def584a906c548918bcf89a140863eca984b7cfc4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlVir7MACgkQiIP6VqMIqNd1NgD/d6TRDl/Z470n/A1csXxueMLH
+k5Ov6EQDwrWflNVlqr8A/2BWeQUw/um6V9jQu4ljKaqEIfMBYViZcT7fDh7o5KkP
+=8dXS
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild
index 71e7043fe59c..8a445f55e8f8 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild,v 1.1 2015/05/24 22:56:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/faraday_middleware/faraday_middleware-0.9.1.ebuild,v 1.2 2015/05/25 05:14:26 graaff Exp $
 
 EAPI=5
+
 USE_RUBY="ruby19 ruby20 ruby21"
 
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem eutils
 
 DESCRIPTION="Various middleware for Faraday"
@@ -21,19 +25,26 @@ KEYWORDS="~amd64"
 IUSE="+parsexml +oauth +mashify +rashify"
 
 ruby_add_rdepend "
-	>=dev-ruby/faraday-0.7.4
+	>=dev-ruby/faraday-0.7.4 <dev-ruby/faraday-0.10
 	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
 	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2 )
+	mashify? ( >=dev-ruby/hashie-1.2:* )
 	rashify? ( >=dev-ruby/rash-0.3 )"
 
+# Bundler must be used because the optional dependencies have different
+# version requirements that must be resolved.
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/multi_xml-0.5.3
+	>=dev-ruby/simple_oauth-0.1
+	>=dev-ruby/hashie-1.2
+	>=dev-ruby/rash-0.3 )"
+
 all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/\(cane\|simplecov\)/ s:^:#:' \
+		-e '/rspec/ s/>=/~>/' Gemfile || 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() {
+	${RUBY} -S bundle exec rspec-2 spec || die
 }