commit: cd0ceca03b79df48a7b800839110bd7a8a2028cb Author: Matoro Mahri <matoro <AT> users <DOT> noreply <DOT> github <DOT> com> AuthorDate: Thu Sep 29 01:59:23 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Oct 22 21:33:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0ceca0
dev-ruby/sinatra: fix tests on ruby31 Upstream determined this will go into 3.0.0 release, so it's still required for 2.2.1. See: https://github.com/sinatra/sinatra/issues/1774 See: https://github.com/sinatra/sinatra/pull/1519 Signed-off-by: Matoro Mahri <matoro <AT> users.noreply.github.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> dev-ruby/sinatra/files/backport-pr-1519.patch | 2 ++ dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild | 6 ++---- dev-ruby/sinatra/sinatra-2.2.1.ebuild | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-ruby/sinatra/files/backport-pr-1519.patch b/dev-ruby/sinatra/files/backport-pr-1519.patch index 2521dcaf2881..cc344621c3b6 100644 --- a/dev-ruby/sinatra/files/backport-pr-1519.patch +++ b/dev-ruby/sinatra/files/backport-pr-1519.patch @@ -1,3 +1,5 @@ +https://github.com/sinatra/sinatra/pull/1519 + From 6d34a2a1bee48961c25e1b53edac874a31c42060 Mon Sep 17 00:00:00 2001 From: Jordan Owens <jkow...@gmail.com> Date: Thu, 31 Jan 2019 22:32:45 -0500 diff --git a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild index 23ac1f9ff9cc..4a36cb96c31f 100644 --- a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild +++ b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild @@ -21,10 +21,8 @@ SLOT="2" KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="" -# Backport https://github.com/sinatra/sinatra/pull/1519 from master. -# Fixes https://github.com/sinatra/sinatra/issues/1774 -# Required for ruby31 compat. -# Should be removed on next release. +# https://github.com/sinatra/sinatra/pull/1519 from master. +# https://github.com/sinatra/sinatra/issues/1774 PATCHES=( "${FILESDIR}/backport-pr-1519.patch" ) ruby_add_rdepend " diff --git a/dev-ruby/sinatra/sinatra-2.2.1.ebuild b/dev-ruby/sinatra/sinatra-2.2.1.ebuild index 20f026413a36..26896805eb10 100644 --- a/dev-ruby/sinatra/sinatra-2.2.1.ebuild +++ b/dev-ruby/sinatra/sinatra-2.2.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -USE_RUBY="ruby27 ruby30" +USE_RUBY="ruby27 ruby30 ruby31" RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core" @@ -21,6 +21,10 @@ SLOT="2" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="" +# https://github.com/sinatra/sinatra/pull/1519 +# https://github.com/sinatra/sinatra/issues/1774 +PATCHES=( "${FILESDIR}/backport-pr-1519.patch" ) + ruby_add_rdepend " dev-ruby/mustermann:1 dev-ruby/rack:2.2
