gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-ruby
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
125 files changed, 1199 insertions, 875 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1366e1ad59d7..d0cd637d71c6 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/childlabor/Manifest b/dev-ruby/childlabor/Manifest
index 1cb3a73b549c..ffcc88cbf9d2 100644
--- a/dev-ruby/childlabor/Manifest
+++ b/dev-ruby/childlabor/Manifest
@@ -1,4 +1,3 @@
 DIST childlabor-0.0.3.tar.gz 3120 BLAKE2B 555310e2b6b70292b580451b3627973a2cfc33ae0a8ceb5507fcc92ee70f388802644b1586c18736b34339418a9aaa6450f07e5353f3925a7238f02d397a640a SHA512 d18f3f90204b12e3b4a21be1439fcf44a4eb9f905402633966e6ab2a3cc9412a28c502a8c78487834a82e1de24f0f905691f33f443de930f670c70b17288fb6e
-EBUILD childlabor-0.0.3-r1.ebuild 994 BLAKE2B 482d03dccce006b96cb4b8ed8c92f8fe2b0271d4f8d1e25ce022437fa586636faa3c2ff7cc6b864c6506894ec6af5229554f913e762ed386f2fc83b4369ecccf SHA512 78bf7fec8f91cde98f54b5c9a3b5160c19474177ddc285d111e5bb4e6c4318b9ad6daa21686963acae0bafc69b4d025c705cd409da5dba8a1ebe668529e800fb
-EBUILD childlabor-0.0.3-r2.ebuild 1024 BLAKE2B 8e998b40ae717222a4b70963b41bb2b730d018905f3c34e598767158577bd66af6214ab4ee18cf0655b59c09f065213a73606a0ce9a860602f8dc236e1071db0 SHA512 f5e37ca6b0d17b4303e39dfffedf9c415c8820d604e5412a1d9addb5686a0c663e7bbfef9fc200a16a2250b253b2926342ffd19a6782bea9fee797c379473049
+EBUILD childlabor-0.0.3-r2.ebuild 1022 BLAKE2B 19592a6d0383b7d9e5740110ae85d032384a3231d3d256236cdd7094e58c6a1cb10bfb43ec3231e785e5c1375c1752c97a7d19697cdc0e6cbed9411c9ade3a48 SHA512 70b7ac02562c7d35068d5b9ada91dc4f3233482ea59d7dad7b89166fb1d68cbb075598676aa6c7d0344ab6af7e301ff545d0905018d79ac40841728515e91430
 MISC metadata.xml 348 BLAKE2B c762375aacc3e71a19cca6bc56921bc95af9118d414b9c4ea107ca14d0d03a48139aac70b3bffa97ef8a79bc304c77d19ec886cc6afceaf507978045df5580ed SHA512 7fc536d6c210376169edeb9141883a08a163193c2551f7a6f55d9b896ca455fd4933cc8bb2c311ad6eaf448a56acb161f6dec9d8f6f426d23620ad3d38f0e392
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
deleted file mode 100644
index f1c57a296957..000000000000
--- a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="https://github.com/carllerche/childlabor"
-COMMIT_ID="6518b939dddbad20c7f05aa075d76e3ca6e70447"
-SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-
-RUBY_S="${PN}-${COMMIT_ID}"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Avoid failing spec. The signals work, but the stdout handling
-	# doesn't seem to play nice with portage.
-	sed -i -e '/can send signals/,/^  end/ s:^:#:' spec/task_spec.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_rspec -I. spec/task_spec.rb || die
-}
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
index 1f85f3021ea9..5c434e717017 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index 23a5d1ec5e9a..e6e827493ba7 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,3 +1,5 @@
 DIST curses-1.4.2.gem 524288 BLAKE2B eccdc0773244efbda0d96468469f69dfc8caa6949815f94a4cdfe0f19dfc4f9248ff62bf7b50619dea26ab90391ec5b732f40c0c89ebb71a2cb9677ab78439f8 SHA512 9518bd1d4195dec8ea0eed10d5a836a7bb620874a691ba1c0f76f7444be544e77da84339af38699683ebcb45760e91bb09571d00069c8cc366d3b8a8fddc4c6e
+DIST curses-1.4.3.gem 524288 BLAKE2B a4f0ab5d1bb2723ac406c8d61b0ef6ed1b257d4959d59224c8bcca0622b930c8b06f81b4fb73718922544353edd5fd53f66df22d248cbf6342998bd1df5dbc22 SHA512 b68cc9d39df7e7b176601f91b5235f2b77cb70edf3a86a2eaaf9004995fa42dd107a4becda386f37ef95e95db40798256fe1eb416960f6f14e9973a75089f766
 EBUILD curses-1.4.2.ebuild 533 BLAKE2B 7dea0c7fd544995554ce01e900055d2a07a84faac372fb9532f96a6f36d3ee140e121e3adb868cbcd0c1fd02a00bd11f640a900e59a32da0bebb20dc65e0bbe3 SHA512 1e937ae22390d5252da7c47fbde733ab8198405e13d925266b33d3665c89b3f480289d935b7c8e6583831cc8da0574cd0599cf00171ac33877e29513a029e087
+EBUILD curses-1.4.3.ebuild 526 BLAKE2B 0478da45f1a95acb282760fe90fedf80f573abc68741c6fa3d444a13b558f9841c81429b974757b7e1e8a7e5f28aedace5f01ec559fe7577c31d2dbaeed4b481 SHA512 6c3b83da89f75de96cbf2fb678331554c6e4735a1646a71bedae81d1dfd251f59d22c53a07cedc21e12032c88c9e47b2993f50c7b7857423560aa36e8a893d67
 MISC metadata.xml 338 BLAKE2B abd01018668395bdc0e27d71ccc6341beb96b969dc215cb05760e478e46766948116542416274e0a99284458f2773dd0ab73e6041112f62181efa441d879082b SHA512 d074a3168d313769de5bcb360d0e70bafa37a5c37fd9416ea3d0b9c992648d7e5416c71256d16bdfdf83abf11b77e1fec8069fcbf56bd2c909a9ade07adb219a
diff --git a/dev-ruby/curses/curses-1.4.3.ebuild b/dev-ruby/curses/curses-1.4.3.ebuild
new file mode 100644
index 000000000000..6b1ad29920c0
--- /dev/null
+++ b/dev-ruby/curses/curses-1.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/curses/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64 ~riscv ~x86"
+
+SLOT="1"
+IUSE=""
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
diff --git a/dev-ruby/daemon_controller/Manifest b/dev-ruby/daemon_controller/Manifest
index 96e3f6b66f9e..fa6b704f6983 100644
--- a/dev-ruby/daemon_controller/Manifest
+++ b/dev-ruby/daemon_controller/Manifest
@@ -1,4 +1,3 @@
 DIST daemon_controller-1.2.0.gem 37888 BLAKE2B c320d92cd3515f861e775eab72726469d7b6ed3cfd1655a67bf11458ef1ba5b43f72b8ba600f5c953b99c18f99549a48d0648b387abda45a87de99d2c9d955c5 SHA512 d22b5f37a41f2fab642cc7a6f5b5ea8a892d2c8b9eda04c9a547ee3aab3148a8897bc4737fd30fd9eb6e2a4fba458ea5811024fb5ad71b7959f3996dfa7b7705
-EBUILD daemon_controller-1.2.0-r1.ebuild 584 BLAKE2B b997e22bc49f9d36533a105654f2b85ebac84df2d576d3547ea40b588a0a2597ad83c0fb91c742dbc03b39dfef3b08da0b3fc5d9ec4948476e571ba1b5e9ed79 SHA512 e5336ad4f5bc0d6f5e201407119f1742629fed12e44e506429adf4504889ff71ab929d1a4102fbb680d4dda62f90504535212179ea745834e6342843685bc06a
-EBUILD daemon_controller-1.2.0-r2.ebuild 579 BLAKE2B 65f251148fb5e03adedbe7574b73347e6c34ae67a5582127d797e5eb3a5954baf9ddd908d732f851dff99f40bb7c83a6bd61b74f2262616d57456749e0399f01 SHA512 e1d51d026e79cc818248bb8a6032610533c6a5b5b058fdd81be5a8aff16b09daf9575b7dd801337aad12f7ebba20dc3bb673f97fb9afd6d5e8717c0ac6111b37
+EBUILD daemon_controller-1.2.0-r2.ebuild 577 BLAKE2B 1e53a2f6b2091b43be059a4005fd84e154ad3c905355c32b3e24e6cf3f70169eb99328a3a8a1dc5032b01383bbb40ed7e5e4f3ae9d374c04f63594e1d91e1964 SHA512 b9ada5bbdb2d4c61c88363810c0f4e3537b994f7fdde4b9e612f85a3f5bf40d9940899a9b3ef49fba6c512fe4617849e3312f45d85bda5d7180de2b7536dd86e
 MISC metadata.xml 357 BLAKE2B 1433cdb0948e9433c7cfcf398310b9ef13803ba303936add7a6810be6a936c8422e6e88d80ee39063b3e1cb4a64f6307cff09cdb9366e07a117c4fd3f20909fd SHA512 d57ae25a8de29ca8fc27e6be1db3a2a7bf1157256bd68f70c2df5e23b0f938d98940956145eccf4b3b7a69bd3c9e114ccb8f9ba6c80a01a8eb964dbcff039317
diff --git a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
deleted file mode 100644
index 2fdd40f44587..000000000000
--- a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library to start and stop specific daemons programmatically in a robust manner"
-HOMEPAGE="https://github.com/FooBarWidget/daemon_controller"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# fix tests with RSpec 2
-	sed -i -e '1irequire "thread"' spec/test_helper.rb || die
-}
diff --git a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
index 538b16a1b408..19cf81760874 100644
--- a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
+++ b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/FooBarWidget/daemon_controller"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/deep_merge/Manifest b/dev-ruby/deep_merge/Manifest
index f23f8b3bfe2f..06637d7b9e87 100644
--- a/dev-ruby/deep_merge/Manifest
+++ b/dev-ruby/deep_merge/Manifest
@@ -1,3 +1,5 @@
 DIST deep_merge-1.2.1.gem 14336 BLAKE2B c122eddaf63fd885f82b292ea7d1f2b6a9a9dd50731e77b856fd02284634a699b7897a12c1856732c77b4d8ffc9f6efe06f792f42d53236a521279bff13b6dce SHA512 ef93e0c4c6a8f389338ea30b2b53271f089b0b8275adf6fc74e7d15a2faf32d62a1b297af9d31c42cb5d816066428c8407a82d874fad14d64384098fc3c5c70c
+DIST deep_merge-1.2.2.gem 14848 BLAKE2B cb79bfd2c4499b3578cb493e4a9d664a44672f01941c88f559aa110732f6fb19d3e18e32274e666a5021e35995a3f0afcdea57fcefd9ff0eb675aafdb5d6eb8d SHA512 58c6dd789812c5010a4019ec731a21dac70c135fcf54701c82fca7b43842199d8eb41c3dec3926cd953d3e5ed14039384dc270e06de5922bc438f98c6d1132a1
 EBUILD deep_merge-1.2.1.ebuild 540 BLAKE2B a7e1839562227995f2642f3881abaa44e54c52bebfd609ab51345ec369160763907942018491cb42776a5209c9d88eaac41908f3392e2143bb1f57584ff026ec SHA512 831392a167cc6945435a4504a61ca7e0314ffd112bd65984632e8dad6ff6ecfd58c2ffd37f41f6c1c7fb5b88feebdd6f0688310094533f2f1d77e786143fa3f9
+EBUILD deep_merge-1.2.2.ebuild 533 BLAKE2B d4d8b7137afe8fd48a0c79b17b9309974ea105d26fa11282e911c1b27eac8f0f3b94433718a1e428c417e2e05fc82fb94a451fb3f6e7e676be76d931fad7b26a SHA512 caeab0b069bff8598e2b6b70eeef261aae58285a1abb70389aee1e9f7a2a3d9f3d7fe6e4007e963763743fb7ff859e0e54e29e550b0fd3a83a18667f419d6cc0
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
new file mode 100644
index 000000000000..a6a6d658a270
--- /dev/null
+++ b/dev-ruby/deep_merge/deep_merge-1.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple set of utility functions for Hash"
+HOMEPAGE="https://github.com/danielsdeleo/deep_merge"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -I lib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/deprecated/Manifest b/dev-ruby/deprecated/Manifest
index e4a85f6f3a82..83ceec8b63a8 100644
--- a/dev-ruby/deprecated/Manifest
+++ b/dev-ruby/deprecated/Manifest
@@ -1,4 +1,3 @@
 DIST deprecated-3.0.1.gem 6144 BLAKE2B 69ef1b95168ada9e66dda556d0c6731109b2b7845f8c4be0ba75749f2e7af092c3b800d0334c4cd1c555905c09bb12dd945f4692eabf0155fc32f4ea380c52da SHA512 c4280f8bd6914a6b073cbc443db5dd5232379abb7870d90cd0146c08312f82aa8fd8c042b48c2b9b26c4120dc8afb326070a1256c51355f1cfa898905ec59e51
-EBUILD deprecated-3.0.1-r2.ebuild 521 BLAKE2B ea319e3c7bd9a743c34f8adff4b40b4e4f07b98033671241bc48c80308dfb5f940afd17a1af898617d5677bd3e3af9767517ee7f739794432d1fd45733532252 SHA512 84e547e85a330779f940f4403a7a18e6db801fecf4581ee7dc6a0d2c5c36606dbc25837aab2c656c0aebc608b7fa3ec61037b88f3894e1c22220357838c7dee2
-EBUILD deprecated-3.0.1-r3.ebuild 524 BLAKE2B e6411a9b593c820ac9c92c22a7378c9b92afc1eb0368b7f57b45866edb5c9ab4da53fd197d77d49e81127161fd4fbbf1b303f929d12bafc00f6a76a063c65575 SHA512 d70461011e3309d90ab115cc9cf2a0b68a57f07ce6191fc598855f3a8b55e6d5d1ec6a9b8c5b8e58cc8ed3104d9f3e0cc6b8c06d9d64c2eac1c17c130f9f3baf
+EBUILD deprecated-3.0.1-r3.ebuild 521 BLAKE2B c644465905e7b386dda3ce3d0df0ca6f817e81ed3e4d4aaba693c238492249162986682214a2947583512e09ea4e3abd2f8325546ca0d3f350dbb7b307e161fb SHA512 32071c4088883489f26011b97afc2c0b13e03ff97d011912cfc0bf23549f8e795094374e8ab707b5acfd59ab4484a337034a92c67453d15f289a8c6f2dd14cfe
 MISC metadata.xml 343 BLAKE2B a5da26f1c3672356b9180e93e87df2b3b59d7c4fb3ef918073816574cd73e6bc334f34c85e0fadd57d58d17cdf18a09c57db5dcec247f5fd1eb8b8b511314499 SHA512 476df3cabc2c29bcc20d4127abe6cc0b80d4c5c8b42f34324005ec38fc8d4b989bccef5196b4061e5626e6e4c11ae09abed9f0b7df028c747ac032a834ede1be
diff --git a/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild b/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
deleted file mode 100644
index 2be9109ac2a2..000000000000
--- a/dev-ruby/deprecated/deprecated-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for handling deprecated code"
-HOMEPAGE="https://github.com/erikh/deprecated"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. test/test_deprecated.rb || die "test failed"
-}
diff --git a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild b/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
index 852d3bd1ef7d..0d47a2655f3c 100644
--- a/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
+++ b/dev-ruby/deprecated/deprecated-3.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/erikh/deprecated"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index aa8618ca2ec9..c58370011828 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,7 @@
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
 DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
+DIST dnsruby-1.61.9.gem 261632 BLAKE2B f86682fbc50bc0b20f59b3a7bb825081824a3dfa5a6de36f3083b39fac9617ff770d3a53c17f015bcaff5dfe5a96ddafd78b1aaf72bcba9bf990a649cf3a0c63 SHA512 ba692db6ab5234c0669076cb5290d5e4613886956d3cea23c22837f99ee2a970e7f86c7c7fdc7542ac4873d324f52b83b0f5e14bb9c3d5107b068fdf419f6ba1
 EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
 EBUILD dnsruby-1.61.7.ebuild 844 BLAKE2B c7717b55905d00df0e0d8c11d4334db6699a0becdc233f1d5c8896d875ae28673e1c3ac535458c70334bde64c9fc06fbbde49355f178026d83107eabb6dd13d6 SHA512 547d5f4c4227f519366142e6321bf147c7ed606dff7f3f5e3885ee630020712dee1652a86b636bead2b0cc66bb1279dcb5d763f2dbd447274ccb3294e09ee8d6
+EBUILD dnsruby-1.61.9.ebuild 844 BLAKE2B 34c3f9a415ba26bd87bea389cbe1d9da37f063570114151dc4909710e71db3da1df8a104bf81fdae5580250245540cb1fe79d2d6a41bf6805dfc869514fd32a6 SHA512 ec5c4e2232cfd9638fa1f2fe60376c5a2dacfa13adf05c746b061c4f990c79369378a01a455345d502a06d117074990753b454d7fa56f1e5044bbd4b34036437
 MISC metadata.xml 414 BLAKE2B c4ccb95f7844c4f0ec41dda18d5b80f8972d3f81fc571fea8feeb15ed8c0284358fa180248f2536ee0cb518bc6d48a992305eb9b1c032dcde79d25f13b6ecdc1 SHA512 e4fae933534b8a4988d008dbf8be50cd2675eb9142108c85b4c0fe4b0a06b5f553827773e08f58a09371a0cd44623c7c86c7c93fda34899614ff5b513cc33e54
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
new file mode 100644
index 000000000000..b1b12dd543f6
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.61.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	#${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/ecma-re-validator/Manifest b/dev-ruby/ecma-re-validator/Manifest
index 111405998a82..b0c9a3493627 100644
--- a/dev-ruby/ecma-re-validator/Manifest
+++ b/dev-ruby/ecma-re-validator/Manifest
@@ -1,4 +1,6 @@
 DIST ecma-re-validator-0.3.0.gem 8704 BLAKE2B 86358302c5f55c03ec5b30b360364cba04eedd9ac89461a3938e6365d118dcf9220b104605e05fe7340ac1b0c542af11ffa0931b6ce61ab4390d3cc68953a4fd SHA512 f1b0cadb3f2a6f9b488095a8bbc1863aeb7d40a9c2b5604fa7217505eea58db29eac9d03bd362a92589e1c277f83d13cb901b7ffc591c49a5cee0d2162b03156
+DIST ecma-re-validator-0.4.0.gem 8704 BLAKE2B 5dae210ec7409ac2b114203b2e764d1b6cdbc798ee2246588af8455df312fad1c2002e0ef68ceac77cfe293d28d259f5e23314865ec70789e0e09e8f4767c6e9 SHA512 2aa8500bf5a487e3278bac58e29fa188c310ef85b5635f9bc3ac0bda6df36cf9533f9715ac716378405d0d1e61081a532aab3d9faed757ee0a4bb5bf2ef2419f
 EBUILD ecma-re-validator-0.3.0-r1.ebuild 561 BLAKE2B c502c3103d1a63711d6311f9ac851f3ef6de508d984ca45a358ac8b801449a5e0ed5fbe96ddaee543f107ee3c2cc5b1c93f0cc8852ac49a189cdab9978510fc7 SHA512 d76a83ed93afac9e878778169659f9fb3236f6b271c705c44f20b9016f313e6316197cebec20bdf8d4e7316122f4ec0492fa8a040b5d3cacdf485f6aecc72662
 EBUILD ecma-re-validator-0.3.0.ebuild 561 BLAKE2B beee34c945bdd11fc58a2e98e6c789057a86de2b7fbfb6e2db2afb3e51054561a778a110a34b805757b143ef68700504dbcb32f373302bec81a30cb50be2fce6 SHA512 c694c02d8784216aae6815e3c0491645886f0fe20347ec4417a056440f41e8e12348b3575ff5dbfb2b8825098e66a37913f277f3ebad54c80c209b9d87a419fd
+EBUILD ecma-re-validator-0.4.0.ebuild 561 BLAKE2B dd47a98549337525c29870e6d6acad2125fbdbaf19198ed87c57819a5908b574d17e62e965c48cef701eb7e37fad7a5cce6e4124cc6b11f464bed7e564d26f8a SHA512 b255f75ebb5426d887a4d8647b7f9d04941f8382b2041d2cb481fa5abc1b05cad54b998b7caa6d1c43842ec1135a6e25fec7f44f2fa5ec10c7779a5484b35fdb
 MISC metadata.xml 336 BLAKE2B 664fd49d854f58a599202e840c9a93027328e199d462e192ae1a71c47b191ea933647c69cf1f273780fc5e936ab11b0cd2e34405040351048e4895bbe1b59d01 SHA512 5ea53e6d81ce197528d70c24acf07bfe66cee6488de385cdd1bb8f9e525bc51efa4cbc7bb5a617457078a6753b7d1c9cea2b9f16cce52d48b3ab7c582f4a5ce7
diff --git a/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild b/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild
new file mode 100644
index 000000000000..7d61c97d30ae
--- /dev/null
+++ b/dev-ruby/ecma-re-validator/ecma-re-validator-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Validate a regular expression string against what ECMA-262 can actually do"
+HOMEPAGE="https://github.com/gjtorikian/ecma-re-validator"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/regexp_parser:2"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/excon/Manifest b/dev-ruby/excon/Manifest
index 1667ea92c2f7..f89f1d54d0d7 100644
--- a/dev-ruby/excon/Manifest
+++ b/dev-ruby/excon/Manifest
@@ -1,9 +1,7 @@
-DIST excon-0.73.0.tar.gz 216100 BLAKE2B 7830ac608c25ac42dd5fac85d2e4fa7a06713ba49340693f23886aa2e7bb5f29cde956eac99a13f17c1f7ef987f00d0cfb3bd306c5bffd16c1bdb469be4baa60 SHA512 a58556510d8c53c7d4f71dd4846497ee8ab17bd087d5ac9248784fcd1f1dc2e46bf4dbccd22ad8e467614428fdeacc7af6768380922749f92c7d78b849e08eff
-DIST excon-0.87.0.tar.gz 207823 BLAKE2B 1affb1b566afb18ad563806362f75b43704e7753f1aab1e356a38058f1cbb79d89e09d271e4f6f49f9e8ed775592fe78bc262979ecc73285deda056a1fd5fba4 SHA512 34149831783a51f792dcdad500691343e675c84d7d45766eebbb590080111dc790928455b7c885f731e01fa5637f531f7736e42496d9f77bb0337110aeb531f9
 DIST excon-0.88.0.tar.gz 210056 BLAKE2B abffad837a6a2a7337e43fc73d1f4004f6df01113f475e44daa48e21cef95f363bd5fbf88be0093fb18564d382fae5f4409e23689e11b5c47bc900f708ea7455 SHA512 5cb664e64973959dffb80f421bd70c300303fb6c4083b06f6bb42be8987a8822dc4ae38892467576583ec5dccd696b68dee7a946c3917df2066ebfc2afb72209
 DIST excon-0.89.0.tar.gz 210503 BLAKE2B 3988bdff1db39a84ba6230bb8d789662bbf589e89ea637a8b3208095d0d26f4bc83f0994fca5db92de162e2882d2a519f2d9f3c4f535d123d2b018d4abd82d60 SHA512 36e23d93983098ad14b9169b7ae65c28903e8a46a2d8cd341ce111387a83fb90a7f01973d401c8089844355d18a6e53da117df3c3fcb82cf66eb5367e065e2ee
