Adding metadata

44 files changed, 319 insertions, 870 deletions

diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index bd3679bf6a22..4355c84a31af 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,5 +1 @@
-DIST aws-sigv4-1.2.3.gem 16384 BLAKE2B 55da04b54005107075e3e4ef6a16de03e25ee355938bb1846f2c1ab79f1d9c72b0d272acb8b8c58eb7803710f3ad9be7e2d137b0c387d84d4841f7dcb0fb82aa SHA512 5d3aa9256f5e0fec5841ca5c9ca5aeb9a32cb4cf69f30221476d380c22e8f1863d2fbb4c826b89634c65f8080b83debdd84efe6e14e31f0a01bcf18b9fd71750
-DIST aws-sigv4-1.2.4.gem 16384 BLAKE2B 31aee1c3c028b9ccd6b20e967af97394e3800d27cfec2f19a4f12b0a7f0ed2ed931b720beb7d3e3ae737ca33eb7c4271f565053f201a3e233625c5d1faf33fab SHA512 1c03bf59899c7e7f6b01a786e75985c73459f0aacd3f01df70bac562db452e369317f8cb749f30d30629f058845687d9e2f614547f6f3ca1a4378db724170e4f
-DIST aws-sigv4-1.4.0.gem 16896 BLAKE2B 42a619d5037e6974a64ba329d50b83b221177d50abe89f8cc3dd38cb8c91eb7d049fc2e93b1c3c29910778ab5254b7a65936257fb1809ca92535841a3b58b77b SHA512 250dfd5755fa5163c65c122ff33c4e3b700359281a2b7c0640fb25ad8fbd2f01afa6034413345eb395d0219dc7c4cd6f4ab899c21321b76a336fa49a7ff298de
-DIST aws-sigv4-1.5.1.gem 17920 BLAKE2B 3ffe44ea9971826ca139dd4e4e09fcf7ccccf0c9b915bfaa80da9a7088acd8cd9dcb34e2be8e21636aabbea0b4fe4b86135484047a097d00656f8033f39d94ae SHA512 a9aeed9a335aef1358166ead1ba2ea12d588fa61ecf45a6e42dfdf311ef6aa36a372a4f236d0fad0ed61dee81e812f2f9a5ab2fda55a5a42f39c11e48a308afd
 DIST aws-sigv4-1.5.2.gem 17920 BLAKE2B e6122d4846ec103e8929aa109c19822951bcc129a923c7e2733b5319495902f3a20cbabebc574671deac297989b0c4f60046e2f5b7499473cca1989fb8262f5f SHA512 7a756e3faafaa31046b1a17a825e8e1b88899914435cd1d7811089105f4d31020d24b81c1e8e86efa9a7446a768399323389e14462f1117a9f74f0dbbe2fbc62
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
deleted file mode 100644
index 972cfb7f058a..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.2.3.ebuild
+++ /dev/null
@@ -1,22 +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_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild
deleted file mode 100644
index 18a8f4abf81f..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.2.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild
deleted file mode 100644
index 18a8f4abf81f..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.4.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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="CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.5.1.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.5.1.ebuild
deleted file mode 100644
index 5fa6f1f45ab4..000000000000
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
-RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services Signature Version 4 signing library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/aws-eventstream-1.0.2:1"
diff --git a/dev-ruby/cliver/cliver-0.3.2-r2.ebuild b/dev-ruby/cliver/cliver-0.3.2-r2.ebuild
new file mode 100644
index 000000000000..9c8ea9218e07
--- /dev/null
+++ b/dev-ruby/cliver/cliver-0.3.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="cliver.gemspec"
+
+inherit ruby-fakegem
+
+COMMIT=3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b
+
+DESCRIPTION="An easy way to detect and use command-line dependencies"
+HOMEPAGE="https://yaauie.github.io/cliver/"
+SRC_URI="https://github.com/yaauie/cliver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cliver-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files/find */' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/cliver/metadata.xml b/dev-ruby/cliver/metadata.xml
index 246d194b7ec0..3ecdca76cd54 100644
--- a/dev-ruby/cliver/metadata.xml
+++ b/dev-ruby/cliver/metadata.xml
@@ -5,6 +5,8 @@
   <email>ruby@gentoo.org</email>
   <name>Gentoo Ruby Project</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="rubygems">cliver</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild
