Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rack-test/
Date: Sun, 10 May 2020 08:15:04
Message-Id: 1589098493.06afa37c2790c054791fa05fb485e1e1842b57b5.graaff@gentoo
1 commit: 06afa37c2790c054791fa05fb485e1e1842b57b5
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 10 08:14:41 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 08:14:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06afa37c
7
8 dev-ruby/rack-test: fix tests with newer rack
9
10 Closes: https://bugs.gentoo.org/718386
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
13
14 dev-ruby/rack-test/rack-test-1.1.0.ebuild | 8 ++++++--
15 1 file changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
18 index eb442b6dd86..9ddb9c01468 100644
19 --- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
20 +++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
21 @@ -25,10 +25,14 @@ IUSE=""
22
23 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
24 ruby_add_bdepend "
25 - test? ( dev-ruby/sinatra:2 dev-ruby/rack:2.0 )"
26 + test? ( dev-ruby/sinatra:2 || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 ) )"
27
28 all_ruby_prepare() {
29 rm Gemfile* || die
30 - sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
31 + sed -e '/bundler/d' \
32 + -e '/[Cc]ode[Cc]limate/d' \
33 + -e '/simplecov/,/^end/ s:^:#:' \
34 + -e '1igem "rack", "<2.2"' \
35 + -i spec/spec_helper.rb || die
36 sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
37 }