gentoo auto-resync : 07:12:2022 - 09:13:05

19 files changed, 91 insertions, 229 deletions

diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
index b13578766edb..eacdc71c04e6 100644
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
+++ b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/GeoRuby/Manifest b/dev-ruby/GeoRuby/Manifest
index 0c014b32b5ff..b2eb91c01bd1 100644
--- a/dev-ruby/GeoRuby/Manifest
+++ b/dev-ruby/GeoRuby/Manifest
@@ -1,3 +1,3 @@
 DIST georuby-2.5.2.gem 211456 BLAKE2B 67340729118cfb64d78a0ac3e98a6e29414ba0ca111c8a9e608486803c4c1da51e99e06b9ac1abfba0b3781d330ad83e09b72cb5d643d32fc47ce35307045a17 SHA512 f65aca747ff2615ce2cecf0d3a9fa8728b362f211da0433b075e5abd95644daa8d5d8a6e19b051b8e2b78d55e819f07b19b2dfcb95f26f3d678c698fd7126f3f
-EBUILD GeoRuby-2.5.2-r1.ebuild 637 BLAKE2B 10eea37ee238b949b243b1f7fea31428f7917cbfeb75cc81404c7f944388fb0d4d2e488c70cd8f44a54e31a77d8e71c50f3d16e1cd340b280c1ac102ced5f1e4 SHA512 cee1c1959f4b1b03de3782757ba3347640e7f13d766085fc039267d10ab3e5b3a439b81d644fdfc1b681e26163033a19a9b077ad0a68ef5efea3e914cbcc8453
+EBUILD GeoRuby-2.5.2-r1.ebuild 637 BLAKE2B cf38bab84c5e83e0fa515bad3bd8d4cbcb23a81399d516461251d0dc9c1fefeaa4c5c5669782cfae65d4c70b7079667927675cdc6764c806340ee2b0cd15a7bc SHA512 27fe57a81e1deecbeed4514a80cd20e6c1b663eaab033ea21f98b736a203327214450c115c2bebe326829e26fddc7961595091ba2f9b0d5144a08859390f558c
 MISC metadata.xml 476 BLAKE2B 12503c8e28c1b3b6f681ab95743bf38ddfca1ac9528c0e0f5ead1966f13c5dce1a8c9e4f7311d3aa3e63e7f3fa56ec5d3e0319b9d4974e21eca65e5d694c2bd4 SHA512 1462fa6aea7ae53e6e9073dc94d125f7b4fdb55c398a20411ffbc2d5732d744278afdae967c9db9343fce2ae249f864d1de8933125520004af3eb718a0eb9953
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index eb13fb8fbd7a..b39f4f8ba845 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index e77247706b4e..7a74321a520b 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -1,7 +1,9 @@
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
 DIST did_you_mean-1.5.0.gem 34304 BLAKE2B deefea833d1fe12733a6b1422e5ae43d0cfa7ff7ddc49665762a83866634ccd0a440e5a3b351cff6d9d308e85de0490d56d7b675d582f090e0e4fb07186c197f SHA512 7fa4cce3fb895bf026788bb5d558f88d4ddb62b7cae1e284969dc4f0570e88871d5f103514da2c9d79399dcf10ffc845a594afc9c676e90cbca4d5a38d74d7f8
 DIST did_you_mean-1.6.1.gem 35840 BLAKE2B 618e11c23135edac66cea95c0cc4212045fcced1148c46543ba243b5993e577c0ae610e168b6b3b5b178c1642ff47436ea765b4880f6cb0da505931e9643b197 SHA512 3d29ed5ea25d163963c7281be2f70d08b47f7aeedf997674e5bcab11d6dacf231ae48a5c9d2a9fcee9ca607883867a5b39c59184da722ad0f822730747380ea6
