[gentoo-commits] repo/gentoo:master commit in: dev-ruby/sprockets/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     aa16891d0b3ed14da97021d6555cbf7824dab338
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 08:25:05 2015 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 08:25:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa16891d

dev-ruby/sprockets: fix tests when tilt:2 is installed

Fix tests when tilt:2 is also installed. That version
will get picked up by default and cause errors due to
incompatible changes.

Package-Manager: portage-2.2.20.1

 dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild b/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
index 7be0d99..30d14ef 100644
--- a/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
+++ b/dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild
@@ -25,10 +25,10 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-m
 IUSE=""
 
 ruby_add_rdepend "
-	=dev-ruby/hike-1* >=dev-ruby/hike-1.2
+	=dev-ruby/hike-1*:0 >=dev-ruby/hike-1.2:0
 	=dev-ruby/multi_json-1*
-	=dev-ruby/rack-1*
-	=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.1
+	=dev-ruby/rack-1*:*
+	=dev-ruby/tilt-1*:0 >=dev-ruby/tilt-1.3.1:0
 	!!<dev-ruby/sprockets-2.2.2-r1:2.2"
 
 ruby_add_bdepend "test? (
@@ -55,6 +55,9 @@ all_ruby_prepare() {
 
 	# Require a newer version of execjs since we do not have this slotted.
 	sed -i -e '/execjs/ s/1.0/2.0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Make sure the correct version of tilt is used when testing
+	sed -i -e '1igem "tilt", "~>1.3"' test/sprockets_test.rb || die
 }
 
 each_ruby_prepare() {
@@ -68,5 +71,10 @@ each_ruby_test() {
 	rm -rf test || die
 	mv test-new test || die
 
+	# Make sure we use the correct tilt version.
+	sed -i -e '2i gem "tilt", "~>1.3"' bin/sprockets || die
+
 	each_fakegem_test
+
+	sed -i -e '/tilt/d' bin/sprockets || die
 }