gentoo auto-resync : 08:01:2023 - 12:15:59

4 files changed, 16 insertions, 48 deletions

diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 186a4edba4e1..253a43b58017 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,11 +1,9 @@
-DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
-DIST sinatra-2.2.2.tar.gz 513056 BLAKE2B 80904850ce577131ecc6c28917772cda6ab606ff1b4a71b733cde98d56e2906bb0dc5b65c83465e65686571e8752ec7935d89734e7d2e45c544fe14a2c8046d4 SHA512 e69a36738a7c1095968a343113ddba414ff685e941a8b55575e4b2ffa5a8e7394d874966d5532643cdfec997ac4c825c293185f6688c715006e37159eedd2be8
 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
-EBUILD sinatra-2.2.0-r1.ebuild 1005 BLAKE2B dda13c02308ce841d04b6267592523a417d2ff3043124ba024a591097e3a3436d4f30f1adf0237d4495471c1b9b406f3fadf792710a6e42a590f8b21284ff51b SHA512 aed0a377a5b9145344506ef2175ec1d6fec265f347f82ac960baad954366c325d501fb3f4ef167bf81e09079d99dc68c1686e9479b5d76abee800b32e51393fa
-EBUILD sinatra-2.2.2.ebuild 1006 BLAKE2B 02051754d7ceead4327c603836d52b6d4344e9c1ab4d3ae6fc3a7dc2ded7a2ee8540702aaca19f3eb388e064bfa990637776e400b068f1ee0702fc5917da5eb3 SHA512 2552c3e63d0b62838d631551b2a135822df89c2ec6758a34ec058989f47925525cf0c3a984f777166404449c0ec09e16b4cd4d5672a1d01d43769c6e486a483c
+DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968b0f3ac98b599748e9572cc0bfc9121dc8731a0dcc9dd1bce04837373f93f198bff56c0de9f50932711b4040e8 SHA512 9ec41c3f0c4e4faaa181fddb2fe3262796a29e93fc07349422ca20dc845632c127c3e82e67f16ca19d2b2bcd43ad48fdca918d70b6747d8a2088ce1c84fd8eb2
 EBUILD sinatra-2.2.3.ebuild 1005 BLAKE2B 5b6d14debe343babe32dc4985a05a41fcd5c956bc9f7438f2486d4bea48349af8cce4c5eb6d97783242d55ffcfe051fe6b9a01ee15c6afada090177d71d0fe57 SHA512 aca6222442954b05734e096d225e9e550449f1e597cb369e3e653bf3063400fece8a776dd11af6e7e37841c585f27d4f46f5de47f574a715f95bb2b780793863
 EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.4.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
-MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
+EBUILD sinatra-3.0.5.ebuild 1032 BLAKE2B e534db05a691a05197a5733c2ba4630eb463749e2436f08711e0eadaef7c0f85d90804eb803811d55d03aa63e4f7fde611b5a9d2cc6a0c159d6c5c2f4a99b4ec SHA512 a744d018502e8dfc1cec63bd3aa4575dbb2d45b1bec0df74ab729b03236941aa7fa7bfbcc49e329c7e54a88dd6c327b71f70432f89bcb46b57a3c6e6ab82f953
+MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/metadata.xml b/dev-ruby/sinatra/metadata.xml
index 658c72b1920d..a14add969f1a 100644
--- a/dev-ruby/sinatra/metadata.xml
+++ b/dev-ruby/sinatra/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ruby@gentoo.org</email>
-	<name>Gentoo Ruby Project</name>
-</maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sinatra/sinatra</remote-id>
+    <remote-id type="rubygems">sinatra</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
deleted file mode 100644
index 6e3d3a72f8de..000000000000
--- a/dev-ruby/sinatra/sinatra-2.2.0-r1.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"
-
-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="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:1
-	dev-ruby/rack: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-2.2.2.ebuild b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
index b196d368b135..affc012e8456 100644
--- a/dev-ruby/sinatra/sinatra-2.2.2.ebuild
+++ b/dev-ruby/sinatra/sinatra-3.0.5.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"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -17,13 +17,13 @@ HOMEPAGE="http://www.sinatrarb.com/"
 SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="2"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
-	dev-ruby/mustermann:2
-	dev-ruby/rack:2.2
+	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 )"