Adding metadata

47 files changed, 200 insertions, 429 deletions

diff --git a/dev-ruby/mab/mab-0.0.3-r2.ebuild b/dev-ruby/mab/mab-0.0.3-r2.ebuild
index fa6bfd2c2424..2806926c3384 100644
--- a/dev-ruby/mab/mab-0.0.3-r2.ebuild
+++ b/dev-ruby/mab/mab-0.0.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 1a32a7ec10ae..8440ba1b68f8 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,4 +1,2 @@
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-DIST marcel-1.0.0.tar.gz 7929941 BLAKE2B b8f956e9876a86f26ceb789d59da4821d512f83fe619b81a6ebf4c638a03eda245d617a504ff24ad89295797ca98473f613eb46f635f45382ba4e6ce92c57b1d SHA512 1c8addecc7ab2a7c58a22ff114f3bc453e7cf8f620cd212a4213da4743e5992d2becf947bdf91ce8976b8c0819ed6799bfcddc1948ab08713e9b01dd2410954e
-DIST marcel-1.0.1.tar.gz 7978633 BLAKE2B f65489e7a398099b8856d6bdffdcded56547a601d8d23f4094673694904b00a9aecb545aebee8863a2f7b52fc36956450ed293b725971e65fdb0c275ec39bb2d SHA512 d72580e6bc626173e17485996773eef895c44eae26c0695b6aec16a5b194e8cf23693b1a1b981bdbbadf1256b91c8918896ba69fada9897287613ce17c4ae533
 DIST marcel-1.0.2.tar.gz 8305198 BLAKE2B 264737cdb29852a186bf0e719748caca6c63626528f486dbefc3eedc7df6d7fe6f34e5cf68eb8b04f8b2b75c52bed59222d5f7bbcf60047cd5db7c4c935802ff SHA512 cd159545b246dcbd26ca07ac69e36ff13a965ac0e99ebd040c53b6a92f8ec8fd65786783c9a173d669fe6b32340a23d72c83c483011eec2e1097bdea73810ed6
diff --git a/dev-ruby/marcel/marcel-1.0.0.ebuild b/dev-ruby/marcel/marcel-1.0.0.ebuild
deleted file mode 100644
index e7b50e045730..000000000000
--- a/dev-ruby/marcel/marcel-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/marcel/marcel-1.0.1.ebuild b/dev-ruby/marcel/marcel-1.0.1.ebuild
deleted file mode 100644
index e7b50e045730..000000000000
--- a/dev-ruby/marcel/marcel-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
new file mode 100644
index 000000000000..706c47049361
--- /dev/null
+++ b/dev-ruby/mecab-ruby/mecab-ruby-0.996-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby binding for MeCab"
+HOMEPAGE="https://taku910.github.io/mecab/"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN%-*}/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="~app-text/mecab-${PV}"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README test.rb )
+HTML_DOCS=( bindings.html )
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1
+}
+
+each_ruby_install() {
+	emake DESTDIR="${D}" install
+}
+
+all_ruby_install() {
+	einstalldocs
+}
diff --git a/dev-ruby/memoist/memoist-0.16.2.ebuild b/dev-ruby/memoist/memoist-0.16.2.ebuild
index 9c3a8a3098f9..bd0d05fb7fe8 100644
--- a/dev-ruby/memoist/memoist-0.16.2.ebuild
+++ b/dev-ruby/memoist/memoist-0.16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild b/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
index 5bc8fe628835..98dd49f80c74 100644
--- a/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
+++ b/dev-ruby/memoizable/memoizable-0.4.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild b/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
index 20f46c97d4de..8ff665ccf067 100644
--- a/dev-ruby/memoize/memoize-1.3.1-r2.ebuild
+++ b/dev-ruby/memoize/memoize-1.3.1-r2.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=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/mercenary/mercenary-0.4.0.ebuild b/dev-ruby/mercenary/mercenary-0.4.0.ebuild
index 78df0e87a38a..df32666d489a 100644
--- a/dev-ruby/mercenary/mercenary-0.4.0.ebuild
+++ b/dev-ruby/mercenary/mercenary-0.4.0.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
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/metasm/Manifest b/dev-ruby/metasm/Manifest
index 34f3689cd4d9..a502ed66e23f 100644
--- a/dev-ruby/metasm/Manifest
+++ b/dev-ruby/metasm/Manifest
@@ -1,2 +1 @@
-DIST metasm-1.0.4.gem 802816 BLAKE2B 8950f4c3c0d56bc414795c5a348fb07767223163c1cece4a7b5f5374b1c9c901a576b6adbb10d28b6b4541649e176863ad68da3a7e2155025c7f1bc9eaadff90 SHA512 35fe98bfd9d8b2f0d6a69cce409319288d9a54458f22a308682c3ea432e2c34d50d33a3849c08f773e87ee0a67aa5cc6bb337ec99045f23b6aca43c9f5ce70cc
 DIST metasm-1.0.5.gem 803328 BLAKE2B 24ca2cff66257b063007b872028d4fad541584bee031dd4caacf2a89ee8f823e88dec8a2cf41815c72a5ef1b8db827b69fbb8ceaabee4d67de73aa04c15f354d SHA512 74a6eac47c06e7ff53f4e400fec6c6c73981bc58d09520ce7cdd657b6b74819fc5b9d6168edaf90eeb5c9b2087fd4924df1e21743809065cc1433428efbe1dd8