+DIST did_you_mean-1.6.2.gem 46592 BLAKE2B d24960738dadb3f2881d2a392d8f3aec48b7eb770c19af59fa79971316326f2509f79517b43fc1a42c77f41602938c8a3483c162ab6f74c7df99035ca599eaa4 SHA512 98df1f9820c0b0c19c2493418a0b8e605148757e9958ad0a3a9d19d314b7b6a883bd1a93a1dfed96f62a796c1417f16a8f2ab782bfee60526bbffdcb7cc31e38
 EBUILD did_you_mean-1.4.0.ebuild 669 BLAKE2B 5486983f1c62524241b10f81c1276c89548dabfceba67077b12d40f5eb2bdfb853da72c7fc7493a0ba4fd93f4ca1b166c3e9901c24712b69fb2d7343a2c641ea SHA512 f6f3a2a0f57c11028ff433dc10cb4cd3573219d9fc2801eacc660c144aa0f3704f661a067a4f383a2a6d0498bd7dfaea399ac8c015e9e12ac5fbea6c0669c33c
 EBUILD did_you_mean-1.5.0.ebuild 691 BLAKE2B cce861947b4e1ae7a3a99ad21590ca07bfd6d0a4a67cbcc4390f47692fac04c63da34250e260ef4dfdc5d91d54d23ac73a65aa69efce9947d0f743721e242672 SHA512 50c333eb63aa54ec4e5cf4afa0eb3bf7db6792d3ab607bb7dae5e258e4dcdbbfac25fda84e26be342ae8a6a43e3ea263f4baf2ab998d47e43b1f4b2f77ef9386
 EBUILD did_you_mean-1.6.1.ebuild 698 BLAKE2B 4dd8c8f26e6cb6bb5b2a08e651853c6d1e4abe3adbf894d4eee28e378a6541027d5cf2e09f16cbb1f25cf70bbeb340f3460cd7f9007bb28f1c5c1dff98979e00 SHA512 0b2d968cfa50d337b9b0d5efa96f90de445dc71eb4e4026825b558244075e9422f61c7313a75e437003c3c8c9a8550aa444e7838b0a1c2cba3f8a21e6641bd89
+EBUILD did_you_mean-1.6.2.ebuild 691 BLAKE2B 24a5c175f851b51d249f5666aeaf9ed73d5dca120e9a95ab313afe3ed4fc2b7ee1e838b7afc053dc5cea3b11acd6e8daf6dfa7ae02160f2cf904466158b85c3b SHA512 2e05ef46c842f2a07da88c7e8825988a3c9efffa3976815e3255e0397abfa146e00487a558ac958fea98d3636514216bd15f10c20e568c8dd0afca446ec95d91
 MISC metadata.xml 346 BLAKE2B 7168c0159e7fefc614f4574bffe30a5ed799c93fa130be05777e155fb457f1674629a75388f704d82df8931c1b5686b91a62488e27de5dc2a0cfa97238a2e3f7 SHA512 15a8957c29c10e64cf244aec15aa6cc6b8dbc8e993b22dfd82c9f96914ecf5f82b65f924556e01f5124e8fecb122a10cdd889f9af7d5d833fedc0baec0186987
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.2.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.2.ebuild
new file mode 100644
index 000000000000..9f69b32f446e
--- /dev/null
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.2.ebuild
@@ -0,0 +1,24 @@
+# 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_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="'did you mean?'experience in Ruby"
+HOMEPAGE="https://github.com/yuki24/did_you_mean"
+
+LICENSE="MIT"
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index a5f6cf3f5aa1..43bec03f02d5 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,7 +1,5 @@
-DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
 DIST faraday_middleware-1.1.0.tar.gz 28104 BLAKE2B be490abc57a11c64331c45f1529e55b38df699fe20e81f3783ca92ba7c5c573c1ba2494086f40bdcc7080581ffb2df89093bbabadf8c46721dcca2cb6a0310c1 SHA512 e9c3ada418e47c397272b52706bbcbfa1c98b7b467c148c0094b1dfe47d28fc57e397461e6e7446c5bb8d71ed968e74e1b7e67e793e30d3f47e9fb1aae549912
 DIST faraday_middleware-1.2.0.tar.gz 28332 BLAKE2B 09aefce13f0145e4098d68d2b8887fff5b535b3eda520335fdcaeea05256d1a256501fe9fee4273636fb0bb9d806d38ff7588a489840d2e425ce6666c496a4d1 SHA512 abfc6faf725c4646d0c1c59d2bde23db13dd78f81e74d313368bd0ec4945c33f24c8e8f3f252c6fa499fa845bdda19544876ea93bb9118b3fa4d3c7615366283
