gentoo auto-resync : 14:06:2023 - 15:13:45

3 files changed, 21 insertions, 43 deletions

diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 75f46e00a47b..b796b6ae0928 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,10 +1,8 @@
 DIST sinatra-2.2.3.tar.gz 513333 BLAKE2B 925b3188cb3f63d58a1078845bf58c6684e176527f29bdb0507e2185613b35930345ef1143319b3bd53170846cc67c8e8ce92b036e39ad03fee0f4f361a2aeaf SHA512 666b7a7fec67b4976ec10a704f1e98f9e815cad887ecaaf5bdee6cb0b5f4e29d99ef806865bc5b8e61d2aedea5b343c14f342d03515f0f6c68de3dc905fe77a1
-DIST sinatra-3.0.2.tar.gz 265824 BLAKE2B 87739d8863dd9959b8c3530b19a3f52de31636fcdd77fe1558930749498c73ec4cf0ddf998a9f6029c46842656059f8bd76d1781beb277608ccf265577561447 SHA512 57094e00ca8280401ed76f5c52dded82d42a4a81290a9a990f464ac43abbf350e8325b8f60505bfd005b6c7d92283a3f7a9345c0ccbf227530a8c3cb93c0af38
-DIST sinatra-3.0.4.tar.gz 266263 BLAKE2B d338fde60ab57f08d5df8afe240b1ed5cb1cde351b3f57b9700a7019e317cc16fc1a41148c1a75e97ff22844e8555b8fc1723c9d12818406fe28d1399fba9506 SHA512 b0581806261df57d8aa392b920a8998ecec311b1f82ab5ac7093c77ba5044eb9f5029a4d7266db05aa791ab30397fa304295a964b3ec3b58a2c0d13e3abb6328
 DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968b0f3ac98b599748e9572cc0bfc9121dc8731a0dcc9dd1bce04837373f93f198bff56c0de9f50932711b4040e8 SHA512 9ec41c3f0c4e4faaa181fddb2fe3262796a29e93fc07349422ca20dc845632c127c3e82e67f16ca19d2b2bcd43ad48fdca918d70b6747d8a2088ce1c84fd8eb2
+DIST sinatra-3.0.6.tar.gz 268815 BLAKE2B 2993a4c28ad4559e65e6e0dc4e5f9bc25f4118f1f0d5462e0469808e873197823a13f682abb4762426860322df4408faddde037f120d370d0e206abc2b1753ef SHA512 83643b634d2a992144ced65fc1466fded29bf6fae2e20f359b2d440c46013df26f4595f842cbed36319c5278beb77383eea6ac6eb4281f508501cee4e1c6e67a
 EBUILD sinatra-2.2.3.ebuild 1169 BLAKE2B 945caba2ba540c84ce59ca0394ecefd9593017f8e638a4b5569db6b949cac5d27b28fff3d3938b80ae8e8ec15fbcafe49d51499c52e57ced4ca56bcc1cbaeafc SHA512 2597953c54e9550cc5574b5a64ee1918b8aea67d07e380886800d93efe06455daf5ddee033cebd350f07599d16c27c7a0d8a2092fcd1277009876df8bef47d68
-EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
-EBUILD sinatra-3.0.4.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.5-r1.ebuild 1418 BLAKE2B 271aa29633cc26f9c208b5c393668fa0cc61824120842252503c4357f1b22026174f605f32b57814d999061377ebff5f43e6a5108201d8477740026283f9c059 SHA512 7139b0120f2351b8156cdf190cfff9f889208293c79d4348cef2663667d0c2bc0b3d1bd300b9221e3cff79aa9a6a60a6ba859da9730501325886e388e5cf4fe3
 EBUILD sinatra-3.0.5.ebuild 1162 BLAKE2B 03a501a76198e2062f4fcc7119ec7ab80f8a99b6c6101fe54944a13890feba4a9e138fa6b2c3874051b2da0bd5a7be7270fe54f5dbb8173dd1314fd92ce97c9b SHA512 5ecf1151fb089075004c87fb97913dc8ddb344f93cd1765c2b48af364bf75c6df5f9ebd02087e25d87d23275daf02a1db464cd86c2fb074b1d683b2d8a388a05
+EBUILD sinatra-3.0.6.ebuild 1262 BLAKE2B 9383e9cd6fa98e3c12da36cc6e61232e9c3223a7c3d8760a233c059c6cb8a8e2018756a220393c62cbb276be3c5075d32460933bb83db5b3bfa2db58d3395432 SHA512 307fde1aa61220863b59d833bab2306cb71b96ce0f497d5886d612ab5ea1e960d7b2250c50cf434146144187cc59e29538f4216f118fc933b99019d97935afd5
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.4.ebuild b/dev-ruby/sinatra/sinatra-3.0.4.ebuild
deleted file mode 100644
index 1f4309cd5174..000000000000
--- a/dev-ruby/sinatra/sinatra-3.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-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="http://www.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/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
-}
diff --git a/dev-ruby/sinatra/sinatra-3.0.2.ebuild b/dev-ruby/sinatra/sinatra-3.0.6.ebuild
index 1f4309cd5174..685935e657d0 100644
--- a/dev-ruby/sinatra/sinatra-3.0.2.ebuild
+++ b/dev-ruby/sinatra/sinatra-3.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
+HOMEPAGE="https://sinatrarb.com/"
 SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -26,9 +26,23 @@ ruby_add_rdepend "
 	>=dev-ruby/rack-2.2.4:2.2
 	~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-7 )"
+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 '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
+	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
 }