-EBUILD excon-0.73.0.ebuild 887 BLAKE2B 5c09388ff51ba837541aa865729b4100d70a055ba109b1f590da2c77ca1f5ba6284e9d6738b342b6170c9c3e4d21414a281af73b4674ecd4e40f6c72c9464f9e SHA512 f052fc3de96f0ea9209226aaf4c503419af2c788982a03e6231c6548612e9f5dd960842a152671213bc2a00833bab814d0b1c43cf4bfe29430b1a17ab1fe172e
-EBUILD excon-0.87.0.ebuild 870 BLAKE2B 391d30ba6c340f34e7dada411c881b54450f68d7267c154051aa8ce5dcad0a60b30cbc357737277465de8a37feb361acb2aca4c293f26983d1abe4c9f8cba64f SHA512 99e808e7cd8f09c0e308c746805972f33270c2e49790fb30a3dc817299330f30905716d1631a996f1a5f0f67d527aec88297dd54c4344ca497dd2293e0a278f9
+DIST excon-0.90.0.tar.gz 210538 BLAKE2B a3e5898e3985ebdfc4026355f4761b1b0d9367408e01a119101fa2453924ff751d888ab976382b654b846e0ed9908054aab6ac1f6410a2a96056b7c8d8d977ad SHA512 efcc9a13b8715306f980cd4593c44befcf895f5c42f9475211420e67247d9eeefecddae53ba771710a6894ca23bf880158e7cdf9db895baa42ef3c5436ac846a
 EBUILD excon-0.88.0.ebuild 872 BLAKE2B 94e4c62c1e51fda7700972bef243a33337157263fe7afb1ac2edd4b1ef2085e085b65c851b8493d633042c223a71ae11390180ddcbca605219203ee159245c9d SHA512 15c787a97bdf83b085c73422d43c9de3fd06d215407758d14d92b85ed1a36f026f7005de39b981bad18e027470e87fce1aed775747f394fcfe27d7fdaed35a3c
 EBUILD excon-0.89.0.ebuild 872 BLAKE2B 94e4c62c1e51fda7700972bef243a33337157263fe7afb1ac2edd4b1ef2085e085b65c851b8493d633042c223a71ae11390180ddcbca605219203ee159245c9d SHA512 15c787a97bdf83b085c73422d43c9de3fd06d215407758d14d92b85ed1a36f026f7005de39b981bad18e027470e87fce1aed775747f394fcfe27d7fdaed35a3c
+EBUILD excon-0.90.0.ebuild 872 BLAKE2B e1560118a2a39a529c0baadeb9d8019de047d0ecb064e0456788ef0e7ca300df23db12bcf1a8d26b2dc8ad0b6433410756dc70f6ce7d1fdb8188b48782d72a98 SHA512 79ca24b633edeea11649eb6b9329499496ddc14e36dc339919a7d79c1b3a1c0466a9faee4671846e4394b0021535945292d4b98c0b486fb63ef98694fb49e1c6
 MISC metadata.xml 448 BLAKE2B d571a600d11154abf3426b7b33e338035ffad7cab94fb848b33bc60e0ea1997bb3b24b8b01c5bd7dd112614045e0ca6ffb09ff9e8891137dee7d8e31a73a7e6b SHA512 6721ab6317c97ea10eb08a0de3a3b19ccd5bf2933532fbd9bf6d7df0b7d236083d01303500f8c3ed1485cadc11e2c8548326d4fb167cbd6e511d7fb4fd5c134a
diff --git a/dev-ruby/excon/excon-0.73.0.ebuild b/dev-ruby/excon/excon-0.73.0.ebuild
deleted file mode 100644
index 30a8df2cece3..000000000000
--- a/dev-ruby/excon/excon-0.73.0.ebuild
+++ /dev/null
@@ -1,40 +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="changelog.txt README.md"
-RUBY_FAKEGEM_GEMSPEC="excon.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EXtended http(s) CONnections"
-HOMEPAGE="https://github.com/excon/excon"
-SRC_URI="https://github.com/excon/excon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-ruby_add_bdepend "
-	dev-ruby/rake
-	test? (
-		dev-ruby/activesupport
-		>=dev-ruby/eventmachine-1.0.4
-		>=dev-ruby/json-1.8.5
-		dev-ruby/open4
-		dev-ruby/rdoc
-		dev-ruby/sinatra
-	)
-"
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# test that need network
-	rm -f spec/excon/test/server_spec.rb || die
-}
diff --git a/dev-ruby/excon/excon-0.87.0.ebuild b/dev-ruby/excon/excon-0.90.0.ebuild
index 44a58d833344..84ee1858942c 100644
--- a/dev-ruby/excon/excon-0.87.0.ebuild
+++ b/dev-ruby/excon/excon-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ ruby_add_bdepend "
 	)
 "
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/git ls-files --/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# test that need network
 	rm -f spec/excon/test/server_spec.rb || die
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index a413a31af271..85e75d74f193 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -3,8 +3,10 @@ DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308b
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
 DIST ffi-git-1.15.4.tgz 167917 BLAKE2B 0694bc5baed1a902a444d75ca534f38c61e56db17e542311f78edad07cc40566aaced5849766b2cce2fdbb531a7ae5ccc3d2506d5871f15c382bbdb3a8302af3 SHA512 3278dd217669b5467e3e0b92b5879fea745c955be52de4096ee490efbfac4ad887018c07ecb5dcd8b0fefd8a02144740c2aba74a1e545d798e73f64f69c7cd79
+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.1-r1.ebuild 1731 BLAKE2B 45b4105438974b881c87a8b3816511bf36a3628ddbe2c51de674035e79060fe93f8ff10dd1eb94eeb6489775e67f4b43d3f76e3cee7169e33e1dd7c340a422ad SHA512 c917cd89095105b05dc036f6a1331f596ad7fafc4dd38dc1d050925bfbda8c1e9bdfd3103e7efd86d8f4819a47f74f85227207a5e206f0de39acd73521682ea3
 EBUILD ffi-1.15.3-r1.ebuild 1738 BLAKE2B 23a9aab4109842cfbd7594da2da91b08de3f1bb77dd44d0832cc00dee1accdc7e752da1627a3a325bb8ea6d7d0db6a0b4a56cbc9de9e3f8e91e09b40a6631db6 SHA512 6377fadfa25732fe421b52be1230c25940527acb79f91e00cd202d20a609ea35a85de299c0a10bb314ff037e9d42dc194f4ff574da7039f3cb70d035e986ef79
 EBUILD ffi-1.15.4-r1.ebuild 1731 BLAKE2B 8ef7962bf3415957c6c685d4d0c4e91853ac9086c677dddffab0165489f70af803f1d25c71ebaf5c91ce979035dc904a121636e4fae72fca7c0d3be759a0963a SHA512 d8250be6b4b7df40e28443dceee3654686a8866e52687dfda7b6779fc96c9dce8aa6285a8bbd536d841568df44eb42713702b1cecf257254803337a424768911
+EBUILD ffi-1.15.5.ebuild 1666 BLAKE2B 515dcd4ca219dbd83bebd9091929a9e42701db6316297ca469f9e8e5491975e4ac7b1699d857d3cfbb618b00d558ada3b71695009df0b74ecac66d308c194250 SHA512 c7507442694b10ba9c52fc65574d1261908c68f93ab54948c856385bf4e90f228388a58fa1094ed95553d771e178516656daf8a2bb1df4e8f85dc5a98bbcc3ce
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.15.5.ebuild b/dev-ruby/ffi/ffi-1.15.5.ebuild
new file mode 100644
index 000000000000..f14690edb137
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+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/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${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/flexmock/Manifest b/dev-ruby/flexmock/Manifest
index 423c37044832..4e88c3ee0a5c 100644
--- a/dev-ruby/flexmock/Manifest
+++ b/dev-ruby/flexmock/Manifest
@@ -1,4 +1,3 @@
 DIST flexmock-2.3.6.tar.gz 91601 BLAKE2B f2888891820f13f4a9812ffdfe042ccd266b0b5166fa538aba96e2c865ba55d3689d077e73fb9aa238455e90b8ea97aa60f8649c08823a753b6af8c0f550cbed SHA512 0fcc25c1a83ba1e2aed91eed98242592dfc1a69d57c033fbd363383962b16d6e72011d62a906ae8bf076801a3d5e8e8501bdb9f6ca3750c9615dfe8b9b0bdbbc
-EBUILD flexmock-2.3.6-r1.ebuild 1135 BLAKE2B 420f97c3cb50ba757e64d3fa5f3dbe66136315bc3838b4318a72303fa1e1a79397d768effd4d445d6cd7cd0a3b971826214138f6b561455628cd12138e73404d SHA512 c19b0ff62a7b9bae8040236353450bb835156c721f04d3351ced3041e2203c6130e8b9a1cde0e90c18f3d01dd5bd7b3c91422c7f6e93b0b12951b75e5fd682f3
-EBUILD flexmock-2.3.6.ebuild 1027 BLAKE2B f77dae841d04b1f2e914434e7613463d51b2385449301d1d9e40b1c10d7f5076402a9161f6a0b850a308fbce197a81111885e043625434b84d2e40d898a89029 SHA512 aa3b72f472af2ca47f6c03d360c5dbbf9478d80381874f04ea2b71f2f9dfe9a0ff6619d088c427b1a074b8a59720ad0a59f4d175f2274d0ed0cf090365e2fa8a
+EBUILD flexmock-2.3.6-r1.ebuild 1133 BLAKE2B 1e5fb9a6a15a9689b96940a865d1cc20383ed16eab1d4dfb8bb10e1a1c97c60cc8c5bf91cf616475b1e5a7d5cb1078d161913aeea66f841f66a9d700768779ef SHA512 e5c65be24e5ac95185793559d51be62f4e1e82917fe8647fdd1293eefb669d6268fb033aada04449581362cab896d34638ebd260402b313d7a21f0b66f3792f9
 MISC metadata.xml 346 BLAKE2B 80f8ed32e41d3df3b32db9b646a23f2fbe9e037e1b5f058b07d3b270ed002380d17e67903d49d2290ba43b59520d005396575f1fe359c4f41546d1d9bcb6caab SHA512 9d39eaf3912ec47aee2fc5ce85bbb952a71202ef07c5fd6cef1d1645713f46a016d97ea5f8f08f0707fc8bbdf70d49621ad4300d4b14f3fd58de6c022f1f05c3
diff --git a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild b/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
index d04994270898..eb003c501dc1 100644
--- a/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
+++ b/dev-ruby/flexmock/flexmock-2.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="flexmock"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/flexmock/flexmock-2.3.6.ebuild b/dev-ruby/flexmock/flexmock-2.3.6.ebuild
deleted file mode 100644
index e5a0cab2284e..000000000000
--- a/dev-ruby/flexmock/flexmock-2.3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="html"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*.rdoc doc/releases/*"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mock object library for Ruby unit testing"
-HOMEPAGE="https://github.com/doudou/flexmock"
-SRC_URI="https://github.com/doudou/flexmock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="flexmock"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 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
-		dev-ruby/rspec:3
-	)"
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec test/rspec_integration
-	${RUBY} -Ilib:.:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest", "~>5.0"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/font-awesome-rails/Manifest b/dev-ruby/font-awesome-rails/Manifest
index a81a022f1319..03fbd6715b6e 100644
--- a/dev-ruby/font-awesome-rails/Manifest
+++ b/dev-ruby/font-awesome-rails/Manifest
@@ -1,7 +1,5 @@
-DIST font-awesome-rails-4.7.0.5.gem 637952 BLAKE2B b4d4c8391fc3ff7fd9874c1c3d1ddcb60ea36999f8ab6ccaa5797c1d6b47adf9b70bf323b2f32c8c518ce8b96750e1cddcb9d2ff32f8718570f0c36ef18d2a48 SHA512 ffff431d5a76ba6618d9b505c599a28243038f6550c44b8bee930875e0294c724135aca40e5b591f999c98488fb35d362482eb5a53719a4e026c60ea08804781
-DIST font-awesome-rails-4.7.0.6.gem 637952 BLAKE2B de85a8135683bd72aeda32297c2ecddeeec8b48d51a17e9cdcf15a13890e85c6b302016c7006ca55acd4b6be8e42a2cb9acf14dc08956f5831bb84ba0828fb0a SHA512 4a62a41aa5bf2d7a70a027321110f97bed546a15a05eec51b95706d14f4fe2e9ce12692b648487d1ae9cbc81bac63161d50470aa638e3c5a8cfc31efe8edff3f
 DIST font-awesome-rails-4.7.0.7.gem 638464 BLAKE2B 2cd0a992377f88ae94db8b52260e5bd14138268bb901c808ec48f615d29311326cacf3f8e3c3fe0b6b6da6c2d8383fca9933d479fd72cb42b7c57e5277694112 SHA512 15db10613b41d122b5a4632226254de018d798e951391177322abf78294b1b7ddb2a13363410dff84903d1b6624a793a8c3af0591da9bdb56232d4e585eb5149
-EBUILD font-awesome-rails-4.7.0.5.ebuild 504 BLAKE2B bd12bf91a574795da8bc4cdb38fd15b2a26c0b4e3ea7e56ba4fd8899447bd3b600bd1839598fe205348bcca32402502bd25086884dc952361985234fb5e810d6 SHA512 86e283dc31285900b211cb8d46ed839738c598a50a0e3ed74fe1bcbcd25409bacc95c00d07f9f76210355a2da3543df997871a02eeeaa0f4030d4ee483858ae9
-EBUILD font-awesome-rails-4.7.0.6.ebuild 473 BLAKE2B 7fdfd09bded07b47a341a737e1c797624708aea1f42f76024684598b28698d809a726b4c2397a92d7a13cc481deca24820b32df736e9f87a4e4e530c1c8de1c1 SHA512 4df12db43411f62244f3047719d69dba0ec61102edf89c69e39dd206ceffb41a0a3740cd5977ce1259f2e93c36697953751b2ba2817d0c48dbafc2b93f162887
+DIST font-awesome-rails-4.7.0.8.gem 638464 BLAKE2B 5aaea78b2f8601004f349b6a526c6e19dfd42686dbe424dac112c9ae99eabe8f09ee571cf0b07fc2b1b0221a3fdeb7a005b9e466aa281a2d85d1c71804debc0c SHA512 011d2a3f66345f5629b98b1224ace1818657447635610c5b927def5595f8dd1878d7b65e526ab6f078fb717cf44804aa989d3502072c6e341f01b75d2f7b9936
 EBUILD font-awesome-rails-4.7.0.7.ebuild 473 BLAKE2B ad1e66e71aa46de1f94a0bac17186fb43cd9c26b602ebdccceb26462b10660fb66545b34598d4211d17ed0e1134b79123fbff782168b2138c9d37809f5f3faaa SHA512 cef55f3bb2916c13b3ca98211c3410ce2d07eb6835b24db10b7b64fcbf23cb3d4c73743e61dc4453cf7329ff73c45335fb108d80039616460d5226f64d8d347d
+EBUILD font-awesome-rails-4.7.0.8.ebuild 466 BLAKE2B 54254e3ed45c29a1aef213fe5c6d0031115c7849a568bf0200d76dc44f33e574e9968be3515c14b26c8417f9e7d236d74efec38e263bdc9f3f731310176ccecb SHA512 a8b24baf5e65e85072f20cb553f5fd0ce216bc1c31bab32c243de2fb413d1e662ca300213c5df94c58009246261155fff334aaa88d2d915a3254e28b3fd1c1b4
 MISC metadata.xml 403 BLAKE2B b404ef92bc36bbb37a597966a63c2835509641ae98bb26c68dcf5284581de91507a615845b1744469d8a9b73edeba734324e94d715e652786b0d9527b0a55eaf SHA512 0fb5addd2f849897f540da63e8c335618e48e37f55133e8b4499efc027493a720cab358e2979d41c50831ebed01e88e402b0a2dbb576c5e5afa489dc20f106b7
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild
deleted file mode 100644
index fc698ed9b0a6..000000000000
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.5.ebuild
+++ /dev/null
@@ -1,22 +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_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Font-awesome for the asset pipeline"
-HOMEPAGE="https://github.com/bokmann/font-awesome-rails https://rubygems.org/gems/font-awesome-rails"
-
-LICENSE="MIT OFL"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/railties-6.1:*
-	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.6.ebuild b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
index 1f1cbecd3ab8..4e4ca50caccf 100644
--- a/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.6.ebuild
+++ b/dev-ruby/font-awesome-rails/font-awesome-rails-4.7.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
@@ -17,5 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/railties-6.2:*
+ruby_add_rdepend "<dev-ruby/railties-8.0:*
 	>=dev-ruby/railties-3.2:*"
diff --git a/dev-ruby/git/Manifest b/dev-ruby/git/Manifest
index d49f7a4c80ea..04b1555363f4 100644
--- a/dev-ruby/git/Manifest
+++ b/dev-ruby/git/Manifest
@@ -1,7 +1,7 @@
 DIST git-1.10.0.tar.gz 207412 BLAKE2B e18406a9690d4c0fc3009b57629515e701f41113592fd7533b6b2ae659b90ec1b635410deb7bcb3bd711ce291aaec2010bfcfb4bfb812b9fffdafac167d33bb9 SHA512 717ae5df3cf2b700395df91e8f6e9632062c804955c8f18215c5220ec373a33c2a991534f2a63155111643a867f45f2e7056e2dd6e297340372143770bb70021
-DIST git-1.7.0.tar.gz 142017 BLAKE2B cb05ef711582b98b420c143dce8fcc3d932c7509ab8c5577a46d70f180ee37d865d7268f56c133d3327ed27058a4c5cd7b03a6c602c665d2f574bdec476c6eec SHA512 c90cd3fe46767a4db5391eb85534e3801f1bd2f345a324ee89d3c04c4348aef09a5424760c59a079d51f3fa003c3b31d30907bfcff4b854adf3b96339d25a8a0
+DIST git-1.10.2.tar.gz 212738 BLAKE2B 4059066fac1a22e8f19ecce1ebaed648fedc30767b91cb38cf9cf4c9f7091f55f5e9682183e188357dd12ed06dc1ad905d9b688db0c536623487e3c5431ba6f8 SHA512 5d8150a8f974c9b9f531d169e2899b311965a9e9d48d1e45c8bb778a48ea0887ccecf7681baf7cbfad4d22509ba0aafb9886559565e918b84f740b3da7430d86
 DIST git-1.9.1.tar.gz 206509 BLAKE2B 3f8739286f3197fa86a3fccfab357510d562415f568726126cf96c8b74c716c4fbb592f854cafda26cf2f0371e4bc9b52a9f5efdea860d0ea6836198ca48b887 SHA512 ee1df3e704b8bf0687c9fce83d73502d3d46e7f3291da90906961dda057d8e6ec3a0fda5b68c258dd8542559055f1bfabf8915a7e594edafa4b3f267f302f397
 EBUILD git-1.10.0.ebuild 1200 BLAKE2B 991615dd67fe42429b509737211c7315f46a56a3648806acae33cdd3e7740defaa01571ad2bbeb4898902efb84d03e7d19c3274134cd132e1d8e50ad3085748b SHA512 e3fd22e22c2fd9e594e7e7d77fa2c11af491cb500d7589f18a2d3f71a50b840509037fb93bdb7d027ab9eb134846d26ad3f6ead54eeeacba400c419fccf1d006
-EBUILD git-1.7.0.ebuild 879 BLAKE2B 60c6e55cb242a941c55c295f9c5fb4a360f9921e7923f1e930a7c29b685f377668fd6d78b6c0c4885b8aaf5e0e1700885499bcc3011a89641570d81b89b4e8f3 SHA512 4ee521b7a3172180d4d046f0c4f422e0bfbc50a45e5049d344f67ff28c684d0e3e3e1c45e049ee3b1b290531dcac09f7a9e5af38955c672d87fdc72147134242
+EBUILD git-1.10.2.ebuild 1224 BLAKE2B a78685594f262c426ae6fd5aad44dfec5c2078aafd4f1c3e058dd5c6c233d8647ddb9502ecb14230c3df84f35e224344f82ecb9ea4faec07340134393499307a SHA512 6136428443fa4f501f1e388d0fecafefae6f83a61521d5fdecea854d81507ae8ae6916b36b019b7c502fc7d74df88da8bdcf80ddbe8d70e1c79bec0fa74c4a07
 EBUILD git-1.9.1.ebuild 1268 BLAKE2B 19969628ac8dffcfe08bf9da5019623bfd92d224a8bada17fc823ec6fff2c91087b6cc377804d7f6b6de5eae6558cca6847c42b4be2761c53f13d06ce8061f3c SHA512 38a51246fe194c10e8178c9fc736a622d027ad0d15da4c93957f8aff3dfd3e5e337b4c677b36e6be88bb09085a15f03b2f7230ab3ccbbf4cac3ff9d88b760f02
 MISC metadata.xml 343 BLAKE2B bc9a79524aa9216ddb3624e81f61f8ecaf988538693155f5b8de7289effc0613a5d102b55b4c9c9eccc50d8556b0c4fdcec1e9a9cdab67d28753008204c9af2d SHA512 d599ff9d1df8510ff8603e9030a65c294bef3ee93f0e5a438300a8bb5c0ffe3c4a9bdd7ec41fd5effa27b4b7e1c978faefe95dceedc270b6a995bb928f2d70be
diff --git a/dev-ruby/git/git-1.7.0.ebuild b/dev-ruby/git/git-1.10.2.ebuild
index 9d54c170a635..e8578adcddc4 100644
--- a/dev-ruby/git/git-1.7.0.ebuild
+++ b/dev-ruby/git/git-1.10.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
+RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="git.gemspec"
@@ -17,7 +18,7 @@ RUBY_S="ruby-git-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND+="test? ( >=dev-vcs/git-1.6.0.0 app-arch/tar )"
@@ -25,9 +26,17 @@ RDEPEND+=">=dev-vcs/git-1.6.0.0"
 
 ruby_add_rdepend ">=dev-ruby/rchardet-1.8:1"
 
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit:2 )"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitar dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
 	# Don't use hardcoded /tmp directory.
 	sed -i -e "s:/tmp:${TMPDIR}:" tests/units/test_archive.rb tests/test_helper.rb || die
+
+	sed -i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	git config --global user.email "git@example.com" || die
+	git config --global user.name "GitExample" || die
+	${RUBY} -Ilib:.:test -e 'Dir["tests/**/test_*.rb"].each {|f| require f}' || die
 }
