gentoo resync : 12.05.2022

3 files changed, 3 insertions, 34 deletions

diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 86b4c8bc00ef..05e59d7ce792 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,4 +1,3 @@
-DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0
-EBUILD sinatra-2.1.0-r1.ebuild 1013 BLAKE2B dfd0b7bc97476ab32a906222a599c692c1db7988e5d3a5385e2abe0a3a10e1b670c60c82650d2c4d3adda8d05b468ec03864e354b76915dbff60dbc63cf7e35b SHA512 4bc8fe6fd22c540e1660bb46adc954b65d46b4ed0da582d9fdfbafd8908ca85f394b30c80e6dbe1382e44dfedfb352a821fb466e878872fa547eaf52303a07e6
-EBUILD sinatra-2.1.0.ebuild 872 BLAKE2B c8acb9775f696b87432785ded15acf0e81a3ab0cd9d4f2ca9942d9b66ea28e9d9bfcb9cdf03df772a077355ca00b754a152fab2d0907f6f68c03c64b679f84a6 SHA512 9a5f25ce46a6f1d39c67410554b99a38c501a248e1570ff8220c5b2c436eb3a4809400d93f8329746ce4f5d36f5c7cdde2c43973bd53d93e67ba286dc0170c78
+DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
+EBUILD sinatra-2.2.0.ebuild 1012 BLAKE2B e5748efcee47332e37a741df852b5851956bac34bdc4d50c6bbf23287c143b324a0ede69a14a3153ce3d68aa3ee76244d00ddfb6b0f527c8ae98e4a880a36790 SHA512 a96d186b6330bc65b95643543d6d1816bea49fc5016baa476c75d20fad140ffcd64973a43c7dc3167bfaea4d009f71873d525cbfe6a57bdd551e627ec8eb35d9
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sinatra/sinatra-2.1.0.ebuild b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
deleted file mode 100644
index 51d577f6653a..000000000000
--- a/dev-ruby/sinatra/sinatra-2.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="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 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/sinatra/sinatra-2.1.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0.ebuild
index 16a511abe9e4..e1b5bdf64a8e 100644
--- a/dev-ruby/sinatra/sinatra-2.1.0-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.2.0.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "