From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46E16138359 for ; Sun, 10 May 2020 08:27:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80EE7E0883; Sun, 10 May 2020 08:27:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6221FE0883 for ; Sun, 10 May 2020 08:27:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CDCE34F0C1 for ; Sun, 10 May 2020 08:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C980F1EB for ; Sun, 10 May 2020 08:27:28 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1589099239.834836f9cc25d85dadb15063d826c47251d869a9.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/sinatra/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild X-VCS-Directories: dev-ruby/sinatra/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 834836f9cc25d85dadb15063d826c47251d869a9 X-VCS-Branch: master Date: Sun, 10 May 2020 08:27:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83970420-20d8-4838-9784-129ac20b9129 X-Archives-Hash: 72225957a577968fedf4f1e83d03c2f7 commit: 834836f9cc25d85dadb15063d826c47251d869a9 Author: Hans de Graaff gentoo org> AuthorDate: Sun May 10 08:27:05 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun May 10 08:27:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=834836f9 dev-ruby/sinatra: fix tests with newer rack Closes: https://bugs.gentoo.org/721698 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild index b365cde14ff..7021116b670 100644 --- a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild +++ b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild @@ -23,8 +23,12 @@ IUSE="" ruby_add_rdepend " dev-ruby/mustermann:1 - dev-ruby/rack:2.0 + || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 ) ~dev-ruby/rack-protection-${PV} dev-ruby/tilt:2" ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )" ruby_add_bdepend "doc? ( dev-ruby/yard )" + +all_ruby_prepare() { + sed -i -e '1igem "rack", "<2.2"' test/helper.rb || die +}