diff --git a/dev-ruby/htmlentities/Manifest b/dev-ruby/htmlentities/Manifest
index b90a81de5273..d233e7eb4251 100644
--- a/dev-ruby/htmlentities/Manifest
+++ b/dev-ruby/htmlentities/Manifest
@@ -1,4 +1,3 @@
 DIST htmlentities-4.3.4.gem 31744 BLAKE2B 519f84a05ab8fa5cc2e7994785606b6d66a70169af7acdd9f5e2a71d08e06a29d93587175f7e13608bf2a05a21a7597cb435653282c2485aa07d89cbfb83d9f5 SHA512 0163d6c014ffebb4ee9bdb15d32884c8d6af60681f240d3f0177811d37647776b8f8fd0aa4f1c7559403f36a5538ce8da6926bc16cc8105bd6eed5c180db700b
-EBUILD htmlentities-4.3.4-r1.ebuild 514 BLAKE2B 87284a4c37b7081e524e57fd84187b22bed4b4a1877e8867775ca9b1ced48b76cf0ed18d7ffbca953f4fb43dc65c5828083f6f2645fa1af4e38b250b03ca9f58 SHA512 99a66928a5f95cf56d00fab6947f78c360af6fb4258c6d5e56b9d34ab3f65e6655ec77fd54952aacedb6242fe3211f02f3e8be162703d63b8a897d2b579400ba
-EBUILD htmlentities-4.3.4.ebuild 544 BLAKE2B 3a0266e980fdfbc247af3be8133b016caaae4b2397816ef3819a9e361bdd76ac0225af43ab8f7ce7c7e30a1870e48f38239d9bec8eab29a49de3d75bfe46a250 SHA512 b5c0b8a666d88b9becca840d204e84acf3e6ecf5c963f822c2405a8ba0ccf221bd32986f0f5736f25ef03e94ad2810b2a4c87b8804f984e87b88e457c7fb88e4
+EBUILD htmlentities-4.3.4-r1.ebuild 512 BLAKE2B 77429b489b5c0002d6904c5fc860e6d15be352c5434c469cd6c61e32c3c03a5bb2d080f8792fd2b1dc33f3cd5ebe65ef6be2ee4e802de7f4096d7b65b3ae9cfb SHA512 29fbd68ca27247086c839e3d01a11991e1d049b9482826a1f82ba8797c1a7e59a24973a584674574f0caf8fd12abd25047d832e9b9d3c1af6710913a5bd21d66
 MISC metadata.xml 352 BLAKE2B 0c19ef93f3378c38b05804bbf83cc4d51ea504bb022ec297a2da6125c6d15fa8a834bb6e8a698c3330306e02c177df29cb01b02176cd6279f91aa240233d7d83 SHA512 fd1356cf2e0569b1a2fa07aa57e8862d5da833867a3ad4231756d496dfc836f126cc0bdca7f18dd53334411e50d188392985fc7a3d09727c2b4d8486bed1bb6f
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
index dd52d4f57713..c33af966f1cd 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/threedaymonk/htmlentities"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
deleted file mode 100644
index 15d7cbebe9b7..000000000000
--- a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple library for encoding/decoding entities in (X)HTML documents"
-HOMEPAGE="https://github.com/threedaymonk/htmlentities"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -S testrb-2 test/*_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/instantiator/Manifest b/dev-ruby/instantiator/Manifest
index 1a7d597f65bf..2b828a8410a4 100644
--- a/dev-ruby/instantiator/Manifest
+++ b/dev-ruby/instantiator/Manifest
@@ -1,4 +1,3 @@
 DIST instantiator-0.0.7.gem 8192 BLAKE2B c1cc0bf4a3f2aaf9afd522e33fdd2b32d78ca114fc7b113f6ae297e825177827cb6aa5398917d6d05523f912bebf22e43709e53c0dfe4e1a941ebda4350d3098 SHA512 b37a9380d787252244d2b85bb99365f4a4ecdab58f76caf5e59df00b239f4981119eb5c2eb2fe6ddcf810bb0fb43695f8926370a101f4223fa28811953e6731d
-EBUILD instantiator-0.0.7-r1.ebuild 533 BLAKE2B 2240ef98261043f7613794de2676d021431d437aa4a42f540ecaa48710b4f897fc7296664a639067a4131d2bea52c278c2a2e27154be3dfb963a5034b24a963c SHA512 2b8725096e549cacac6a07f18f82c79b8567f7ad9f063f35237bcca076bd228502ae245ce1964c18a60646f8421b687506332d5f74bfe02f4c4b85dc859859c2
-EBUILD instantiator-0.0.7.ebuild 558 BLAKE2B b23458b17910441339e953ca32187f85943b15eda259b7513feee3f609d08f2f2a0f8fe38f6d9717640125fcdb86ffd570d95203a910984740dddfa498a404e4 SHA512 7746333f2864661a198c305fe716fb67019cbb106a36cf6c167ef5bc1cba910d5502b517e46a016261463a9f3d2fa4f80729896d38f057c3e07c443894a26ac6
+EBUILD instantiator-0.0.7-r1.ebuild 527 BLAKE2B f235a0ff4cccfa8c5df0970c51ad781f341ba2314b517025d468aa53a050f7d66149d94b66f04998d0d556e9fc0e6f1c081b48f40d6c5d07c3236a54a0c4068f SHA512 016c7492bbc4f8174d669acdacc0e30107bcff1c75ec3e553a0040e3cd5563d27596015102a15f5397a7c13cb521ee4103b26b706e86d8c20826dce4c04c1e71
 MISC metadata.xml 351 BLAKE2B 6e084682032749f5c2ef0362c7c03352e77b804d4d85538e0fb26fbc6e22f401ec5be2252156d5def142be73ed53730fde82baf138d0f78f05b9cfd62ae11328 SHA512 3da384f7e5e5e57740aa53f410d97a92635a670f5a2032c41dead2b51942eea3b44b2989132543bb4f26f26a6616a9bb3bc5f8b90286c31303078ade91bfe2c3
diff --git a/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild b/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
index d18a2b82fb39..548bb30d90d8 100644
--- a/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
+++ b/dev-ruby/instantiator/instantiator-0.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/floehopper/introspection"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/blankslate:*"
diff --git a/dev-ruby/instantiator/instantiator-0.0.7.ebuild b/dev-ruby/instantiator/instantiator-0.0.7.ebuild
deleted file mode 100644
index 0a55a283d84f..000000000000
--- a/dev-ruby/instantiator/instantiator-0.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Instantiate an arbitrary Ruby class"
-HOMEPAGE="https://github.com/floehopper/introspection"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/blankslate:*"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/jmespath/Manifest b/dev-ruby/jmespath/Manifest
index 62e966249694..052c8b14b477 100644
--- a/dev-ruby/jmespath/Manifest
+++ b/dev-ruby/jmespath/Manifest
@@ -1,3 +1,5 @@
 DIST jmespath-1.4.0.tar.gz 40899 BLAKE2B 45e52f649950b00205af6010084e009a7327600971fdf84e0569498a031e9307876e412a4491fc176724667246fe9f81317a80dd7ff6c44b7e24a135af224e01 SHA512 2b3923a5c853c527ae10ed95da49e3f4888f80ec4eec18fcec2eff16698765e6e875575994ce2fa681977fb5329b122d95cab77fb80ead3548fc26fcbfb33859
+DIST jmespath-1.5.0.tar.gz 40777 BLAKE2B b1143860b5b52835f42293ee1f61e21f1ff392b09707f6c53997f54b3ebe8c4ecc9128ee1336010bf623c2c220a6f25c3ef6796bf66cf1cf076d1fcc3ca22b80 SHA512 823404f2c5530d1888e9d9dfa22edfd42c8171a4c275f1a5965e56914c528ae0a20af8e69d62ec9876de57659f4dc8ac737c2092b1631b499c09c060bff21e36
 EBUILD jmespath-1.4.0.ebuild 698 BLAKE2B f20fd4fc99eea671bd702295b3cbc71ad7955b3f338521c798d03ea142ce83be0fbec45f5b58b2d98c082859aae5f4ed3516a751b07cd68cde40b088ec5f15bd SHA512 b06055a765afc6d04ef8065f723f9a65d3da7cbb9ec8188aac3853570e1900b005519610b22c0ac7d84c11b18bad8b6d09395f166fe9c3a781c23c3c273383ca
+EBUILD jmespath-1.5.0.ebuild 706 BLAKE2B 710ca7ca408e988a2c5c13e71fd60c17f5e01e4b6533b2335acbf9bb458035eb8edee2dd5ed3e7ac6badd8b475a4c9cfe78a29c5b3333fd84ee0786462fa45d6 SHA512 0cf06482c19897c81530d9082338b7ebd020c120e9b3160e59f5f5078336cc43464d9846155143ba85e40db62f707f728cc728fcc018657fdef5740212e49108
 MISC metadata.xml 347 BLAKE2B 7219b16d2eb4568aff52005110e3c7ddc5c5375f64e8abff8a6d95ec52cf3dba44788a5a08ec73214bd3871a26a9944b501eb6fa42860d98cdeeb864f0197c66 SHA512 ffc19d6bba336d9abeb22a069170b684cb585072f14ac035270e3c14199eec963162b3e0d7a5545c10339fbb97347e1ac91900f2f963c151b3a2f00bab43c869
diff --git a/dev-ruby/jmespath/jmespath-1.5.0.ebuild b/dev-ruby/jmespath/jmespath-1.5.0.ebuild
new file mode 100644
index 000000000000..b640b015b668
--- /dev/null
+++ b/dev-ruby/jmespath/jmespath-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_GEMSPEC="jmespath.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements JMESPath for Ruby"
+HOMEPAGE="https://github.com/jmespath/jmespath.rb"
+SRC_URI="https://github.com/jmespath/jmespath.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}.rb-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' \
+		spec/{compliance_spec,compliance_without_errors_spec,spec_helper}.rb || die
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index 8124d3e07235..39f1243c01b9 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -2,7 +2,9 @@ AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
 DIST kpeg-1.2.0.gem 57856 BLAKE2B 6397792524e00594c7f64acc79b920781b6dca28d0954fa73de0c9644afc4788969fa2e807cf196807808d93e5520db0e1b1cdd412391a592334c8811f687132 SHA512 97a1e573dcff89f4a8a6832876e4ce737a85fae63ffe6ac8dad001db8ff8237f32d437813252f3487e68a0708c161ee5731b468e5f1b039e59d714b461722e7a
 DIST kpeg-1.3.0.gem 57856 BLAKE2B 783c0f6fad341139dcf8b69adb9bee829a302997917e07cc2beb7dfbabff759e26c31bf1c9b272193919a7a78d9b793db7db85ecde1b5c6ad7c5eeefd95e103e SHA512 a84aa2afd0bb9148dae3cd3c8e1f3104bf4b4997e7c89524ef8b3be1c6fa9dfe7364c931eb9c0e641277590b634b164ab78b8e8e499937fbea65ebb7aa556fd6
+DIST kpeg-1.3.1.gem 57856 BLAKE2B 73f589e0bbd1ebefc3b9068b96476a607214bd32a44920020a57964d705ff45b103bd4846bb2355d8fe30e0c8e585a29dbd2484385b78f87533c152e9ecf496b SHA512 73baedc77d44d671e6e9d074bc4f9053a19aa50fa62f7394206d328c4c102d5a869a4b69b52de16acadafa8c88573bef9593bb4e3278ccf239e7d0850cd63ea9
 EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 EBUILD kpeg-1.2.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
 EBUILD kpeg-1.3.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
+EBUILD kpeg-1.3.1.ebuild 734 BLAKE2B fa0ce4a82ba3f906b83eb1221050cfd2a2382d63c5d825a8166929ed3f5f963f0ed0ead759837e225f0e5bff4926072cc0baabf3b7c9535f777e8c68190a957d SHA512 0dc340a86f9abd6fa63c65fec553d72be43d90b551ff8d09d9445ed25b609fd4ef269fef45534d6f3e5dcc2e0b275b420cfd431af90c0f39eee5cabc31b4556f
 MISC metadata.xml 339 BLAKE2B 84a27b2b24e20e2ec895782c175d959092397b5936b4c98daabab1ff20a24b7c3b3b951cb14622f8c824629131ba9d84404cf908c31003d17e049ea91868264d SHA512 ba4fc3f1c9f36619d257f5a9fc7fb2c0e47833e81ee5e092dd2649185d7e00ced6f865fce299e97d5e866b78184bd5b7350de1b874079d41b7337b2f4ef5a124
diff --git a/dev-ruby/kpeg/kpeg-1.3.1.ebuild b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
new file mode 100644
index 000000000000..145da7b1303a
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+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="test"
+
+PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 450ab16ebecf..16defa90be25 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -2,8 +2,10 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
 DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
 DIST listen-3.7.0.tar.gz 56192 BLAKE2B eb7d154dc0e608d43b6751db630f0b99e89fbfefd61e718aa99cc6a03c47e1a4aaaa55d42f1ae75351f4397c60902dcc78d8c9e8250899f075c351a7fd781069 SHA512 86942d60cc57a0a960ba813c3b90ca33c47513bb609c1861c792ce2b9b37371998859c0d6e1cd979d4a3427319d3a75454dfffa068ca1dec22d38497add1335c
+DIST listen-3.7.1.tar.gz 56280 BLAKE2B 3e0409ca5d636ddde8493e6cab342ca724c98f5ceb4f4abd306d1ec081095387d7d5d6da48d05f47ee50e23475f5685bd23ab7c2592b5697de6bd8292f30c174 SHA512 f082e177b14f86c0906af3760f2da81b1574aee5931ef308c640c537bf0e70488b9854c7f1515545ddee76d4a203734b47a9a3d501955214562cec7acc590e1e
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.5.1.ebuild 1207 BLAKE2B e223fe981c15ee7d82dfd8c478e56b76537548047b18b48c87acb9cba25d427c38d7e3abc2405fe2c83c738bcdd401f2533d0877e2e33dd557c50fea98f46ed4 SHA512 a9016edbb630fba96ef1b3011c39666feea2783cee7d0078bcfc6a973ed04c689ca5b6a886b7fc89185788a041267ab62e33073115d35590bb34003903679cfd
 EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 EBUILD listen-3.7.0.ebuild 1209 BLAKE2B 407281814bbcbd60f7688efe14c57fedc7d2d2b4cd11d03a5e06b7f4e818a81577382b883ec542e5a96f6dd713f4d37a772ed97aa3c6455e9ab03ebaef1a1da9 SHA512 e11ed90de9322059fba79c85c7f10de56a1d957de07bd1310aaac129178c65099701f5e09ad7aed25ca18d58e9ff6e1a9ad8abc7ea539e9b14841e981276e42a
+EBUILD listen-3.7.1.ebuild 1209 BLAKE2B 8522cd1cb462d74fc9c6d6f09f6249a7123c135c601f6bd046314b825e2385bbcd60fdc3ebff70e905206be37e0f7cdc710fd6f79a9f863d8a11c997ebf46b95 SHA512 64263c939bb98fffe4d429cfb656a6b7a01facbce82009fadb1cd33c94bf3195d49c799f07ab137e38817b6299412151b31e0564089535669a5075114a17e36a
 MISC metadata.xml 339 BLAKE2B 13641c725d126e51be4bc7ce83c26afd940fd2562cdca16b523a6d447fdb876b48bd8f948dc50edc30d0573d93fc6d12c1598bc201ddc8aa33d2279b33260fa9 SHA512 269d7d6f3d427c9a4497d1f4ce13ed601d0db8f807f2378510a0fc0dc0b0bdc065059b09b8cfa8beaaefef510925d0ac47750bb790b85c13b95c0923afcde9d6
diff --git a/dev-ruby/listen/listen-3.7.1.ebuild b/dev-ruby/listen/listen-3.7.1.ebuild
new file mode 100644
index 000000000000..51354f670a70
--- /dev/null
+++ b/dev-ruby/listen/listen-3.7.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/log4r/Manifest b/dev-ruby/log4r/Manifest
index 040b520dbb62..e4f66101437c 100644
--- a/dev-ruby/log4r/Manifest
+++ b/dev-ruby/log4r/Manifest
@@ -1,4 +1,3 @@
 DIST log4r-1.1.10.gem 118272 BLAKE2B 32b47cd7896b4b1769c51542a4b7f98b22874d40abe59fea4859079f8af10c07810d51cad275d3962f9948b6237a3e507d6d010cf7ebca232ea282ddb108b70a SHA512 a3a9e6c9ef5b388106afc4d402455ec480729cb58054794e6ff6c963b4d819776bf5b57ef5ab7499ddc9a6b3c10f299a133f3f5986d94ee0a438b64ede5bc143
-EBUILD log4r-1.1.10-r2.ebuild 600 BLAKE2B bb4a948d08e48759bf91c911c24038d8d63187af45ad4a1d076c87c0b9e6be4b9bacfdabe029f7708afcf948a38cf4beecbed7d658f2da7773e0654e312de20b SHA512 190d10c03424ba0613af2e639df6f17743c8e49643e80c9e90b0323f588e4a89d7326caf2cac9f6b7fc226961fc632932a1df41e48e09316c44e61da189eb403
-EBUILD log4r-1.1.10-r3.ebuild 600 BLAKE2B 585ad1b68922cdc34d5114ccfe88edb7b46881ccde1c8b35ac19bdbb62a1532675ec4969259de94c44db2fd25051991960f66fe6d45ae10984195d56dbf51577 SHA512 e61fa845d45e6fa8de73c9b113f04eb5e24ae3670c69009c1612f82793a23ef135aba027a6682a29d4792003843978f3d85eac408219d9ce7aa39d2b62748fe9
+EBUILD log4r-1.1.10-r3.ebuild 593 BLAKE2B 6f0a699509b1a36993bf3e48dda69a2dd92a0192cd222d86910d04c9ab3f34b80117e85459f2cee954ec62f678b2c51c74d260dcda911c3c42e332b165d72e88 SHA512 b9877829e327a73522f7de7286c3f9f33b346401b7d35c6841cd58f13bda5cbcbe80e20f0010b6301d83a0f8c9326a97201696696042b46ec71c54a2878c9f0c
 MISC metadata.xml 327 BLAKE2B 0f1860fc5352d7c7e1b3cfeefed9c28bf4a7fdb28420525664f4b91491d5a21dcfb7517dd3c72aa5dd32614df66d03130a602136c4b2cd3a5e2465e46e72c5c1 SHA512 512e2ca9eac8cd8cb33f815e83328795245cb5dc2df115370b6f74ad64af2235c25fdec9e3da485e13545e95247776f42a8b7b07a685be0c1f49f8dc96b7fb9b
diff --git a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
deleted file mode 100644
index 90b18cdbabc7..000000000000
--- a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# There are no working tests atm, to be checked on next version bump.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A comprehensive and flexible logging library written in Ruby"
-HOMEPAGE="http://log4r.sourceforge.net/"
-IUSE=""
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc -r examples
-}
diff --git a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild b/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
index 1e8c89bcc55e..e0b2e1255f04 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ IUSE=""
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index cf73b31c08c9..b512cc3a8b78 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,7 @@
-DIST mime-types-data-3.2021.0704.gem 169984 BLAKE2B d5179c3ae38215eaab5244b59d8935800d05b3b79d496f765633e5a799f5d46cbf59b53682ef793a340ddc69f89302285c081d535c7d211e9eb458cbf64d07ed SHA512 0d0b4787bb39d7cacc202e2eba3c3e5e04efe1cd053332dbe1f0daeb9a58d533bceb01711a0d392ecca83f8d00f8fe7cc55f586060c3633b42749d7cb25246a3
 DIST mime-types-data-3.2021.0901.gem 170496 BLAKE2B 549bddb921941f15599db71dd76ed1502341101386c10550372796d5de8591575f4525276e196bfafe246132ce6a67007cd8afb0634013e5690eef06439af84a SHA512 382cfe97d19e516925dfa04220516ea6f2c4002e92831d6bb112c11a5378bf8af5b373763841ed84e6fa1bca4d72d4fe9ccde94ad0a9f6f7ce9930270574d8db
 DIST mime-types-data-3.2021.1115.gem 195072 BLAKE2B 233d801305d48a6fc126b8439b2067e6c6eb9e27bd48391fe0a701ca01b12aa23cf807999f46ad945e766b26d8d25a16453a26148f7c91d9322ef8704590cb4b SHA512 995606efc98dcdb9c19cf94ea758a210fde3e56ed6cd853101c97964dff0fba0da07aff87c4e39bbe11887ce2e15b19d781fce4ce264671d004426dde2761c64
-EBUILD mime-types-data-3.2021.0704.ebuild 627 BLAKE2B a858ff3d050f80dc05a55e5a882c8b1ca7ba489f6be1c80de91b30d82948701e997bf33e19398a442b0d8c73fcc04febc4862d27cb6c3ff8120fe9c5c1c2f895 SHA512 0c845812ee86800bd4a0b575202edbaf88906e270dd7f1d44dcac2c054018f020faecdf0f463f27fffe2ebece2c3c5605599157791ba295ec20547b65edf0947
+DIST mime-types-data-3.2022.0105.gem 196096 BLAKE2B a36b9254e256c86adf7bff10a0c2e2d4d0bd25257ff7c8b5bc65e57012b2b70a5d1ce9a1ef88126a18cf00bf801eb068160dfbdea4119afe8ee99075c54eb0ee SHA512 4b5998fb5d39ba89d4ee4f2f1fe20ec93a6b7214b28b77421dd9f7647b14c88342ba17f709f34640f65ce4c1bda08bd2be4aa35c7f99ea1ba2f9e21458540a00
 EBUILD mime-types-data-3.2021.0901.ebuild 619 BLAKE2B f6943d766129225f958c32ddb85850240a740821ff0a36ab8251294ae1fff7b8b2575481ec90b617900ca26fe9fa0202c2012cdc660b68a2828d1f6f3eaf1782 SHA512 f4e7d2032e92ab1c0390cb34ef967a98738b6c9ac9a152f99bd70976852a4427048f573420f89e68f6d6f224bf7f0c9125dc7a8f4ad30a495453ac731ef48ab0
 EBUILD mime-types-data-3.2021.1115.ebuild 621 BLAKE2B 721c9086925e7b18cf72528451c35e409ecc237460ba5ff0bd646bbeb6fd66cd9b39f0b10c2b5893e8188f191f6d4b2dc4e409c5f04ca5aa105bc5c723f5039e SHA512 3c7399bef269d48c58bef801a3fd11676433e0e159a70630c5e9d430ab0605134eeaddd479fdeacc2561bab6332763b915593493a8a8f739c1c91bc5651f7581
+EBUILD mime-types-data-3.2022.0105.ebuild 621 BLAKE2B 435583ee82a2e720d21295c92320bdd4510e49db440a3c582fc0baf33c53e5d593c2c8d80320a2ac555dfc71b57ad87ef41d3e6830daae7bd0f4da5bbcc40fcc SHA512 56bf53da2f331796b909c57a3352c9781e1484221cdf45d47a9385f547b27238d3cb7d76332562cd68043db9e6a3d9cf390c13f0c09139ebc934c1985bcda258
 MISC metadata.xml 353 BLAKE2B 8cfdcb1624b48ec3419ebaca31fe8045773377232977772d5445558947c2c0272c8777b5949fa9a30fc41275082fc284d6110ce640d465d9f6ee4c6f70e7f470 SHA512 072336e2f6abae82b5d66bd077d0b3651b6d8a3c1846d1e6e84974e0cb275881a986ec4fbabde731aeab59eb956514c44adfe5b67b185660f20eb1a286b22a26
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
index 7903ac1bc40d..8b427a509007 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0704.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2022.0105.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
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index d1eeeac7265e..8ac44da56dd0 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -3,7 +3,7 @@ DIST mime-types-2.99.3.gem 149504 BLAKE2B f0e34e5379948e5e742f3d9db0214bcf40bcdf
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 DIST mime-types-3.4.1.gem 36864 BLAKE2B 09c6c2fad3cad3535e5c357b49c84b2c1809903235f3bdbeeb766157c48bfc899f32fe95be535feab3c7835c4b535e25b49019c14f51dee1a812fdb735f0f7af SHA512 d0cec7afbe1685c008765997c3047f23bbb0bd10989cd82475805f932e61c400b3d2e60f5f95804c46919b57f0d3644c866be358b0c4c653ace43d62bbc98e4f
 EBUILD mime-types-2.99.2.ebuild 954 BLAKE2B f7b0ef6ce92e3ec23fa286d55e645864ee517a13deda8ad78b94addcbffd61f1ad9887a87ca912882b8e03b3336f08d0e4e4617e50808bad3fad2881f86655f3 SHA512 cff676037784df55c8da8e171d3efbc0c6a16567b1b52f938c45964cf8e7e1ff50cbcc098c90434e0468cb3a82e24c3ecc6612e9125ff86105140a69cf27d147
-EBUILD mime-types-2.99.3.ebuild 941 BLAKE2B dff1344acc532252c4378e489235c834401af2505a7b8a639c89fa9df248e00764138707b7242829b71df4b6eba8d46d6b160a746c04f52697e08f9a7e471d73 SHA512 e7ff2d5b6e064b70f86e5571de8f49db11b0cf2cc43daf90ad43925231db116f657674a174983874519412689e31d80f414ac495c75faf0c3a9e7050d7d8557c
+EBUILD mime-types-2.99.3.ebuild 936 BLAKE2B a00e8a0752150531c3f3109204340323bbb7e91091b3fcb6403557d7741c8a74c10c4b692d5b6cd054b1cb1182a0e21355369d72e1b02929094f0f0157092818 SHA512 739c6f1355ad9984497f57b5c680ea09eb547844e777910077bf6d54e4c87252e85b4eeaa550f4e22b9845306c6a542ffa0fa746c44fd86fffeb8354497228bc
 EBUILD mime-types-3.3.1.ebuild 883 BLAKE2B e7def86853ef408c7f97a606f28c26a892a76ed908144d6c4ce3e495335e9671691a168e6c0df4026dc40a41ac414c59dee8e6f73d86be01827495233bfd7557 SHA512 8c2bd498f2b17e8d927b4f2b561ef6eec7754e79a226a524954787dc4cfcb5b85e896076b4e2751c17bb1c81d08ff1892e38f14cb8533a71dede5f0244e82f59
 EBUILD mime-types-3.4.1.ebuild 906 BLAKE2B a69668628e09805999323839c2ffe0978d8044c0ac88380091a14e0be8a05c0fb5835dff489ee2877d8d0cf77f13acff0b59c113f8896e340cc1b8f2c44b517d SHA512 ded630d5dbef4ae267eb13a6df7f613f1d61d39495208b8b2d36a516789911b330d2dc88969aa2ab3faea16f692f0926a09c73b189553c69b072d1baa160b5f9
 MISC metadata.xml 353 BLAKE2B d3a674bfa5b4ee14e4ae29722f8b03c7fe30f8978bf40654bf3dad99d67d09a34fd2b01c1f347cb014f2d306ffd31fdcb1f8d1f68844d5005742a979c6308618 SHA512 ec6b59001e875f74e73e645b69828d9498e39e0820016eb453341f0f0a14b7d50e4fb188d959a1893f438fb4f8f8c8b0f5422b31bc1e9ed08ca8bfc33d78a50f
diff --git a/dev-ruby/mime-types/mime-types-2.99.3.ebuild b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
index d9f1f84c1fbb..f737ab148063 100644
--- a/dev-ruby/mime-types/mime-types-2.99.3.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.99.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 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 )"
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
index a80f4238a276..36fdcecf9fa1 100644
--- a/dev-ruby/mini_portile2/Manifest
+++ b/dev-ruby/mini_portile2/Manifest
@@ -1,3 +1,5 @@
 DIST mini_portile2-2.6.1.gem 27136 BLAKE2B 762b538c2d57cffe8a8ef570469b7796442f51a7a813a2e4f1dae5bd9a3ca62220c6dad1fc9d9157cbb8e93f940afce4b1e5b2b4d4f9edf01d54ce48d99dd6ca SHA512 d1cda6b7bb6b10187360717fc8ae6812d8f6625f6d302d4f76b7a829213f7938c7f0b68cdad7d7433186513542acfadd30100f4c641693e19ff82c5d6dc78859
+DIST mini_portile2-2.7.1.gem 28160 BLAKE2B f134704aa5fc72b01f3304f7b392b1cf665e0a6a52b70354409f9979d70dccbd58f5edb5cee3a54e97b3621eca7091a639bb1e317ad002fe8be855110562a305 SHA512 91cf285efb9f8e28d0781a80036c036ae6835a557a7aba535ca2c0bdaa113fc8e9509a37b1577443a4d763862dce3cc9babdcbe19efd88fe8195cebba4b07faf
 EBUILD mini_portile2-2.6.1.ebuild 593 BLAKE2B 94d361321dbfae72391dd5b67a0b11477dc26346bbcec7fb197352425a1b57814cfbf4003845c2ad83ceaa863ad869d662055498e9749abf55646b54bde94755 SHA512 5da480d36cd6f6c11c4047c2518df66bbb60f3cc13ab93f55dc8643f5719e1bae2ee1903b769b3cea9e5179f459533a47bd411b338456337b00930bcd55b4da3
+EBUILD mini_portile2-2.7.1.ebuild 599 BLAKE2B 3d4eaebc98009d6f0867025158d4ace9a1bf25076a5cc29d625da7761d733463abc60eaf67908c8ce0f555ad6eab70f42f60d59a8b55f0bdb9f86ff730d6ab4d SHA512 95270a7fea30f12c44953e065564fed21cbd3ec83d4347418c5f743ebe484da6a51f7094b3ec77ef9f0c88f258529df5e977629a47face1a571be10376ffbc87
 MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild
new file mode 100644
index 000000000000..5bcbb0b35482
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/webrick
+)"
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 7ec497e6c71d..1e578417105d 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,9 @@
 DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
 DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
+DIST nokogiri-1.13.0-git.tgz 6188433 BLAKE2B ec603e4202b03cc74ce73c540cfccab51f0910b24a3cde0ecbc6267a83c0c4898bc40614261727f7c7e52561d0dec679e00d97a9a0066ac436037a1681a4125b SHA512 f11169ab0dfec9b16e9fc32c066910dcc71325795283fac1372a67383535ddfd09bf342e2a82b129b71c058153f338cba30000ef16f85225f24b6d0c769c98cf
+DIST nokogiri-1.13.1-git.tgz 6190499 BLAKE2B daea484ee0e5bff581ae67528f1688002f1e2f550eb55e3164b631f9e87b188ec4152347aaa0ae6253feafbdae9182c54c92cb709c223ce04120ddd1b340cd17 SHA512 febb7b8a701c9be4f7b60a8b43bc24d17a37d39a8557ea4fc76d1490e7f9973d2a4516560f3335ba5d2405ae487e040e47fe24387a25e6c170e34719e9dd230c
 EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B 020c0670608a63e9126d98e30a423aad9937e698fe3b3d55ccbade79d7cce323253a528db4eee0b3bcd86ec746e8be38b71e0316548f948e60f3d9b8ec0b7efc SHA512 017ce68216111061f5056dae14eff11c27a3665bf20e8f104f388a694fe1971d6548650d31d354fb99b0e6b8a5d45d20657e2b2d4bb88241aba059cdf8d50f4c
 EBUILD nokogiri-1.12.5.ebuild 2686 BLAKE2B d7bedca4d89aa2bce71911036de22d551a0dcd0c96b07d0246e12c0115b217811310da97a73114f9891a2ebd0965a92ead5c73fbccfaac5efb066807268326b9 SHA512 0e3b8c2a6dc7e20eb55bcd6328755c07c98f9ed07e3fca8366e68a8f593b3e8e962305a2d0a86bd6d9576ac2b71ae4859c49eeeb303b93b36115b46ff1fc6c9f
+EBUILD nokogiri-1.13.0.ebuild 2692 BLAKE2B 196593084ea5c8bfb263319f21d4a04392e9619a09c67a8791d7c4c815a507a43fec72b75d0ee5c868248d6af96702db9a8222125d7afd067ff4c7b4019d7f4d SHA512 038b4ebf8871e1f6fdeb5b9ff4474ba29857d426fa0aba9fe7ee3be8795c8c4b127717fec3b3ccdf993d740764445a228f0530bd6c11dcc9dad484162af78fc7
+EBUILD nokogiri-1.13.1.ebuild 2692 BLAKE2B 196593084ea5c8bfb263319f21d4a04392e9619a09c67a8791d7c4c815a507a43fec72b75d0ee5c868248d6af96702db9a8222125d7afd067ff4c7b4019d7f4d SHA512 038b4ebf8871e1f6fdeb5b9ff4474ba29857d426fa0aba9fe7ee3be8795c8c4b127717fec3b3ccdf993d740764445a228f0530bd6c11dcc9dad484162af78fc7
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.0.ebuild
new file mode 100644
index 000000000000..84744c5cfcbb
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.13.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://www.nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.12:=
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.12
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.7
+	>=dev-ruby/pkg-config-1.1.7
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.1.ebuild
new file mode 100644
index 000000000000..84744c5cfcbb
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.13.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://www.nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.9.12:=
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.9.12
+	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.7
+	>=dev-ruby/pkg-config-1.1.7
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/ntlm-http/Manifest b/dev-ruby/ntlm-http/Manifest
index 503524a42cee..2503c13dde78 100644
--- a/dev-ruby/ntlm-http/Manifest
+++ b/dev-ruby/ntlm-http/Manifest
@@ -1,5 +1,4 @@
 AUX ntlm-http-0.1.1+ruby-1.9.patch 657 BLAKE2B 179668ac8377cb16485f934027dcec83faf2ad790f45b0382facc3fd25eb957a501099b346b1f9a7d1a90d96e96566cbd6307fd3868bb5702945a88da75785be SHA512 c1cf26169cfb7eb8e5759b143f49dd7eaa124cb9e22314e0d2d36c3128080e2dd85b84386ed219cd35e3022e1ba36926dff6ee603400362d8ad59bb627f3080a
 DIST ntlm-http-0.1.1.gem 13824 BLAKE2B 179baff2b4b00306b15aa42bad3e91bb41bdc6070ad2eb4681075474839dafea06c54ef7b3fb9f997951ad7b4ddcfa78caf5345b35e5944366b60f27bea63530 SHA512 1d2868582a194fb3a3dcb48a7dfb031014e51a93d57afb83aaef98be8e57789506b71e6440770ca7bc48979d9dd730f398d01d554d6d0575ff01046a227c7669
-EBUILD ntlm-http-0.1.1-r2.ebuild 863 BLAKE2B b3c123b00c16ad8aa03b278c1c7cfed7f1dc87d374653e9749c3b5db7c972e6f0005531a329e9fd6d9d91b029c30f3255022493d227b19042b2d6666213428b2 SHA512 103a7d4cbde6f1e871bcfda4dcc02338bc96b14139ae9a75abb025ca73f7d7df040c8e099a39d5600f32b7615eb168fc8e3250b33228cb54984e78d27769800a
-EBUILD ntlm-http-0.1.1-r3.ebuild 813 BLAKE2B 28bc2f96d0b2a184535e6eab14dc3f94a872a02b13dea43ae86d6d53d4e5ad112cf80e33a0de74b3355f4debb7a64f14adcbf7c261cbb3cbd4ee26d14036ba42 SHA512 df9a209750a693b27e91a7a06850525a88d2cf09b15c32a0c05d3c9a9550789bbdd30fe7a6064f2302623ef69d2caf5f4e4832d6eff92bd007fe9e6b14824d11
+EBUILD ntlm-http-0.1.1-r3.ebuild 811 BLAKE2B 4f3f25f2e72454f0f35e39652657bb601087f30303c2ef6945b5db232842669d377e1566e807e329529effca239c27f675447b22b2e576389e15f72555c14db2 SHA512 78f75902e1e12b503138fceea3866d544065b0a289ba2332e3943cd5bfbb4b779f8687ead62f2efb957d0bbbe4d32b25fb9c3617a1de87aa3dda83d0ed2e162b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
deleted file mode 100644
index 541cdb6ba866..000000000000
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOC_SOURCES="lib README"
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem epatch
-
-DESCRIPTION="Ruby/NTLM HTTP provides NTLM authentication over http"
-HOMEPAGE="http://www.mindflowsolutions.net/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-all_ruby_prepare() {
-	find . -name '*.rb' -exec sed -i -e 's:\r$::' {} +
-
-	# We can't use RUBY_PATCHES for this because we need first to convert the files
-	epatch "${FILESDIR}"/${P}+ruby-1.9.patch
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/*_test.rb
-}
diff --git a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
index 960bd91a5093..d05197d014ca 100644
--- a/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
+++ b/dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.mindflowsolutions.net/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index ce7c96d54c20..fb639ebfe03a 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,5 +1,7 @@
 DIST octokit-4.20.0.tar.gz 3127939 BLAKE2B 30b251c95cf664ea83d23473ecbd5d1652586a567775253afa3f0c954490a6381c86da40cdc3761c8c43b17c850dfe9ba80f3814e946f1f3a008be81dd3c002a SHA512 180a4846052dc223b4d5444acc7af7d78151ac941687c75e6853c119ce75d9383fa5ec1ffc7ede97a6ee6d5780ef27030f2132761484099f634be6a3c4a9d7b6
 DIST octokit-4.21.0.tar.gz 3134804 BLAKE2B 67648f7dd3a04b8b5b397d94e1c73329fe6ea0a6db1abff3c5cb5ab443beb1e5874c2bc2f072ecbeee2a13b4de229791c03184eb5fa769ba52e2d8793bf0b9c1 SHA512 364ed578ddef4b4fe50c3848559820819a517d33e2140f2867f70de4fc1e9e5a14c0fcc9b34a6bb6b2240bfaf0b9ff95038e01ff7e857e2bd0ab707f546d9fd9
+DIST octokit-4.22.0.tar.gz 3141531 BLAKE2B c852f34dc99b10fb06194bda9f15bffb4242a2b5ee7909e74defa2a7ca6b90962fd30232eb8850d97af872bfb036c87f7623acd9088efa3afd07f01cad525fe4 SHA512 e8696176227c81d5f80080fbb3c660b7b6e1b28b149b664b20d7e8cf333450988ac2fb9f5327c5e4e46528dbf7eea1246e82c94b265e6008f8fd7cd98f87423c
 EBUILD octokit-4.20.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
 EBUILD octokit-4.21.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
+EBUILD octokit-4.22.0.ebuild 959 BLAKE2B 1e62991cd4f5cf188418cfa385ab99d14480314b20c51ce259534001f7b122082f470d792a7c9c1fe499b1ce84cd8ef9f3d16d83f1d167ecb297f8762d511849 SHA512 2a0486a236aac0e24d662058ec78e043a899dc61cb5e0776c03d84620576249bf5c1702b9937d68b0f46df75b11e41245bca1f886f7ab3bce5bd7a964dab14c9
 MISC metadata.xml 345 BLAKE2B ea9d229a1fa9c9e756d829b4b07d85d90cf5834f6667c622b5b9b5a886e2bd7b3f4d3e115a955ec823869ffe55d7fa810e97cee634036d7da88846462e42fd8c SHA512 afde1a713d352134bd4ada1404bb8834e0a33c4f0558a56050786d67bc76e9d397b0aa362445b74b29b620f93e2eb85b1374f2becb0d568ab618b65a4a95b689
diff --git a/dev-ruby/octokit/octokit-4.22.0.ebuild b/dev-ruby/octokit/octokit-4.22.0.ebuild
new file mode 100644
index 000000000000..e9e1d7a6daec
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.22.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9:*
+	=dev-ruby/sawyer-0.8*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr:3[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
+}
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 01f42ee11fd8..b5ceecb9c5a3 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -4,10 +4,12 @@ DIST parser-3.0.2.0.tar.gz 282150 BLAKE2B 28091cc76a33f606cb5fd1f60612fcd9731064
 DIST parser-3.0.3.0.tar.gz 284651 BLAKE2B ed6905541642a243514dc95f986939d7cfb1d7d3900f1f6922ab2765943aa0fc751c24bfef3368f7e960c6ad13d47ca13fc49fedb2b9f714e158b295143acaa2 SHA512 579e4fd52af42fe1bcb18e445b367d49ba9bc682276d28024eba9fd8fb74a359d578f712b6da9a1b988e1734aef06effa07c9953a8d3a96e6969bcd215a2c8d3
 DIST parser-3.0.3.1.tar.gz 285932 BLAKE2B 957e56bf4deb47e0c118543e1078d845fcace0f4d0a5a9a1073bd95544f80544de9c0c736768194ce43402d939599934191e00738464972fd32020a3c193bae8 SHA512 37a1d53b14a9d436b413abe55932f95211531fbd5d4e4af98e26fbf923ae5edffeec907dd39a5dd8dd484a4fdcc4aca557cd20c0e2560e64c271274f955a4355
 DIST parser-3.0.3.2.tar.gz 285975 BLAKE2B 3772e78d3e92469940c21b9167d9bc5bb7a31d4ddd74c3872d99c5de7fc12b59cda72209f0983758e81259f2effdd6f5221a71dd24f0e19351485bf41c2bcb7e SHA512 c2f6f822d9a60fb038b66fb44e8bc6339ca9329865e3a2c4bb05ee8db80826df7f96766b661d94156c6e4bcc3d5d4fc3624a4e1373a8919ad19ef1a1acd41797
+DIST parser-3.1.0.0.tar.gz 287924 BLAKE2B 042f325c12718a8d05dbbe1052cf3792bfab5421a0eb279b81b7c4e3ab9584e4f806de6823f9a74c47e81a949d676d2f903b77ceb5369a656b6047dd9856333d SHA512 68191906b6fd7183233875da3ba4937d3e90c491ffeec451048d3dbee6c0c979eb50b474135f57cd6fd9a42abb6629668b97eec00a4879760a362d1cc5bb38a3
 EBUILD parser-2.7.2.0-r1.ebuild 961 BLAKE2B b983259aeb654773b384d9be90469bfef79587de6b376e60cdc643c433fc67e287272f8290589266443caee118e3fadd07d1d5e25f067581ae95292f8dda8f8d SHA512 ee6064b566299e4b600bda95314eba535b39c8ac7909440fdc5ff62f4bdae280c6813b62b44e8e73e8d45e189852c8431d0da63c007b8ec23bf91e2b5ca8143d
 EBUILD parser-3.0.1.1.ebuild 968 BLAKE2B de4555c5dc3c62802ef3bf7a68c0521dc828d0314e50f7af5ad9eba893a96ad0d00580dd3fcab82c50f5ed17eb4a09687872ad9e203c589f759830bc2499312c SHA512 cf277daa666c688d1392f0e1e650eb17a21d7a69264d6835fc67c82bf479b7d4dd9c2475c15ba41d787d2f24789d88cabfdaf419dd221927daf5325cbee808e8
 EBUILD parser-3.0.2.0.ebuild 968 BLAKE2B de4555c5dc3c62802ef3bf7a68c0521dc828d0314e50f7af5ad9eba893a96ad0d00580dd3fcab82c50f5ed17eb4a09687872ad9e203c589f759830bc2499312c SHA512 cf277daa666c688d1392f0e1e650eb17a21d7a69264d6835fc67c82bf479b7d4dd9c2475c15ba41d787d2f24789d88cabfdaf419dd221927daf5325cbee808e8
 EBUILD parser-3.0.3.0.ebuild 961 BLAKE2B 570ba46abad8fa1dece217f940a0e53d4456c62408a66dbcddf1f5ea675212ac9417554b8d3ed4af2c42966532a2c09e9ebdcbeef24c93f7e8a43e3e7f635297 SHA512 6ead78988b39f0dea2418ea682de47172f2459b5192f6f0ba92fca3fe25eab4af8393be1710a0644899cd490412a1011b393e5430f626387a74119eaf452e3f4
 EBUILD parser-3.0.3.1.ebuild 961 BLAKE2B 570ba46abad8fa1dece217f940a0e53d4456c62408a66dbcddf1f5ea675212ac9417554b8d3ed4af2c42966532a2c09e9ebdcbeef24c93f7e8a43e3e7f635297 SHA512 6ead78988b39f0dea2418ea682de47172f2459b5192f6f0ba92fca3fe25eab4af8393be1710a0644899cd490412a1011b393e5430f626387a74119eaf452e3f4
 EBUILD parser-3.0.3.2.ebuild 961 BLAKE2B 570ba46abad8fa1dece217f940a0e53d4456c62408a66dbcddf1f5ea675212ac9417554b8d3ed4af2c42966532a2c09e9ebdcbeef24c93f7e8a43e3e7f635297 SHA512 6ead78988b39f0dea2418ea682de47172f2459b5192f6f0ba92fca3fe25eab4af8393be1710a0644899cd490412a1011b393e5430f626387a74119eaf452e3f4
+EBUILD parser-3.1.0.0.ebuild 961 BLAKE2B 2117170d2ea7d7e9297037612bf8232f9009f6cb01cb96d3da1c878a5010bb5f415b59d41c35012a2a242e13884f3f47db2c516a12150ac7737aef567d514cf6 SHA512 536bd2d0b4c0582fb7442b03da58479997df906e13f8ca02fd93457f0351fbe02dcc6e82b5aeea6a68e75ea6fe1412d25c1c2786b7aa47fe3509c25c34e6ac8b
 MISC metadata.xml 344 BLAKE2B 00abcffb45cb3f1cbcd61458b7bcd8a4a81029fd58aba3f67a270c5ec37e8738f4d31b09f8b382987615acd4a8bd5ad335c54b60662a862f3828a1af360437df SHA512 4a28a0ed71d39d82fa69378ab26f4cf5844d01e58cc1805372df985a5ce25892f268a75db5a0dd3ca00bba3285a7cfb5447a1f261d79c7bcd41cd45b6cc68677
diff --git a/dev-ruby/parser/parser-3.1.0.0.ebuild b/dev-ruby/parser/parser-3.1.0.0.ebuild
new file mode 100644
index 000000000000..0bc9672c1a19
--- /dev/null
+++ b/dev-ruby/parser/parser-3.1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+RUBY_FAKEGEM_GEMSPEC="parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+SRC_URI="https://github.com/whitequark/parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5
+		dev-ruby/racc )
+	dev-ruby/cliver
+"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 24373145d94c..e68cf1afd09e 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,7 +1,9 @@
 DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
 DIST pdf-reader-2.5.0.tar.gz 12457904 BLAKE2B 6a17a586297ee238b9e0e8ae707cc0518ae3de62ec058ea31303f0787cff7f6f79f4259babfec4323adc6fb08b64b92e3f0f6f01da3a1eda29c6ea02f25aef3b SHA512 684d7ea414c8cdb7bc2aa17b2f3108a18cb6cf967b844ab26a6ac39071508b8a871b661e0e017a7f721cb3c2e6dffcd2cc0d3c31c2b33b3c61be08292c25da4a
 DIST pdf-reader-2.6.0.tar.gz 12463722 BLAKE2B c7c788871c4c99decf13509a116c266c33489d8a3f3b46988b14307d2534f2f6aa20a578af8019b44690e44f9bff780aebc8c7e7299c51f25a97cfa988070748 SHA512 5234708f9bb2ddd85bd6821023ff7320cf21fe91f70e517f6791ef0d5186909f055da6af3903f77e8a4a1498f3fc130c9797437f4c00a817b8f33ab3dccb37e7
+DIST pdf-reader-2.8.0.tar.gz 12598389 BLAKE2B 8572c4c869d09bd7ecc9967d46b44236002fadb863695675b3d7bf2f7d63560c72240f9f0544f844d63f33f65f6097d28eb315f332eeca58294a5956cf24c09b SHA512 8f1a7990d982141e6dae682ad5dd6f415a363a598f76523ac9be2fda9c460479e571140c0f407f01f950dd94d73bc006a32a827fbab08a42d1c6656024d241c9
 EBUILD pdf-reader-1.4.1-r4.ebuild 1159 BLAKE2B a725a3daf9e001f0875e426ece047cfc6f0154ae2886e88b576c178769589cc320850bc178e51c135084e42689b80c1f43578e17214306fda599f0e26760308e SHA512 dc5c1fe523848da79af0ae6e4d2b6cdcfd9869e56c24fca4afbbe9c98c57acfaaed880de01a87c77e27fd5d602495b122cbaa0e7a73d1d4a50756a37d8620167
 EBUILD pdf-reader-2.5.0.ebuild 1135 BLAKE2B 7e0531988483dfc5634430530cdc5f7850382c9caf803a1b8a625ed62ef03d22b2bff1040a735c7fb38031470605548da500b6e51d3a718933e76d9979d376d3 SHA512 b4db4a10b3722154e13fa46d2a379e85a2ea88bcb8916c71809fb1fcfdfe506ff02d4a81bf31e32418a08581eef0ec08c61ef6e367b269581cf10e18ba28faa9
 EBUILD pdf-reader-2.6.0.ebuild 1128 BLAKE2B 817814148e45f009e959ba693e40a5ad7cad3cc94fc6f24f3599dd3dfd1604b4df68159e7b78d28c94d0ef9c9544b6da563ecc633fcaecd24103d05837f1456f SHA512 8acb8326119cecbfc6798f956b01783f57eed7c970459b74b35b2064404eafcadb52eed10940df73cca7248f558cbd0e3047ab2ea8dc4647959306c5cb15ff1c
+EBUILD pdf-reader-2.8.0.ebuild 1128 BLAKE2B 8e3f24a975b23d1ba7ad19fd5f160d54277aea6bc505da93e3414b97c1321cd8a7bed464262116b10098d1bc70b3424734bab84bc13428376d85ff3c746c7727 SHA512 9ac0b5ff1fc0e79600356e9e47c1b49ce33c6c8ce9e8a8106be5260e038a5b3b745bbdbdd98045fb4b5c20b7661e5de0aa9a4f07ca368e4b18a426809b3a252a
 MISC metadata.xml 341 BLAKE2B f8cb66bab4f3e19575ab8fea37585e35760e4eb05e75f2da902104198fb3eabde71aced9a21d95093826ebdd5151d47b93505910607460e900fd30cf984c068a SHA512 0ed5fa988875afa0aef09acd9af4c7fa319c5d23a4240b9a7c0b064c41a5da623bffdfe7883960590967d75f0b0a9ed7cc09c100a667b49c034088109b0f7c1e
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild
new file mode 100644
index 000000000000..06b2336fdc14
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-2.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND+=" !!<dev-ruby/pdf-reader-1.4.1-r2"
+
+ruby_add_rdepend ">=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
+	=dev-ruby/ascii85-1*
+	=dev-ruby/hashery-2*
+	dev-ruby/ttfunk:*
+	dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index b301b30bd3df..29619f8e7bda 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,5 @@
 DIST puppetdb-termini_7.7.0-1stretch_all.deb 22018 BLAKE2B 38716d2fe7bbe14656e4f274096ae93d4dc316cbdca49a0da33061df87666caea2bb8fa855de7539be8355805cb5055f74339b12660fe4f8020dbc0f92b79fdf SHA512 61c70aa919a6cee85a36e50c122ed7570e996fb74f68f70733d3f2233dcbbce8623090e9d856722c0da8583836457ded11cd97d1492019a84df00855fe79d462
 DIST puppetdb-termini_7.8.0-1stretch_all.deb 22012 BLAKE2B f084e99db0948bf290b0b37e27e206d2929214b9b071b9681a5b8cfa4a153d4c35f5d00be5a50a24af669619080db5ccf9d2a16c62d767a457db344f347e2811 SHA512 4b7b3535e85f353ad1d120e3699ddd76b42c23bd9a93eb06403dcf8cc50697512c097d2fe23495fe676c97993ea535a26a752f02fd9e8203073a09bf018d12c1
 EBUILD puppetdb-termini-7.7.0.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
-EBUILD puppetdb-termini-7.8.0.ebuild 672 BLAKE2B 6f9b12dd3d6dc426e0a3a067f864087010c3fc001cb66dad08317eedda34e493441b1ecb4767373d84bf30d12f6e2d108ee93a19c6dc431ed6dfb59c76f8b793 SHA512 197da62a5fb778b148cb32282953173b6bed803cce7b526b4ba1b89406d4c1ed9369e3644afc0886dbe519d70a592ff8062c6b879940f2c316fef9b27564d8a6
+EBUILD puppetdb-termini-7.8.0.ebuild 670 BLAKE2B dfda445189572bda7d3928403ca710d4ecb14763342a09cb93007d846b5eef90cdf096fb517d0f48e8fbdcab8cd342d42049c6f4b15aa5a099d04ecb4a78d768 SHA512 246c86ba051d8d18961346810acbfea32eeb55b9b08ed1b9325c069686c290a352416c274f6c097fdc9ba69438b7e57ad4623bd39bc07e1504bf20cec988ca83
 MISC metadata.xml 367 BLAKE2B 46ba9e83a3422a65265eba357896709907ac39b394d1d02ab02d70a0252a0470944a2fc23a44bf6c76b3562f90d8f6d9f6c28055d8458ce3cecfd2e3d2c347a4 SHA512 1fbf96c090522cccba0daa607ee8edadf107ebc38abaa66ce9a8465a1e0cd1e92f748e95ed5e7e490350191b2cc03460e8e9632a7de7550662e83a098dd47335
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.8.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.8.0.ebuild
index a7cef96b4b13..595019a13dac 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.8.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/pusher-client/Manifest b/dev-ruby/pusher-client/Manifest
index 2c16237957ae..95da9f14d547 100644
--- a/dev-ruby/pusher-client/Manifest
+++ b/dev-ruby/pusher-client/Manifest
@@ -1,4 +1,3 @@
 DIST pusher-client-0.6.2.gem 138240 BLAKE2B d9692cd09bff5ac093e7f340d82676f57f299e669c86526a04dbef0ad6d33410647e4163f51c855284fe73aae82115dd959fc4bfedef246e384c98f09116a46b SHA512 1d4a81027f08065c840c89098d562787c73c0f39fa986152bf22ee43fb222b8a26782fc4be3cf01acb9a62c5237cccb8515d2bfc6c4a4d9d1dc53b853599a30d
 EBUILD pusher-client-0.6.2-r1.ebuild 524 BLAKE2B 67ea4e6877a088b53731d66ad613d9b7e334ca99f334e1a15849548ea7db38167f516f4e7006ac297b6d5117ab864d461844996b068d1997e7893de8d0ef0309 SHA512 22d1791e9eb760cd3d76714797420f2a644a22fb3ea76b3ff2597f04272e984ee2a10e5336570d9542d2bc1cb982c237bb825adcc4145b1b812b5a9b5d6bd7f3
-EBUILD pusher-client-0.6.2.ebuild 562 BLAKE2B 82ed86b3d34bffe69e8f71eab8cbfb78f4f90205c1e7690718261f075e3bd82ff538dccc2447dcffd8d7e5b3b0ba028b94d5fdc9fae3d3a48eafdd9f4ce36bcc SHA512 600295d93ca16ee1b94e72a3f58a90fc66bbc32a54f22f40ec53a244097d93dd4a7f957593bc62801345136f0ace2b64ce2c59d9822a2bcb8e099b65bc918a07
 MISC metadata.xml 355 BLAKE2B 271d2bfcc00ae427a49ced43e665d0de9a4709a025117afd0340a7a0abe9ce1f9ce11ad6f3e887db2076cb39acff227676e7c1fd151702108fb28044fee7abce SHA512 31710e712f66c54ff1e5cdeaafeb49f0eb80cdd8169d8aa9f87412134d1d0b57aed7f1e8d2218c61e8ebbd70d8a7793d1e42fb844c804043d6e6aa6f74b6cd79
diff --git a/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild b/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
deleted file mode 100644
index e0dbf9c3a20a..000000000000
--- a/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Client for consuming WebSockets from http://pusher.com"
-HOMEPAGE="https://github.com/pusher-community/pusher-websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/websocket-1:0
-	dev-ruby/json:*
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/rainbow/Manifest b/dev-ruby/rainbow/Manifest
index df2ce006712e..b6ede93d7d0e 100644
--- a/dev-ruby/rainbow/Manifest
+++ b/dev-ruby/rainbow/Manifest
@@ -1,3 +1,5 @@
 DIST rainbow-git-3.0.0.tgz 15105 BLAKE2B bc2c91b8ac726c080dbed45584adcdf4a4a496de070a92291042490009ae490efc4ab91cdd12d338f0cda156811358550507ad629e27dd54445a68427f8d4d2d SHA512 863b89152696b6a13606a1e92b68a788b9b5bcd6f521f02f26fb189fc6c9613e5db032dd5deed1aa95247ab0aa08a44981756f941af6eb786076c271881a38c1
+DIST rainbow-git-3.1.1.tgz 15785 BLAKE2B 9c5dffab817fa2b2b5f70acbe642990c6417de7a5b4347f7921ea57ea5c1017fea63656696544d870a3589f9ac8049e56baa6f4e70b8af902883d62046480d11 SHA512 5aff955e8baf78d99960ec9caa11626f07460085f35966c410bb867dd6454a932d2ee8742729a32eeca186fa338bbb02bce3ee8a452a8b4fb0044bb6ec751bc3
 EBUILD rainbow-3.0.0.ebuild 581 BLAKE2B de158acbe161c4e592c1fbf56fed12dd47f823d483f8c133791719e103a44a266fad4120a92daab1e44314dd430f718b26a0840f145f6a9676f2903fc31c78ef SHA512 21dbe3c104ce6553acd935ee9bc145216dd1ba885d644475a435a88305e4c09a74bf5916160571a95569fa6cd6ca3e2ac23e49108a75ef9d85a116983228fe22
+EBUILD rainbow-3.1.1.ebuild 584 BLAKE2B e419e885a663f6820ae1bf8f17933b58c2d9b6c0d71db7600c41c2794bd5e39cdb7ab8bdb9d05e7e7ca8f97428e9782fc3331e76829fc1c5db94012bd4022cff SHA512 a897d4dc3d5cebca490792be818a4cc91dcd41306d3324e5a400ac09c2279f5e28dc78265d84fec14316f7db04b82c584bcc909f8a7a3027a526b815db2242ce
 MISC metadata.xml 342 BLAKE2B 24d758c15e4ec55de20b643f72150c5616a1cde81ce9e2c4ec1a1484aa0744ad588cfc940872b42ac219fd58aaf57f8a794824b8250f17e639635722bd0971a6 SHA512 4ba57a974ecee4c16665a8c39c93990bad7f6ad117beaee17a3add5be38bd76a5a55ceb92ca83fa826ec148c8015f378acfbf96ab3e54e1d65b43319861c1b97
diff --git a/dev-ruby/rainbow/rainbow-3.1.1.ebuild b/dev-ruby/rainbow/rainbow-3.1.1.ebuild
new file mode 100644
index 000000000000..0cec82a9b17e
--- /dev/null
+++ b/dev-ruby/rainbow/rainbow-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.markdown"
+RUBY_FAKEGEM_GEMSPEC="rainbow.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Colorize printed text on ANSI terminals"
+HOMEPAGE="https://github.com/sickill/rainbow"
+
+SRC_URI="https://github.com/sickill/rainbow/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/rdtool/Manifest b/dev-ruby/rdtool/Manifest
index e84342a2d58b..18578d3f25c5 100644
--- a/dev-ruby/rdtool/Manifest
+++ b/dev-ruby/rdtool/Manifest
@@ -1,5 +1,4 @@
 AUX 50rdtool-gentoo.el 174 BLAKE2B 9480cb7873a3f12db0cfff40adb1bd18a5f5fb8c8249c24767631aa9f0f341237fb8c9ccd3cc720ddbe02c63b0d7846127706f7a25def3ca23e71716099e538c SHA512 77e893e6c9660b8a6cb2b8e7d1134867c4e9d38acbf11db4ee948f288b69dfe3a938ab0d37bca7b4b9da2f6ca27fa27e2d9c17629ef3c0d49797f65c036c472f
 DIST rdtool-0.6.38.gem 115712 BLAKE2B 037575dd890512ad1f88a4a04532b6c2b8ca6d5245cccaf7ab1b7f51fad971e449bf280bf5ffdb295f212d56add4e817fff5494b0bba011229cf54d2ed74e1aa SHA512 958e9066a8b3610eb1a78069e615c5bd672aa56b3b45669604b35cd094bb8ddc549d8f373d1ee53864c27a0aa7ee038101b3256c56b3b8ffe618f75a1a939bcd
-EBUILD rdtool-0.6.38-r2.ebuild 800 BLAKE2B 4168f168c254453e044224c04850b2b525d8c9b1dba48816c096b060f18927a6e310d5836bdd0d3521b9e7f76222360c806ea27e9bf28f0fc7a629939166df4c SHA512 7d1aa21ac3f4bffb0f7bbe75308f760a973b18071ac18697dd26b67cd349ef57a4b8fddefbe96b26bf4e687d53dc6fe39297966952c8180ef085e9c2452e7ee0
-EBUILD rdtool-0.6.38-r3.ebuild 800 BLAKE2B 13751a52cb55a1c5e1cf2cd3f3cd0fa3089a77f1ddc47b35a0f1dc5136dc6dd87e12e1d544419f99ee7e56733027c9419373f2734a228a951ccfeb0fe9481956 SHA512 a26bb2254f47b94d864cf906725390ac6ada054fcbf51e77c030d141c496dd628357622044aad5adb6c5489e52e79ac243c20be9910fbc673fb6095ef3e6e170
+EBUILD rdtool-0.6.38-r3.ebuild 796 BLAKE2B 2f0ee2aec0fb8c7a4041e67759186c3e59be850c258fa745e97ee3db8ee74150840d140c598856523eff40d7a7da51aebbd5085b9cfd9286209d5e93c3dc2068 SHA512 cd5b412274f7dce953ef36ec32aef837da27a8e7c31b0d9b1abdfa106fbe89a1cc1f223a5f7a50ed8ecbdee3f29f6346e67814151b3e1de1936474a7677f909f
 MISC metadata.xml 341 BLAKE2B c7869bdbb270ce39e061039cca7efd99b85ecfad0c14daf5f7dd236e8d489d23776b0f606c78a0a5608e7902976428612aca2c3e92bca7ad2b04805d6a3c80ad SHA512 acbcaeed327c0b86b7c46a3cc0f63da5956ae66d5ba356a8bdb3d2b96589c84c95b3961ba7663991dc82ff1861903b05ea004b314de6e4b651e32a7502380a9d
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
deleted file mode 100644
index 1f9ab78b6b4f..000000000000
--- a/dev-ruby/rdtool/rdtool-0.6.38-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.*"
-
-inherit elisp-common ruby-fakegem
-
-DESCRIPTION="A multipurpose documentation format for Ruby"
-HOMEPAGE="https://github.com/uwabami/rdtool"
-
-LICENSE="Ruby GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-IUSE="emacs"
-
-RDEPEND="${RDEPEND} emacs? ( >=app-editors/emacs-23.1:* )"
-
-SITEFILE=50${PN}-gentoo.el
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use emacs ; then
-		elisp-install ${PN} utils/rd-mode.el
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild b/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
index 6edcdda0fe91..f2f37b8773d0 100644
--- a/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.38-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/uwabami/rdtool"
 
 LICENSE="Ruby GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="emacs"
 
 RDEPEND="${RDEPEND} emacs? ( >=app-editors/emacs-23.1:* )"
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index 5713d4a40318..b97d0fcbea3a 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,5 +1,7 @@
 DIST regexp_property_values-1.0.0.tar.gz 12884 BLAKE2B 82f63d21a1e1508cef79afc2f1b5cca842c1e5bc96b197efa90ec0d02e7bd213cc67ae99f4f71cae6e632e0804fa2d6e935c7d30f27a940c767f5a83dd9edd21 SHA512 f51946d93c255c3b51bfb8055d2c0548c9656db9f208de74b569df8799fa97712a76b509546e149f71e3176ae0e979f295b225c171cedc687e1871f204c1e0d3
 DIST regexp_property_values-1.1.0.tar.gz 13637 BLAKE2B c274dbe0a1168af8de4f3180ba48d3332b1b4425aefa7be33074465120568aca4fc3c3ffe5caa27042139495d1d6ce80e660da4239be8455f41f7e0a97f8f357 SHA512 196b29de3d41502b1f26fb3a64ecf6135ca917b85edb633bee015fde1dfac86e00f9565509973f64842a24542740cb4a887a754b4688f47fc32b0650fc80feca
+DIST regexp_property_values-1.2.0.tar.gz 13713 BLAKE2B eaf96fea2fcaca3156f87271f772e03c07c447e7876333b7fa3f11f9bbf267d3e93d69c17601e8fa35004aa8fdb35b05829490ba86906fc4b460281ed29da561 SHA512 01add1c7ededb8a48b42d3c24b5de6d539774656bd59b666e6088b20a495e1936b547ec903678bbb8e49af35f7c72e3dbd35a7750ecba91a04c751d5900bed8a
 EBUILD regexp_property_values-1.0.0-r1.ebuild 1135 BLAKE2B b1eac8f60e2abc5b555e0a9061577a9087c0ba16477bd134c075e3aa875e63841e9063bd190a7ae5faccbd96a44bec6f643445ae29b8a765f53bfcfdfd147837 SHA512 ef06d5446b29e678a68beee6f4ce69bdc497f946802467334e6329631883ce3d274574947ac347e78cf4b5b3cf97ce42c56902e76bbe852aef6b3c72f7809325
 EBUILD regexp_property_values-1.1.0.ebuild 1138 BLAKE2B 7ca7c019d5d2e3b7a8e45d8e153b8a1fa51493a29fe334c7f1191cd633d01319915e0909d2d35a98bd84c82d6e4527cac6bcd795ffaabfe3895bc8ae0c7afd5a SHA512 0be1d93eed15c6ccbb706e7ce761abdc2a795ed6e449d0c70900099e6727e2bdb2e7ffe640f9aac2d12065fa9e1470da500566583db2a011fb2d7eee2401684c
+EBUILD regexp_property_values-1.2.0.ebuild 1138 BLAKE2B 31abe550dc026e0b40936c5dbea4dba876a70cae1a7c198a83cf6ba02680ae73cf437d3b9f8d17ed407bbc018a07a431076724886c06c935ad4ff7fe7b148183 SHA512 9d007acf27ccdb35a8ad5b005a421b740bf62cf521005e980bf68a58660adce1060d87ed59da9b4b4f7ca49843986b9e1bfffda94241f808007c9691b4af1402
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
new file mode 100644
index 000000000000..485ecbe3e2ea
--- /dev/null
+++ b/dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/regexp_property_values/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/regexp_property_values"
+
+inherit ruby-fakegem
+
+DESCRIPTION="See which property values are supported by the regular expression engine"
+HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
+SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid dependency on character_set which would lead to circular
+	# dependencies.
+	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/value_spec.rb || die
+}
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index 398e39477f1c..f4a3eaa1166c 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,3 +1,3 @@
 DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
-EBUILD rexml-3.2.5.ebuild 879 BLAKE2B d6757afe42842f3b6017ead14d5687705e91f15eb2b4df343f98d0415e2159c2fcbdf34d3856d89ce393383bdb371bdd39b9b4db10b968594f6d56b05dcb37cb SHA512 9f1c01ecc7a344f2e554db9539cd84a093c0d8bc8592d0584fbec695e8813b62c04d01f581f1fc4a6887ca1a4940635b720384f6bbce3ca509069f28520d6156
+EBUILD rexml-3.2.5.ebuild 878 BLAKE2B c179e47e33e631650806b40af49f26a0d7c77c4f81b164550f54f181452c457d32f1dd50ed7e5e18d2e16deee7b5be51e9e203b1339bc4a6047eee3a18eb8b12 SHA512 59aaea04f2670b707a1df27424dec4d74888fd9fa3264bbc6d744d3801534b227e161a36a621d6d22f052ea7ef805242d074796ee531a6c8d077993c15170306
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/rexml/rexml-3.2.5.ebuild b/dev-ruby/rexml/rexml-3.2.5.ebuild
index 50e13ee6d580..c0aaebeb5c0e 100644
--- a/dev-ruby/rexml/rexml-3.2.5.ebuild
+++ b/dev-ruby/rexml/rexml-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 
-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"
+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"
 SLOT="3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 115e220bfad2..e533c5d80aa6 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,7 +1,9 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
+DIST rspec-expectations-3.10.2-git.tgz 213253 BLAKE2B 51c306d34dfd82d551b8390bed9790748f8f62b9f4b5243399486640d04465dc0c33756f7a575e98c8e61310cf6c25b93b4c1102fc1798814d916defb0ad310e SHA512 819f1b9e881a56d5563c9421e3e897726931c3cb27be5554e35f41077656e426cbac1ddced6a6e61ba21faa7c147c239433ddb9d21ae2e88592d91b286c170a7
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1631 BLAKE2B 2615ea756770527b5995f6849579b352ad1ca23dead5059de56f1da33f515df4b6e6f1a8f27a2ab58d44c9d25ea0bc9a554e12006079328284573f588d01b1b0 SHA512 8e704765209e260ee881e44f5faa162e3ad68fce865bfbc2e9eaa163ae74e93063f07b6ae5195882c562db2d4a23f0f6caa7165f654cc7b9c1c8feea3af239d4
 EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 9dfb52e62ff11b037678e39e986602c9a9d9982b1f230f126d060e5d4fd53a77e942d8c63f7a466fdabf3d2a66fcbbe21a75609643d0874b7712efa5d46df7b3 SHA512 3f82f0e97cb560ebc7d5df647dcef05ef70126f108da01dbe2d6b47bc1a54dbd19d503e9670883f28a7ff51488a69abee0eba2001223bd4e46a2c29216c87afc
+EBUILD rspec-expectations-3.10.2.ebuild 1318 BLAKE2B 728632075a61aae02e2b7457e48af0acd9eb2cd4160e211cf2b612d7b12619856f024d9c177360f700d4fcb32f1ae569b49e71531c778537ea5cc08146086747 SHA512 d46ff515a45bf7f501383296d8191d7ba07b149dfc2a10209ef9161ca79f1ad57577603fffb907779b1073b6c8f5a24a1cec5dbf13f225b7736172eba1c20a22
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
new file mode 100644
index 000000000000..89b2242466ee
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+		>=dev-ruby/rspec-support-3.5.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm -f Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index f7d242f5feb6..c6984502ccba 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,8 +1,7 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
 DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
-EBUILD rspec-mocks-2.99.2-r1.ebuild 1623 BLAKE2B 69c1d153b480908d66ee2850a70352c02c3cdccbb8a69229c233b6ef4029135e91b70c96eff88063295a3c328a08f38b133cc3ac1d22e401c1a79df60dad85d8 SHA512 0df31a0cec3d2fb790e486f9c93290d2625812877e6550f24b403e5444ba50ef6e1e7948b93c81c9eddb2909107d678b426281421923997b3943765c3b27c62a
-EBUILD rspec-mocks-2.99.2.ebuild 1517 BLAKE2B 239e43ae3232aa4a6e8924375186ae5379499aff4a13b773465b6204dc79f66202ec86f65b668356aa567576df38d65b5f914ce858f444f37e691ce729c93ed6 SHA512 62c49e43f65c7a36422b3b3e6ac1af4fcb8a4dfb337a5960b7a8397a996190826691bdecb351510d23371bce173db6334f15863fef9dbc5df226bf851d6beb39
+EBUILD rspec-mocks-2.99.2-r1.ebuild 1616 BLAKE2B 1a414ceb73933c9e386a440c58b09667a91f70e59b9f7e5dd4b18d61f5845f502e17026457aca39f149f879ea27a7fe29ccf03341186bd9733be4dd95f3ee94e SHA512 8e309d98623cd010f8027ca1e2382bd615f0c95fbe6978d64b6dd29323e143d3699b7ef54dfbc7f24da6623a1b40153fa396a52fd817dc314dc44d52219cdbe0
 EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B fec61c4afdf328f06e2c2a9d7e0f3644836376b9925dbf27a55e959956f9c049343a56e95e3272cf9d062d86d2914998309d6cd51a6f6db1b86352d90cd5adc8 SHA512 11f1f35d5b2d59292a42ad277b3676c5c34bfaa72e22bf5705150eeff1d94fc3688e5f9daaf2b11e327767d481102f1a1890329562c0a6e78bbae0146e9ed3e7
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 344 BLAKE2B 5b939c668a8c75c33348bff9e8a0fa6042702fb59cdfdc2c8b45db1d9d191950a63d6f9b1329e6a2717a097d7b001afecb9ebbd0fa08badaf95664d37b06eb17 SHA512 026e9a293c2f99d86a11f37267fddcf54dbdc33aec00f470a988d477d6e3198ccc478c03cca059be0a4e324b9f256719c99c7c81af97c75fd7cebab433d4b1a1
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
index 0a09d4cde658..bdcb716c17ec 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa 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 "
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
deleted file mode 100644
index 7b863760dac9..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-2.99.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa 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/rspec-core-2.10.0:2
-		>=dev-ruby/rspec-expectations-2.99.0:2
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	# Avoid a weird, and failing, test testing already installed code.
-	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
-
-	# Psych and Syck are not supported by default anymore on ruby22.
-	rm spec/rspec/mocks/serialization_spec.rb || die
-
-	sed -i -e '/does not affect the ability to access the top-level constant/,/end/ s:^:#:' spec/rspec/mocks/mutate_const_spec.rb || die
-}
diff --git a/dev-ruby/ruby-dict/Manifest b/dev-ruby/ruby-dict/Manifest
index 55844db40388..2c0b3f900e4d 100644
--- a/dev-ruby/ruby-dict/Manifest
+++ b/dev-ruby/ruby-dict/Manifest
@@ -1,5 +1,4 @@
 AUX ruby-dict-ruby19.patch 472 BLAKE2B fb7fb083ce6a0d33b01da92e6eb0a44fc0494767a48a79817cddb2a17d8cd831c0f5dce3e5376d377ef916c7e72f5a066180374cf6f07a85424fd861ca33e212 SHA512 632459a8c8a46a42b7d7fdc6771ccd57e2e0058ca2fac785c8a97fa9ed08b47d80bd29ad07e4b0ba356cddab42bcb3f2144b80dcb9b9dea100998f00aed49a6b
 DIST ruby-dict-0.9.4.tar.gz 50487 BLAKE2B fa812bf222f82bc91ccf5a4f2a225e3463d7d85677004e3131547a49da88f89af3632de6f18e1b95f4ca68a5f7c5b5f909a9e811faf849865c879b3658bf43fd SHA512 54ce421c1bf49d0d52fc2549409887e05ebac5d3d1d50fc1b3a2ef55eb1242af509e3fb2ee046ee3389b088ca951a9903e9ea3ed3ca3dcfb0d521acd0eb54c59
-EBUILD ruby-dict-0.9.4-r4.ebuild 689 BLAKE2B b6b19da4dff795aa5dbe4fd66acff70e97369c1b8f2be8406281af3b766ca9f831bd729983be052d420d74e154ece29e9ef80273dac01df813e40b3af8c99ba7 SHA512 9a09d5fd352339d41c320aaa9699b68fe5a97fcb8af53eeb42250bec2c0034765f7871587717ad06e402ae8ff292dd9c2d86163e57fb0ab36c284e3170f4d2dd
-EBUILD ruby-dict-0.9.4-r5.ebuild 724 BLAKE2B 4502a64159551eacc430c4cfb49ba4648253f2c5fb3274f2fe0361643f130a561a2ea27281b19061d87afa596b1ad95a08710f5f1441931521a3c36b1761775c SHA512 f368cf7454758627b2794cde1b2ff3fe70dc773c335a1ac523dc72270aa4e005b00964db4a8aea3f639bcf80c0962cfa269e2d9d3de6a2336b32a51b95d4e53c
+EBUILD ruby-dict-0.9.4-r5.ebuild 722 BLAKE2B 25c1241d4aeb3ea9e384523bd152a2a0193d9708ff149e4857c4b26a10ecbbc2d31f81f940542b9182d0e4fec312eb68034be1649ecb5ccb68d6098e9bb48e75 SHA512 6fe9c8e0c457d1e9a42d7a12725d8b783af6235f77b467b0c409303d5c58f5e680158dd5a1360dd4a9e57c6693617e50b03f944a8f8aa047d10ca480bdd76b5c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
deleted file mode 100644
index 51d71bd816ce..000000000000
--- a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="RFC 2229 client in Ruby"
-HOMEPAGE="http://www.caliban.org/ruby/ruby-dict.shtml"
-SRC_URI="http://www.caliban.org/files/ruby/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RUBY_PATCHES=( "${PN}-ruby19.patch" )
-
-each_ruby_install() {
-	doruby lib/dict.rb || die "doruby failed"
-}
-
-all_ruby_install() {
-	dobin rdict
-
-	dodoc README Changelog TODO doc/rfc2229.txt
-	dodoc doc/dict.html doc/rdict.html
-
-	# This would probably need a 3rb section..
-	# doman doc/dict.3
-	doman doc/rdict.1
-}
diff --git a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
index b9f23145d653..9e223cecfe2d 100644
--- a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
+++ b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="http://www.caliban.org/files/ruby/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ruby-elf/Manifest b/dev-ruby/ruby-elf/Manifest
index 79e77ba121f4..0dc5e07a8f8d 100644
--- a/dev-ruby/ruby-elf/Manifest
+++ b/dev-ruby/ruby-elf/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-elf-1.0.8.tar.gz 1958368 BLAKE2B c12464d55dc318301e7b999de5057bc6efb306c2393942200e866d7a48c05a179a09991366bddbf10d4a181d9db36c1dbadb0e2ba50ea1021f012a47dce200e7 SHA512 40eb774b9869948812c56193c46548f5c372a1fbd3892b7e6ecd7865607e0edba81ba7e857b6571acb9abb67e066aed312d48a3d0ddd64c8f51f142eb45f8d8f
 EBUILD ruby-elf-1.0.8-r1.ebuild 946 BLAKE2B ce71d02551f6a8dce39b273839316af69342e0ea421f7bd6d6a27301b1f5b9a389a222f8139d6123869fa4fb3ad909abcfad1690b1a5129e7c3e1f40c3ec0c71 SHA512 8d9c0c85b362a12995956cce95d6918cd44f0cd4894fd1092a14d9afd080be17d2ffbbb9da5c024d7a612c1cfcc93947d8fc2cba360222d9fa7acf608f163b30
-EBUILD ruby-elf-1.0.8.ebuild 1207 BLAKE2B a04ad80a71849d3210e6412d891108781935227b31559c3b0fb8fcdb8ad7b142425217b759e149d1f7ccbd26e9638636574c3467ca91f72c83c5cac5d0ab741e SHA512 df785d63c9280dd9f779d0b729210ae5e803c6475f0ded89e1080c5d16d28f37ee81e19f320405257362b8cf4df012ade23a3f83761d7a881603d5c072aaaf88
 MISC metadata.xml 335 BLAKE2B 2e6fae65263f86c378fc241a7f1d88a20baf12e16f14df4bb8636f93a1f868619334b39ba70d379c7874289d15fbe1926c50ced9d35941a8dd0f12d5d3050dcc SHA512 7f1a90cdbfbb18bcebdc42b8d11565b971a7d5ce20db779027f97adcdc761aaa07eb50dc6ea271c060f49dba0b35b9decac6b1b379f1eefc65af307adcf681a2
diff --git a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild b/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
deleted file mode 100644
index 246f1f2373ff..000000000000
--- a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-GITHUB_URI="https://github.com/Flameeyes/${PN}"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="${GITHUB_URI}.git"
-fi
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKGEM_GESPEC="${PN}.gemspec"
-
-inherit ruby-fakegem ${EGIT_REPO_URI:+git-2}
-
-if [[ -n ${EGIT_REPO_URI} ]]; then
-	SRC_URI=""
-else
-	SRC_URI="${GITHUB_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Ruby library to access ELF files information"
-HOMEPAGE="http://www.flameeyes.eu/projects/ruby-elf"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/test-unit:2 )
-	dev-ruby/rake"
-
-# for the man pages
-DEPEND+="
-	dev-libs/libxslt
-	app-text/docbook-xsl-ns-stylesheets"
-
-RDEPEND+="
-	virtual/man"
-
-if [[ ${PV} == "9999" ]]; then
-	all_ruby_unpack() {
-		git_src_unpack
-	}
-fi
-
-all_ruby_compile() {
-	# build the man pages
-	rake manpages || die "rake manpages failed"
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman manpages/*.1
-	dodoc DONATING README.md
-}
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index 8a658704dd0c..1a98793adbd0 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,3 +1,7 @@
 DIST ruby-oembed-0.15.0.gem 4528640 BLAKE2B 3bfb6f6b7b23d82b89adad5b329072d050a5ff5dbf475f7443734c6a0cb70ad8c5a5d8cdc391e81a8a150d448454e3cfa8302a23c55a39cab8898c5d0fc53fa9 SHA512 9a97f292298ec0b030435ec4d63456b9eb6547de9cbe7b56cecc390cd8a5c374aca4aff2da4de3189cb0a75c6e1b0884c1fdf9c69d729d5a5436ed6e94d3fd2d
+DIST ruby-oembed-0.16.0.tar.gz 4547329 BLAKE2B 2132098010884b3734e1842e6bccd5a6fd2a2c5ce5d1cf7d9a3eccf8e5afcc2a01fb20e17cbaedd7b8e4996df1ed1c07fa0df997355a0a8116dd4f2f1d20a4c8 SHA512 3e076b544b013f527a700c6610336a66b32cb293ee38f1f952bb16603105b85668ca239f0c8090d532e89d164a35ec4e85e18cbb48c60651587f564c547109dc
+DIST ruby-oembed-0.16.1.tar.gz 4547399 BLAKE2B 929d0a63aa0bd8acb005630c3f774a56e5fffed83b8e6c80c491dbf93df1b85b555b37ef8dedc77428cfcc8ad00c9eee54e49c8e31467efb8a8eae28e25397a7 SHA512 71241c818478c4321844276e4ba5e726536fb40f35c18b0ff9ead46e7d8b2ec1b58ba6738b179e62164c352005fff947baa156ac48bf6c021e29da8be3f2ad38
 EBUILD ruby-oembed-0.15.0.ebuild 794 BLAKE2B 6ac5c97ba84af2470f962c4271505ec557f8380999021c728f5e53e0a623c33d4d965b6f6d13cfdb8c8d40b3158334a6a5156459df34cb8ebd8274b0b18c1761 SHA512 97558d4a5e206980d20c3801583e2640358c6d6e5cef35bde678e1c7ec7caae097131d5eff9c2114e1d187693618099b3de4d90d74a1a0507d261d8f33bc4f6b
+EBUILD ruby-oembed-0.16.0.ebuild 999 BLAKE2B a23789171e23dfebb87a14594e5f2f8fffe97b337b5aec4c4da2467fa1c96fccb290a85925dddee6e5f05d2a4f4331a37a9241674a5fa84b76996ecf4f8b1804 SHA512 58dd4e6f85cc194fae4f09d445f892f584d926272f6faa7f5cf39cc760247130f1bb879104b237eed1c20d28d8a719f9b1c17cdf1be0f9edeb946898369240e2
+EBUILD ruby-oembed-0.16.1.ebuild 999 BLAKE2B a23789171e23dfebb87a14594e5f2f8fffe97b337b5aec4c4da2467fa1c96fccb290a85925dddee6e5f05d2a4f4331a37a9241674a5fa84b76996ecf4f8b1804 SHA512 58dd4e6f85cc194fae4f09d445f892f584d926272f6faa7f5cf39cc760247130f1bb879104b237eed1c20d28d8a719f9b1c17cdf1be0f9edeb946898369240e2
 MISC metadata.xml 346 BLAKE2B 2ae8109e99b28aa300f560b27c10ee51505c1da038fadf20035e719fc15f41bdc972702c410d4c82e5f0a0a045b0c3d20cf1977236768ca35663604c1d910750 SHA512 0eb5553fa5fe2aa455b3c7fce8b36b23d6ee23d0d747365a920a25307a63f65771b822029731a50674624331e636eaceafd57ff12c6187cf4a758a778520c1a3
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild
new file mode 100644
index 000000000000..70968be2d9c7
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.16.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby"
+HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
+SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:5
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
new file mode 100644
index 000000000000..70968be2d9c7
--- /dev/null
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+RUBY_FAKEGEM_GEMSPEC="ruby-oembed.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An oEmbed consumer library written in Ruby"
+HOMEPAGE="https://github.com/ruby-oembed/ruby-oembed"
+SRC_URI="https://github.com/ruby-oembed/ruby-oembed/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test?
+	(
+		dev-ruby/json
+		dev-ruby/vcr:5
+		dev-ruby/xml-simple
+		dev-ruby/nokogiri
+		dev-ruby/webmock:3
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler but keep vcr version requirement
+	rm -f Gemfile || die
+	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
+
+	# Avoid development dependencies
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ruby-romkan/Manifest b/dev-ruby/ruby-romkan/Manifest
index 8b494732b461..c512a892a6b0 100644
--- a/dev-ruby/ruby-romkan/Manifest
+++ b/dev-ruby/ruby-romkan/Manifest
@@ -1,5 +1,4 @@
 AUX ruby-romkan-ruby19.patch 900 BLAKE2B 209603b4b3ac92a7a076fa5c121d1274bc974dff581eb6d53b09163a555a4bd2ad2aead660c2e6066bf94b309f82927e88ffc1a856696d1c0f9852ae4dd3b7f5 SHA512 b031c67b6bc821ab6dfd91cafaf98384eca8b8ecbe7f8490e54c06ca54e817e07f54b8f97a0b9499b6fc617e4493a737bb06177d2ecddc97db435c2ab5259073
 DIST ruby-romkan-0.4.tar.gz 4653 BLAKE2B 2680fece04c80be9d2f312a98c5d5756fcd465aacbee5a3ddbd5409e89d8d54cbc0dd27b556173e94ead143dcc25cde530fb002dd3c4833d321b6169afaabaf7 SHA512 d4e4089122d643878a0e19852dd650c4d7e35918838edfe4bc210a5d26cc3e55b5be430db4378e75f44a3435331fd4e1155dfc3e1846babb3a1b626dd127eacd
-EBUILD ruby-romkan-0.4-r6.ebuild 684 BLAKE2B 2a2b234a3242691cfe32378e17537e8c723ff7031a97baf662cb38e641efc11edf4ff58f2560f357f085c9f5751cfdad48780ed4082cb1b465bb9a8da7affc2e SHA512 7374d87776bf71c38af00cd783c82a83e9477454271d2497192f629692e0ed8d0cc8e6f3e9852366dc122e09cfaae2fe4fcd62d60387f017edcd50741154f156
-EBUILD ruby-romkan-0.4-r7.ebuild 699 BLAKE2B abc1f5df36331f3a304a7f0461073b1c5bc80275e8b48dab6577723a4a4652df48e7244250f8e5ca231666f7eb5ab2c7bc78f68987aef6d099df83f8d89bfd96 SHA512 ab54d6ad6b8a80e1390d1dce6bfed674bd95786c41bf4374c960f21324a1f7219216fbdfa737dca40f0ed8af9eb06679f0be2dddf98d47b4e0de5f63209db5a4
+EBUILD ruby-romkan-0.4-r7.ebuild 695 BLAKE2B c90ae3435eb62fd21f634c3ace73d404ce32d41cf89727f304c4cd5b0ccff648f54df657b19e3868e2194d2a56a75a985c7f1bb4b43deffbfda278ce0ab7057b SHA512 794061f6c071fa1a8d0c3b3ca1fd906739077194667f6e90a7b956d8134211bd316a00847d76c9a0376d48985ebaff5e5412bffe2ce98a004cb05dcc10511ffe
 MISC metadata.xml 339 BLAKE2B fd7de5f10fae358e20ba467465cbf2fce5a1226b8829461b5064f947b540167f5acff85b43713ba2d9535fb8b4d0a680a6012c60a8a9ce6186fe696ffa910bba SHA512 d9e9ab9f9ec786e643384cf6cad846ebe4217c26cc5cf532c3bb3b1349e0c445862b8b515b3ea0b78c0a4bffffa6607106f089ebf37e5a96873e435787d07000
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild
deleted file mode 100644
index 1ec06751a51b..000000000000
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="A Romaji <-> Kana conversion library for Ruby"
-HOMEPAGE="http://0xcc.net/ruby-romkan/"
-SRC_URI="http://0xcc.net/ruby-romkan/${P}.tar.gz"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DOCS="ChangeLog *.rd"
-
-RUBY_PATCHES=( "${FILESDIR}/${PN}-ruby19.patch" )
-
-each_ruby_test() {
-	${RUBY} -I. -Ke test.rb < /dev/null || die "test failed"
-}
-
-each_ruby_install() {
-	doruby romkan.rb
-}
-
-all_ruby_install() {
-	dodoc ${DOCS}
-}
diff --git a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
index 9b5bfd7d9153..832c7cc94925 100644
--- a/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
+++ b/dev-ruby/ruby-romkan/ruby-romkan-0.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="http://0xcc.net/ruby-romkan/"
 SRC_URI="http://0xcc.net/ruby-romkan/${P}.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DOCS="ChangeLog *.rd"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 0797fe014537..b9e521f6f81e 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,7 +3,7 @@ AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
 AUX gentoo-defaults-3.rb 1899 BLAKE2B 5a0d83e40bae62ce76e1caf609cc931aaa6cd40ff41ccdc68f0bdfd9559b8691dbc7293d72715b0555122c8c87e695660e8ebff326a2b2805fbfde8711318e48 SHA512 5da2b92f6ca56ed3fa9e51258f9e5c13883c8da34236b609c0d43ef8b788b97a6d5fb2ede235340d8ed99c0c09b32ff76bb6a3f190d55b5b2e1832f66af0d3cd
 AUX gentoo-defaults-4.rb 1907 BLAKE2B 6e41d5534d47ef7bad5ae798fff81dd8ab928ef97f771150d7d6198e7d10fd5ec8625c044a77a8549d7ebf0947a4578e8cd860b5362f3a8c7352495a14928857 SHA512 86b25f61689044496dbf41424664e0109714abc212a536a75e20146617c55176b9a77edcc2c633de30ecacaf0f48c8f7820007bed1dd2d4c31e004f545fdfb2b
-AUX gentoo-defaults-5.rb 2035 BLAKE2B 6b55cd77e987cb0cb36b85b36514a8639d75ad3461d015cf6529f376af502b1dd550422f0f9c798e32899b4bc23b58602c8b18b9d5f2dec336b48314d9c19b77 SHA512 18f2b5a319650217503839b14b0063e1f67cb60a329767c58f65c02abba68ffe6b86f8c7496a3ea77ee8186b7fc8c819f3849625bff5506d97d7110193d0ffdf
+AUX gentoo-defaults-5.rb 1362 BLAKE2B 2410b639b383080eb1a3905b603d94dabe5a1c6ab0362080a441c42da33885a383237f06c10f7698ffa551315dea8b78c289ae86065115d87e180c28b5c33eac SHA512 fb1e2062f7a7cb3742473f7b4f7dc91aa5e5de9d7996f3b9037f87a3752851d71b727140b96423843f1fedf2de47b528dc8cdabd53bb1c0500d382041968a56c
 AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716d107a8f98c5058676c675eb42e1d5e0a7214cd74df9148d54220c0202189938c45f4000301e52a3a73f SHA512 fd5a33c433041efeefba4bb8d550b8db66f31d4c0966188f07943f4f575ee9e13da6ef6fd66f89a4b3b979c5b310d96e2876407b79aee6ed404ca3027859160c
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
@@ -11,11 +11,11 @@ DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
 DIST rubygems-3.2.22.tgz 1236895 BLAKE2B c4782e064d2d9748519f915264411e11151edf9273e6a0473e70c39d9fc484b0c2d45e5fe4f00c6b83d9f27393a487c9e0b87a6f9d02449b370ae64a32f891a6 SHA512 6872e08b22ed3903e9d6e67ed03bb79f1ab6819eac0837b9f1003c0ef88ee751a380f9f55e548988baf2658470fcad204eca289acbd2043e04a9d12ed23eac16
-DIST rubygems-3.2.31.tar.gz 11219985 BLAKE2B befb5910365e109e130ca63fb71cc9b94ad92ab0eac41808a2d1955bb062a0c548e9faf283e0bc4b65409041ba4ffdc665335c920417e176bea7d2b08b7c2418 SHA512 34f934b4091a883c9e583563e37f7238c817c1dc9634506239ecd177b7c3cffee49eaaa33c6e9f52dfd7ee195609f2b6d7096254e2fb995396b835c9526f0a3f
+DIST rubygems-3.2.33.tar.gz 12131881 BLAKE2B 6ec9321d808df2ee1bbde7f9889471bb7dbadb719872577a9f04863ccf7c314f6b9e2edb178efa8b1996070112673163efb2cf7501d289cecbddd134770dcb12 SHA512 dcabbbbc57031ffa3ca04227a631323559ea99cb0b26e082b3bc51dd4f9b34b996903c7701932aa303192c0483a9e1c66661424233937d1d406773b4279263a4
 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
 EBUILD rubygems-3.1.6.ebuild 2839 BLAKE2B a43114e777b786bdca79c591dcf10bbbedbcb09e7518cd37f9823a526f92e8c96ab3a16b920998877e239c3e12661adb829a4483fc7736a9721c97424129b1dd SHA512 04745c5b1c8b7f4601de19f41c72a8be8a8ba7ec2d3eb7c351a41d8d0330522555d12ebe93dc24675853a1203b7efdca2a6061920afb875a662d8b75b7391857
 EBUILD rubygems-3.2.14.ebuild 3154 BLAKE2B 12e440bb8a187063330c58307299c10119258238741af575582fa13e15802266e0fbec31f1b07ba9736b785925f622ac56e0a13034c9f89faca59083d84fbf09 SHA512 ab894afb51c0114f355b7189739c34de8e0718c08fad6566dc48ea6e8e7f648958da55e71d5e8efc4a09cb40aa9915705a9fe61cef0f483d02a26c96c89b3ad7
 EBUILD rubygems-3.2.22.ebuild 3147 BLAKE2B 3467a6f8ede381989f2a4303a001e01f979be15c8fa98dfe5af556443d38e4bdf72281b69e1e0fe2cf41beae1552ca5c1f5304e474c72b9b380aacf0dd4d642d SHA512 aecbf87c7f97725fdc2858ca1397aa8c0de13e7e760c28ff7005b0ff11db58018398d79d533746e098d15bfe2080412573755eda872bb4139c4c8ba4d9adb45f
-EBUILD rubygems-3.2.31.ebuild 3319 BLAKE2B 2cea263f93591b45b02303a66263bc07c23169df65ac58eab7cf1371312507e270224290ba40229dcd1e244e3d58739be6962bf0604c4c91380260f43e1146b1 SHA512 bee763825c7404308ce13dc14ff53f30efe0eeab4a0da051edf0b134c53270e6e77da53307c6522e6f2ae21b131892344233108852ca8a33de7a1155ecb67c80
+EBUILD rubygems-3.2.33.ebuild 3319 BLAKE2B 0d0efee6da06e03dc0b229f897c023e79c6c4ad374ae46479472a93111eac292fc1ee5ccab7a9701c1d9a980cacbf8653117643cd4ff2bf6905c5b21358a9831 SHA512 23abd59af15c2872995048144e8bf87e61912e2a25a405a9a37f758248f9ecb0f22c65e5897fec5679702d064b454b2a9b8e391eef45567f41ce6906bde29057
 MISC metadata.xml 336 BLAKE2B ecfca0944e7009be46f398152d0858c119a01660c84767594af30797d15407baa8ad6b2ad464d1e561c9688fcaa701d9f1316942a5c32a6041aa29eb28b42f3b SHA512 533cd9bc43b23201a785034e5a8ba954201c37024d654fb57e848c1ab6eb99ef98398be224a4d346d8431d1e10a7ddedb2134babea287082b348dd1ff2392803
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-5.rb b/dev-ruby/rubygems/files/gentoo-defaults-5.rb
index 602ad0e4055e..b6ac5554b121 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults-5.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults-5.rb
@@ -6,30 +6,23 @@
 # /usr/local and to keep /usr managed by Gentoo. This policy file
 # ensures that all manually installed gems using "gem install" as root
 # are installed in /usr/local. Gentoo gems are installed in /usr.
-
-# TODO: We used to manipulate the default_dir, but this no longer
-# works since this is now the base for the new "default" gems that
-# ruby 2.6 uses with irb. So default_dir should refer to the system
-# default now. rubygems also provides various hooks so we may be able
-# to use those to install gems in /usr/local by default in a less
-# intrusive way.
 module Gem
   class << self
-    def portage_gems_dir
+    def gentoo_gems_dir
       RbConfig::CONFIG['sitelibdir'].gsub('site_ruby', 'gems')
     end
 
-    def bindir
+    def gentoo_bindir
       Process.euid.zero? ? '@GENTOO_PORTAGE_EPREFIX@/usr/local/bin' : File.join(user_home, 'bin')
     end
 
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
-                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
+    def gentoo_local_dir
+      gentoo_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
+                           '@GENTOO_PORTAGE_EPREFIX@/usr/local')
     end
 
-    def install_dir
-      Process.euid.zero? ? local_dir : user_dir
+    def gentoo_install_dir
+      Process.euid.zero? ? gentoo_local_dir : user_dir
     end
 
     undef :default_path
@@ -38,27 +31,16 @@ module Gem
       path << user_dir if user_home && File.exist?(user_home)
       path << default_dir
       path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
-      path << local_dir
-      path << portage_gems_dir
-    end
-
-    def system_config_path
-      '@GENTOO_PORTAGE_EPREFIX@/etc'
+      path << gentoo_local_dir
+      path << gentoo_gems_dir
     end
 
-    # Set Gentoo defaults for gem commands
-    begin
-      undef :operating_system_defaults
-    rescue NameError
-      # Avoid either runtime errors or redefinition warnings since
-      # this method is not present in all rubygem versions distributed
-      # with dev-lang/ruby.
-    end
     def operating_system_defaults
+      options = "--install-dir #{gentoo_install_dir} --bindir #{gentoo_bindir}"
       {
-        'install' => "--install-dir #{install_dir}",
-        'uninstall' => "--install-dir #{install_dir}",
-        'update' => "--install-dir #{install_dir}"
+        'install' => options,
+        'uninstall' => options,
+        'update' => options
       }
     end
   end
diff --git a/dev-ruby/rubygems/rubygems-3.2.31.ebuild b/dev-ruby/rubygems/rubygems-3.2.33.ebuild
index b0596c49d95d..752c178a4872 100644
--- a/dev-ruby/rubygems/rubygems-3.2.31.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index a79aeaeb35c9..e01df830f2bb 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -2,8 +2,10 @@ DIST serverengine-2.2.1.gem 39424 BLAKE2B 0c68bfd59c0f6abbb294ecd8003c80853413b3
 DIST serverengine-2.2.2.gem 39424 BLAKE2B 113ffaa6dd1c35ba0796aaec30c4b3bbc71d63abb7214bd0ed30c7d38195bb2caf4e12d79968ca2750fb522600ac9494848984248fe1645ae3d7c1e97fd6a608 SHA512 ec34af108017468e3981861b4a4ae84d071dd31aaca78d458512bf430a1c7075deb64134f899dbde14e8f18a0e163f0f61236a7b3678173030c093d3362eecf2
 DIST serverengine-2.2.3.gem 39936 BLAKE2B 20f36d60b3f9a01c3768c490db89b8adaade75fc16c1ba738135d24bb858f44c10ab5ff1d0b31f0a287b2ddb3a69f958eaa155e7a54a26bbe5b6a480e52c4325 SHA512 4f95dd9559e7ea79e1f276554a94459b0ef250c639d2ecd17509651a5585dc1688936048b636a3d9f09f84eed3d4b16aa5bf50537cd14ebbb7f0e289600b6e60
 DIST serverengine-2.2.4.gem 40960 BLAKE2B 66e3b10c4396b4613b734d3d2764293de2935b0e99bc33c9ba0e79f69c2af6fbb53dee8e356ab351d65195124e139ec4b0aa7976594387432b88a3875e985ef9 SHA512 39f5abe2e15bf1ea6524563a7f86e441f93479160976421d41aa092e04a0fca8d4beda3b20487c45b6cd3bdffdb175d98fbebdd36ef9a85fa242ef3cf356a9c8
+DIST serverengine-2.2.5.gem 40960 BLAKE2B a7b256c1029c38b35673d104f6aba118bc5644947db7feb185d57456af60baebafb3c6a74996998630b7a0dbe3ee0baa5d4f260538ca7a8abf542b7528cd7204 SHA512 fb4abbf35553b8d69447be195a14018e335cbce0756b9ae91160bc4dc8253968a4b94c383f40aad1e1bd20aaeb700efced91341f3b26077a0d44b3dc00aa89c7
 EBUILD serverengine-2.2.1.ebuild 787 BLAKE2B 89e0c43add0b47e665869c0b044333721a7f8e4247fb5cec3b5746c94f768139f51299a1bb4eaa6671bd084b5e975d05c8c90e898358f53c81d5e90230c8c558 SHA512 9bc7cdb7a98cc45f022e7d32127b6d3572febdf2292e3e91737f0d8114f3b99ac84b60a81ec0d69eb2ee6e4a6b8bccc9df5e9f734eab2db142760a74f8a1f262
 EBUILD serverengine-2.2.2.ebuild 780 BLAKE2B ea88557e63b858eefa3f78df226437bf60a2c98b8f7e74f76c7a7f37400a2b9a3c4419db5a7bf8c09bdd7172f0f83cf238bd3c4f813d9681d55a8c02215559b6 SHA512 b52559dd5d8e2a43a7d30cc27665d1920ca7d1e5683b9db7e2adf604c2ae5ee4b21355ce3e1b0ed4afbe51d60be4f73ec093687b03678542ddc67e2c878a1b7f
 EBUILD serverengine-2.2.3.ebuild 781 BLAKE2B a89e232904b8f266c280f9bcfd20933119dfceff9b6e41d12dc4426b657df06826a3fb95b737d67546a56e9592bfed90c92dfbf7d54614436873aa43ed2c4396 SHA512 4dab95efd9bbf456f7143bae49099344e693c75a1daf34821042276fc718215ef67ed048f4d7c49214165bed43ae9406b21313e0d04faa93299067738742de18
 EBUILD serverengine-2.2.4.ebuild 773 BLAKE2B a9cb0a38c1c904e0f0bfbbbd02d1dc3f1128241a9a308cdb2fa62f374dd8b4e3e5b180c44a64bb5936a41971723ccf82e8d8839c9796ef746c3ae703e91eb0b2 SHA512 1d0f1f4d7ede7f52cd9adccda8633e76d599ad96b819e043634fc1ae89fdc13dc35ea933f60a5a019cd8288473a81e17315a0818dae09a7309cc5056b99bcd1a
+EBUILD serverengine-2.2.5.ebuild 773 BLAKE2B a6c2d9ef6aed9461422a987588629133f1727185ab8f74eaf502727e7c05884d8beff4adf5f401054b19458660de0b08946d837ac8a965d6798bb6c4531bd256 SHA512 571e659ebea165fc69f4937581ab9419975456222a4ee721b63a0ee888f4044b77e51d2c4334425d40e4ff64a6bd1779b1809af7e10a5ce1b3121c999f5ab7e0
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/serverengine/serverengine-2.2.5.ebuild b/dev-ruby/serverengine/serverengine-2.2.5.ebuild
new file mode 100644
index 000000000000..bab728791f52
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
index ee552364ab11..2ce933f5bcc5 100644
--- a/dev-ruby/simpleidn/Manifest
+++ b/dev-ruby/simpleidn/Manifest
@@ -1,3 +1,4 @@
 DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
+EBUILD simpleidn-0.2.1-r1.ebuild 831 BLAKE2B 72a8bbd95e8df2d13c8f93155e7f9d51b1efaa51fd6e5137b23aaa5bc4e7b34f74194010dec077742d9b99ba4505867fc736ced0420f77faf848270e6e4b160f SHA512 00e1dff1903543b825f06c606a5498593499f766933677c49853929c3f48e27ba00edd2f494ec03864daf25177878e4d09f3b18e32107692fb5580197cca0f3c
 EBUILD simpleidn-0.2.1.ebuild 831 BLAKE2B 6f1e8d2a81f5c580515a30cfb470fa8f3a49a9c3f164770e08b4d395de4fb5d63ea7b466bde83bbf69e413684f96866c8a7731fd0e8bdc41b4835d8ba83eb3d1 SHA512 86545e237cf1b6cc1913a49b0904bc4c03033ffea5d1582216a8fe84b71b17d5718f505868fc1b0df44b5161994cc96367158715099ab5b6b77fd3a115d453fc
 MISC metadata.xml 333 BLAKE2B 5e0406b0968db1bc76f4dde0fd0f676a23324ed5b431e7c378cac3c19da91248a8d9831d8d92033a77fbe1a61c9a276a42f816c6a8691a8332d4477dfc7677ca SHA512 9938dda4d73b0f54c161e1ac0b42f20e7cded4f2611f1d4d26edfaa92452b323f079c73e192845144b75c5bf6d656fbfe058d0f45d65f46712102196c1efdf44
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..d0cc8bdfd09c
--- /dev/null
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1-r1.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="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="tables"
+
+RUBY_FAKEGEM_GEMSPEC="simpleidn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings and vice-versa"
+HOMEPAGE="https://github.com/mmriis/simpleidn"
+SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/unf-0.1.4 =dev-ruby/unf-0.1*"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/sparklines/Manifest b/dev-ruby/sparklines/Manifest
index 06d7eabd57a1..d8bca3f9a7d9 100644
--- a/dev-ruby/sparklines/Manifest
+++ b/dev-ruby/sparklines/Manifest
@@ -1,4 +1,3 @@
 DIST sparklines-0.5.2.gem 150016 BLAKE2B 408a8a5348e0bb3a331087066dfccbb42a58f68b839b7ba24b7577e50d5ad8f9c33c8befc60ae4577d2f8b5b809e52d13c5e11f61021a1d3eafff4d5c1fb2a32 SHA512 2666db1c2f4dd97cad10fd6b9b2fc938ab6b2e619b968f93b86090db4a77cc356cb97bd5ec01582804412c214226ed99cc0f65196e2a26ea1a395b29288cc715
-EBUILD sparklines-0.5.2-r6.ebuild 796 BLAKE2B 50948627f9cb9ceeccdddae7121fe582634b4aa335b324d042538d89b7ed59cfacf75c6f9ba2b1b1ae9e43f7d28f4a005d9c663cefb36d1dcc6b7a1d7e18531e SHA512 15c2edb7081925efd98a99265885d0a46c07776cda2482022df673806214eb024da42171217b4fc4af67738163b40470a1cb0b4abd5e644055fa3f30645edbe6
-EBUILD sparklines-0.5.2-r7.ebuild 796 BLAKE2B 6335efb7fee2c2e20e943ceba93205e9a31d890d34bf48a71b867011e239065d5ec69c609a95971b7269cd2dca3f75b049a028be04eab50571b94acf8c7b6cff SHA512 9e456e9f458a80c2d4a872644be01e6f9d005bce10bac81e3e4c2f7c1ba331d93b3b417c37dde891e969bd6a506dcd216aecbf327577c1a69968addfdc80d444
+EBUILD sparklines-0.5.2-r7.ebuild 794 BLAKE2B 327b182ad5f43d7aa137b6994b2093bf61bdbc5a8770796a17a3e70a4ff007e65eada3648c649990ffffef1746ba7588bb21e01711a69d71cca86538af8ae215 SHA512 5ce528af3b70a1cff129044a3ab51e28026f634db8eef55d9ffe9a30fadea746830f64a3f14b824d60dd88b5c9cb36487e2172efb960b457660751b8e4af4d52
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
deleted file mode 100644
index 3b037fc8c8d3..000000000000
--- a/dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Create sparklines, small graphs to be used inline in texts"
-HOMEPAGE="http://sparklines.rubyforge.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND+="test? ( media-gfx/imagemagick[png] )"
-
-ruby_add_rdepend "dev-ruby/rmagick:*"
-
-ruby_add_bdepend test "dev-ruby/tidy_table dev-ruby/dust"
-
-all_ruby_prepare() {
-	# Don't use deprecated rmagick require for compatibility with newer
-	# versions.
-	sed -i -e '/require/ s/RMagick/rmagick/' lib/sparklines.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I. test/test_all.rb || die
-}
diff --git a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild b/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
index 954a3e3e6b0e..fede5c423980 100644
--- a/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
+++ b/dev-ruby/sparklines/sparklines-0.5.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ HOMEPAGE="http://sparklines.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND+="test? ( media-gfx/imagemagick[png] )"
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index 6ddef0afd8bd..5f2275fc1d38 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,4 +1,3 @@
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.6-r1.ebuild 1128 BLAKE2B 05b80b4d477bc4f449aeb949301be267164ac82f19e50c98cd12561ae2f8a7f9bb44cc5d82bc8df1eabaaf33855c2da56c70c1efeca95c1f009589f869e3b3c6 SHA512 d00410526c3bb92d6c2694456ac8e12fe057a685658f7c6e48a9cda04a373a51b1bc56b26b3b943575c7c51584c77ea1962f6786e384bbf86c36304913a4d1e0
-EBUILD test_declarative-0.0.6.ebuild 1016 BLAKE2B ca4647e178c383acecf9cdbed06414c737ddab8a9ada93453708c6f247e18e2d6757c801e156ce9c34b024c04fe3e53143cfd51bc31f698224c88a3c8e09b214 SHA512 dc7039c13f230293b523ca7eb0c43dc558bafb3433e799efaeba11af44f53bfcf9dfd05131dea4b02af7647f3a05d6fd87c9339f882fe87676ddb1492a5c2d8b
+EBUILD test_declarative-0.0.6-r1.ebuild 1126 BLAKE2B ac70c439fc272e100b1730451bfb88ae698c5dbd87bfae4572c5a7ea4d3b012e8bccc10fce564cfd0e0cd9e3094ae40f91d6c8af9f517f0674b5eb81c845dd79 SHA512 33733cdd103584e8151f32244725d6628e4684f6aef905534059aeb946723419909fcfade18ae05217aa6cde3f20dfe2e6dc0f9f867049806609ce3cfd91ec43
 MISC metadata.xml 353 BLAKE2B 504efd99cbd9cd70b9241711a5ecb7ac96f10bef5a88e25288dd6293e1c42b2d215ea3042feff270a4c9b9d36c724a6f6450d180dc69a724781d034e5d91e27f SHA512 c6a704277f2ee955f9cfc5898a89285951ee0a9546760bd949bd29e06b4a8037788365b9a95e2530da65907e03fab5d52dbd0d73768ee75cfcf1b00eddea5d85
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 3188501ca72e..4f5866174a60 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
deleted file mode 100644
index 5dcd6d1e34e3..000000000000
--- a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simply adds a declarative test method syntax to test/unit"
-HOMEPAGE="https://github.com/svenfuchs/test_declarative"
-SRC_URI="https://github.com/svenfuchs/test_declarative/tarball/v${PV} -> ${P}.tgz"
-RUBY_S="svenfuchs-test_declarative-*"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~> 12.0.0/>= 10/ ; /minitest/ s/5.10.1/5.10/' Gemfile || die
-}
-
-each_ruby_test() {
-	# There are other gemfiles but their setup seems broken atm.
-	for gemfile in Gemfile ; do
-		einfo "Running tests with ${gemfile}"
-		BUNDLE_GEMFILE=${gemfile} ${RUBY} -S bundle exec rake test || die
-	done
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 1e56659f010c..86a4ee945b51 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,3 +1,5 @@
 DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
+DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
 EBUILD thor-1.1.0.ebuild 1723 BLAKE2B 459c1c524d3d43ff934ff3780e8bb03c2b5c32892cab1d7e25bae4cfd90db7a70589c6b50bbe0eb088dd52a7934b07160c048af7a54ceeb0c2d25cc046fbcec5 SHA512 db6fa89e2b968639cc67a5aba134a43f41179e26d7daa9eca26934904e3ef2d8a9ad724a59c70c3b91e9578565b25c62e1ef4220557802991b8e4f342d5b7e85
+EBUILD thor-1.2.1.ebuild 1698 BLAKE2B 6dd475e8a68b048e46072bc562a34668a1ad60964a63dfda7adeabf14d0aad01237d0e89a71e25fd2e13588a3b68220ff592e5cb85b48dae23834afeffbead8a SHA512 107396686bfbbeed5a6b74752eb5509570cb9449e14a269b64ac3c30a7ea3c1700a572550979e2b47c55a453b2fd06db46daeabe2d4685af3f937bf02d661115
 MISC metadata.xml 681 BLAKE2B 18af48da65edba93d19a6a8541a5a79b63485d15108736b8b2c964a57006dd8e0bcc094261045a2598ab5537c3162cffc012e35dbff7c631e45f8de1657b5cd4 SHA512 ccc14bf0262a52707216bedfa51c46d5de83b04308d6768dd73e9d63a0e807ae5f069b9730b5e88311ddf51185aaec12144ffd8540044baf2b18d1208dee380a
diff --git a/dev-ruby/thor/thor-1.2.1.ebuild b/dev-ruby/thor/thor-1.2.1.ebuild
new file mode 100644
index 000000000000..3909b4a435c3
--- /dev/null
+++ b/dev-ruby/thor/thor-1.2.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2000-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="thor"
+
+RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A scripting framework that replaces rake and sake"
+HOMEPAGE="http://whatisthor.com/"
+
+SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+IUSE="doc"
+
+USE_RUBY="ruby26 ruby27" ruby_add_bdepend "
+	test? (
+		dev-ruby/childlabor
+		dev-ruby/webmock
+	)"
+
+RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
+
+all_ruby_prepare() {
+	# Remove rspec default options (as we might not have the last
+	# rspec).
+	rm .rspec || die
+
+	# Remove Bundler
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Thorfile || die
+
+	# Remove mandatory coverage collection using simplecov which is not
+	# packaged.
+	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
+
+	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
+	# bug 430402
+	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
+
+	# Avoid specs depending on git, bug 724058
+	rm -f spec/quality_spec.rb || die
+
+	# Avoid currently broken readline specs (already fixed upstream)
+	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby30)
+			einfo "Skipping tests due to circular dependencies"
+			;;
+		*)
+			RSPEC_VERSION=3 ruby-ng_rspec spec || die
+			;;
+	esac
+}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index be48afa773e9..9b410111a767 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,3 +1,5 @@
 DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
+DIST tins-1.31.0.gem 307712 BLAKE2B 2f4808bada4ddad9de6b6ba93c9a123d79cdd6d038bbca64712afaa46c8b031407989e522f359bbbeaa37685c65407781f34a639501b68507b9af927bc06868a SHA512 390ef8366304582e635e702f1175e8f3c59aa1051765b6a971469b4057e9d4025848c13a21961ac960c12297783e9c1f1485e13310dc117e4a04bde5c18018ed
 EBUILD tins-1.29.1.ebuild 843 BLAKE2B 2abacbf3cf8e1afc0dff0b5f9f6602225d6f82f2421e36a9545545f3968fadc3e335cb99d1c553c8f22154d8afd8adba7c0500a43adac17186698c787f213681 SHA512 aca5c80a5e4155d2e7c54ac0d28ffaa9d29fc03449208a251c1221980a23c8e0d6719da1c993d70405c78426eccfe68216f5303e7db9ceae33215031431567cd
+EBUILD tins-1.31.0.ebuild 758 BLAKE2B d8899419263cfa9d5841eebf7612d00c587e6972b107adc060b467830600dc26ebf8c5c0417267f733752f8d269a81a6e81cc2980293c1a7f74a166b40aec54a SHA512 504a94f174f002c787198f3a4f1e03306c43b85b9ea4cb4b65f4e009eee2cf0dfca260a71b7e09ad5d07bd7610722bdd5eacfe1206c4782e75865971f12d6080
 MISC metadata.xml 337 BLAKE2B 488c14119bb23c3d78d6e3ea71ea808cd398fead5dcf2e2dde61c1ce7de8985b6bc440387a19378f5e123dc64b71e3561fbfe0303e87ff8a4cd79a7923183078 SHA512 e08cba10144c2eb80069fd8d8826053293e9d8d5f1ffce97048c4100af31cac83e672af0945284ba0e1bb169d4e9fad3c0eebb369cb35823b42e5dd4454cd79e
diff --git a/dev-ruby/tins/tins-1.31.0.ebuild b/dev-ruby/tins/tins-1.31.0.ebuild
new file mode 100644
index 000000000000..fa0092a12ee4
--- /dev/null
+++ b/dev-ruby/tins/tins-1.31.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/transaction-simple/Manifest b/dev-ruby/transaction-simple/Manifest
index 81da0b8aae15..5e2e7558acf7 100644
--- a/dev-ruby/transaction-simple/Manifest
+++ b/dev-ruby/transaction-simple/Manifest
@@ -1,4 +1,3 @@
 DIST transaction-simple-1.4.0.2.gem 17408 BLAKE2B 731564406f9904e243838ae207958857065aa7e785c6c92ce769cdfe4fe8c32e8bbaedadd1a258b40babf3c4d59c77894ddaf3607978129590c7bf642f2877d8 SHA512 083c2c0d8c094d052a5262e21911985a3bf91875892844fb0559546901eea21ef14b139d7af6446c7a7bfbd1adf177e2d73cba2798c823bf295a6c87981165a4
-EBUILD transaction-simple-1.4.0.2-r2.ebuild 661 BLAKE2B a7b3ed5699fbf4940b818a2290fbccd155327b6ec4ce6d1bb80e501efe21964e630a3ec8fe6c1308bca506c09a12489bb1e3490999e4d6bb4420984072288d5b SHA512 5568b227d3b9c60d9c7bdd428a6d127f968d0650967017f17c5c8b933d9d35be566ecb3731961197b6939da045e50e44532947d33addc62439f563d76c858151
-EBUILD transaction-simple-1.4.0.2-r3.ebuild 625 BLAKE2B 7b7c200ca3d8f218f7c6d852dd86653ba26dfb863aab54b3966a2f090cd261c7889066cde2c1d5d3031bc738dac91222be8062195d6be17e4fec249513f0dcd3 SHA512 99fa058f2f27de764450c5b35b7027bd18f42bdfba3adf2b9ee060776e72ccd78d196d7a567e335684383ec5c9d567d81ab9d1917a378eaf044c68f1b7008660
+EBUILD transaction-simple-1.4.0.2-r3.ebuild 623 BLAKE2B 31300420358d74d0bf59470f1495dc3d0f95f6e1714f6b3ac45dad2524bdf7d27c00d889d60ee89abb1039a2d81d69f0819785d70c77ae7219bfdbde4b361b31 SHA512 6e444f9c7b5f2a2583e0e9961596e25be6042a32c7404549516def7f3473f8a1beb86c2361b714264be2247ae5c9617762efd3a439c4b5e9264012e119251f68
 MISC metadata.xml 356 BLAKE2B f126702b9fff448882c2bbd2321d813d414e220e0b9c66ff1e6d20d2329aa6974bebbdd51d5676cd443fbff8b2390dbea44813dc8f18556ca261ca1295d738e1 SHA512 c83b0202dfd6edc7669b56bdb511a27d499d7b8aa45553e4b6f572bb5b02bcbd985b8f9cb85fda8d0f698b9e8099eb4a1f9a905a52911177870a245ac255aa1d
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild
deleted file mode 100644
index 442e58009e75..000000000000
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides transaction support at the object level"
-HOMEPAGE="https://github.com/halostatue/transaction-simple"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
index 815cd4630724..d259e58198fc 100644
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
+++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/halostatue/transaction-simple"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/uconv/Manifest b/dev-ruby/uconv/Manifest
index 741cff5779e2..6f7cb87c9ccc 100644
--- a/dev-ruby/uconv/Manifest
+++ b/dev-ruby/uconv/Manifest
@@ -1,4 +1,3 @@
 DIST uconv-0.6.1.tar.gz 740417 BLAKE2B 41bd221121e301d5df365f6d9eca56fd37e3185cbe75f653d60fe3df5d62c385c831607086330e56c45e280627cb03247be230e655f293c09d671fd1ee574723 SHA512 6f964e42886f498bd6c4111e522143d8d958b8c6e401d26f784fdf1441684f1fde7cfdc35a08d3707a42e305d5508d9ff3fbc1b735298f8af2aae3923cbda68d
-EBUILD uconv-0.6.1-r2.ebuild 722 BLAKE2B a58e293ab6fab47db178edbd50ada96ba951475e63974598d424a211516fef427c897096c5e218f71d4916c41c07218bc7f0c8bed993fa0d3bc93c2df0aaed00 SHA512 893c859cc1a547e5c7396d7951b9a79118eb78f4ab24683a12064f169ef83da2e91dd72948e85a2c12516625f2b4bc9dfce2ed4d10c6db754282c1669330c051
-EBUILD uconv-0.6.1-r3.ebuild 718 BLAKE2B 67390307500509765f5f3bb324b5696b7c1da530483d7433d49f2d6c0d6c7c91cf4ea60ef5f51153c0eefb7546a5b00cf0228f2f8491b4ff4b01859021c43974 SHA512 65ecb0c1d7b50314b5f167cb4521116bb3a9e0bf373d1776d3879aeb2ab8470fd61015c1f11e97c79d6b75974086b6d601e6d93787e5f71104f2a2e988f15438
+EBUILD uconv-0.6.1-r3.ebuild 715 BLAKE2B da495a9e57b340272e1aee2690ae6d713f28de060475dc687c6598f7def46cfaf098d7b69ad3a723221ab68a48ec3b86aac5b8f3b7f2f0167981cb526798be1c SHA512 d668e14e5ca85595e7688fc84acc23ebf28d6c59a3edd4d72afe0d7373bdcd9a7b76feb2dd55d27fbf15987f106d5a0c7ae74ff32806da1c2106d1cb886d9e3b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/uconv/uconv-0.6.1-r2.ebuild b/dev-ruby/uconv/uconv-0.6.1-r2.ebuild
deleted file mode 100644
index 2a8410e1ec06..000000000000
--- a/dev-ruby/uconv/uconv-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit ruby-ng
-
-DESCRIPTION="A module to convert ISO/IEC 10646 (Unicode) string and Japanese strings"
-HOMEPAGE="http://www.yoshidam.net/Ruby.html#uconv"
-SRC_URI="http://www.yoshidam.net/${P}.tar.gz"
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE=""
-
-RUBY_S=${PN}
-
-all_ruby_prepare() {
-	sed -i -e '/^\$CFLAGS = ""/d' extconf.rb || die "Unable to remove CFLAGS line"
-}
-
-each_ruby_configure() {
-	${RUBY} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1
-}
-
-each_ruby_install() {
-	emake V=1 DESTDIR="${D}" install
-}
-
-all_ruby_install() {
-	dodoc README*
-}
diff --git a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
index 8af5f475d2da..a6c7a17307b8 100644
--- a/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
+++ b/dev-ruby/uconv/uconv-0.6.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.yoshidam.net/Ruby.html#uconv"
 SRC_URI="http://www.yoshidam.net/${P}.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE=""
 
 RUBY_S=${PN}
diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index 84b94e9e6d2f..8c33b8a121b4 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -1,4 +1,3 @@
 DIST unf-0.1.4.gem 120320 BLAKE2B ab339ce957a1d3251d14944ccb4f68a9c7271f0f918f20b57c70824ded730fa18abb5078312d9820e7ef056163b5f1340c1cf72974b6c255279dcf572fb3e87a SHA512 a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b
-EBUILD unf-0.1.4-r1.ebuild 1180 BLAKE2B 6ccc44333b92d153d022499def452fab07e4887e6ca24ca8aa919625bc3ad6f1ce948f36b41091ecdcd429f9f72e5aaffbcfe16b237d7b6838e9533ad9177679 SHA512 567de5e52945f3d94b15108540bf625820c4c30dc7e9303323abc21db0639f39a9a49cb749214ff739b40760a511402425651d3fabef23d52b1ce2bb9394f993
-EBUILD unf-0.1.4.ebuild 1182 BLAKE2B 35e0a91176deae62d94dd7c51435601b860d8fb007f5f9635ad7890846c50c8ece671a2d73d7d1e42449bcb0b253b722405f94e232fade312841239215e3fa14 SHA512 2f84448bae2573fd2c942b277d63b53d38364608b9b9daa0f0e6b2e2bc89034e80dd698a876dfc68269c32766a0c018acb1d23199285a6d6c5f5ef443de1ae90
+EBUILD unf-0.1.4-r1.ebuild 1175 BLAKE2B 46698a2f7e65454efc1911f3deb02bff26056a99358f3265830a15b0aa9984fd888ed56c162d2ea9201bb302536abb8a3f3f89b83f8172aee6600a718737677d SHA512 1cc350d0ed570f13759eea51d880dd24ca516592ddd557e7bcf0abb5f68321b835f3a2f66c221aa4c53bc6c2f71f518f730eb94ee8196d518f7d5da1e428eb5f
 MISC metadata.xml 339 BLAKE2B 453389f654780d3181aabe6239d3fbfb25272b4a1cf8719614f84159bc50aff48f45d40a5b7f77ee94ab13d9c59fa87466add2f60ad31c9978d99e3e114ef0fa SHA512 68c573840acc02e64460bbf329fe532c88a0d4f501fc9f5ebb15f0eea6c5938b5a05aa50b98c3da47f4987416d6e79be9557992f42958f36276a265a56a9e46a
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 442d4c7d5a2c..7373d57c72fb 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
deleted file mode 100644
index 674d0b034018..000000000000
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/unf_ext"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
-
-	# Remove development dependencies; also remove platform as we don't
-	# care about it as it is, they only use it to avoid the unf_ext dep
-	# that we tackle on our own; finally remove git ls-files usage.
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rcov\)/d' \
-		-e '/platform/d' \
-		-e '/git ls/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/windows_error/Manifest b/dev-ruby/windows_error/Manifest
index 578209f1b241..e51c34283f96 100644
--- a/dev-ruby/windows_error/Manifest
+++ b/dev-ruby/windows_error/Manifest
@@ -1,3 +1,5 @@
 DIST windows_error-0.1.2.gem 227328 BLAKE2B 99cd75d66f3e3322d62daea39a8e217dfeda89141ec3d78c61a29306b78206a40c4bd7867d59a783752da20007b43c45577ec3afe53b7037b850d4983f482e4b SHA512 32e94e561f53f77c5efff5457068e31e66b1d3c73531870b52af00297f69341e390b6d8419a0c0b78ec05f6b65be6456128b9055c143e7b65663520baeac90ad
+DIST windows_error-0.1.3.gem 227328 BLAKE2B 2d0dc8771cd68983bafb3d97d27663e30cb02c67eb982d6b76104ec46405b1a7f055437046dedf068c074deb2b2d1ea49a327109be2f25ea5bd70ab2ee2bd698 SHA512 c74d5a17c44772505b745678c67b3bcaba6710e9b4e59b9aba45daacb6993d3b6529a1f9a53f76e2c31cae922f8f36e40fefa6a232f9ed8ba9034fa109d8317d
 EBUILD windows_error-0.1.2-r1.ebuild 467 BLAKE2B aa348a793a5383ca0ff03f676a9aa030c2c25b7f708f1f9ef17dcbbf458658deff73d584ab0fe78b55da10ee860a0d110aeba8d15f5ab7b87d0d6dc064ca3bde SHA512 82735d75a14b6ff4e6608ef6029024b8607b9ea325aae7d3f05c9ade3b83527a4eda341fe2314ebb1616f8c13c15710dd3d27fcaa42ab133fba086bad3f79d4e
+EBUILD windows_error-0.1.3.ebuild 467 BLAKE2B 6ccd6bceb81a4882f1dde00d83a944d93759c8c5b7e384347d6b23bdbe45f8a5f521e3af92612369f50ec5612b74816cbdd3ac00ee0f4ed0d235da3435e33e4e SHA512 91b4003e3adbe8c215c3f34f10e8cca364721898a13938ff4535ea188ac706ff8e4c8465cda38dc177271a1fdcf59f6d488be84dae167f31215f437714ef6c65
 MISC metadata.xml 333 BLAKE2B 5e692ccfa70b1bbf9e2ede9947d7925c278e1ab0af36df615deaf6c5d89e91d4acfecf303880e1e32864e3fae2b506487a22870719cd753443333df71b9fca03 SHA512 b2f9ca68fe8ebb639a863b88d4899d97665a7dc8765048d2a5a0fc52e41e39b93cc5ebebafbd4cacd7f317cb5e730d39e1eedcee4c9ae7ebae723cfeccfdd8a2
diff --git a/dev-ruby/windows_error/windows_error-0.1.3.ebuild b/dev-ruby/windows_error/windows_error-0.1.3.ebuild
new file mode 100644
index 000000000000..04889817f17c
--- /dev/null
+++ b/dev-ruby/windows_error/windows_error-0.1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="reference for standard Windows API Error Codes"
+HOMEPAGE="https://github.com/rapid7/windows_error"
+
+LICENSE="BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	rm -f .rspec || die
+}
diff --git a/dev-ruby/xml-simple/Manifest b/dev-ruby/xml-simple/Manifest
index 4bb90ff9fe61..f101c6541355 100644
--- a/dev-ruby/xml-simple/Manifest
+++ b/dev-ruby/xml-simple/Manifest
@@ -1,5 +1,5 @@
 DIST xml-simple-1.1.5.tar.gz 126288 BLAKE2B 0fb7f8cebee23e422d2941de790426e494bce51af90cda8a3b7f3b27129f6272aa277a80fce004aca2658d5ae5f62b7aa9f251b53839d14e6d5b7f5a33b819af SHA512 df81a05a0c32141cb5a0328fb782292438ec3ad6037c150e2ff4fee07b65ba9a739987f25f28c196ff8565af53c62120c3a729820a94dd3da0551fe43948f9a3
 DIST xml-simple-1.1.9.tar.gz 119573 BLAKE2B fd23d75f45265093f7d7a6a1a96a5872bc12d918f775a88339f82bd3a5f710c3db23390769b3d88832b145aee04863734061b27210f129dc23b62ce8c6b02824 SHA512 3bc53558adb65b0d9c4c1e7f2980b5d3cd2fa7f2b0ec1969c1631bd95960be504eacc459830ce83f08d11c080250346e6059c8c463faf372c1e61bbc1fc86804
 EBUILD xml-simple-1.1.5.ebuild 654 BLAKE2B 83be16130e8dad62f7501baa7e1b3036f03b74a9000d56d133046a42799b875f047db8f53d76b9b22196c11242cdad4793783e9bd47e9c65c372ae497d34dac5 SHA512 217962ab9437b010ae603f952dd5abf3117137585602fa1f47c1dd52b86ddac9d5ef318695b77f1de46cb933977f253c3ff4d688bff820ad684fb7c7d18cc7c9
-EBUILD xml-simple-1.1.9.ebuild 707 BLAKE2B 64cf9a2b3a608fcf12ebdd6ee695a2d72d0b08545b5f0d17fa26545ab9fcffdf38490024d24b3051e3be2de9b905d4c3a74eb5edebcb2b12243cceb0a04b951e SHA512 013fc9487f27d63b779f838ae6bb19c7c0a9a7258d659f12a8528d1125874714922a07cef7e97ae02f63cb050ae69cee0de206e1e15b91dd80a3615e6d00ab2d
+EBUILD xml-simple-1.1.9.ebuild 706 BLAKE2B a1f415bf39eacc4f77ba7212a965cef57f2af1af2cdd0bca62478f55707d3ec6f619ae833843a85ce25794ffac9648f7a330c7a6ed604521cf8f48463266df9d SHA512 0354adafa156dfdcf69c884090b8b18c4aa2f90a2fef3c6eb7701d8df9de27810ba9ea2773188d2454c82a740058153dceebb64104234620b92135633c1c89e8
 MISC metadata.xml 342 BLAKE2B 09b84530611bce4e3deb7b205a6d1c293283b4947cd2d25761cf93828d5c3339dc21e536b3e38bcdf516ee22e6e101ecd57a5ecd24c0695441b84e68fa61ce6e SHA512 0237ff135ab962bfc2deaf4c3b0512e33e050e56e1c7464aeab9d20c94b6f3aa1c45ee4be1cbb7e464afcdd379666191812f10f716df26769137484ac8395b94
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
index 705a80683e40..325e135ca4f5 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/maik/xml-simple"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~x86"
 IUSE=""
 
 RUBY_S="${PN}-${COMMIT}"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 1b35883e6393..6eb71f4cdd08 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,7 +1,9 @@
 DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
 DIST zeitwerk-2.5.1.tar.gz 107666 BLAKE2B d8049a1adfaa6b278b59298e46d4697b70121d0a599a286f91720b31a06cccd39424367fe9c1ffbb90b0862a9501115f808bcc4fd36f3a09081987ad706f89bd SHA512 4558a63f33d26f2aa05e5f6e417230902f14d4ade5bfb50cbd94d283b33e94e8486158f5b4c677c4dcd7b8bee51af165693593d303d1f07420fb5d4c72f918ea
 DIST zeitwerk-2.5.2.tar.gz 108139 BLAKE2B d4277dc79729e39bd63b066b12ad4d91d9457e8e7a836c2e24606f6d343c85ce59febaa0425ab10f96d8d327935beede285a5ae52cfeff37210b36b0bcaf22db SHA512 0e8be7500163761a75518b002eb8ca9e41d0d073f0d03443af4a57fef07ee647de3faafaf79791328c4b2b9a6f5898e1038b310b697485a363af486f36509393
+DIST zeitwerk-2.5.3.tar.gz 108192 BLAKE2B a91c76530df7703c08aa58babcfde5520fc9ca00f804e2dd217b19664256986dadd3ffa19879d3a3f6402ae186faa08f14e5b080f415345b189821b578b76c1b SHA512 641bb89a14e5bc65dcb078a93b5669266e2ffe10395416473c243b840c425de200bd9336817c44e7affe570fb0a41811cfba54a4c04d9fb6f56ceca96b504ac4
 EBUILD zeitwerk-2.4.2.ebuild 900 BLAKE2B f944c93347913374c6f1d50e4cc48d2c499fd6fce7b10f411795fb5bb2708262fda6ede489ae3c32e6b8aa03f3f933d3f878ffc6e928c491d5ced3c203e87e98 SHA512 99dffffb4ed0dff209f0930224cd63b552ed3a3c8f229976d2887ce0cefd4132851e0aff0bcdbd1d8635c1cd35a255d13ce77824a802ceb217a7b1a62dea3748
 EBUILD zeitwerk-2.5.1.ebuild 895 BLAKE2B 68941ee133fd1cca03d2511d6fd1873c99b7a7c0466f11e96ab4058e698fc4a2ba1d872e40836f01f8b4269a1f844f31de7c3bf3dd2d5ad16512167aee049ab6 SHA512 41abf12a11547a12e2ae08b373dea6d25fd3eab58b8cf1db992915a6e23742a971260a60aa3ba6a35daeab9702495b876a0b84b04610f3891271d6c7fe639bd2
 EBUILD zeitwerk-2.5.2.ebuild 895 BLAKE2B 68941ee133fd1cca03d2511d6fd1873c99b7a7c0466f11e96ab4058e698fc4a2ba1d872e40836f01f8b4269a1f844f31de7c3bf3dd2d5ad16512167aee049ab6 SHA512 41abf12a11547a12e2ae08b373dea6d25fd3eab58b8cf1db992915a6e23742a971260a60aa3ba6a35daeab9702495b876a0b84b04610f3891271d6c7fe639bd2
+EBUILD zeitwerk-2.5.3.ebuild 895 BLAKE2B 7dccab8674cacef3a3ef16ae5cbfb73062fd438700e7b2829d0b448649154f5c37643d7e88aff92eb6ef294717c053eaada830e56b320495c32e309484313af8 SHA512 63102012dc66cdee93f73d3fd94648b4b5e786bc56e3c87bf60f1c8085a8ec62dde0c7e553d50fd31e375deabe97ad5244d2d606ace3772166c3e8d86f7ddc70
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.5.3.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.5.3.ebuild
new file mode 100644
index 000000000000..21985abf3cd9
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.5.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/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_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /dev-ruby
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)