-EBUILD faraday_middleware-1.0.0.ebuild 1695 BLAKE2B 494f0688de5319c53547112c920575b87c6a24bce6e61698f6c8aea0890359e6dddd04d1a5cbaf749497a4896231836472ed9323b49dc75895aec5c2f9427dc8 SHA512 344daac4c69f0f2afd180744e4d229b6294670802995fd6c8c08d124350b3c9bb752b88638e436d0678ea5e37e783575de930a7113973cc9b913c315ce703a8f
 EBUILD faraday_middleware-1.1.0.ebuild 1694 BLAKE2B 5c72148f44baf0c9bf4cddaddb806be325a2b1a24e9dede08bf47e93c73db7db3b7196dbed80ff24e7a189498c803b77c41efe32f83777ddf3d1c5c16e191b33 SHA512 710546f9fe4655299ad0c5d390a7f9dd942bbe4179abbd3eeebde94571d84b3a824a373c1b297d0c482b84a981c0e35cb8ff8cca22bb239ff56649c02ab6c961
 EBUILD faraday_middleware-1.2.0.ebuild 1883 BLAKE2B f9aec81deb45462a79ab1a641f796b5a6994ec202cd8215f2bcffc0d83f2059f76e00d2821a3831b5f58e4a7fce0fe24c87dff59f8e43ff4b8ff7406d4bb4490 SHA512 d0fb4b53fa54ec84cc70ed821cd8b9d4e92aade09b140cf1eb38dc3a23470a2836d85afceb4889725fc850fa6a7c59d24e9fdf51c41e32435b139c60fbe75bc2
 MISC metadata.xml 730 BLAKE2B 64f366662ab812afd769d94c56eb3829c55803a968afc445cf2e43f16f3c02b6c25541459fa10a93adfacf7064c0fe136321d64e546e8a570365ad002ccc5397 SHA512 9ea2039688d9139404e6d0bd1322f399ce4019e5e36e6d4941296559ce64bc9ca99807d7e0f10c776c4b597e0839a49698d6240c432be4102bfbdaac09b46e2a
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
deleted file mode 100644
index 3ad6b8513fdd..000000000000
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
+++ /dev/null
@@ -1,64 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Various middleware for Faraday"
-HOMEPAGE="https://github.com/lostisland/faraday_middleware"
-SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="+parsexml +oauth +mashify +rashify"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	parsexml? ( >=dev-ruby/multi_xml-0.5.3 )
-	oauth? ( >=dev-ruby/simple_oauth-0.1 )
-	mashify? ( >=dev-ruby/hashie-1.2:* )
-	rashify? ( >=dev-ruby/rash_alt-0.4.3 )"
-
-# Bundler must be used because the optional dependencies have different
-# version requirements that must be resolved.
-ruby_add_bdepend "test? (
-	>=dev-ruby/brotli-0.1.8
-	dev-ruby/bundler
-	dev-ruby/addressable
-	>=dev-ruby/rake-12.3.3
-	dev-ruby/webmock:3
-	dev-ruby/json
-	>=dev-ruby/multi_xml-0.5.3
-	>=dev-ruby/rack-cache-1.1
-	>=dev-ruby/simple_oauth-0.1
-	>=dev-ruby/hashie-1.2
-	>=dev-ruby/rash_alt-0.4.3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-		-e '/rspec/ s/>=/~>/' \
-		-e "/addressable/ s/, '< 2.4'//" \
-		-e "/rack/ s/< 2/< 2.1/" \
-		-e "/rack-cache/ s/, '< 1.3'//" \
-		-e "/simple_oauth/ s/, '< 0.3'//" \
-		-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
-
-	# Avoid unneeded dependency on git
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 12bc47a49601..96cd4aaed749 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,9 +1,7 @@
 AUX backport-pr-962.patch 1773 BLAKE2B b4eb227a949136143a98e8a5ed9067599d3a4ec14376c52619e2f3db56906ed028f9be889aa6eea5abe7e7ca9c3196208ede7dc5768cba43ecf9d000f1e3e1da SHA512 dc6a17bccde42b3a64e7de3bed5fe0818a4bfe9e109b665ccf06963a4939fec2a77e3fcff073cf3a4feccb68d3dc05bbb4885ebe53c2060965e114041c9e3ce5
 AUX ffi-1.14.2-32bit-long-double.patch 701 BLAKE2B d8a3f2a00f8b93f42953bf5317cf6ae45ed662c81b993f83b728125d6fae15c6f75d11e0f76b0f46912b1c52c849764d3393a09c3ac1e35f3557e97bd3662364 SHA512 9cfe4e1c80e08c672eee30fe3b170d667e72cc2e047f4edd1e9573bfe6d4dca315a84baa54855756631f90c04fee59a417f286df95662f6abcfd3728c1b1a4d7
 AUX pr-957-sparc.patch 1681 BLAKE2B e08a03d5e054ce030c04cb0645ed2683faa9d0ec8782313464112e3dd3adf0b8ee40f7fbea9aec15ee7590189e93f03617fe06b506e2ea049535e48bc33a8f23 SHA512 32bd488a3cc4b0c81d8f7f9f2875e591b8de7bf741b838aab3f20ea64025984b3d83c393e1e8f0b628f009b2473d381139655f965cc746dc9074cbe57171cb7d