diff --git a/dev-ruby/metasm/metasm-1.0.4-r1.ebuild b/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
deleted file mode 100644
index 8810ff79935a..000000000000
--- a/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
-RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cross-architecture assembler, disassembler, linker, and debugger"
-HOMEPAGE="https://metasm.cr0.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="!dev-ruby/metasm:1.0.5
-	!dev-ruby/metasm:1.0.4
-	!dev-ruby/metasm:1.0.2"
-DEPEND="${RDEPEND}"
-
-all_ruby_prepare() {
-	mkdir bin || die
-	ln -s ../samples/disassemble.rb ./bin/disassemble || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper disassemble
-}
diff --git a/dev-ruby/metasm/metasm-1.0.5-r1.ebuild b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
index 59108ac0207a..abcd332d597f 100644
--- a/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
+++ b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 8b186f5d4907..effeff789c0e 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/middleware/middleware-0.1.0.ebuild b/dev-ruby/middleware/middleware-0.1.0.ebuild
index 26d63aa73db9..ef4b9e788df9 100644
--- a/dev-ruby/middleware/middleware-0.1.0.ebuild
+++ b/dev-ruby/middleware/middleware-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md user_guide.md"
diff --git a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
index 614628696347..aa3313c65158 100644
--- a/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 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"
+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"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
index ffa2c2f74299..75136f68b715 100644
--- a/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
+++ b/dev-ruby/mixlib-shellout/mixlib-shellout-3.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 49b1dcd51959..b750dbac6e6f 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,2 +1,3 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
+DIST mocha-1.14.0.tar.gz 246015 BLAKE2B 836b678ca0bcbc1860cb185ee6cd5a71bbdeff4698780fdfcffe6fd38196b1291aa6c23a779e7e1e59bd8155d5ec48fbde426ace468f8186e18860f3d3764836 SHA512 41dfd1f9add0b62c8609ec4cdf07ae58580503c81eb40886cae6c97ee5a5109ae5aa6094756c9666985266c83fad38adef7c9c4a2add8ef2b7571c2c1753cfb0
diff --git a/dev-ruby/mocha/mocha-1.14.0.ebuild b/dev-ruby/mocha/mocha-1.14.0.ebuild
new file mode 100644
index 000000000000..490453bbc3f0
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.14.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index 2a275be59d00..7213d9a559d5 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,3 +1,4 @@
 DIST moneta-1.3.0.tar.gz 130195 BLAKE2B c6eabfe31ca39b4b0c91214eb37a6090d21b3ff62943cbbb5e1f1b2dc72e6c4087aed7227fd1ecd0678730ca0b86b82423b25e8dca3c56881f2c0a7a98fc95f3 SHA512 9ea725f095cc7e7faae9621c2f4bfa27c54c81200c16a680fce289e68f79f4a5f66d9bb55b1921578a65d303ff6dd2069f56fbba28cb9e758d898ae03bb1c3dd
 DIST moneta-1.4.0.tar.gz 129069 BLAKE2B 86b3eaa875483acb5931eb5583f56a0484851df57bc0186daf5fe1cca402c209a44226e5dca570b14026f8beb861650506ccbb386ad8d092fb7b5a9277c6f8b5 SHA512 ebcdafd4badaddccf833a43c3561421d82d0941c2340b9bed37b62a94d79e5098a36e7f04b93b1fe26c7dedfe455d6a751be3aa4606263fd2025b7a95fb5a68d
 DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
