gentoo auto-resync : 23:10:2022 - 15:50:25

26 files changed, 112 insertions, 186 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5bab7ea23ae8..6d5ab41fa857 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/async-container/Manifest b/dev-ruby/async-container/Manifest
index 59f443773ea5..4a6025b48205 100644
--- a/dev-ruby/async-container/Manifest
+++ b/dev-ruby/async-container/Manifest
@@ -1,3 +1,3 @@
 DIST async-container-0.16.12.tar.gz 22626 BLAKE2B 8e850ebededcc0110a8ddf79c23287d816973fee1c32b7e7b76a7158995ffca5476d8701b3b4499aa3c0fd023ee9f253e4d07bc9ad0562a32d529678d0569701 SHA512 d71bdd1dc22a7ebecd4fed7e17b28c9ae1c875e111db4fb9cddda3508113e3cb7fc72b820c447cac27f047606d20f62180b203e58164da18dc47cff385262441
-EBUILD async-container-0.16.12.ebuild 1259 BLAKE2B f75dd8b3baad6753e5be739ae1e1547675a07b7e534e0cfc7585c0681ff602192a458779b653a1cb4ff25aa58f173d4717a651d6862683d22f0bc41c9be8bf2b SHA512 91f62615f2043c8c7103a7f937a0cf3e847173364ac83178b5f7983d11afb441a3bcb045aa11205b5535edb9e8bba2bead1842654a0b2952cd9d5acea9f5aa24
+EBUILD async-container-0.16.12.ebuild 1255 BLAKE2B 32ee4309d0583dce2c92415595eb4d438f704ec61668ea9931689868fd26355bcdce0bd4ec7bd0d53585d2a946b26639a191a032e0e6732f634a262a7a102c7d SHA512 c57f22eae78ead96df9418174e41eb603e0f78ba4467a68f7e6764dea5c016cf1976fa87ccd6621bf9628fd23e2ecf4215a5939caa87afa330142e2a6907dbf0
 MISC metadata.xml 351 BLAKE2B 671a90bb6d0e6ee6c41c96beaefba1bf84f236b557c8116d8489da01f034edbd3a122063df64a85c587cc114455b9d9e00404307d1539c8fd8e79c781297e337 SHA512 402376317da59de4bc9f10422743898870efb6f9429ba07fc37861e3c4752b4ef2197051b81bef300d07279c6bf55f9c5796a5b5c84cab8dcaef9a07537ff725
diff --git a/dev-ruby/async-container/async-container-0.16.12.ebuild b/dev-ruby/async-container/async-container-0.16.12.ebuild
index bacc76a095b5..6b00d4b10d4a 100644
--- a/dev-ruby/async-container/async-container-0.16.12.ebuild
+++ b/dev-ruby/async-container/async-container-0.16.12.ebuild
@@ -3,18 +3,20 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Abstract container-based parallelism using threads and processes"
 HOMEPAGE="https://github.com/socketry/async-container"