-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 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.14.2-r1.ebuild b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
deleted file mode 100644
index 10c95ec49b55..000000000000
--- a/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,68 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:="
-DEPEND+=" dev-libs/libffi:="
-
-ruby_add_bdepend "dev-ruby/rake"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
-)
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/filesize/Manifest b/dev-ruby/filesize/Manifest
index 283530bebb88..ac0345f27e1c 100644
--- a/dev-ruby/filesize/Manifest
+++ b/dev-ruby/filesize/Manifest
@@ -1,4 +1,3 @@
 DIST filesize-0.2.0.gem 8192 BLAKE2B dddf9a19712d03bed55d234f89a4d2ec9afb713ea8d2f63ad8cf9c1daf6ee9d8e6a7219dcd7c76b19a548e3d58ed4712b4c953ee1c573706ae010042c81c41d2 SHA512 87d13278e62fc6ff7ef08f9a287951a1ac3f502b69e1c3b9f5579971a2ad167875f4028a1f51f24f3bb54de38f7cb0e735ab3763bf8774ceeda68c8d3f8de42a
 EBUILD filesize-0.2.0-r1.ebuild 447 BLAKE2B af37a4e80d8a29843b58d14dc2ff63cabc089fe516db8138b9f433b07acd44e8532b98bbe55be72409b75ddb368c1351d5846e58ebb32bb8fded0d66a8807a7e SHA512 66a49947095e9acd35c063e1c4dc4d6bf88a9765e00ae461a1053cfccd692414cf19914da8384da3489fb80e8806b957470a9912fbd19ad0b614dd719a0f745d
-EBUILD filesize-0.2.0.ebuild 471 BLAKE2B b675b6d23117eb187f9392ae2684918918b9d1f7ece95188e2abdd15ddb2bb49b9ce54e361641c7563e6987844ed9bfcf06be38b7a5120426fc0f50e6e7ed3da SHA512 1ff22cfba153c381f93756af4b9825b110588f13a7e6c512e1b4e923950a35ed75c9fe7c02c7e917b8785568c7051d1aaee9409e76a2628882d434932bece648
 MISC metadata.xml 340 BLAKE2B deb5c3b256bb1138f8961c8c408e3bef3073ebee4f7d423a30387e06efaee36cf33856e4e73dbe0c8748af81befa412cf5f66bd4a9e2e7b3c0a45297bb5b24ef SHA512 1bf557a10930fbdda22e5399b932feacc68f3b99eef3ace12a083d88f9c53dfdcf5b250f75dba3ee023d2215bc1d877817ffbab2ba78b56148820ba91c9c21df