+DIST moneta-1.5.1.tar.gz 133512 BLAKE2B 6027685e3e28e238b2d984b02fe2d5e7ccf1dba6646d71980932581e9b63cfa9082aa3c3a1509b679922f480e1601c71475113ad3eea5f8b7644f69998e3bbca SHA512 018b162d75eb7cb5f2d38e1e6a79e5a17abf8aefc381eb3eb4d9d4981ac88be5063ce95b786aa928de1618c6458b926a27bd26f41ad6515cf7ee3dfc1274c236
diff --git a/dev-ruby/moneta/moneta-1.5.1.ebuild b/dev-ruby/moneta/moneta-1.5.1.ebuild
new file mode 100644
index 000000000000..d9be5d3e4a3b
--- /dev/null
+++ b/dev-ruby/moneta/moneta-1.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+# test is disabled for now. It requires many packages.  Test suite also
+# takes very long run time and has high memory consumption.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="minad"
+
+DESCRIPTION="A unified interface to key/value stores"
+HOMEPAGE="https://github.com/minad/moneta"
+SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild b/dev-ruby/multipart-post/multipart-post-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..4046299435f2
--- /dev/null
+++ b/dev-ruby/multipart-post/multipart-post-2.1.1-r1.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 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds a streamy multipart form post capability to Net::HTTP"
+HOMEPAGE="https://github.com/nicksieger/multipart-post"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/mustermann/mustermann-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
index 4ff1a9fd53a5..b71baa060801 100644
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.1.1.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=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild b/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
index 1603c28efec1..37d6e7fd7c44 100644
--- a/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.3.20210920.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 # Tests require a live MySQL database but should all pass.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/naught/naught-1.1.0-r1.ebuild b/dev-ruby/naught/naught-1.1.0-r1.ebuild
index ebda1f6d4c44..3d848dda9b1c 100644
--- a/dev-ruby/naught/naught-1.1.0-r1.ebuild
+++ b/dev-ruby/naught/naught-1.1.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/necromancer/necromancer-0.7.0.ebuild b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
index b1e9e54126db..73d45d482c7d 100644
--- a/dev-ruby/necromancer/necromancer-0.7.0.ebuild
+++ b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
index ad6d13ad68d1..19fd0447c95d 100644
--- a/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
+++ b/dev-ruby/nenv/nenv-0.3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
index a4b32a23797d..40e1897cd99b 100644
--- a/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
+++ b/dev-ruby/net-http-pipeline/net-http-pipeline-1.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
index 24bfd3876fc3..c3b21af43acb 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="net-telnet.gemspec"
diff --git a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild b/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
index b263f4e63950..814b9e13c084 100644
--- a/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
+++ b/dev-ruby/netrc/netrc-0.11.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
 
diff --git a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
index 2e4c2572c5a2..0d329543785f 100644
--- a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
+++ b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index f6bf356a4632..95e7a931f2d8 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,3 +1 @@
-DIST oauth-0.5.6.tar.gz 60887 BLAKE2B 8dea7bc6b1a3c9d5befa5badbda105fed28004d6627624fedaf1572cc261421e3a8636019bb0a600a28fb6aa933d2b1be5faf613ae3062f7d50b314b86059b17 SHA512 dcb516b90d6cf0ff3f1071fa7bf1e1b30cd998c79205f9a6df001d5c04784ad23ecd430b4e04565a6351efcc780b552dfc38ea962d0a938c9e19a6e5bd3fe070
-DIST oauth-0.5.7.tar.gz 65889 BLAKE2B 71787b6a03156a25edbb006acd05f7aae789e9bc0fffa0afe9d3f0c55a2b991fa20527c493e9933891adc0e32571c1834f1a3f928e12f2a7b3159ebc09d29286 SHA512 4bc217123aaf74482ed118344c57b241b9efea172d872d670a860e8f236fac4ae1956826fcc786025164a5728c62edded8cb453f0051091c48bc87fe1f72f931
 DIST oauth-0.5.8.tar.gz 67852 BLAKE2B 7dc19a2f84f585fd517d677bf441c5964b45566ffea3cbd7612061db115a5570cf8315b4cbdd8788f9b0ff336b6eea91922f17c0ce17a4c626731282bd8203ca SHA512 3bf8298ea5bcffe1fe61ba894a5cfcb04a5814348154749e056ea18d975b00b10db7ed226f2187ffb9f414b755022bf32ff4bb2c02f1f429f6a9a7062032d82e
diff --git a/dev-ruby/oauth/oauth-0.5.6.ebuild b/dev-ruby/oauth/oauth-0.5.6.ebuild
deleted file mode 100644
index 7fdf4be49c41..000000000000
--- a/dev-ruby/oauth/oauth-0.5.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
-
-RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/oauth/oauth-0.5.7.ebuild b/dev-ruby/oauth/oauth-0.5.7.ebuild
deleted file mode 100644
index cdb746579c6c..000000000000
--- a/dev-ruby/oauth/oauth-0.5.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
-
-RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/oauth/oauth-0.5.8.ebuild b/dev-ruby/oauth/oauth-0.5.8.ebuild
index a675a968338d..6aacd85e42e9 100644
--- a/dev-ruby/oauth/oauth-0.5.8.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md TODO"
 
@@ -26,13 +26,13 @@ ruby_add_bdepend "test? (
 	dev-ruby/mocha:1.0
 	dev-ruby/webmock
 	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
+	dev-ruby/actionpack:6.1
+	dev-ruby/railties:6.1
 )"
 
 all_ruby_prepare() {
 	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"' \
 		-e '2i gem "test-unit"; require "test/unit"' \
 		-e '/mocha/ s/mini_test/minitest/' \
 		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index d5df191d04d5..947a0a2b2d2f 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,3 +1 @@
-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
diff --git a/dev-ruby/octokit/octokit-4.20.0.ebuild b/dev-ruby/octokit/octokit-4.20.0.ebuild
deleted file mode 100644
index 85e02ff81cfd..000000000000
--- a/dev-ruby/octokit/octokit-4.20.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_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/octokit/octokit-4.21.0.ebuild b/dev-ruby/octokit/octokit-4.21.0.ebuild
deleted file mode 100644
index 85e02ff81cfd..000000000000
--- a/dev-ruby/octokit/octokit-4.21.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_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/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..e532af80584a
--- /dev/null
+++ b/dev-ruby/openssl-ccm/openssl-ccm-1.2.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit ruby-fakegem
+
+DESCRIPTION="OpenSSL CBC-MAC (CCM) ruby gem"
+HOMEPAGE="https://github.com/SmallLars/openssl-ccm"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/coverall/I s:^:#:' test/test_ccm.rb || die
+}
diff --git a/dev-ruby/optimist/optimist-3.0.1.ebuild b/dev-ruby/optimist/optimist-3.0.1.ebuild
index 3b00cb962597..f08a822bec74 100644
--- a/dev-ruby/optimist/optimist-3.0.1.ebuild
+++ b/dev-ruby/optimist/optimist-3.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_EXTRADOC="FAQ.txt History.txt README.md"
 
diff --git a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild b/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
index f8215391936b..b1281a2fea0c 100644
--- a/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
+++ b/dev-ruby/optionable/optionable-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ox/ox-2.14.10.ebuild b/dev-ruby/ox/ox-2.14.10.ebuild
index 9d396a28c0f1..18c6fa807322 100644
--- a/dev-ruby/ox/ox-2.14.10.ebuild
+++ b/dev-ruby/ox/ox-2.14.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
 SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 0fa146012e75..0eaac44be6b0 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1 @@
-DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
-DIST pry-0.14.0.tar.gz 238895 BLAKE2B 325a7eaa03836cf78c8599af15aa6758bc36cccf20937c3a7f222a5a831d2ffd8fc990e005b587779fe2a15077e0b8b38628c6f075b2b73de7ea44b5642e8635 SHA512 c10ba16d7dbd05308079f98a68fbcbb367d07977fd71a7077a80938b10c7588f585651e046d29a2f1499f136f56c062598f77ada8fb47a31608a4ea8536c5ef8
 DIST pry-0.14.1.tar.gz 239261 BLAKE2B 46bba71668cbfcb710ebf4f8921d1b4cbaad887b1546b4566a90f9f246f1ff41451ccabb4a8692bb8a404532227aaa72b2d530fa4451bf1b7141cb6f57dfea1a SHA512 b258d1ae7ffd82c6fbed7edbd6e9bc64006eb54e3376a2f85b7482e0517be34efb46a2264975820cac3b7c0bea89b855b4d2a6fb104ff760f25667e1afb3ba44
diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild
deleted file mode 100644
index a6ccfb80e171..000000000000
--- a/dev-ruby/pry/pry-0.13.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
-HOMEPAGE="https://github.com/pry/pry/wiki"
-SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
-SLOT="ruby19"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
-	=dev-ruby/method_source-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/open4-1.3
-		>=dev-ruby/rake-0.9
-		>=dev-ruby/mocha-1.0
-	)"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on git.
-	# Loosen coderay dependency.
-	sed -e '/git ls-files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
-
-	# Skip integration tests because they depend to much on specifics of the environment.
-	rm -f spec/integration/* || die
-	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
-}
diff --git a/dev-ruby/pry/pry-0.14.0.ebuild b/dev-ruby/pry/pry-0.14.0.ebuild
deleted file mode 100644
index 8d4d5fc87dab..000000000000
--- a/dev-ruby/pry/pry-0.14.0.ebuild
+++ /dev/null
@@ -1,45 +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 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
-HOMEPAGE="https://github.com/pry/pry/wiki"
-SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE=""
-SLOT="ruby19"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
-	=dev-ruby/method_source-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/open4-1.3
-		>=dev-ruby/rake-0.9
-		>=dev-ruby/mocha-1.0
-	)"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on git.
-	# Loosen coderay dependency.
-	sed -e '/git ls-files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
-
-	# Skip integration tests because they depend to much on specifics of the environment.
-	rm -f spec/integration/* || die
-	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
-}
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 9025bcac9e48..986d61a757e3 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,3 +1,2 @@
-DIST pundit-2.1.0.gem 25600 BLAKE2B f8284e326a68475fe4c733de85597ba91e376d37e5dd24d97c1a8da2ab7f15d2cf35cf76688370f1a96c00f8ce89df2d2bb6b3c6de1ae33d6cdfe1ffd1926e3f SHA512 3201cb3acca8301a0e07fa9bd58617ee32074842e873a85a31d9b56fac5bd93c4a78d94d8b57556a011f1713712eb484ef3281d68ae3acf1c8bf1bce13f47e0c
 DIST pundit-2.1.1.gem 26112 BLAKE2B de517b25d0d062c2a85b6ca28b6dc8ebcea25f4786435788e90394ad29338462073c946d7127172766baeced6dc98d0e21923220b1371861f200b73fe09039e9 SHA512 d5463e21801ef04e82500c671ccbee0e8fb1576a8b7b86283ecc80d1c6e81cd375abf3c81ee5fad8323eb3ba0c296df43c9a78fafc2cd6e7797f1447d02ede0d
 DIST pundit-2.2.0.gem 27136 BLAKE2B 560843f9e1d19c551ee9bdeb3ead856a483dff68187da20c463fd01cbf1ca68f48adf6d4b9589b2c755cf6c860fba98b3719af8732e9f4c284c7dc4b2a1b2f5b SHA512 fcb8c9305e7ce9301142bd62c08856ee29cf5227d63ae36ccc894c4a3b19ec9c03625c3742890e9aeabc2fc8877a5d9527d28ecc8084103bcfa8321d87458a44
diff --git a/dev-ruby/pundit/pundit-2.1.0.ebuild b/dev-ruby/pundit/pundit-2.1.0.ebuild
deleted file mode 100644
index dc228494dd9b..000000000000
--- a/dev-ruby/pundit/pundit-2.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Object oriented authorization for Rails applications"
-HOMEPAGE="https://github.com/elabs/pundit https://rubygems.org/gems/pundit"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0:*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionpack-3.0.0
-	>=dev-ruby/activemodel-3.0.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "/pry/d" spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
index a2bc85cce4e6..68f1eaa1a4b6 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit unpacker