new file mode 100644
index 000000000000..4173bdd4fcf2
--- /dev/null
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
+
+inherit ruby-fakegem
+
+MY_P=elasticsearch-ruby-${PV}
+DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
+SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+		dev-ruby/patron
+	)
+"
+
+RUBY_S=${MY_P}/${PN}
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..b591d117716f
--- /dev/null
+++ b/dev-ruby/hashicorp-checkpoint/hashicorp-checkpoint-0.1.5-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Internal HashiCorp service to check version information"
+HOMEPAGE="https://www.hashicorp.com"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+# Tests require network
+RESTRICT="test"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/rspec-its )
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+
+	# Make tests compatible with new ruby versions
+	sed -i -e '/check/ s/opts/**opts/' spec/checkpoint_spec.rb || die
+}
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
deleted file mode 100644
index ee20f39cf7d0..000000000000
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.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=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A GPG backend for hiera-eyaml"
-HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/hiera-eyaml-1.3.8:*
-	>=dev-ruby/gpgme-2.0.0
-"
diff --git a/dev-ruby/idn-ruby/Manifest b/dev-ruby/idn-ruby/Manifest
index cfc94abeb679..b538c79ade6d 100644
--- a/dev-ruby/idn-ruby/Manifest
+++ b/dev-ruby/idn-ruby/Manifest
@@ -1,3 +1 @@
-DIST idn-ruby-0.1.2.gem 18432 BLAKE2B 9bd1a280c76195a84bc996cfb68550c759a466fca4f5c88167c1e395652088b746831f3cd92a197af25d649ec18ce19ddf78402714432976c612ae38c6c64289 SHA512 404025918ca8fb49580d726b9972dbbde987bebc7fa1e42b0e7f091cd8fba38871258c18c933e49a6ee3c11a21cdd388342beb72c6ce46d8c034156eb9064ac5
-DIST idn-ruby-0.1.4.gem 18432 BLAKE2B 7c530e0d24ce515337a1810fbbc33c7598d91c9b82ed19de196aedd47a71edb50c3d6481e62d11e893418b579c58d167a24e1cdd5d9eaa99757b48a88f1943aa SHA512 b06ed738a488493aa843acd1122e40e039ebaeeb5873fc9f935edc5ee52a1f86eb0b2cb5460d211bee9d42d05491b0ee6e4a707b0840a07bc3f3174648435124
 DIST idn-ruby-0.1.5.gem 18432 BLAKE2B 802929985a96b221dcd218cea444cffcd11ae0662ed759fcdef1e5d3dd616cfaa301890f9df1b5b65ec52514ec10d2da0e4e55abf0db2da367be5ad79b91b95e SHA512 8a6c88a822991dd0a6a75030e05998df15c937348afb7e868f8bfb3710203644aab0d9308cc4569e10653a289a37625652592f676897627b75afdd386ae18757
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild
deleted file mode 100644
index 56707f390fe9..000000000000
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.2.ebuild
+++ /dev/null
@@ -1,35 +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="CHANGES README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="LibIDN Ruby Bindings"
-HOMEPAGE="https://github.com/deepfryed/idn-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" net-dns/libidn:0"
-DEPEND+=" net-dns/libidn:0"
-
-all_ruby_prepare() {
-	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
-	rm -f test/tc_Stringprep.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir lib || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
deleted file mode 100644
index 72ee7e5da432..000000000000
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="LibIDN Ruby Bindings"
-HOMEPAGE="https://github.com/deepfryed/idn-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-RDEPEND+=" net-dns/libidn:0"
-DEPEND+=" net-dns/libidn:0"
-
-all_ruby_prepare() {
-	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
-	rm -f test/tc_Stringprep.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir lib || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild
index 8c46474d5555..0a26190ec2de 100644
--- a/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 964f88b07993..22964e805352 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,2 +1 @@
-DIST liquid-c-4.0.0.gem 15872 BLAKE2B 8083ae622da685db2aa557ffff0927a900a51c92227ea2523dcf4c408ff4df6f417cbf7fe019383220c3fe580d53f40d496787d8f7328a1e42c3f17a435eebe6 SHA512 a9f3618a7286c6417e9d22cad8c0716f84f33c43e9b12708711f9c4bdebb94a30e408b3dca99cdfe0a7c5b5e5b39ffa79e978ef6b44e5359975e3d74106932be
 DIST liquid-c-4.1.0.gem 48640 BLAKE2B 4fe526b48500349526ebeb2430f87fbb8ccea2f47dcfd32f16e3db803425180955c7ae81a707628ca377fd534882d71e06aece7d4119c16cc1386d4b3b222447 SHA512 72600a5b7962b91d63350adc9f3f355255ad9b9f93b6607064a896e1e3d109a9da897f442f9fc15a7a8c2c26ccb4674e491def9e7531ef9577b790ca9a3eb884
diff --git a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
deleted file mode 100644
index 544e5d002679..000000000000
--- a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.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_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-MY_PN=${PN/-/_}
-RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="Liquid performance extension in C"
-HOMEPAGE="https://github.com/Shopify/liquid-c"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/liquid-3.0.0:*"
-
-all_ruby_prepare() {
-	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/maildir/maildir-2.2.3-r1.ebuild b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..64299a337221
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild b/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..d6af8723dc3b
--- /dev/null
+++ b/dev-ruby/mercenary/mercenary-0.4.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.markdown README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Lightweight and flexible library for writing command-line apps"
+HOMEPAGE="https://github.com/jekyll/mercenary"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 4d51e5d99fc8..df63b6656612 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,7 +1,5 @@
-DIST parser-3.1.1.0.tar.gz 299759 BLAKE2B c4fdf278c1ae90529de414d9cda2770524f051f05d457ebe3224c49a84c55abfe8ac11799b0caf4d74200c4be494c3f655ed7f9c03e11d198436a7f54bec77ce SHA512 9c51aaa7d19e4a679d9d4c40716a90ef4c15d22728a21a8a4c278245114cd8cdeace19018d54dbb73b77897d531f3eb446b99c6dfaf9e205aa54346933ada215
-DIST parser-3.1.2.0.tar.gz 299753 BLAKE2B b5c991ab0834ed5e5b7107935500659828a6f804d9231462dc8a658346bab3959ac56b514045c25af4adb84af3f0cdd9615c9aafb2325ab24a04c0c5617ca732 SHA512 d8becf7e5b633c0a1ddfe8aac98c2f89d6b713cbabd2877a4eac36b0fd4935bd1a05990c100bcf58f04ad78218af0a5f79dbb83bf369708750c8834598286cfa
-DIST parser-3.1.2.1.tar.gz 299885 BLAKE2B 2fe56279be003825a25e6fdfc99dbb13b93dc167f7da3fe636da368bc10a6506afd7510bf3d7c55122321de1cd0bf46afce2ee0ff0a9d914e507c0333225e5ea SHA512 9bbaae6436f41668621fdb1f45dd2a30ea5485dca19b0024a19e8be0684c4a961e914040e3b53f725f06c98822392cfef87113332124272f895bb571e56cc961
 DIST parser-3.1.3.0.tar.gz 301000 BLAKE2B 3b7984966643d983e8606ba4de13a08de9130aa58b5adebdc9cfb273e00e700086f99f8a678ccb6db1ac70dac2da429dbfa1b45661c4f9764b676beae5c64633 SHA512 23ef12043706ba810ade3ac94f376082d5b45db8b451634d469a26f834890e7a82a9669132df4654aef4cb7650f0e13d2f33aad489ebbbb76ab547cb9e64f498
 DIST parser-3.2.0.0.tar.gz 302043 BLAKE2B 8a02ca62560fc976fbe62d02ecf24713248a9f522e1cc9daa1deaa153d900628dce4f59c7791cc61652199358addca1432403a3f3849b0ef8f9495639282697d SHA512 58b9011c22af76f5eccf7035dd53da705ddc952c6185ebbb48c33c5486b5852ba8a543093f8c1f2a2c7aea8e78407c04a9dc49abf43edb27c460cf8b038338cf
 DIST parser-3.2.1.0.tar.gz 315249 BLAKE2B 57013e299541e0b1d589be8640611c3deb04b11cd39ada33dd2ae0b43fa68b7ffa55d6074d53559a2a5f552e539bf80ea7406a91e4b5dbc7fae345d9d399bc09 SHA512 f79f84188650a210424558c9f0d131de25ea7d879487331db9d5a55127fd72e28946a78f7596896bd837b4b17e8602b908fc818f467f77cee04c4ffdce545f76
 DIST parser-3.2.1.1.tar.gz 315592 BLAKE2B 5e783269d367fc9f2e98f5bcb038c8f835a930bd3664769da30441a1525908f96c9fa9cb23c42d07614a550d327c406470f59696a22cc58f57c087c3a09a9967 SHA512 ba9077e11864ba816d04f77f1160f46ad697c5a0751ac6991758259054754fdfda59e762c8df5e66d6ddb28ddd561713ba15a11a67d61024180f7e375ac112f1
+DIST parser-3.2.2.0.tar.gz 315575 BLAKE2B ad6c25f35809de7148ca156d6928c7b2b6ea49d2808fe5af5876263fd44191e8b43e24932ebfd4d335c367cf7aad0f4fc2594ad5e6dec70d9c05aca1ebd5c4e2 SHA512 b1f6d4ee0ef589e45850fbe339b6168abd662e843ba1bc66e91c19055d9c88296fed926abbe800a860868b2b8e9c33124dce1a8a7fd05e7db6ae62e0cc2e9a24
diff --git a/dev-ruby/parser/parser-3.1.1.0.ebuild b/dev-ruby/parser/parser-3.1.1.0.ebuild
deleted file mode 100644
index 53805a815992..000000000000
--- a/dev-ruby/parser/parser-3.1.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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_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 ~sparc"
-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/parser/parser-3.1.2.1.ebuild b/dev-ruby/parser/parser-3.1.2.1.ebuild
deleted file mode 100644
index 878b2025cd62..000000000000
--- a/dev-ruby/parser/parser-3.1.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="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 ~sparc"
-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/parser/parser-3.1.2.0.ebuild b/dev-ruby/parser/parser-3.2.2.0.ebuild
index 53805a815992..8f30b69d7705 100644
--- a/dev-ruby/parser/parser-3.1.2.0.ebuild
+++ b/dev-ruby/parser/parser-3.2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/pathutil/pathutil-0.16.2.ebuild b/dev-ruby/pathutil/pathutil-0.16.2-r1.ebuild
index ed5a294db9e3..a2d80d2c8ccf 100644
--- a/dev-ruby/pathutil/pathutil-0.16.2.ebuild
+++ b/dev-ruby/pathutil/pathutil-0.16.2-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_GEMSPEC="Gem.gemspec"
@@ -21,6 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ruby30.patch" )
+
 ruby_add_rdepend ">=dev-ruby/forwardable-extended-2.6
 	<dev-ruby/forwardable-extended-3"
 
@@ -28,10 +29,7 @@ ruby_add_bdepend "test? ( dev-ruby/safe_yaml )"
 
 all_ruby_prepare() {
 	sed -i -e '/\(coverage\|luna\|rspec\/helpers\)/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"; require "tmpdir"; require "json"' \
+		-e '1irequire "pathname"; require "tempfile"; require "tmpdir"; require "json" ; gem "psych", "~> 3.0"' \
 		spec/rspec/helper.rb || die
 	rm -f spec/support/coverage.rb || die
-
-	# Avoid spec failing with newer rspec versions, bug 775383
-	sed -i -e '/should chdir before running the glob/apending' spec/tests/lib/pathutil_spec.rb || die
 }
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 12e2bb8276e3..c0ee56f98eba 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -1,2 +1 @@
-DIST rqrcode_core-1.1.0.tar.gz 20891 BLAKE2B 1900cff03c5533453147c736e254709766e8fd2c8be7ed84695682974611a573d1e4eeb34991707eae5e5b7dad31f4d2e74ac0c412f01dce67e558259608d68b SHA512 c9b571f43eb3bb50843eee480add8b5d6bbec171b7bd4f70e746aca0b0dccc321ea190a234151beb1c6d30bb56c3aa7d8d6522dfc346a46165bd90e9be9c20fd
 DIST rqrcode_core-1.2.0.tar.gz 21103 BLAKE2B 9988dc999b2853888e91b6346af074defe59dbd1be097e6c058fb7e8e68a779aedef14458ac14aa06e57e8cccdd1240e5eb003944951b47c174a1239cc35d77f SHA512 423a492b29ed8cb4e2f037305121a77f22e76dafc93675d0a24e2c6ad1918522003a8d404d55fa28e007bbb9be6d2038eafab76b2dd5e5e59c0d9adb7ab4626c
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
deleted file mode 100644
index 243d00d0334a..000000000000
--- a/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +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_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
-SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d6eff46ce1e9..d6b7050cfdcb 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,6 +1,4 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
-DIST rspec-core-3.10.2-git.tgz 400299 BLAKE2B 82fe8689022f69f444549d654cd4799f8f1dff7c984016eba0835cffb518dce892a0af61a3ef6b251c598aa3caac66b0498620dc8d2b06a02795fc6ff3f46c41 SHA512 0ebeea8aed275f08bcac4846977b0718f85d95dedaed82b99280e5b52519713be6234d97b34b61a56e3276e767f47a13e6888401bd5a4b8a0003c9bbb518364d
 DIST rspec-core-3.11.0-git.tgz 403154 BLAKE2B 1a5043bd2120236e8e3ca931c1fd9562bc78d692674d3133ac3742ef7b7f81161a7fc550f4d11bf34575a85a8657aeb39fcc0fdccaab67cc189cc1d39a303ade SHA512 6121b805f6feade244fe13e273526e64c5a3c74a1f9d4316c895279f4ed8576dbe3189b06040f3f29fe7d3e90f862f2c78aacb0b4bef989660eae30d046ed69c
 DIST rspec-core-3.12.0-git.tgz 408651 BLAKE2B 97467e57059cbd5fc32763c2b4d8be2b6ffcb688f3bfc7d4e37c415816a28827022180c315e33145cf0702d390f02f6adbd534579cc7d9ab02b7b530c607f001 SHA512 a339c7b9005713a7eaccb778260e1a433caaf3024d9015ae6f3b810834c7d47a75bc5cfa13dd2574b7d88a286d0cd52a8a464a2eda41db425a535fdd09f37a7a
 DIST rspec-core-3.12.1-git.tgz 409036 BLAKE2B 0a6311f9908fd2e85621ebdb9cce5723de83e392bc5a6f0bb5be98c26b8f26b759a1cb3923a5d583f2ea7f6e72f07093bb23d54aa2b44d3a3ae0874ef6a99a73 SHA512 aaf7e4aebf1240c5f602a1e34f1f9e9355438ca544484f500d21e6021fd95d5ab5d26dc2249122d1dfc76b23725800f88937b5d1e53cd00d0b84faa46b056bea
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
deleted file mode 100644
index 3c5e9c4f2ca8..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ /dev/null
@@ -1,91 +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_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-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="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild
deleted file mode 100644
index 4fcf7ab73a72..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.10.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-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="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.12.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.12.1.ebuild
index 82f1b17cdd72..6cff1b60328f 100644
--- a/dev-ruby/rspec-core/rspec-core-3.12.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.12.1.ebuild
@@ -70,7 +70,8 @@ all_ruby_prepare() {
 
 	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
 	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+	sed -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' \
+		-i spec/rspec/core_spec.rb || die
 
 	# Avoid a spec depending on specifics on local networks
 	# This fails when localhost resolves to ::1 which may be a
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 9da6216d2d36..1a0561552fba 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,6 +1,4 @@
 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.11.0-git.tgz 214878 BLAKE2B f830a0a31fb0e7cd6639e711e4daa9faa98e514b6a1dd864c383259d199dc617c6c7ff45dc65f37cf53d3c4581c6ecb9148e42b77f3c37541d8985714d62af23 SHA512 209eabafe92db3de1a78524d98facda16b3f5fef11f8f0c8c74bc6fc68529c8d9a835a8196e84b8b8bdf828d548d4b00bb1acdd607cab14dad7874f55a42b0c6
 DIST rspec-expectations-3.11.1-git.tgz 217396 BLAKE2B b9660b22f0b23a5436d98ffe2b21b58c947765ab5cf7d245bf265faead46a5326fc403ad55ee2fcd72d96c8c29fc996715ecc74c9521ec4ca34daa9d5bc0f819 SHA512 1941056eb2f2205f583f335993e25030b433cb0463992d74d5c568c7bbab4313fc6e7e14ada5147064b14d6da49326e3c3cb342408cfe9b38d350c9470e5cdf9
 DIST rspec-expectations-3.12.0-git.tgz 217524 BLAKE2B f9638e2e5c83020818b2de4c06074b7d70f02655a50d598ecfcd8c79e1abb2ec351c5b7aed1ec0ea84fde140fc1a04349a6f2edbffda7cb697135ac0b5788b0c SHA512 51a80b5d45e8ca61a829f2130c60433999c6d5c60343d25f737bdb9d6864e89a156b29b549250f7c4248d5ba7a0cef11eb28e55d3023274051eb11f2d0361c83
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
deleted file mode 100644
index 7ff27b85ca39..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ /dev/null
@@ -1,47 +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_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-expectations/rspec-expectations-3.10.2.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
deleted file mode 100644
index 89b2242466ee..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 e56d42fb2df1..9706457eccdb 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,6 +1,4 @@
 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.10.3-git.tgz 196996 BLAKE2B 22759a11cefbaccfef52b2a1a37131d3d0b6eb5eb20d042172cf30e14816112bce729c2648c0b22a6506f9959fd336024710e18882bbe42f42144f0bd43e1281 SHA512 b116094873f682f14cb38a5dd7c0aa8fffac868ca28f7302bbc655bfb0c0ff64afe345b71b797d01028d9fbdad97df5ecf8398a82fc0a7252f2b47a963dbeac0
 DIST rspec-mocks-3.11.2-git.tgz 202347 BLAKE2B 7db89badf2cd3a9bdb590260dfced05cc72ccb7b2a8f600969f17c2df0523ee602f728aef257e88876f5c3b283645cf7f3243bd6de67c5bd26d3d74d0349593a SHA512 a1053cb9604b01de99f79b18fea2c4b3818d950e83da642a8b3aa9dbdb397429f51d95efa84a603770d4db94a25758c1cef15ce1ba77a4c952e9ef5f43a21e4d
 DIST rspec-mocks-3.12.2-git.tgz 204751 BLAKE2B bcbb8d6df6b1bf3b58e43e72c25b792f91f00467520cb1b366883e8ad54b7a380b287ae9e6f453de78603423f099ed0d4b3759338f5a4a91ea9c42c16439c4eb SHA512 ae1cdafe53d7c3258bce4cd0bec10a9b91886f2b71736e028350ea212999b88b9fb2e3554f1db040bf8e66cfb2d0139c305aa219e01c8db998b75283da327d3a
 DIST rspec-mocks-3.12.3-git.tgz 204925 BLAKE2B b72faa1e560b179a0bb9f2a59d53b2dd01142bfaaa60f66056848eb3f3c7181877be3d921c3eff5e023834fb256f2a7f49f96cf448040713e52560c8d4525ef9 SHA512 0ed50f0e9a38a23805a56c1ae3ffa94f27428755f6613053df0771440d0b5b9f3d6d1bbc8a3e310e0f66b57540dd8bc3e409336c96a78d178506b3ac2e849b67
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
deleted file mode 100644
index cecb8a217cbb..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ /dev/null
@@ -1,50 +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_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-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/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.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 Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild
deleted file mode 100644
index 3238c9421b17..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-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/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.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 Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 5bad09d14ab9..2fbd91bbb6df 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,3 @@
-DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
-DIST rspec-support-3.10.3-git.tgz 75447 BLAKE2B d3eae3b148ef56d6a8668ad4c92ce52ea066c82442448446cbdc6d37137c6fa32bf54e5f579d4a39525305fdd795feee792dac29234c568ab85d59d684af4b84 SHA512 21d7f3076e11467ef6c5b7ce23d5a8635320ca21f61f0d640e45c4e7855995a672fe400fc11f7dbea37097f6eefe09f24d3b177c86e75b2454a97c898f9a1cdf
 DIST rspec-support-3.11.0-git.tgz 75644 BLAKE2B 349df9b326e98fd3564ae22c8659c95205d5e623f0e67721cdb3dd658bdbee5ec574f4286d9548984567079178997c6e9b419211c7c3da601dd02ad3aa0d448f SHA512 38bd7c132b6dea3036c8c18e6c535c2dfb5faa0601fb13eb406c8bb279e42e460cecb823527b04a22966f0e965eda6b539e48cbac20c663ae3a17c01f4fbd0e0
 DIST rspec-support-3.11.1-git.tgz 77995 BLAKE2B 19fb743a9488d13ac8b6d4238bdc100b8ff324ae021b2214e0ee5eae32a000bfed48888868f5092d1f28742d74072c1b76debcbee4bd0bc9805e2e29c2f3558e SHA512 2acb99fefa52d3b9b77d7875c27a7869ad3dd0d2dece09b67ba0e272a3c5e1ad1e2a1ed3adfd32f4c1b145232d8b1996a613ea308e9aa4c6a3d8aac1b8796bea
 DIST rspec-support-3.12.0-git.tgz 78119 BLAKE2B 75ac5a3e03582fe11fba164687eddf291cba1d9389cfb47e9c0b64b59177634914313f25b94c1ab658069c331b0d19b33ecc882894ca5cbe6e17022befb45632 SHA512 c1296d1589bc5536b5890e1589876d0b13f122bd1b555f3e3ae62ef29fe46c989013d9435486ffe553f657d928e99434b11339c53e5248f1817a99959e344430
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
deleted file mode 100644
index 420caa87edaf..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ /dev/null
@@ -1,51 +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_TEST="rspec3"
-
-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-support"
-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=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild
deleted file mode 100644
index 1c31cea5242d..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 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="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-support"
-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=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index dcbd8c0e45cd..cdd33c873468 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,4 +1,3 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
-DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
 DIST rspec-3.11.0.gem 10752 BLAKE2B 24941576037669a53373d263bda99c7c98e295f5d616c08964d95dd3b0697d64c5399ed554d15705c1ea3f11c8bed667de00e0aef28d6cd1fd119057ece5f626 SHA512 233f80500446066a61a50d8e3f8a602316071beaa82e95776390684f7d58fa0acf8807386bee7d08b21f5481933e031b968fd752cf97efa74ba6cd411a8d1395
 DIST rspec-3.12.0.gem 10752 BLAKE2B 80beb56bfed2200e05c8fbe040a265f4176a7142a7c077564821057eec2aa02f68c2417eae5e0309221457d419bf0c9af9123c5e8f1f19992a9361298240c0c8 SHA512 24278c467e5226ad1a5bb4c64190fb5d1077777237d9c2e5c4f16a00b026bf26d8f15e2c74a34221b198992f73ef06af314488a61358968e2083f935467e5a35
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
deleted file mode 100644
index 9fc7a4756c84..000000000000
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ /dev/null
@@ -1,26 +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_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
new file mode 100644
index 000000000000..e994a48bbecb
--- /dev/null
+++ b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-arity.patch
@@ -0,0 +1,23 @@
+From: Daniel Leidert <dleidert@debian.org>
+Date: Wed, 1 Dec 2021 18:51:51 +0100
+Subject: Fix Rubx 3 compatibility
+
+Origin: https://github.com/dtao/safe_yaml/compare/master...paolobrasolin:development
+Bug: https://github.com/dtao/safe_yaml/issues/100
+---
+ lib/safe_yaml/safe_to_ruby_visitor.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/safe_yaml/safe_to_ruby_visitor.rb b/lib/safe_yaml/safe_to_ruby_visitor.rb
+index b980445..5fd71f0 100644
+--- a/lib/safe_yaml/safe_to_ruby_visitor.rb
++++ b/lib/safe_yaml/safe_to_ruby_visitor.rb
+@@ -4,7 +4,7 @@ module SafeYAML
+ 
+     def initialize(resolver)
+       case INITIALIZE_ARITY
+-      when 2
++      when 2, -3
+         # https://github.com/tenderlove/psych/blob/v2.0.0/lib/psych/visitors/to_ruby.rb#L14-L28
+         loader  = Psych::ClassLoader.new
+         scanner = Psych::ScalarScanner.new(loader)
diff --git a/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
new file mode 100644
index 000000000000..9b597276617b
--- /dev/null
+++ b/dev-ruby/safe_yaml/files/safe_yaml-1.0.5-ruby30-openstruct-tests.patch
@@ -0,0 +1,69 @@
+From: Sergio Durigan Junior <sergiodj@debian.org>
+Date: Fri, 28 Jan 2022 16:35:01 -0500
+Subject: Adjust tests to reflect OpenStruct changes on Ruby3.0
+
+Ref.: https://github.com/ruby/psych/issues/540
+
+OpenStruct on Ruby3.0 changed its marshalling/unmarshalling code,
+which is now impacting safe_yaml's testcase.  The two adjustments that
+needed to be made are:
+
+- OpenStruct's instance_variable_get will now symbolize its hash keys,
+  instead of using strings.
+
+- OpenStruct's to_yaml method will not output the 'table' entity
+  anymore.
+
+Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
+
+Forwarded: yes, https://github.com/dtao/safe_yaml/pull/102
+---
+ spec/safe_yaml_spec.rb | 26 +++++++++++++++++++++++---
+ 1 file changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/spec/safe_yaml_spec.rb b/spec/safe_yaml_spec.rb
+index aa701a4..1081173 100644
+--- a/spec/safe_yaml_spec.rb
++++ b/spec/safe_yaml_spec.rb
+@@ -318,7 +318,13 @@ describe YAML do
+       it "will allow objects to be deserialized for whitelisted tags" do
+         result = YAML.safe_load("--- !ruby/object:OpenStruct\ntable:\n  foo: bar\n")
+         expect(result).to be_a(OpenStruct)
+-        expect(result.instance_variable_get(:@table)).to eq({ "foo" => "bar" })
++        if RUBY_VERSION < '3.0'
++          expect(result.instance_variable_get(:@table)).to eq({ "foo" => "bar" })
++        else
++          # Ruby3.0's OpenStruct will now symbolize the hash key.
++          # Ref.: https://github.com/ruby/psych/issues/540
++          expect(result.instance_variable_get(:@table)).to eq({ :foo => "bar" })
++        end
+       end
+ 
+       it "will not deserialize objects without whitelisted tags" do
+@@ -463,10 +469,24 @@ describe YAML do
+ 
+         it "allows the default option to be overridden on a per-call basis" do
+           result = safe_load_round_trip(OpenStruct.new(:foo => "bar"), :whitelisted_tags => [])
+-          expect(result).to eq({ "table" => { :foo => "bar" } })
++          if RUBY_VERSION < '3.0'
++            expect(result).to eq({ "table" => { :foo => "bar" } })
++          else
++            # Ruby3.0's OpenStruct's to_yaml method doesn't output the
++            # 'table' entity anymore.
++            # Ref.: https://github.com/ruby/psych/issues/540
++            expect(result).to eq({ "foo" => "bar" })
++          end
+ 
+           result = safe_load_round_trip(OpenStruct.new(:foo => "bar"), :deserialize_symbols => false, :whitelisted_tags => [])
+-          expect(result).to eq({ "table" => { ":foo" => "bar" } })
++          if RUBY_VERSION < '3.0'
++            expect(result).to eq({ "table" => { ":foo" => "bar" } })
++          else
++            # Ruby3.0's OpenStruct's to_yaml method doesn't output the
++            # 'table' entity anymore.
++            # Ref.: https://github.com/ruby/psych/issues/540
++            expect(result).to eq({ "foo" => "bar" })
++          end
+         end
+       end
+     end
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..5d6063220f78
--- /dev/null
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Broken with newer psych: https://github.com/dtao/safe_yaml/pull/101
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
+HOMEPAGE="https://github.com/dtao/safe_yaml"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}/${P}-ruby30-arity.patch" "${FILESDIR}/${P}-ruby30-openstruct-tests.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/hashie
+	dev-ruby/heredoc_unindent
+	dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/local timezone/askip "timezone"' spec/transform/to_date_spec.rb || die
+
+	sed -i -e '1igem "psych", "~> 3.0"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# Run specs with monkeypatch
+	${RUBY} -S rspec-3 spec --tag ~libraries || die
+
+	# Running specs without monkeypatch
+	${RUBY} -S rspec-3 spec --tag libraries || die
+}
diff --git a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
index ffa03c933f02..75d6d95014b8 100644
--- a/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"