commit:     06afa37c2790c054791fa05fb485e1e1842b57b5
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 08:14:41 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun May 10 08:14:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06afa37c

dev-ruby/rack-test: fix tests with newer rack

Closes: https://bugs.gentoo.org/718386
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/rack-test/rack-test-1.1.0.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild 
b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
index eb442b6dd86..9ddb9c01468 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@@ -25,10 +25,14 @@ IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
 ruby_add_bdepend "
-       test? ( dev-ruby/sinatra:2 dev-ruby/rack:2.0 )"
+       test? ( dev-ruby/sinatra:2 || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 ) )"
 
 all_ruby_prepare() {
        rm Gemfile* || die
-       sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' -e '/simplecov/,/^end/ 
s:^:#:' spec/spec_helper.rb || die
+       sed -e '/bundler/d' \
+               -e '/[Cc]ode[Cc]limate/d' \
+               -e '/simplecov/,/^end/ s:^:#:' \
+               -e '1igem "rack", "<2.2"' \
+               -i spec/spec_helper.rb || die
        sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }

Reply via email to