diff --git a/dev-ruby/filesize/filesize-0.2.0.ebuild b/dev-ruby/filesize/filesize-0.2.0.ebuild
deleted file mode 100644
index 7aeb065f1134..000000000000
--- a/dev-ruby/filesize/filesize-0.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="small ruby class for handling filesizes with both the SI and binary prefixes"
-HOMEPAGE="https://github.com/dominikh/filesize"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index 6626acd26cbf..c26d97e0cff8 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,7 +1,5 @@
-DIST flog-4.6.4.gem 26624 BLAKE2B 27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3 SHA512 495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
 DIST flog-4.6.5.gem 26624 BLAKE2B c1cf4377be7a2b9856e4f370b6a559ac1ebac6aba7da28bd6a27bb84fe8df613680cb7c96e3d30e42d30011b97309c60e7f4bec2c322bcc3b2ed8ad5f93172a1 SHA512 81eaf3871f6111b442fb82371720709073f00a17044885e85498e7f943e1c9f8b5345ae8ff06a56ff68db8919ee0e696284bf017b1e1e66d76419306bed90866
 DIST flog-4.6.6.gem 26624 BLAKE2B 7643813d436ca516d60bbde6cefb18d561a1ffd6fde3586a7104450a96b6d363dc6b794620b41e8ffeffd831e252cf15d681b2fdf41acb3b3c0d0cb5b4e95c25 SHA512 0689f85de19eee0d992e094f43b74f2eaf08696cfdaab849760e5f017b83bd0acb538bd0a6d6289538ac5b7f888069e12507eb6139fa35532a310122c4412c64
-EBUILD flog-4.6.4.ebuild 607 BLAKE2B fb082d88645917c8e0a785b327daabbceece093fa99e92abc88aa88ee8bf0dae91b500343223c9222878cb79bd5903351e6ade59750537b45784c34e006332e8 SHA512 c0733785b5cb1fb7b4ef8b64df0b779d544bd001ae9c39baaed9b48d684da5e7dd9b27b02b0907e6132cf9a57b99e81a4af0d4b42bf03d44e01c08b2272f6c3b
 EBUILD flog-4.6.5.ebuild 607 BLAKE2B 62b42a2e150f8f78db09e1790aa1c2582aa42e8affca3de89342d3d3825b4f9770f07503b717091d810a7788a3a370bba01a3713ad6228b25ef1de0cf8da7e14 SHA512 019e3902b3d90c2d5c17ad2e7dc8801b612c3ee0948cdc28b82c6a75077883938949ccae9435ef4b1a0f9526d9087a5fed778ea39247eb81684759034b3805e6
 EBUILD flog-4.6.6.ebuild 607 BLAKE2B 62b42a2e150f8f78db09e1790aa1c2582aa42e8affca3de89342d3d3825b4f9770f07503b717091d810a7788a3a370bba01a3713ad6228b25ef1de0cf8da7e14 SHA512 019e3902b3d90c2d5c17ad2e7dc8801b612c3ee0948cdc28b82c6a75077883938949ccae9435ef4b1a0f9526d9087a5fed778ea39247eb81684759034b3805e6
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/flog/flog-4.6.4.ebuild b/dev-ruby/flog/flog-4.6.4.ebuild
deleted file mode 100644
index 3d36c1b55794..000000000000
--- a/dev-ruby/flog/flog-4.6.4.ebuild
+++ /dev/null
@@ -1,28 +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_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Flog reports the most tortured code in an easy to read pain report"
-HOMEPAGE="https://ruby.sadi.st/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-ruby_add_rdepend "
-	dev-ruby/path_expander:1
-	>dev-ruby/ruby_parser-3.1.0:3
-	>=dev-ruby/sexp_processor-4.8:4"
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_flog.rb || die
-}
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 78142c1bbbe7..18a867ba7c60 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,6 +1,5 @@
 DIST gettext_i18n_rails-1.8.1.tar.gz 21942 BLAKE2B 7925bfad0e1033fd363ca2c376594ba8ca6a7f5c1da940c680acae53e4b3902d7c07828b6023ed208f559af1b9ded7933ffae6b7385e066c0494aa16cc728256 SHA512 711c15620a23c070f47d4846f48b74564bfc23d27e9757936b432c1b3c534121d4cf58101fe533bc58b7d3e33e899134b92cd119e2cd2cd3eb39f54e93e394e0
 DIST gettext_i18n_rails-1.9.0.tar.gz 21389 BLAKE2B 12c98c76f6e782d35957a168d71ba0ac6cbfa492954716366fc9c41cef1ee7cd733f4e352bff0c28c9ae873445729a30c572053eca423cfc272b4639e474a36d SHA512 dd271828120a4f430adf2d2f63d3c7c294d4b236d665b1e64599ba0c3e40114afcab0cd485fd2388e5747c4edb40d12de69e08464b36b160e216326bd112c232
 EBUILD gettext_i18n_rails-1.8.1-r1.ebuild 1063 BLAKE2B 181e93a46b69899a8eb5fd4fd835c9e58d1c517a6ce7c5f7d82ec79e957405483fdfb3b902867a1c97f5c1fb05d1559cd404474978c462c71659a530e9e9cb7d SHA512 ae1b8a1b252269b8839f513406b38970b0d510dbb9a1af912b75905c1c070dd6d7462f3afb58cffebdb42dcace998262b86c90d60d8b4259aea9aac72475a2ff