-SRC_URI="https://github.com/socketry/async-container/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
@@ -33,7 +35,8 @@ all_ruby_prepare() {
 	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
 	# for this reason.
 	sed -i -E 's/gem ".+"//g' "gems.rb" || die
-	sed -i -E 's/spec.add_development_dependency "covered"//g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
 
-	sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/async-io/Manifest b/dev-ruby/async-io/Manifest
index 3ae333f7f621..57e8888adecb 100644
--- a/dev-ruby/async-io/Manifest
+++ b/dev-ruby/async-io/Manifest
@@ -1,3 +1,3 @@
 DIST async-io-1.34.0.tar.gz 34147 BLAKE2B 85cb79423bcbcc45e7c3f703d5ce7866522e66c55f866a0545369b65eda9c8a4b5637eaeeb7e17a5a8ee7256c6a991871dbb96244e4647fa19f8f027fad37961 SHA512 d35389ebfb748ea1c44f4a7ea7707511e32d40e98ae3fd7e8a5b22fdbb5f8f5a00933ec48346e2ed44c679ee6121a6fdf980c8ee6a1da609fb7571abb703aa02
-EBUILD async-io-1.34.0.ebuild 938 BLAKE2B 226169bac443a6edd3844f1efd35293d0bc7973826949d7eab3641aa702d00049c360c29bd485f878eda57bf34ea86b100efeb17f9f1f3aecd9d416b9d85fd7c SHA512 4bc7a2b34403b937c6ef90024dfa2f5b8709b9e7698bf794416f6136bf6f2f3c756126a283790057a4796bddf9437cfec07ca5c250e839c832657617bbc1a728
+EBUILD async-io-1.34.0.ebuild 937 BLAKE2B e8b4444e63a71e8b07629e2cdc0b6cef5b7a9ab410f0cc230aea1e5f7a60b2fcc4a513f0367985b4afc110d70126d08a2f0b17c48c5606eb23e1e6f527be882d SHA512 720d4f3f4665b277aeae3293ef1856f11568a7d082c7b57bc0a836a7a3b92df247db37bbaac63e19d0b7731a2bee86c9d756d2b0fe139ecc36718635049f22c8
 MISC metadata.xml 344 BLAKE2B 7fb67688ba60d30637605ba7a2020cb328e18ffebd9fd6fed09114cc14596836b0dcc4d1590fd3755952baa52c258bdb9a935c47b1a4ef4f2d5e545e931d40fe SHA512 6ea960fe1feb969df78e66ae985b6ac95faa09a248d694aaa47876634f84a09a3807effc2b4289d35dbeaee3793c2c73276fd0f8b87375ab99e813085edd12af
diff --git a/dev-ruby/async-io/async-io-1.34.0.ebuild b/dev-ruby/async-io/async-io-1.34.0.ebuild
index 75b432695d8b..b69e9ffdfcb0 100644
--- a/dev-ruby/async-io/async-io-1.34.0.ebuild
+++ b/dev-ruby/async-io/async-io-1.34.0.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRA_DOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Provides support for asynchonous TCP, UDP, UNIX and SSL sockets"
 HOMEPAGE="https://github.com/socketry/async-io"
-SRC_URI="https://github.com/socketry/async-io/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/async-io/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
@@ -28,5 +30,7 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-	sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+
+	# Avoid test dependency on covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/async-rspec/Manifest b/dev-ruby/async-rspec/Manifest
index 40d9c0b4eb2a..875b1d8986c3 100644
--- a/dev-ruby/async-rspec/Manifest
+++ b/dev-ruby/async-rspec/Manifest
@@ -1,3 +1,3 @@
 DIST async-rspec-1.16.1.tar.gz 7775 BLAKE2B a1ff314fbe3e42b9b25e1c891bf1a336644fa5183b6f504b06e0747c127e712a66a0fbb2f18695bd7cba91ec8a4e8af887a25fe3e9887f86fb5f17873e26f51f SHA512 5c2bc5cf5ff4ca25cad67e251b5e078ac9f6f2d0f5d50f67584d4a043040c4e9e9e51d3a9e2727f08de3eba39d46be66461e691af8b86e173d8b70b589161a29
-EBUILD async-rspec-1.16.1.ebuild 946 BLAKE2B 61ab59840ce19e6eccb9e5a68beaa2525183da67c4efa4d117dfe8f1ea7d1008db9b3a3821d7e4ea8359e09f371d4bcc8f18557bd242371fcb05d5612aa034f8 SHA512 91462ae9b56499dfb1c74f5ce5536770526cf0a16fcd08ac5ffcac8095a2b8a3d63c6f7ea23647706ef21ac93caf8217086d0401747ac7c6d6ef9a34bbe0a6fd
+EBUILD async-rspec-1.16.1.ebuild 918 BLAKE2B 39986a84eab1f61615fce44b1f7e8c183508704ed82a994fdf706e8da6bae4f66077e72c1527f7e1288dd75d9379ef6912592668cb06da725299e84c6d27f2d6 SHA512 26e603009693b697adb4967ac6c7774e0559aef67cdfb47131170b6a4cb5fb11cbaa50e55bd7bf508da4d87d94eb71d97497a834355b0d27362b6b243b57ccbe
 MISC metadata.xml 347 BLAKE2B d18d791313af87bcb00267fa7886d513738c127ca281e4e3f2eca2d3a345748097016ee229ea663efae9980d5fee97d27b800923021e682a9a9bb28bd031c0a5 SHA512 6396202046253385c58f6b5d1762800d596027e1d7ad7e95d69695023dacffa0bd32f2d0efa396fafd5e65bafd55376018f27e127752d5109f537339ac06584f
diff --git a/dev-ruby/async-rspec/async-rspec-1.16.1.ebuild b/dev-ruby/async-rspec/async-rspec-1.16.1.ebuild
index c920dff8061b..12f48d519fe1 100644
--- a/dev-ruby/async-rspec/async-rspec-1.16.1.ebuild
+++ b/dev-ruby/async-rspec/async-rspec-1.16.1.ebuild
@@ -3,24 +3,26 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Helpers for writing specs against the async gem"
 HOMEPAGE="https://github.com/socketry/async-rspec"
-SRC_URI="https://github.com/socketry/async-rspec/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/async-rspec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/rspec-3.0:3
-	>=dev-ruby/rspec-files-1.0:1
-	>=dev-ruby/rspec-memory-1.0:1
+ruby_add_rdepend "dev-ruby/rspec:3
+	dev-ruby/rspec-files:1
+	dev-ruby/rspec-memory:1
 "
 
 ruby_add_bdepend "test? (
@@ -30,5 +32,7 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-	sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+
+	# Avoid dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/async/Manifest b/dev-ruby/async/Manifest
index 37e07817bd76..9f8ea7b027a8 100644
--- a/dev-ruby/async/Manifest
+++ b/dev-ruby/async/Manifest
@@ -1,5 +1,5 @@
 DIST async-1.30.3.tar.gz 92599 BLAKE2B 69db66676adf2dd0f77142bffc55b1e90a6983c53c7fac444f72b9365f6907e4d2ec45579ea267f3a8f31fc45af63c3517908c353749b288d1873e2cf720f96b SHA512 337a51ca8fd0e6685528e2eca9b584344ba583f7254f2600110ee62da6e4ccabeb471e7d94f36ab6f8d0eb3eada9e23335a262a50c8d035f67708fce0a590e5e
-DIST async-2.1.0.tar.gz 75110 BLAKE2B 6226cd64f62d42a57d46f1c31287e403af5c645343a2de899a090f986e2b669dc96f1019629cf32ed46809fbfcbb5716375ef4560358676759dcad0e17d02849 SHA512 85f02004f7851757425f6e30c364ad9cb52ac4ad4559fa3a4a9b933fc5df1f10f6975233df6057da479dc28b5188d9e6d0b70e215a4a99b7864938260571089c
-EBUILD async-1.30.3.ebuild 1167 BLAKE2B 70b6c57bd9e265ef7567bebcaac567db362ea298507c553e4538d463b903ae29982b388dda34a4b87810f93055db914afc7785a3bad216000d390bba1e19cf4f SHA512 ce75d8a5673b082e77c380b98c009bdeb072aca85b7aa1a2500e50eee7252647ceb74fe7d4f01e84ffc35f88ccc48133efd9dad446442a71c358ff9db30bbde5
-EBUILD async-2.1.0.ebuild 1043 BLAKE2B a6f3405645f902b9056cdba8e348b2e3b324bd77ada85e7d1ad055b8ac74fd7b32fb7f39f38c8194263091c68dce616dabf29cb1058c375745c0eebee8249bd9 SHA512 a7ebe894207e53747527918f738e93557829b1ebc6902b815106a012e5a254b87b80bcf950b15f0f4e1de78f77efc2e13230f53409d19ee3730ca7157f7e4270
+DIST async-2.2.1.tar.gz 75671 BLAKE2B a652bbb99d49c569fd864015059391a013f35c888be1e3b32ae06900bb861274390543c64ac9687689cb012c9b4c82df7764e4aaa50d2e76b595fdc7736ec8f5 SHA512 329862fa30f56371092666bef199b949e6325d99696a7ef2029cf9524a5cea31fc361cfaf438e15731c8e09c06ca47261fd3fcdce306a464332def9897c8dec5
+EBUILD async-1.30.3.ebuild 1056 BLAKE2B 2a88048e89a1150029d60564d94ff467289e30546a9b04ef7d13fbba93077946d2539da8667afeaa787ce48b2faf8cc5e040bb7e925f72061f7abcf24d4ac3da SHA512 0d7e5299f24c8d82d00b3dbdfc46dba7a112f952a150772d2d385fe3132617b575fef2cc1f22f99ffea88d1df0a0b9631f45234aac1c0afac7dddd1217d264cb
+EBUILD async-2.2.1.ebuild 1025 BLAKE2B 15769fc2b55c5a3085791e9e24f6ac05990607d74860e9933ea618540c996d894e77699d98b6e45356f7cd36485deba65e6e99a9d6cbc1236789cc48793ca71a SHA512 da369a7ea28f77a024acbe54836a780eb63add0dc03751370e90694d632dfa6b15dc47ebe10f087962d8f329953bbfa81d0dca0591a49113cb327e00e7fc8944
 MISC metadata.xml 341 BLAKE2B acbe731aefbd211b23790c22ed97fbc1f83c45cf5ed786aa99fedafa5ca930081e71b3466584846f6e2f7a793da65c82bb4c9c85c15a669ebf5e7db47b74836f SHA512 d96626a4c34ef4981c11dcd07f51a9940d29b2bd8013868f3e5778d2f62a59bf3ca864a370a4d7951ca98079d6d5939d9aa9a4f4ed0233ec5f7fe544fa64fa26
diff --git a/dev-ruby/async/async-1.30.3.ebuild b/dev-ruby/async/async-1.30.3.ebuild
index f4164212833c..0624935ba1a7 100644
--- a/dev-ruby/async/async-1.30.3.ebuild
+++ b/dev-ruby/async/async-1.30.3.ebuild
@@ -3,18 +3,20 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="A concurrency framework for Ruby"
 HOMEPAGE="https://github.com/socketry/async"
-SRC_URI="https://github.com/socketry/async/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
@@ -30,11 +32,9 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
 
-	# network tests
-	rm -f "spec/async/scheduler_spec.rb" "spec/async/scheduler/address_spec.rb" "spec/async/scheduler/io_spec.rb" || die
-
-	# broken on ruby 3.x
-	rm -f "spec/async/condition_spec.rb" "spec/async/notification_spec.rb" || die
+	# Avoid network tests
+	sed -i -e '/can fetch website using Net::HTTP/askip "requires network"' spec/async/scheduler_spec.rb || die
 
-	sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/async/async-2.1.0.ebuild b/dev-ruby/async/async-2.2.1.ebuild
index 07e5ba91db6c..6e2688dbe2b7 100644
--- a/dev-ruby/async/async-2.1.0.ebuild
+++ b/dev-ruby/async/async-2.2.1.ebuild
@@ -4,14 +4,16 @@
 EAPI=8
 
 USE_RUBY="ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="readme.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="A concurrency framework for Ruby"
 HOMEPAGE="https://github.com/socketry/async"
-SRC_URI="https://github.com/socketry/async/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
@@ -19,7 +21,7 @@ KEYWORDS="~amd64 ~sparc"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/console-1.10:1
-	>=dev-ruby/io-event-1.0.0:1/1.0
+	dev-ruby/io-event:1.1
 	>=dev-ruby/timers-4.1:4"
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/console/Manifest b/dev-ruby/console/Manifest
index d2a04b6c867c..9fdadb80bca9 100644
--- a/dev-ruby/console/Manifest
+++ b/dev-ruby/console/Manifest
@@ -1,3 +1,3 @@
 DIST console-1.16.2.tar.gz 24609 BLAKE2B 470e6fb547e594d6e4add21c11bccca2d239d5430e148bdd99fe925d57058a3e7304b96c793c72a68ac3df3e285c1b7719b5a1e0db833350b0ef55ac17cca4f8 SHA512 fe32ea7b3ab11319fcefc098571e2a4fff2fec2a56c53880731ab15deca75e84c94cc30456fea264e6201996311dc705799814e5c1d7c32e7b7d786fcac9588e
-EBUILD console-1.16.2.ebuild 793 BLAKE2B df36198a3935493b473545f2768fa0347319703d1e9b4c04bcbbc09aed267c4bab21ed9da80137f1b40dfc82a34a2a8ba89c8b0902ed6e8457a7d328ab596322 SHA512 87d88baafc50ac675cc4deee0a759c7855d82ff5ec29d60cdb2ecc50d1c2a5d774b5aa4735103fda6d8813856c3ad8741d3b3943ee99650e8c93fd50284b4e4c
+EBUILD console-1.16.2.ebuild 910 BLAKE2B c0b20cc2159e662286fa7d15d92137b5e1acd7808cd9aa588b2792d89e6de4fc67f3d539a978cc22a1ebbfe12bd92420cb86759d2c5c88f02d2990a157bc4bb1 SHA512 3b4fff8a49333dd4f4d9c2762f18a78ae53e9cf073c67a69f6b9cff0590827a42ae77ae591055f17b7a54ba9e79a26af95f3ce8230080d74fdea9d411edbb7e8
 MISC metadata.xml 343 BLAKE2B 949f3fccd0b08a5699c083eb21c119af6104cd470fe4f22f2771f5262eddf9a9819a630146ef4cf0636d52be9cca982ab73fd4443e1fb0f4ae77b5223949ed38 SHA512 f243fe8cf5c9d29a4c4f95cd9bce18f8a0ca191b7c62c1644c0b4ec4f4d14d355bc0b564a571b057eb42960997958157bca027b86917a2c43d6ec651f1804302
diff --git a/dev-ruby/console/console-1.16.2.ebuild b/dev-ruby/console/console-1.16.2.ebuild
index 9d18391d436f..50e90567a98c 100644
--- a/dev-ruby/console/console-1.16.2.ebuild
+++ b/dev-ruby/console/console-1.16.2.ebuild
@@ -28,8 +28,11 @@ all_ruby_prepare() {
 
 	# Avoid dependency on covered.
 	rm -f config/sus.rb || die
+
+	# Avoid sandbox violation during tests
+	sed -i -e 's:/tmp/:'"${TMPDIR}"'/:' test/console/output.rb || die
 }
 
 each_ruby_test() {
-	${RUBY} -S sus || die
+	${RUBY} -S sus-parallel || die
 }
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 5aff438ef78a..12bc47a49601 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -4,6 +4,6 @@ AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
 EBUILD ffi-1.14.2-r1.ebuild 1635 BLAKE2B ef999eedbb4c80ef9d64e04c21f7b8abdf390bf1189fd4c24683934930323fd71cefd70d734c76e8b908473d5167463a3da73b1bfbb2d15ddbbca6f4214b30c5 SHA512 fb9af61383048819156d2a2919c487a41bc30e67a4bf6602cd6e9c9383e63ae001f8c26c3b4562bf011234c4d16b187d418ff667ac17126ac9f265dcafdfb84e
-EBUILD ffi-1.15.5-r1.ebuild 1813 BLAKE2B d9ad8b311eacb12ae1af340d4bbd25784fea999f2bbf2b465f67910dedf3892d2900e479980c2afdbd64b80a5d36884faad6cc3a8cde1c1850526b062a735178 SHA512 f03fdfb9315896ebf50d776114c0391308ec477aa6ad946e0d55c65beedac015d2be95f0660a41a4c4cc75017e80e13c1b98384d6a3ddc39c33195e80babdf78
+EBUILD ffi-1.15.5-r1.ebuild 1820 BLAKE2B cd58c39dcd6688408f839583603a53a53d4ab36eec95f8bc40627b73848cff51cab253b3d189f22b8d35e6005fce9e86812b26c517d16e71b392b2dde085c997 SHA512 6b2996653ab0b19c4dcd9c86a52689033f435a0594ebdccdad38f36b411d17604a1c04230494a8ffcc7ce5a41b6a2fe46565af07ed154545217d06bb5fdeb4bc
 EBUILD ffi-1.15.5.ebuild 1679 BLAKE2B 0f21e74f3843306c7416d8b11e43ec8ab279ea1f79662d50a77b8a430806d6d526ca529b13017130f05f1ce2709d3a90b8f4a8efce5231dfd96ca944a0866d5d SHA512 460791276a6e6d158e041a9b57aba47a7535095e6e4f776d8a883d5d8b7e08c61f346ca7b5cc9180d0d4143e4967043a6c96f02a097719195034b81ee4c412ce
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
index 98c573a70b41..c1c66e0fba07 100644
--- a/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.5-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 PATCHES=(
 	"${FILESDIR}/backport-pr-962.patch"
 	"${FILESDIR}/pr-957-sparc.patch" # submitted upstream as https://github.com/ffi/ffi/pull/957
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
index 1d5acd96a4f1..46bc7a2228c6 100644
--- a/dev-ruby/io-event/Manifest
+++ b/dev-ruby/io-event/Manifest
@@ -1,3 +1,3 @@
-DIST io-event-1.0.9.tar.gz 31984 BLAKE2B 543c460cde5ac269607e4d7ec54962879141d40d9592433a55d53e89b2a43bce4f161c1e4b21322a9b3fe60d5ab77e35692a19f899b9210d06fbcf185bca83de SHA512 d2b5903e68425bb23a7a9b861e76b2d125b9cf53f81ca0120ded010559ca26f3af002b5da28092245e00e8d9b81e94bdda72b2ea607cfae27a1e48e3f1a39130
-EBUILD io-event-1.0.9.ebuild 864 BLAKE2B 97541213e4f3c2adea19dc1b65af8d8e267116730ebe84b073155764293d5250e157fe459a235bdbab5d6af0c884a353ed7b6065f27b6cb12000434867ba1796 SHA512 0674bd2e985478d5ceff0be2337d3f71a0dce3211ac097de071d7fc10ca4cff811db91c79d7166bac4ca63c2208a626280a5a5e3c4661c8bc58ff96e0bd1d117
+DIST io-event-1.1.2.tar.gz 34305 BLAKE2B 8e7814ada38c4a766f413373e0ef5b0c94a1b94342667a25c59bf8925fed791c3dc527bf63f02a9e40297abcdde730047a3a80104ac9d9f12ea648e5842ea851 SHA512 68a9c01f8075117767cdcacb095f9587118f86cc536d94a990b55e63e7f5213c350556486c45e2687db2ac810d48dc1d9aa28e994ef6ae0229f7b258d0b92aa2
+EBUILD io-event-1.1.2.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
 MISC metadata.xml 344 BLAKE2B bb572a3bebb66073283f2eea535cb9ac95d3adba0e060350609028bb47b7a03b6ddb3294293e95a6c505fe5d9c7127a37f1d1afa9abf66312bf4b4a688b4ddf9 SHA512 9c114303bb3edf528224eac75e7095403230f94baf373649442c123cceee029258616fa2ea68823814dd1ecdfe0f9c4ef73491ca449f569f12aa159b78811ef5
diff --git a/dev-ruby/io-event/io-event-1.0.9.ebuild b/dev-ruby/io-event/io-event-1.1.2.ebuild
index d0b6cc652fb7..107271412ff8 100644
--- a/dev-ruby/io-event/io-event-1.0.9.ebuild
+++ b/dev-ruby/io-event/io-event-1.1.2.ebuild
@@ -4,28 +4,31 @@
 EAPI=8
 
 USE_RUBY="ruby30 ruby31"
-RUBY_FAKEGEM_EXTENSIONS="ext/extconf.rb"
-RUBY_FAKEGEM_RECIPE_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="An event loop"
 HOMEPAGE="https://github.com/socketry/io-event"
-SRC_URI="https://github.com/socketry/io-event/archive/68cffe24077a53201acbb383e8e132b192e1fa83.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~sparc"
 IUSE=""
-RUBY_S="${PN}-68cffe24077a53201acbb383e8e132b192e1fa83"
 
 ruby_add_bdepend "test? ( >=dev-ruby/sus-0.6:0 )"
 
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
 }
 
 each_ruby_test() {
-	"${RUBY}" -S sus-parallel || die
+	${RUBY} -S sus-parallel || die
 }
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 504bb6745bb1..dcf81dae4a4c 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,6 +1,6 @@
 AUX backport-b1084c1-issue-323.patch 869 BLAKE2B a43d83c09ac9b0bafda3a6a49fb71446425d4f5eb5e4fa9ac006ebf94c84c61aae3baef674d811c86f183cee61c814f8a88406fc7b8720d96d211e04076f25da SHA512 9d4f3ac4a592a811f603a3401ad07ce703620d2b2dfe25c2f37fc3ec1a952e7ab708b321e817edf63452d72bfa0ed2738c69b0a4063f8ac1dd0b0584c4d4b274
 DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
 DIST rack-test-2.0.2.tar.gz 30651 BLAKE2B 82ffa59cca24cbb42a885bf05792cb603c44881886b716698a1ebd6857231bfdfafd9a8e68f2fd2e1d795c167886db44db5a620eac35e3824c8fe7fa1148718a SHA512 de91787563546a3f12da15f665975bf3d68f7633e277c86a529a728cb8ba9d78bac5c30c2ec1ece9aab5341571ceb23d8089d0da542409bdba23ebe93d75e2a5
-EBUILD rack-test-1.1.0-r1.ebuild 1076 BLAKE2B 1656ff7e1b56fc9f3d1b27fd3862ceecd63fb03e600e2259f0312c429131d0079b5763757b0bf9643f3d17eb364f0c8a55819411d75507bdba451702c2281a19 SHA512 4653a807bea38fcdae0ec39aaa140d663a2008a848f4faea0fc470ad59e9afeb33c3eb7ac29d2d726021148cd3345dec5074e03b49b0be3311aa82b8705d7d4e
+EBUILD rack-test-1.1.0-r1.ebuild 1063 BLAKE2B d7e1c8ccd02e5953f77ab30ee63ac9c42879c9e288a2f2abe206845e01af86b625e63a33d43747b4ab84a8019d4bc2738e6194594cd58580b1597eaf0483143b SHA512 af0df14b0e45809940dad05bb24b65687431e45a6533f0c9eb8f1c5864dd75e8c7fb0fd439419396b17b8bf3df45585405b6bc63863335c18a7401ca9cfec35c
 EBUILD rack-test-2.0.2.ebuild 982 BLAKE2B c1c1414c4b6f018ba2463923592f3af8bffad7611a8a07f9375d860caf62f2bd2a400823154f6c3058b5a6e7d772e36473203bf9b36c35bfa394170304067b07 SHA512 e0882e5308dfff5c56e229bf9df612c113dedfe99d53b7315332a9bcb29fd8a424f6490fc3363c9588485337e593888e30585c9a67ae069edf6220aca569f6da
 MISC metadata.xml 344 BLAKE2B e30c148bc0cfee01a015a9f33b641e93cafb8791f46ea7c1ec56942da88eec469d0259780c697b3bae0cbaf806dc47f919b78f2aca4d7565effd47a630f6485b SHA512 93102d50461492b9a866f74783d9d6c3d04698a8766535064d1b3c2600c11f1002b3a8bba79c81b4294e19a33cb06f8b407442c73d24fd2efcf361e39623ad9e
diff --git a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild b/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
index 4197fc6b4827..a9e10dbead89 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-files/Manifest b/dev-ruby/rspec-files/Manifest
index 010d0677ba97..ddf3ece4b974 100644
--- a/dev-ruby/rspec-files/Manifest
+++ b/dev-ruby/rspec-files/Manifest
@@ -1,3 +1,5 @@
 DIST rspec-files-1.1.2.tar.gz 4546 BLAKE2B fc3c3cc2acbac23e36ec6f85f6f58c8243f9ca769a16cfbdab6a4660dd9a22ba40fe1108b319206e9a6b5aaa4094ec372205ca33d00d2030476f1050448ef21d SHA512 af64435572b61ae4eaaed922160b8db5dca8a64987a3c24f2d15d1ec92abd2655d0e408ff2c7b4aeae29189ef1047901adc7c9e2af8a21f65dfafc974a4661ec
+DIST rspec-files-1.1.3.tar.gz 6006 BLAKE2B 30f648f1d364532f81ed169a9f1e32d0cd9cd641093f8aad90b3aa4b239ee30d38ef3331136c47787203dceeada25a499bb0b1f42b08dacffb431835dbfa9698 SHA512 c2c79d0b0cef7db64e83e3335a552f437f2e1a12d703936a2d9dc8b8c81ebf69913302d1d5f65e1485fb0295af8b098c8b25ad4c335a7f8f3d31e0f086d46d2d
 EBUILD rspec-files-1.1.2.ebuild 814 BLAKE2B 381949887a7f18a83fb88c49e2e26a5babf7dfec9233273085a90435c7e03f2f0de05aa86e3c774858eed611545d3915efe308955c884a32f4b0d578a57e44cc SHA512 61841106f074f846dcf437e566934a0a2cfb8ebb535393a62458272e4e8419920537f21111f2914505e16e694700ddbf12b74c04991bea016365818247918292
+EBUILD rspec-files-1.1.3.ebuild 905 BLAKE2B 3cdd63c1f6cc64cfbacc80f9a6c609ea750259082cd63629d9b76bb3ffd336f07ffadbf53442f893cc1847beda643f868a7fde236b61556f7aae0ce3dc3953a2 SHA512 d732dd8c0d811c84d7360a189b26276551523beecd2e605e69fd9d42f960e721c703938c18fb20e04fab5dac8ba849fac2e609406def92254a64e3f2160db1b4
 MISC metadata.xml 347 BLAKE2B e6a2b14dc5577c957615c2c3d71e92e18102743c117277b90b6b7f95bea1d54b0a80137e309b55439b3532e7617a68332c8bdc92cf017fb7fe2cdd179dcb1441 SHA512 cb62bb2293ffcda6670a6c2a1c4dfe6d724690b2059097bf7a9fa311feb2ce9ccf98f42069bcb296d981507692fa88430df5c3a2c1cd04052c462b9d85516232
diff --git a/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild b/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild
new file mode 100644
index 000000000000..ba009773ff09
--- /dev/null
+++ b/dev-ruby/rspec-files/rspec-files-1.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec helpers for buffering and detecting file descriptor leaks"
+HOMEPAGE="https://github.com/socketry/rspec-files"
+SRC_URI="https://github.com/socketry/rspec-files/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rspec:3"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' ${RUBY_FAKEGEM_GEMSPEC} || die
+	#sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+
+	# Avoid a test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-memory/Manifest b/dev-ruby/rspec-memory/Manifest
index 90dfdbd0723d..de3650287898 100644
--- a/dev-ruby/rspec-memory/Manifest
+++ b/dev-ruby/rspec-memory/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-memory-1.0.3.tar.gz 5248 BLAKE2B cf2cb55a6c3d155a739f1cbe3f307016d9446f9edde8554b6336602b86d95a369b152a413426082061c68d2e4015c68d31a34d7d80706ba09986fb8c8952d670 SHA512 1077bd6cb73ada029fc42f820e42792b58f8e06feeda711725d6f2a7a2af9151f72330d3e5a9d0fa7493eeb42f65ddf02a93fac00f5e24f2596f7df0da9439a3
-EBUILD rspec-memory-1.0.3.ebuild 798 BLAKE2B bbee1b34e1ecf72ee0bb3472b112ea125b8c32cc607885944944f3e21d20683ea2f8cbf426848c85ef5ed64ee0cd6807e8ee87c67de3682015bf4463a2a13589 SHA512 575b2f5a61ee04754085ab36fa7f8231f766797752f8decb1a3535e18ff5578f072409c1b2b8a8a3de29bd9e3a90ab8c58c357c4bc5206505fe5301cf96e8124
+EBUILD rspec-memory-1.0.3.ebuild 808 BLAKE2B ff34636adf3fa16834a6cdb53d25abfecb34b6439b52453743fa6be15f87a28038e886214e483f9a93caff814cc3cf8c5ceb484f7ce7a5b4b325cd63e3d99a41 SHA512 9655c9e1137ca14a2911d32453cb699234256c73600f63f4dc0fc98f76e2d73e4ba4740239bac74e4af401a74bb6ebb45666af992a2cf75456394b387655c149
 MISC metadata.xml 348 BLAKE2B b7ddddc65f6c8375f9da0d18e67571a92901cbd4b769e5fddbb32b967013e49004c6818bc4cb986b45166fccd252d1166c813e8e6093093cdbe030ab2c95776d SHA512 808154b4c3f75888c7c278b12a0b8a626638369f609a854129b51ee8b569f98b9e2f4e13ead899d7a3f287e9f62776443f5f79befd7a0a1c8628cc9d28e976ee
diff --git a/dev-ruby/rspec-memory/rspec-memory-1.0.3.ebuild b/dev-ruby/rspec-memory/rspec-memory-1.0.3.ebuild
index 0c30ccc070b1..96306ea5836b 100644
--- a/dev-ruby/rspec-memory/rspec-memory-1.0.3.ebuild
+++ b/dev-ruby/rspec-memory/rspec-memory-1.0.3.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
+
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="RSpec helpers for checking memory allocations"
 HOMEPAGE="https://github.com/socketry/rspec-memory"
-SRC_URI="https://github.com/socketry/rspec-memory/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/socketry/rspec-memory/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
@@ -22,5 +24,7 @@ ruby_add_rdepend "dev-ruby/rspec:3"
 
 all_ruby_prepare() {
 	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
-	sed -i -E 's/require '"'"'covered\/rspec'"'"'//g' "spec/spec_helper.rb" || die
+
+	# Avoid test dependency on unpackaged covered
+	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 3a11f5ca32d2..9bce991a65b9 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,12 +1,11 @@
-AUX backport-pr-1519.patch 3860 BLAKE2B 6bfd7e434af9e3f66517a568fc076eb138e16133b8463c072c3475c0749410f2ba838b825bd07bed14cfd08b7288c4a72e9891976099db10486d86bee0037e4e SHA512 620fb520f36dd2793d52d5472a43731f938438f74b29a4877528210bd06eb831279413692de43539a81b5c1e261f907c2b52c850593d1f4d264376ce46887dcb
 DIST sinatra-2.2.0.tar.gz 513752 BLAKE2B e407b9241cab27e326c0a2d4d83593e292de902b6ed19a12f17b0cd114230b0d10f1ffaa8f8b8237d17b547c7e012c57456af357019b228f3d7a88847220cf33 SHA512 be9432a8efa93578accc836cd0fecca128e56989d8596f1b3d33d2d956e90acd80244b98473fff2adae13ed4a1e933c41e73c80755a6f3418a65cdf33c011145
 DIST sinatra-2.2.1.tar.gz 513047 BLAKE2B 38cec7c3b2e27ac795044d7d64a00deb09707523a13338328bb1d7657b3d8eee9ab9730c6eb903c04f64acca6d24b8f191f825056baa0e705bf7ebf5594c0d46 SHA512 73f35428e259867a9b9adbf7344dd78dfe3c5ae2749902d438e2bcd95c4e7e9935ecb7761a4c52928e3e05fd99f8497db3fc049c868f9b2e76c653b4271c87b5
 DIST sinatra-2.2.2.tar.gz 513056 BLAKE2B 80904850ce577131ecc6c28917772cda6ab606ff1b4a71b733cde98d56e2906bb0dc5b65c83465e65686571e8752ec7935d89734e7d2e45c544fe14a2c8046d4 SHA512 e69a36738a7c1095968a343113ddba414ff685e941a8b55575e4b2ffa5a8e7394d874966d5532643cdfec997ac4c825c293185f6688c715006e37159eedd2be8
 DIST sinatra-3.0.1.tar.gz 265781 BLAKE2B e4fc5dec7045f5a906a91fa8d71ea32e4e1491939047cdfece7d27df3c784a5c3779a4e5de243d87f1eb7e272e3aeeda9fbfc560b1cfaf2cf628d30106567825 SHA512 717d4caff1193b158128a22737340329e5d96bea5718702c22b8c8e2c72652b1048352b36454da410a57288c852de2f04bbee6335dfd4ee977eda62093a1a94a
 DIST sinatra-3.0.2.tar.gz 265824 BLAKE2B 87739d8863dd9959b8c3530b19a3f52de31636fcdd77fe1558930749498c73ec4cf0ddf998a9f6029c46842656059f8bd76d1781beb277608ccf265577561447 SHA512 57094e00ca8280401ed76f5c52dded82d42a4a81290a9a990f464ac43abbf350e8325b8f60505bfd005b6c7d92283a3f7a9345c0ccbf227530a8c3cb93c0af38
-EBUILD sinatra-2.2.0-r1.ebuild 1178 BLAKE2B 72e9d9cbe13398c4fd717ae69789a40414a5f62c6e0c8beb6e100cc78915532560900c339b34e201a9b349819fd40ac1b75e44d9d30724dd651e18c1eff4b498 SHA512 06d51f06b2845304a7756c0bf7266819fe1c40009889392fac950821d67e17afc266a85b8903316c3ead75c0e1e7c2cdd4fe3f140057242e4667ccb4e701ed0a
+EBUILD sinatra-2.2.0-r1.ebuild 1005 BLAKE2B dda13c02308ce841d04b6267592523a417d2ff3043124ba024a591097e3a3436d4f30f1adf0237d4495471c1b9b406f3fadf792710a6e42a590f8b21284ff51b SHA512 aed0a377a5b9145344506ef2175ec1d6fec265f347f82ac960baad954366c325d501fb3f4ef167bf81e09079d99dc68c1686e9479b5d76abee800b32e51393fa
 EBUILD sinatra-2.2.0.ebuild 1012 BLAKE2B e5748efcee47332e37a741df852b5851956bac34bdc4d50c6bbf23287c143b324a0ede69a14a3153ce3d68aa3ee76244d00ddfb6b0f527c8ae98e4a880a36790 SHA512 a96d186b6330bc65b95643543d6d1816bea49fc5016baa476c75d20fad140ffcd64973a43c7dc3167bfaea4d009f71873d525cbfe6a57bdd551e627ec8eb35d9
-EBUILD sinatra-2.2.1.ebuild 1159 BLAKE2B 22a3c11de592a4ac843f24f36313ce98e15a9f6a092e537ee9d59b985f105ea8ce08159c8159d7e178e65d7766d7027ce7185d2f9f648226d8e05404863fd725 SHA512 7cc6aa34ce962441a11e9a3e019e984fa1340c5d28e064d14d0e7c25a6c5e2de9114d0542adcc8bc53c38f8291547862f1529db2c9babf0d710659a199799649
+EBUILD sinatra-2.2.1.ebuild 1006 BLAKE2B 681f6b2f9b17b7ac7d9656dcef754dcd1db17f1a42071e132c4ceed0d8af9a0ae15ca52fabcde0a33bae544a4e7dc53b8afcb2989c637935e6002e3fc16ac4b9 SHA512 dad05b778dd62a7d05865452c0de421e68faa80fd7c02f2fab0a1f581b6de98e746dd21e0546ca0f36a98f2ece46ae9fb23d486127b09101641b91713281623c
 EBUILD sinatra-2.2.2.ebuild 1006 BLAKE2B 02051754d7ceead4327c603836d52b6d4344e9c1ab4d3ae6fc3a7dc2ded7a2ee8540702aaca19f3eb388e064bfa990637776e400b068f1ee0702fc5917da5eb3 SHA512 2552c3e63d0b62838d631551b2a135822df89c2ec6758a34ec058989f47925525cf0c3a984f777166404449c0ec09e16b4cd4d5672a1d01d43769c6e486a483c
 EBUILD sinatra-3.0.1.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
diff --git a/dev-ruby/sinatra/files/backport-pr-1519.patch b/dev-ruby/sinatra/files/backport-pr-1519.patch
deleted file mode 100644
index cc344621c3b6..000000000000
--- a/dev-ruby/sinatra/files/backport-pr-1519.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-https://github.com/sinatra/sinatra/pull/1519
-
-From 6d34a2a1bee48961c25e1b53edac874a31c42060 Mon Sep 17 00:00:00 2001
-From: Jordan Owens <jkowens@gmail.com>
-Date: Thu, 31 Jan 2019 22:32:45 -0500
-Subject: [PATCH] Internal Sinatra errors now extend Sinatra::Error
-
-By extending Sinatra::Error, an error class can set the http status
-code on the response to a value other than 500. This commit fixes
-issues #1204 and #1518 where an error raised by a third party library
-that responded to http_status could set the status on the response.
-Any error outside of Sinatra errors will now always return a 500 status.
-
-This fixes an issue where an exception could leak sensitive data in
-the message to the browser. Errors that have http_status code 400 or
-404 use the message as the body of the response. This is why it is
-imperative that these errors extend Sinatra::Error so that this is
-an explicit decision.
----
- lib/sinatra/base.rb       | 22 ++++++++++++++--------
- test/mapped_error_test.rb |  6 +++---
- test/result_test.rb       | 15 +++++++++++++++
- 3 files changed, 32 insertions(+), 11 deletions(-)
-
-diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
-index 6dbb3ae57..4dfc9a8ae 100644
---- a/lib/sinatra/base.rb
-+++ b/lib/sinatra/base.rb
-@@ -255,11 +255,14 @@ def call(env)
-     end
-   end
- 
--  class BadRequest < TypeError #:nodoc:
-+  class Error < StandardError #:nodoc:
-+  end
-+
-+  class BadRequest < Error #:nodoc:
-     def http_status; 400 end
-   end
- 
--  class NotFound < NameError #:nodoc:
-+  class NotFound < Error #:nodoc:
-     def http_status; 404 end
-   end
- 
-@@ -1149,14 +1152,17 @@ def handle_exception!(boom)
-       end
-       @env['sinatra.error'] = boom
- 
--      if boom.respond_to? :http_status and boom.http_status.between? 400, 599
--        status(boom.http_status)
--      elsif settings.use_code? and boom.respond_to? :code and boom.code.between? 400, 599
--        status(boom.code)
--      else
--        status(500)
-+      http_status = if boom.kind_of? Sinatra::Error
-+        if boom.respond_to? :http_status
-+          boom.http_status
-+        elsif settings.use_code? && boom.respond_to?(:code)
-+          boom.code
-+        end
-       end
- 
-+      http_status = 500 unless http_status && http_status.between?(400, 599)
-+      status(http_status)
-+
-       if server_error?
-         dump_errors! boom if settings.dump_errors?
-         raise boom if settings.show_exceptions? and settings.show_exceptions != :after_handler
-diff --git a/test/mapped_error_test.rb b/test/mapped_error_test.rb
-index cb158a268..562e509dc 100644
---- a/test/mapped_error_test.rb
-+++ b/test/mapped_error_test.rb
-@@ -6,15 +6,15 @@ class FooError < RuntimeError
- class FooNotFound < Sinatra::NotFound
- end
- 
--class FooSpecialError < RuntimeError
-+class FooSpecialError < Sinatra::Error
-   def http_status; 501 end
- end
- 
--class FooStatusOutOfRangeError < RuntimeError
-+class FooStatusOutOfRangeError < Sinatra::Error
-   def code; 4000 end
- end
- 
--class FooWithCode < RuntimeError
-+class FooWithCode < Sinatra::Error
-   def code; 419 end
- end
- 
-diff --git a/test/result_test.rb b/test/result_test.rb
-index cbb781319..67d163fc4 100644
---- a/test/result_test.rb
-+++ b/test/result_test.rb
-@@ -1,5 +1,9 @@
- require File.expand_path('../helper', __FILE__)
- 
-+class ThirdPartyError < RuntimeError
-+  def http_status; 400 end
-+end
-+
- class ResultTest < Minitest::Test
-   it "sets response.body when result is a String" do
-     mock_app { get('/') { 'Hello World' } }
-@@ -73,4 +77,15 @@ def res.each ; yield call ; end
-     assert_equal 205, status
-     assert_equal '', body
-   end
-+
-+  it "sets status to 500 when raised error is not Sinatra::Error" do
-+    mock_app do
-+      set :raise_errors, false
-+      get('/') { raise ThirdPartyError }
-+    end
-+
-+    get '/'
-+    assert_equal 500, status
-+    assert_equal '<h1>Internal Server Error</h1>', body
-+  end
- end
diff --git a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
index 4a36cb96c31f..6e3d3a72f8de 100644
--- a/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.2.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -21,10 +21,6 @@ SLOT="2"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
-# 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 "
 	dev-ruby/mustermann:1
 	dev-ruby/rack:2.2
diff --git a/dev-ruby/sinatra/sinatra-2.2.1.ebuild b/dev-ruby/sinatra/sinatra-2.2.1.ebuild
index 26896805eb10..20f026413a36 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 ruby31"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
 
@@ -21,10 +21,6 @@ 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