summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-10-04 10:25:05 +0200
committerHans de Graaff <graaff@gentoo.org>2015-10-04 10:25:18 +0200
commitaa16891d0b3ed14da97021d6555cbf7824dab338 (patch)
tree46538e3aadaefeade164923cb7eb065a8dfb6d3a /dev-ruby/sprockets
parentapp-admin/collectd: set required env var in file collectd.initd (diff)
downloadgentoo-aa16891d0b3ed14da97021d6555cbf7824dab338.tar.gz
gentoo-aa16891d0b3ed14da97021d6555cbf7824dab338.tar.bz2
gentoo-aa16891d0b3ed14da97021d6555cbf7824dab338.zip
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
Diffstat (limited to 'dev-ruby/sprockets')
-rw-r--r--dev-ruby/sprockets/sprockets-2.12.3-r1.ebuild14
1 files 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 7be0d996d4e3..30d14efdee3d 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
}