-EBUILD gettext_i18n_rails-1.8.1.ebuild 1070 BLAKE2B faf32fa7d7d74703a07c37bac75b9050ae72a020d4912b6d2fce77b55e0b0137ab7d18c0135b98bd6206a2edf594fb4ec966af79bc8aa523b0dee69596dfba27 SHA512 d9370a6c8bc4067a9a6d1ced316eac3b915719bde8e28976249d9385e2688d26f735d6b7fb8294449a97e81b4f0c376eec130ccb2d4111e40e6d5c01589d9597
 EBUILD gettext_i18n_rails-1.9.0.ebuild 1074 BLAKE2B 2b4cf0f59edec41943ad19be74eee123c7d6ca3ec558065167f990cc34a0ae30499a96cab628afbc0fe3487268e1d97577e83712817ae779fc851b0abb12dee1 SHA512 62a8f812120798abe3432407a58256500d9288014f18d853050f8c807cd2133f9672add0f7738d5375215418fa5360dbb50a508dca7497bc6c33167f2b38659f
 MISC metadata.xml 353 BLAKE2B cfdd814918fa7d75f7e209c0efff8c8ecba9154a8977cab4d64412c2cd09a52553d5b25050c25535fc59c3dfc11255ab9fbff703536da85a7b0b7d29390cb7af SHA512 12b6cbce3229f093d824a6d1036a44ee7cbb7399dc29db9eeaac72797440d222f65bd1efafe097efb2aee9ddb2881df54bb93bb336d0c03441b2a396405d1967
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
deleted file mode 100644
index 10b80d88e874..000000000000
--- a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1.ebuild
+++ /dev/null
@@ -1,38 +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_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="gettext_i18n_rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="FastGettext / Rails integration"
-HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
-SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rails:6.0 dev-ruby/activerecord:6.0[sqlite] dev-ruby/temple )"
-ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0:*"
-
-all_ruby_prepare() {
-	rm Gemfile Gemfile.lock || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove specs for slim and hamlet, template engines we don't package.
-	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
-
-	# Test against Rails 4.2.0
-	sed -e '1igem "rails", "~>6.0.0"' -i spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/net-protocol/Manifest b/dev-ruby/net-protocol/Manifest
index b5f00e783d4f..e043bb72f742 100644
--- a/dev-ruby/net-protocol/Manifest
+++ b/dev-ruby/net-protocol/Manifest
@@ -1,5 +1,7 @@
 DIST net-protocol-0.1.2.tar.gz 17603 BLAKE2B 2d5dd2437d2d10e82c20e17884b80259b7cb5b5ef626f4dc054515adaff46143b46754fc375f66e5754aa81a72372784b389864bbed249c6df59d64331c47672 SHA512 959b426ab3fb388d42ccd5b21e60878b58e606ec21d651d232d706c40908c6b53c14ce16362ca3c32cb40da1238baf79127d870788adc8b23884204f4426f9d7
 DIST net-protocol-0.1.3.tar.gz 17522 BLAKE2B 6789bcf2f1908e91b6e01cdb225feb975457b9c274b6632d67e39c2fed1a6a0efe20c8f8f10d8f287618546c116fd0a5947b994c6d749d8312b243bdb7d624e1 SHA512 958f7a52fd7db661e60fa6f4f401ee0097de0782d984b4394dec5ced34b4935d6f30b65a198f5b9cc17247b6ff06ff266e2ca1f1081369cc18597bfd30285774
+DIST net-protocol-0.2.0.tar.gz 17760 BLAKE2B c5606b0f206abee666e53480d1a08f2b673330f8ca0a0b5761e7013dca7273d2d49640b270f7a5f096746bb101ec26382c5a3718d62592f1ed82c32d34409f6a SHA512 9769bfb17e8316f20daba9336af8392d38d4d8056590a4d8b019ca7dc404e2e287a82b0373852b2fea40b249b15602bb2b16596d0e62f4d53cc8f67d977d4e26
 EBUILD net-protocol-0.1.2.ebuild 924 BLAKE2B f8478073769c39c413a449de321b90fee171c906045daf559d320299c8d1adbfd3f2a1676acf85cb8efda16015a69b904dc57bc3a2bcdfa7f389dc86df0a5050 SHA512 f682b9b168fefe5bc9a9630cb06bcd8225be64f8a5eb817aa267d473b60ef58be1f4a64e64defea44551923ee3fe0b12cf50f9ef640c846fc9bc2c4d7481789a
 EBUILD net-protocol-0.1.3.ebuild 906 BLAKE2B a24a6993b511a288bdfde3be4246c612d0aae60b35de39ca1f33517d81debbb509c6b0f4509950688c05a8702576785d67065adbd9f9ecc124332e0fb458b7d5 SHA512 fe1dfef3c61e7aaa9e7e48bbc2f83037083415fe568fb744055d79b97a18434d9b9c274a0d3df427c455f36f6db52a66e894c5263ca82e3583c5157083da376e
+EBUILD net-protocol-0.2.0.ebuild 899 BLAKE2B 00406fb22825d5a8d664ce8ef401bf2e781e62102c1b181f18100e7f2835ddb230e052f9ecf371816f031f471ee9e1ee9201ff976e3e01ced19d30a22e42e5a3 SHA512 300cd73f60992ebf3b3272d050a42656d4c58bd95bce5a99db0471228d774a90a2b12918e1b5f7ef9e319c6e698eaca54298626378c83c17c5abe215e43dddda
 MISC metadata.xml 344 BLAKE2B 81d283914804c68a59c8f6ed77389c5f8f9ccd2c8f22e488569478b9df967b8e7e1bf18bb6e8949eccdc0a3731f273ecbed48bc5bd501a75339bd5121e153e82 SHA512 e137752f286f493b7903d114bb18830999f4991fa78d5838fa48aac8f4e88915db08352e73a8b7b3d19c98888ae4cc94d57e2a772fe11f98f99268544b558b94
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.0.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.0.ebuild
new file mode 100644
index 000000000000..2f0df4b1cbb2
--- /dev/null
+++ b/dev-ruby/net-protocol/net-protocol-0.2.0.ebuild
@@ -0,0 +1,31 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The abstruct interface for net-* client"
+HOMEPAGE="https://github.com/ruby/net-protocol"
+SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/timeout
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/timeout/Manifest b/dev-ruby/timeout/Manifest
index 82c14dbb0a25..576ff36ed823 100644
--- a/dev-ruby/timeout/Manifest
+++ b/dev-ruby/timeout/Manifest
@@ -1,5 +1,7 @@
 DIST timeout-0.2.0.tar.gz 15672 BLAKE2B 2a42efb4475047c947ec1a30637e4ddb8d745651d9d277af9149f952ee88cda335818156d777db283660ac16f338ac53776f6267f040b115078fed9572b4ddc7 SHA512 fe665127e90782602dc4e0f61b8ea39b3c2092a50a0d5f708fcb14bec08443868dd8539417c29166dd925389ef2beed49a67f16bb195cf998104b7121f4c1c4d
 DIST timeout-0.3.0.tar.gz 16332 BLAKE2B 9f76ec3ae80c727c745cb4ebfeed67d0d9072fe5b58b4424b5c8670b75c030990219a3243bb80b3082c58ad640f16655881cf6b577a9ab1eecc51e72ff662b26 SHA512 d9f3c25a82be1572ce4286b1066db6a57ea4ee61062ae433c75752ad9e473b952968cfbfe1c9804c8f666a6409dfc9d2b68e8f6960c32a0e48a56d29aaf1bf26
+DIST timeout-0.3.1.tar.gz 16781 BLAKE2B dece63fff06da13516e1ebae591b5cca63e1cefd2ac10c9e254a1d37125fe05f962bb65befeea58de0c9c88f4c475ce62decf349b5268d67bf41a7a31503a54a SHA512 2bcf81df02eedd3eceb370abb1eec94cc77cd93f8c7d034fdd7a9b78c56490f9f49ea64a805e2d9ea5290bc9d8d0a5178ee5c77f6b3d9ea147a4be499c8b918a
 EBUILD timeout-0.2.0.ebuild 861 BLAKE2B b378e33e3415a951dffcbe44c33e177f5f9e4211d18c365cc7512af6d1c5cb1c03bd86e06f7ea126392c60eafb3cbac63f05b7060ca8817f0c72f051497f82c1 SHA512 e35b38d45521a5872c9ffdc1c34784d4fc8d3dab73972ef133e267738eaebeac746b8dd227ba6ceb65b7a1a6b7c717c695919b151c31f46ba25778879a58f1c8
 EBUILD timeout-0.3.0.ebuild 861 BLAKE2B b378e33e3415a951dffcbe44c33e177f5f9e4211d18c365cc7512af6d1c5cb1c03bd86e06f7ea126392c60eafb3cbac63f05b7060ca8817f0c72f051497f82c1 SHA512 e35b38d45521a5872c9ffdc1c34784d4fc8d3dab73972ef133e267738eaebeac746b8dd227ba6ceb65b7a1a6b7c717c695919b151c31f46ba25778879a58f1c8
+EBUILD timeout-0.3.1.ebuild 854 BLAKE2B 55bb7714cf9f55537d8975a7d678369842af39fd92a1e709eee9f82c5908263f2ee2b3ed22e33d695a1e46314466fc2c75401a2e349991fbd84cc7d1f950e664 SHA512 008e4977b64d0cfb455874193e871b5ed7dba05b959fee09bf36a063f425b4d7e09934ec47bd1b93e35693bc137a36fd00725ce946d85c3f027466064ef946a1
 MISC metadata.xml 339 BLAKE2B 631c72fbacd33d4ff5bae080f6c0c30c59f241e045056f8e4cd8330869a682cc4bdad6c13757f7f151f9171277a3ff227decbb87a20b2a4da7f83ad12d4259e1 SHA512 bff9f7fad39a8eb72caac724534d0d183da7aa43a4f57011e823a4d0b68d53418f858859aff22d46db2b6df3223309322837d2dd2badb0c1eba965cbb1fb3d29
diff --git a/dev-ruby/timeout/timeout-0.3.1.ebuild b/dev-ruby/timeout/timeout-0.3.1.ebuild
new file mode 100644
index 000000000000..8b2a780e6031
--- /dev/null
+++ b/dev-ruby/timeout/timeout-0.3.1.ebuild
@@ -0,0 +1,27 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="timeout.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/timeout"
+SRC_URI="https://github.com/ruby/timeout/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}