gentoo auto-resync : 14:07:2024 - 12:27:13

3 files changed, 17 insertions, 64 deletions

diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 50fc284d7ace..1a70720de0bd 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,7 +1,5 @@
-DIST sinatra-3.0.6.tar.gz 268815 BLAKE2B 2993a4c28ad4559e65e6e0dc4e5f9bc25f4118f1f0d5462e0469808e873197823a13f682abb4762426860322df4408faddde037f120d370d0e206abc2b1753ef SHA512 83643b634d2a992144ced65fc1466fded29bf6fae2e20f359b2d440c46013df26f4595f842cbed36319c5278beb77383eea6ac6eb4281f508501cee4e1c6e67a
-DIST sinatra-3.1.0.tar.gz 272066 BLAKE2B 4bae4e3356adaec8f347dfc25ab9311f6740ff4f5c1486c7230269df0154e8127a4f61f6ebf47098f24848381a6e8e82429184c431cfb89c8beb9e4838135456 SHA512 b0b82a5319caf5768c830b2929f76a4fc9414adff4c32d6723a439747f756d2467c12b1391557a1afe31e5f8eab99872a51dadb59cf1cf8ace373e7a92dd5eb2
 DIST sinatra-3.2.0.tar.gz 273145 BLAKE2B 5d995e3deec3ff9dfe577a7ee816b69321dbc6848e69688c2b0781fbe6440f72eb7a589e0a5609f0f747200bf634e8472006587867e47d30779eb9bdbd4e4cde SHA512 7fa684a1f7f39ad764ae1c6ad304df9020187817d9e6982c1670cb23e7ff03df1968608cfedac13442b59e13032b567e5b46ea7168015f9ff1b40d3b3d3ebd68
-EBUILD sinatra-3.0.6.ebuild 1261 BLAKE2B cf05bb00adf64ae7864854e9e7f97354f58f97c44fe06573d764f4e9241575016b9ef541ff783f8abb5fd208afbbe23ceda5e91f20b6d9c040e524a27305ff63 SHA512 5beb059d51e4bb3948b91d38051687d6a1736eb0ce410d6dff4ebb640aa30ee76dd1874cadf88bbfcbae27418514ee6b484d53bdc741494dbd46d9ea0441529d
-EBUILD sinatra-3.1.0.ebuild 1262 BLAKE2B 9383e9cd6fa98e3c12da36cc6e61232e9c3223a7c3d8760a233c059c6cb8a8e2018756a220393c62cbb276be3c5075d32460933bb83db5b3bfa2db58d3395432 SHA512 307fde1aa61220863b59d833bab2306cb71b96ce0f497d5886d612ab5ea1e960d7b2250c50cf434146144187cc59e29538f4216f118fc933b99019d97935afd5
+DIST sinatra-4.0.0.tar.gz 266936 BLAKE2B dc9c0cad00f5ffd2554acfe0dd830517c4982e836226f0bf5ac0809653d1c0868ea27de4f459565e2dca16f84e5cf017cc48bd4f86f0a3e3eedb656982a9171a SHA512 23e7ecbe75d80ff242bb06ddf28c8193a6d8f9d7d03f4885bc6c03887d3d7e4cef9d8e61ecd6b6411e863721670978ba79e257579e1f5528071fc7990d135335
 EBUILD sinatra-3.2.0.ebuild 1305 BLAKE2B ed64fb36b0a810f1feaeefdb35966420c22142d74aa0f84b22408e92190a45db3706041c26260c65bcadea041e32fc34acd1fdde1b6416cd60c10900bb2737f6 SHA512 c28bda2983a6c9f5af8d166ed69375a11fa03300f2dc01bb7e7dfaca9b7fac4e571111c11ea0fce83e84c130b5c1e1823bcf14a2e40869aa722823755bc2e443
+EBUILD sinatra-4.0.0.ebuild 1335 BLAKE2B cf317bc1d201a759678c002beb76fa658c03a6a02806f7ab0ea5b2c08db6fd596f5c8799319de2b0a3d91cb30275bb24b498ea7c1443402dd5b67d3b535270a1 SHA512 8856b2d6a2d9f148e480e21b955c9d1f8600cfd8620dc64eed6d6c092ad8203c00730b727b6fa136cefb9c85a12948cd55d50b882148ed2621f52b39dd7d9562
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.6.ebuild b/dev-ruby/sinatra/sinatra-3.0.6.ebuild
deleted file mode 100644
index 021ceb5a53ff..000000000000
--- a/dev-ruby/sinatra/sinatra-3.0.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="https://sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:3
-	>=dev-ruby/rack-2.2.4:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/builder
-		dev-ruby/erubi
-		dev-ruby/haml
-		>=dev-ruby/rack-test-0.5.6
-		<dev-ruby/activesupport-7
-	)
-"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
-		-e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' \
-		test/test_helper.rb || die
-
-	# Avoid spec broken by newer rack versions, already removed upstream.
-	sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
-}
diff --git a/dev-ruby/sinatra/sinatra-3.1.0.ebuild b/dev-ruby/sinatra/sinatra-4.0.0.ebuild
index 685935e657d0..a02048adf7b1 100644
--- a/dev-ruby/sinatra/sinatra-3.1.0.ebuild
+++ b/dev-ruby/sinatra/sinatra-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -19,30 +19,33 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
 ruby_add_rdepend "
 	dev-ruby/mustermann:3
-	>=dev-ruby/rack-2.2.4:2.2
+	dev-ruby/rack:3.0
 	~dev-ruby/rack-protection-${PV}
+	dev-ruby/rack-session:2
 	dev-ruby/tilt:2"
+
+# dev-ruby/haml is an optional test dependency, but it will lead to
+# circular dependencies so we don't require it for tests.
 ruby_add_bdepend "
 	test? (
 		dev-ruby/builder
 		dev-ruby/erubi
-		dev-ruby/haml
 		>=dev-ruby/rack-test-0.5.6
-		<dev-ruby/activesupport-7
+		dev-ruby/activesupport
 	)
 "
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 all_ruby_prepare() {
-	sed -i \
-		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
-		-e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' \
-		test/test_helper.rb || die
+	# sed -i \
+	# 	-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
+	# 	test/test_helper.rb || die
 
-	# Avoid spec broken by newer rack versions, already removed upstream.
-	sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
+	# # Avoid spec broken by newer rack versions, already removed upstream.
+	# sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
+:
 }