gentoo auto-resync : 29:08:2023 - 16:05:39

25 files changed, 104 insertions, 334 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 532505ae3c68..66ec0b957afe 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 21c74e67bbb8..74a680428a45 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,10 +1,12 @@
 DIST rack-2.2.6.4.tar.gz 279212 BLAKE2B 381baa25cad48603891c0b40c463843d112b380d0e99cb985ae2d6d59b84dfe9dd33865bfcf3602af81cfe54f8e0fa57166dd4764069b2de054dd1826b3da993 SHA512 3b7cc5ed8b74d8e03a343fbc13c808f7cefe185330e6d020aebbcb6d4852b2485a1b780e14c8593c02fa264ba31b3005c47c6c5d9a432cbf5bc7ec208e279f4a
 DIST rack-2.2.7.tar.gz 279222 BLAKE2B 0c7fb54aaa20c2e840a791240199e3981f70634f9d241d1167b3efca53156d1bc7129c64a7c3f0a82f6001bb46632969041b5310020601d55719beb538972f5c SHA512 c89b7ed8bfea7f53e6f2b507d9668af8220750be336180d0ccea76d86359e7cacff74e6a55e5757ff7f79d2377049f4268d1851f4b83d6ff474f0002310a0d29
+DIST rack-2.2.8.tar.gz 279555 BLAKE2B 798d6d1e0877a895c0b4d33c5dc20e6cfab88745abd4cb76166484df355b283a9e842791b0d874c53ffb8600258d169e24a4570850f4f0994b596c6ebf76937e SHA512 e3055483c8f6f7a9a6aeb5654865a004b02bef781dd95072b84402a98549c13c66b5591b25b1a35fb6915af4b39adf88aa716e3edef7d0e41dbebf2a2a79ffcb
 DIST rack-3.0.7.tar.gz 788611 BLAKE2B 99f4b7394c7b7d78ca3c7888369355437383ed5e3f3bea1bae7117019df5588a2c778270308309908223f5c509c97e6792b2edfeac6b3e3d6815e147bcdab375 SHA512 7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd
 DIST rack-3.0.8.tar.gz 788610 BLAKE2B 9a591242e37f10021a2779bc495ab0ef954eb6474efe279f2bc6417e4255d83a92f156a9bc52fe90c098dc23c26eddf802119fdcd739a05332bc398db1c12456 SHA512 045a1de846e984d2067ce647d0b3652c810a264fa4f84e9791a623ac5c5cfa5ab4b961c4cb0328b51a71f66082190741dbaac3f4dbafad7c5a8e97a71b169448
 EBUILD rack-2.2.6.4.ebuild 1548 BLAKE2B 0d0b187f6c0db03424c755dfcc87ba8051e47818fcdda39d621eaa18ed0e20087d4773635ff23c19dbd54009a34c5f07d9b9621b906ddd1f94817fcc022912f3 SHA512 be3c80b6c5365349f02a8fe57018dbd8c05a9e128e17f8b8daf2e3653d01fe10c005039ab09d77192930b7b3158c2fba9c8f8e6aad2136d925ebf280efdeee60
 EBUILD rack-2.2.7-r1.ebuild 1865 BLAKE2B 943c9360e5581f8208efb827dfebe8b896ff8175164df236c3e37f0eea6a73e5735fa57bd6dab9bef7ed537982b2c59c1840c461ecc7ebca0b7c3be218625837 SHA512 45db1d3ede38889aee6140d4dd78df593a7e3132e5dc2b3b32a41dc1c8a21cdf866e7f77a86cf4312e15c9dd087e721980266d3822e485d43eda17426c1832e7
 EBUILD rack-2.2.7.ebuild 1541 BLAKE2B 9e3b885fb3806caf58d3ff78e6f3aadfe68f7439a8f93cc09c5d35aaeb20f842e3807657b6e4419e49b5fd84fd761a991fdd14bbe6c602645aae6bac42a4f638 SHA512 477106cf9b995b1046ca9bfff0fca9dbb593cb36867d33a60ec5ceb9f1f8bf25d658bd04b8ca06f953f5fb04bd81b7c4569b4925850038335cba4e9075935d1f
+EBUILD rack-2.2.8.ebuild 1680 BLAKE2B 79a49780d2eff0389ad59a3f441b757d08baa25bbc3deb3237969bc4cdbf79c02f984472d4d948b7d28a80d6cf58ed19c2ae6236abe60e5721b787d346cce966 SHA512 9e42da65873519df9a6b9e0dd33473d4d95c0ca55c1a1be884fd496c4628779f0c3a1639d26c7eebff9053288284f442d43adf69453f091d837232ed28d862df
 EBUILD rack-3.0.7.ebuild 1293 BLAKE2B 228f3d3c46693522823fc3df3e52caff783caa6c7eadaa19be9c34a38a3341b8a591116463b428d32dd9993c2ddfc0dda705a19fcd57882fd10c4171cacee0a2 SHA512 47f89a8b637974dbb56575fd196c393eba89697d2cffad2eda5ed91be40c0cc03810acff86f3eaeb0fe9d0bf6a9946a338cabce78baa3d24b10f5948cc006864
 EBUILD rack-3.0.8.ebuild 1286 BLAKE2B fe8a468d2521afbfed947d2d80578a3e6e3586abe62b7863e3037c7235090f5ae1c0d936022534f3b25d788cbad1a9d2288ca4aba1de602c4b2becc43fe005d1 SHA512 f7b4a993ca254b5c7343b332e8ef26662cec66dbddf300ccd94123dd54c5f1f4015f1d8bd24d6170d9660a60baa5ed59cf1fa30d65c19fcdad107cd9d2480b8a
 MISC metadata.xml 537 BLAKE2B 998152d25abdb228da5fc7b39719693fd0811ce6dc0d831cf90a5ecbb88e540d76dfb6cfddb3584748f46f6d66aa2d1bc73d492c9e810db1c0e44895108d5e17 SHA512 4670ef4b5b33270c48d212fa995b965305f558c5f670e7eccbe2e44f9ba8d1628c112de5a9305c2ad90adb6e2996cab6da385e5f473d850b287e92f7594e0d21
diff --git a/dev-ruby/rack/rack-2.2.8.ebuild b/dev-ruby/rack/rack-2.2.8.ebuild
new file mode 100644
index 000000000000..4c6150ecd65e
--- /dev/null
+++ b/dev-ruby/rack/rack-2.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://github.com/rack/rack"
+SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/minitest-global_expectations
+	|| ( dev-ruby/psych:5 dev-ruby/psych:0 )
+	dev-ruby/webrick
+)"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' -e "s:require_relative ':require './:" rack.gemspec || die
+
+	# Rename rackup command and force gem version to allow rack 2.x applications to work
+	mv bin/rackup bin/rackup-2 || die
+	sed -i -e '4igem "rack", "~> 2.2.0"' bin/rackup-2
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	einfo "The rackup command is installed as 'rackup-2' to allow parallel installation with rack 3"
+}
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 2bd27d810848..583469ea3ebe 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,7 +1,7 @@
 DIST rmagick-4.3.0.tar.gz 1986554 BLAKE2B bf6afb0b19a98f45dd9f3a8261b67ad05ed774784e9fb19009a83c266c16362b4938acd8b0af6a07d3a37fb255fb5bee7a33b7f26c2c49460d546665a98a7871 SHA512 1b108d61b836bf382c9776badc45614ff88ca74176595765c3caba00cc6af0f955dd6f7649a9f97698832193d85292bc22ff0bf290d0bfbf9e8faa58b99b0b1c
 DIST rmagick-5.2.0.tar.gz 1991303 BLAKE2B 131e0a9ac1e56942b1281f1ce1a62c86e6997fcbc3f162fc4afea897831003bee2e010a27b6ab4f59331b720ff06d61c07b0ae9ce5327752658627adaab0ccad SHA512 9c7262db329869f33c6ae27980a86bd24b7a4a72d7b826eb3e75d28571d954ff5cba6c7ac86a0540663c9ddf2a8185ca3007d3c2ac5cc5339e4cc327e5f7910f
 DIST rmagick-5.3.0.tar.gz 2018036 BLAKE2B 204ece4d3794ef43b02855cce2f11e0194d2a81e400c1c2ef2af824359b8b4566eda93caba6269ad6b283af60d99ad403ab6ba8e972153e8f20d208ce0c48ad6 SHA512 dcc9e0d7cd77ebd3859871f26449c37839f9102e7aa4f0746698cbd6fe93579c3adbe6cfefeba6cdcb53e573f5113b872d03fcd568bb80edda5c8ca9c1ab1665
-EBUILD rmagick-4.3.0.ebuild 2366 BLAKE2B 0ad9a8c230f133d774d1363d2254cf8f2c4b8ee35a8337e51bc6850ea165f529b7938dc7ded1b7e023d9c3668cf8bf356ec428f31230eab98fb52a62676e642b SHA512 73924c8d1fd9c55a7b22ba1f1e422047d5f6877f891e53fbb8518c23a26abc6b391488c53978d20b2effc78e1d984e097f56bbf39461816a54e11d3b642e3f26
+EBUILD rmagick-4.3.0.ebuild 2366 BLAKE2B dc629f3cbd2fa88d55f4c1335d24e166e90123cd1f2c7d0034a343bfb58bb4bcce02a45eb282b52f9d3e14a5c8383df657d1797ed299390176e160ad46677f88 SHA512 b65c9c8de35a07880d1c00dc71dee2eee3be443187136032bdf3c7c7137662ebb95905eef25cfbdb6f99adc997020bbabb508f72183c89ebbc0580d026ef977e
 EBUILD rmagick-5.2.0.ebuild 2104 BLAKE2B 7a20b61fcafc7ad469fff0742a1a32dc587ce95fcd8ff7651f85d383f7e45e1da4e2b96656dbc0c3f56ca73f7d561ba4fa1c1fbaf9c892edaed6aa4d1daa9513 SHA512 0c3e13da2dcec22854c56b15dad05de4a894000b8692ab8cec23f24aab4045aeb423f229e8990d3fe498dccbe56cef060733f85a268765ea69e523f09cab3d5a
 EBUILD rmagick-5.3.0.ebuild 2123 BLAKE2B 05f89d75f094615263e687e668608bb0cea493432bdf711af03389cf3cf08ee9f0d57b57f4059cc75c9457394b209e91157e21c001ea10dc8c55e7269e92ab81 SHA512 2b739cb37feaf6c76d881bf4964e6bf72a5880537d3581732fbb683ccca26ceae633cd3acfcab741cdc5084c33a2509e9faeca284ed5d280cef21acb4cda75b8
 MISC metadata.xml 393 BLAKE2B 3edbb25a18dc0c0d750cc690bdac1953e583982b54432b9c7440292d8af8277f9698da03947c64b0fa2c275d59fa278d9801d11e79970a330f7dd6748e093f2c SHA512 c38f821c322ae3fac665251d9b4dc936d4213bb8ecd3220078febe454238d56f5b12eef3dd0500dd06fad4a460ce4c16f08c709c42c05de3484fd7d0b3d929c4
diff --git a/dev-ruby/rmagick/rmagick-4.3.0.ebuild b/dev-ruby/rmagick/rmagick-4.3.0.ebuild
index 4ed1ad33e09b..4b5072a00b00 100644
--- a/dev-ruby/rmagick/rmagick-4.3.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 30184cf33f2b..222834d994ec 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,5 +1,5 @@
 DIST rqrcode-2.1.2.tar.gz 108650 BLAKE2B 61fdb8d2c5dde83062b53551932d74db40d6fec4245afeafd9f656a1dffeee7842fb27f750d115843642fa68305cc6af08a48764a59d8912ec759a11a3858d2f SHA512 b037416073c06a13fa1aebed63a9f07e9302ace7bb3a53015a296c1317cc284d680e6e8f93ae295ddf19cc90a74857467389d15cae1606207f039dde301e59da
 DIST rqrcode-2.2.0.tar.gz 109070 BLAKE2B 91a74a9c547f62f0cd83dd60d00b7af2c9363bd34f3987e43b637f906975f3e2b1f95ac67df80a0065fdd9fa3a7801e639fff1d2b36bcc4dc4abbc996fb6c919 SHA512 41d6882b28d15154b9cc5dc6aba30cad404aabad2b9101309bea0812b776cdb540fec3152ec5bb075f19c77a1aa67bc44d9b35e2161d189bd64a7d2517cafa63
 EBUILD rqrcode-2.1.2.ebuild 761 BLAKE2B 23eaa3cfb4310f37400892b604d7e18fa9c06dd2b72b41c03183c6afe134576ee56d8d3e81ab814ff10d514939a6589a7a51bdf0a817088f4a8b9aa0e90e3cdd SHA512 5d34019a2991bde9183413c83c30e61394fae2029e6de3b26d8f48dc28d0dfefb21730995f044f8f278da46fa70bed347004ddb93d43e02fb7e98ba0e3269fa7
-EBUILD rqrcode-2.2.0.ebuild 747 BLAKE2B 413a1127ef59b7e0ba26ac247a9db39b5dea9161a33ccc6e5b5d18eb38f64d3a890b278b9b57fcb9fbeca58935068627810a83b9b7241f1463cda06d107fe4b5 SHA512 18a6577c24c761252d349a5b6d2e54497381c46f225d1deef52ab1233ee9b5e759eade0fa24a692d564c785fd1e5afbeb0f1a63c28d970c122533698901ed694
+EBUILD rqrcode-2.2.0.ebuild 812 BLAKE2B 65f2c8fc5172c4a0ee3d62a364007ab93b2b6bce19d3f60dd6a23ed6287ef22beef7a90bc6d51585dab14dad9c8e574004dea394e7e6fe391e6c4c75411efabe SHA512 bd95f78689d8f666fa877d76784c2b4de3e1248cabce05aabb0a7595133e5d6bbc99db4afe7b7385b2c355d77471c902e27e798d5e224eea3eae732126b1af69
 MISC metadata.xml 325 BLAKE2B d102386bd4b3042e3e0100a19084727a8e177db0d50ccc32f910f8142bc2124c7e5050eb928c559a28f4c6cff17953de6787780f5b4bdcda660cfb89669996f9 SHA512 3e13cbadfa1dfe50855c855d4d8d35fb24323850eda683c06a0b0a691e492dc199f5676804d9aa7db877b59a467183e76f07d058447343e331c6a567d094c36f
diff --git a/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild
index 84f7f4b7259d..5a9dd6d7af3d 100644
--- a/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-2.2.0.ebuild
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.io/rqrcode/"
+HOMEPAGE="https://whomwah.com/rqrcode/"
 SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -32,4 +32,6 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e "s:/tmp:${TMPDIR}:" spec/rqrcode/export_png_spec.rb || die
 }
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index ce94732e94ac..af3e3eb92e06 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,9 +1,5 @@
-DIST rspec-expectations-3.12.0-git.tgz 217524 BLAKE2B f9638e2e5c83020818b2de4c06074b7d70f02655a50d598ecfcd8c79e1abb2ec351c5b7aed1ec0ea84fde140fc1a04349a6f2edbffda7cb697135ac0b5788b0c SHA512 51a80b5d45e8ca61a829f2130c60433999c6d5c60343d25f737bdb9d6864e89a156b29b549250f7c4248d5ba7a0cef11eb28e55d3023274051eb11f2d0361c83
-DIST rspec-expectations-3.12.1-git.tgz 218331 BLAKE2B 9a8604bef9d0118fc3ce5c56f3c53597bf5f4a2eb6a85977fb73ba43e585fc430c3a658ed6ca5b2b9c7fce7e11add81303734bac4bafc8331b221eef8eca4a8a SHA512 a0412cbf55d6cc3c0671abb3cb64bbc9473496aeb8adaa0fa5ae35f0036635adf5f894db0a9150002e7a69cffd1bf2b0c952672890197559be5c54bd2b508b64
 DIST rspec-expectations-3.12.2-git.tgz 218501 BLAKE2B 9b4dffb018d11c6d2bea399a7c1c3ebea157f83231d50e641998e0cb77e85e65c097a5d21e6989ce4c123df00137146b409fa2af102691867195fe42f1e11735 SHA512 6695959bcb185654e7ae96eaf112263ab49cf89f32781ab2b445e11e5d04b070295c9fa051ed6f4925b7cce78fb233490ad12618ac8f54d24a328ae3a6788859
 DIST rspec-expectations-3.12.3-git.tgz 218754 BLAKE2B be6c6c50115bec39758f792030363de88abf5affa8a4df1161a386fee3dfb620542fca6225779e76aa2e72d1f782b65ef9db393be061e9ed47c72d96f47cf981 SHA512 37f85555e0ba16b1a76f8d59571312febfc802eab1a27ff788d57bb34f410867e753dcfee83ca3d70367b77ad9f823341c653901c8ff02c75df6863937c71315
-EBUILD rspec-expectations-3.12.0.ebuild 1273 BLAKE2B 8a55a6c36253649a955fc8ce66910d8479c09888e5eacc44502d4b959cfa7dd767906c9aa30870a65993e3255225db0e950bd3082d64c35ec26d9da523d153bf SHA512 3c494b89756b2b0a199f480605c28fad84f973e356d22bb0ea9d53cca5720cdc607e1534a0eb55ec96619d9e4541f53a2ceb97e91da2df70a70ff2331ffb3206
-EBUILD rspec-expectations-3.12.1.ebuild 1266 BLAKE2B c907d34eb226c9fb97337b977a3f01c7dfaa40e46ad7ab6987bff0fba428714f9a185f900fbdc35a3a52261aab55af67f28aff3fa7cd0246d0a23dbfbc7d02b9 SHA512 c20eb3d67214b6d361ebe058ecc5c874f0a3324afed2aedb556a523c12d5b038f147d7e0f2d0d07659c26c76cf17555f4e4fa7812345a6dab58a7fd352501a91
 EBUILD rspec-expectations-3.12.2.ebuild 1273 BLAKE2B 7885c2775b56cacdd66f44677b295e58e06dc41493bd84f766080912803758be91d467205656e55d5153560c0908be0f53a6151e4b00458da6d273cd45314189 SHA512 2dbef5f55334726817c4a2f4e2f7638a2857619a1543c8682066f9f54ddc2756d93f804d992dc377fb7d6a3782d68a76f9f5606b67f3f1255d0975c48cbf01e7
 EBUILD rspec-expectations-3.12.3.ebuild 1395 BLAKE2B 1c949e837f543fa6f85909e94214e3f4bb0e199d94fb105f34fc0b87feb58d83d3eabd06395b6645b9941e745f82a5c5591acfa9d11203605dd29a9ccc6a4010 SHA512 99f0c8c2bd464881e8f3fa607a9131258120769135abd0c4d6866668749d0219a441329b83fbfdf47a32e81638291a24ce50d515733d970d56ecc471af21262e
 MISC metadata.xml 351 BLAKE2B d819679f0a74e7885241c77f001e1522143ea052a1cd511d128c3321aa96d6060b98ef11c615165f631d4081f5757c7ed463de58f44acb6187d026ce86a2042c SHA512 1f43d7394a1fc32d2aae92b66a513af0572ee1ed4bed3d391b4774df97919113ec9ec9d0da68e26f1c5558d877e1c8fef01aca6b92ce6b70bc3b256ad70dade0
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.12.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.12.0.ebuild
deleted file mode 100644
index eca130d8b3df..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.12.0.ebuild
+++ /dev/null
@@ -1,47 +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_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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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.12.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.12.1.ebuild
deleted file mode 100644
index ac8cf76b410e..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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_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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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 b01ddb0bc7e4..38cb525af930 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,8 +1,6 @@
-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
 DIST rspec-mocks-3.12.5-git.tgz 207219 BLAKE2B 8cd6b706df056fbf896164f195338bc3e3f77393b0c8550a7e6e149a337de2efc0872ee50320d0c8e3d5d462ce3106b1cc34b1ea5854794e84876c32d8a6c4aa SHA512 14cdbc38e88fe6a9d25c833814074bf94ee529bc8c2f13b5bdf74e9078a264d09f6b38e35966c1005fd6fbbfb004276fe1cdc5d614cf9a15550898a40d0dd474
 DIST rspec-mocks-3.12.6-git.tgz 207213 BLAKE2B 0b8bded9c6a04bb79910784e67f97028b9935b9e20e6934c3d1cccdf7b981b386a8dfb2e5e0c1f58fbbc2006fb68dabb108444b0f284b7f7f3b39bb73cb01cdc SHA512 f11ef99bdef109e3b332e0cc79e0d9c46db906b0c939ec6a89782219cea03e6282fe867212caaf2bf2eb272ed7ae1f4fe059a5626d131141925f731fcda3e91d
-EBUILD rspec-mocks-3.12.2.ebuild 1407 BLAKE2B 1aa60e883d5af164ceb6ba342e4cefa91e499fe53619d36b9f1854714b025d47d00ace77e7791dc7c400141fc7f838429b199b6f6384dbe4478acf0171ec27e7 SHA512 68ff22a9fbfb0767e45de1e5a575c609d943f123438d4c635a8da604d927372e4a530e9ed055101089955d54cbc3096d254ac0a066c26fea7a7e646c50b62352
 EBUILD rspec-mocks-3.12.3.ebuild 1407 BLAKE2B 6333b5e834880b68c0a561ee31495c9eef6cb82abb01f4efa08987940f385d19ce06ee5cbae77adc5efafc0465c85dccdc2c103bf1ba10603077ced4ae1a76ee SHA512 139dc470408d9fefe0a170104bbab9d4f768bfb5cc3459cb7fd6cc2057363b8b7ebc9f0f3ea9ded5d4f5dcd96e78c1f79a9056b1506618c2b06e1580f2350d04
 EBUILD rspec-mocks-3.12.5.ebuild 1582 BLAKE2B 508c0ed130dda249367993ea3d8e3ac77e5c8a043579d6968cfafb613cc38fc27476696ae76209fd28c9e9f9ec367801668efff5956c9106e34e8ae7461514c0 SHA512 f1011b7c297fd523de87ed4668d13b41f5c69cc2a2d6187e67a51f2b8b70c17ccd743a471afe3bd028325396014ff8b80b6b71029602612cf19a245e2d007697
 EBUILD rspec-mocks-3.12.6.ebuild 1581 BLAKE2B 049ec92bd82b83cb3bbb6a01406da6a34f06ef702b0754a47a1179778fc3e0adc305a7f5d1def344293b4be2d9a82bfe4098447196eb2a2dd27c506853d0beca SHA512 b5a5fe1d4a4e169424406d8b7c8d1b418dec15ca051b4b563a61c7a58ab2a7481ee2739160badd4a0e9c835d50ffb20083583795e561e380c250e845e82c723e
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild
deleted file mode 100644
index f02f29be76b4..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.12.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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_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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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.12.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-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index 70bc51a137d7..505b791a1afa 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,7 +1,5 @@
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
-DIST rspec-rails-6.0.2.tar.gz 161156 BLAKE2B d76836190225337e619ff56679a1096eccdbb0490cc20954770fdeafa8ced0ed7dfe7e8e9cb7ae4915bda79ced6e3bfe3b4623b11b4d049e7a5011acec6e5510 SHA512 cc2aa476e0d14cdcb6de2e7a254a666161bc0a0b7bca54001329e09ed27c10b9ba12c30352ce37e73af3a32bcf7e17569699b35e90c7f753085c79c43f69d737
 DIST rspec-rails-6.0.3.tar.gz 161663 BLAKE2B 02fdd54524e469387264013e5da9035014533b01ba1164ffe8e3038679585af0943ad82c074f987230b98f837395e57817134466ad33e02c42650dd3ebafb707 SHA512 cf0e34fbc8f653713dd1ba184f01c9ad33ea8739b8c46d5e377387b7c6fc0ebc7999d1a7abbb0581735297ff8a3aa9c665d13616a1eefd6abd4a85cd657203d5
 EBUILD rspec-rails-5.1.2.ebuild 1546 BLAKE2B bbb4289c5382ae628c0bd64998d79a51dd1974ef2be52d671270f1fc1060760f3daded54cb46f452cc2f0f656411f0d54207a59ae438b33b9314421786880e19 SHA512 38352010d95b419a8d652c186938fb798b75991cf4235aa8bb6ebf40fb8a55ecaa03ae9816a91cb5f5ab35cbd0222ac3eb3b0237f9ccc3c997c53080db862f0e
-EBUILD rspec-rails-6.0.2.ebuild 1551 BLAKE2B dd49dd6d9a5bd862b013548288488f5101126e251b50df6f7914f4d156053712adf9ea89f29a6d184f8fc8d0d21ce03c4b06942c8c50d6ac812d9d1384d69ba4 SHA512 64fe3e7a7dd6829c52ec9720129736d71f270c6573d10f32c2d60bd83a66860d857552c78c68db1196f69b1f49f659a07ee18c5c9823d0c0a90673ed6617fa99
 EBUILD rspec-rails-6.0.3.ebuild 1634 BLAKE2B 232908e599fea9dac78ac5362b6bba78002106b6d4562f306d5bc58962f5c50d0102ab5d54e37f197dee367fdcd82c099240f02e8d9eeee2665a7fe30e5ccf0f SHA512 3181a8ba73480c252d7bbb90ad824d020cda89e008242aeb1cf8269b2451b0eaf438e12a394673cdd8d06de30f7f0f07149766d9dccaa9301683db5b3698409a
 MISC metadata.xml 344 BLAKE2B 22dcdd62747138dcdc6e21c019acb6aee50548e35a9189b0b597e603869519d1ca6ac5e6eb32cb6eafb2b313adb1b74f16d7d282d4d19bf9f7bd4913788a3137 SHA512 e6782747b02a80fe50926710100a46ec28d6f55419f2fbb0bff4ebdf1db7d4f43fda195f21570fb5e149990026dd69e3c234baac337e5a6c5fa0c8f28bd62247
diff --git a/dev-ruby/rspec-rails/rspec-rails-6.0.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-6.0.2.ebuild
deleted file mode 100644
index d6034dc7d399..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-6.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:7.0 dev-ruby/activesupport:6.1 )
-	|| ( dev-ruby/actionpack:7.0 dev-ruby/actionpack:6.1 )
-	|| ( dev-ruby/railties:7.0 dev-ruby/railties:6.1 )
-	>=dev-ruby/rspec-3.11:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	#sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find */' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index d8a0472bcf2a..105cb23abe21 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-progressbar-1.11.0.tar.gz 61341 BLAKE2B 558de9d15f6c3eafb0a9ef0b39db279727651c8f86234f3ffad1faac7e9ab7f6bdef6662fadb2132bf10d70bcac9412801a695e0bb3afa5879a48dd363920734 SHA512 5a5c8a6af410746ef601821ec171933d781d32bfb7cb5f67f9cf877824a399941c11be69bb74380941f2271f6f5139928599881441f88860a71f8b7f7b55d4b4
 DIST ruby-progressbar-1.13.0.tar.gz 67185 BLAKE2B 27ea25e4caeb70aefb2523a4f4399056bdb9973deb567fc80eb9daeab6193ecc3693c8364bb43fc94906e6b63a0db1ace6bbd9b00defa0e02177983371b54ad3 SHA512 64723422d6216f2640bc60c8068c8d0437fbc5f315343b13c3167130d868a0aa978f098554ace3ea71406688c0b3c0ed94296adc6b9229ea14df5dbcb56322a3
-EBUILD ruby-progressbar-1.11.0.ebuild 868 BLAKE2B 3c96fc875a0ced40529a234232497743bc56bd96d9b87458af180823c38a5c122f22396911f388e7f4014436d85a4902e4a49ff8acb1d1bfb83f9d569e68a5c9 SHA512 79691b4ff9eb450f657d1905e9b0ffdb68128b758b99474071c5fec4640566ab88650a09a4981df43e320c12a9284528486def7e4930c89d6b085860a1d89edc
 EBUILD ruby-progressbar-1.13.0.ebuild 858 BLAKE2B 80aa1c556237e00e59fda8865d65b078b167900a187d31d612756d04dd35c734ec9ab6adf672251a661777c8e1ffc6f43e64278510d6d91419c1b90cb5aa6bdf SHA512 f1845190572b1119bd643111cd3f666c196d7745d39fa23627fcb3aa672d10f5d035cad1fcdb06e74abfd6e8449ceab88ea6acd7e4527855955825edee18a9d3
 MISC metadata.xml 353 BLAKE2B 7805fc15a01ee29282bd6097c97659acdd06e1437042d9ff67f2eec8fa0800361e143741cb28436a890ab4952777587e8058c5a6c40d6d6100d5aad7e47f160d SHA512 b98e1e7fae3dd752ec27801aec152ec007d11cec4bdbd125b906ef42797052a5f7ab1dc8e718f133243a309a4aba267d4bc0caba41701b25bab13bb4442f4f7e
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
deleted file mode 100644
index 4db555a80ec6..000000000000
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="ruby-progressbar.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Text Progress Bar Library for Ruby"
-HOMEPAGE="https://github.com/jfelchner/ruby-progressbar"
-SRC_URI="https://github.com/jfelchner/ruby-progressbar/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="ruby-progressbar-releases-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/rspectacular dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/warning_filter/ s:^:#:' \
-		spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rubytter/Manifest b/dev-ruby/rubytter/Manifest
index f2e247849eae..10a6fe0050c7 100644
--- a/dev-ruby/rubytter/Manifest
+++ b/dev-ruby/rubytter/Manifest
@@ -1,3 +1,4 @@
 DIST rubytter-1.5.1.gem 15872 BLAKE2B fd4f3be2570f12a900fa031a74fa6b4e053bc966e8c086d099fb0716c80515ccf1df63d0634af676a95541329029b932911262db5f377a1bc32a41bfbed5fdeb SHA512 79be7b7803a53db654a14ff83da657e3e5016d5bda61e8c127dbf6d85231a8c115d38041aba99fdabd50825135b801cc444cca84c13d174004cda8cc4760bd2e
 EBUILD rubytter-1.5.1-r2.ebuild 778 BLAKE2B a209144f03dbc29ebadfd041fbd0a806c3c1d34ce73ec2f93a0397e3e35c581873e371e54e9634f31d210b569e009bedba535cb9849af42fa536a28c7f2398db SHA512 353aa281cddcf870320689356050287432a5866d25605ee1589103430b8b6e5e6171c8c65c17c1cb0be3ae38beda59cf3aae2c89c0cc65d6930193c9d9346b66
+EBUILD rubytter-1.5.1-r3.ebuild 771 BLAKE2B f63d19c517d9af7dc5c78466d6e94ef7f484c0ab784c3ec9adc54855eaaf9703733a82a786c52010d5fea224fbd3842466c6b345348db32c4ded74f94df62e5e SHA512 021fd65ff4fb49517c886c9dacca93bba9c4f12e2bf354e02eb61d873ba03f426a08041a6ff3a60c6e12101827d904a625e931bf072e5b64806b1171fc4a9c99
 MISC metadata.xml 436 BLAKE2B bc0038924e0a73902d58164b446280e3bd5f6ed8768e089dce94fbd07af3eceb29e6dd785a86be5df9075bf6bbbf0cdee736e19789c25be2880d44ac86ac6a16 SHA512 adbdbb0a1799979f8538ef52929e5949ae617b33884b1a3a3748fe480b9ac906b8d24f4159ffe079dfd355f792ced4e8f0ae5e5d425e8018971e6936a2057479
diff --git a/dev-ruby/rubytter/rubytter-1.5.1-r3.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r3.ebuild
new file mode 100644
index 000000000000..30ab34eae74f
--- /dev/null
+++ b/dev-ruby/rubytter/rubytter-1.5.1-r3.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="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rubytter is a simple twitter library"
+HOMEPAGE="https://github.com/jugyo/rubytter"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/json-1.1.3:* >=dev-ruby/oauth-0.3.6"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die
+
+	# Make specs work with rspec 3
+	sed -i -e 's/stub!/stub/ ; 250 s/pending/skip/' spec/rubytter_spec.rb || die
+
+	# Make specs work with ruby30
+	sed -i -e '27i{' -e '30i}' spec/rubytter/oauth_spec.rb || die
+}
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 1f0663782255..8198cfb0fc16 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,7 +1,3 @@
-DIST serverengine-2.3.0.gem 42496 BLAKE2B 944e0e6b6bd31b6609e21fac0ea688b9a4acac3b02c4c1f06a34fe29a51c67db79e9a55c43243ce601d42a30b31ca1da605caeab05bdd9587536c4fb540bb5ce SHA512 0887ac556f9f4faa7d8e25743b2f79694153c0e7e39666c8ea02d0313c17835e0e5697da498ad1b23612ec938d8d9f430cfb9699711479ae088011c5a7fee4c4
-DIST serverengine-2.3.1.gem 43008 BLAKE2B 81bee04d87bbb67b048dc6aa423f1eee431776d9cd2f215854cdba2abe9c5bc14a5575b42129cc91780a893509ba38216a39f7a064f0c30301731aae79b49d0f SHA512 d6afb481872039eb6ea35c2bb0741fab1839f881044cb92cd9318671c5fddb08e86decb87e9954d9ded33239a7d7387ac1340a35478ee7d049fd742ceb4e0b8b
 DIST serverengine-2.3.2.gem 43520 BLAKE2B f07972501906ee8a8418461d80125d019364b1d025740d22e50f862e70054682affdb1a65015e38b72ab971792f2d3cb8c41d7ce45c5f99ce9398c2ae236d6bb SHA512 9ca32740d4579fb8cbeb613780ed78a9a2e5a72fb427d24aa26a9a805f83de0d2840eb3de6e2e4205a771e1c58bcc4a171869807fdb49ddbb017ceeb8ca08c73
-EBUILD serverengine-2.3.0.ebuild 984 BLAKE2B fb443f4138326e7ce9b6b2ba609ab646094b24ab105485d3cce3b21ebbf24a5d5b9ce0b52bf1fdd38e604a21d78d80b70c8f562bf34281b31709f503ad2e8bbd SHA512 fee7d7eb4d271da3887267812bc78863955f9a1a3c2399e462ededdfe5ca91835319ee131bafe329d3303c17d94f3b250d63e2d2f6fb8bcb8d1280acd485635c
-EBUILD serverengine-2.3.1.ebuild 1004 BLAKE2B 8b7e7250faeeccbf7d4dc43ed0da66c494699461fa5697445d3dcba461ed79ce465e3402376bc9140cc52e8c6d33c57ae005b1768444b8dc238d06fa5f2ccd98 SHA512 c74c9d3aeb9dfaae148c864d33639a63e340ed2ed9844a32704da67e800a05e683cbc73040eeb01da9a077bd66e6ae6630f1eaa818cb5d69d37cc177927c8c59
 EBUILD serverengine-2.3.2.ebuild 1011 BLAKE2B 93ea619579775ccc35fb213dd4dfdae74c83eb374eda6d658bd7ddce91b6bb8c294eb6e46e057f93298141a3d8ad5eb4f3cf16bc1ad3cfa3840ac0faf3e4cd1a SHA512 16b2161f841448787570fe9f2bd57c358b28e9964eec210874d60305c9ec13daa79be0725042277139b832d2261f93b575b34db4cc272d69c8f15a8d401c8697
 MISC metadata.xml 353 BLAKE2B 54a03fe8df31db127396923c3d900d76e8e5a4346c43ccd8ade40b61bd0eec6ea49fbda044e07cdf7bb825931407426ac4657552dabccf7f87fd4e537db1827a SHA512 7ade9f2705b8f8edb735ee5a0e6e8d3ce2761a27e58125915f77df354f79c4932e36ea8666fbd3978771d4c9d6d5671579f2eb77738cdb1496a7c90b2df6ecc7
diff --git a/dev-ruby/serverengine/serverengine-2.3.0.ebuild b/dev-ruby/serverengine/serverengine-2.3.0.ebuild
deleted file mode 100644
index 5ca4aae1ebae..000000000000
--- a/dev-ruby/serverengine/serverengine-2.3.0.ebuild
+++ /dev/null
@@ -1,38 +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_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/3.0/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-
-	sed -i -e '/color_enabled/ s:^:#:' -e '1irequire "fileutils"' spec/spec_helper.rb || die
-
-	sed -i -e '/raises SystemExit/askip "Exits rspec 3"' spec/multi_process_server_spec.rb || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/serverengine/serverengine-2.3.1.ebuild b/dev-ruby/serverengine/serverengine-2.3.1.ebuild
deleted file mode 100644
index 790f93f3dcb5..000000000000
--- a/dev-ruby/serverengine/serverengine-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +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_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/rr-3.1:0 dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/3.0/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-
-	sed -i -e '/color_enabled/ s:^:#:' -e '1irequire "fileutils"' spec/spec_helper.rb || die
-
-	sed -i -e '/raises SystemExit/askip "Exits rspec 3"' spec/multi_process_server_spec.rb || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-3 spec || die
-}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 340f0de2c0c0..a9ba700a6e32 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -2,6 +2,6 @@ DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686
 DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
 DIST shoulda-matchers-5.3.0.tar.gz 244767 BLAKE2B 4a1a006702bb352acb338c71e0c3152bfce288c51d676c194ce3135d41057d119c02053c26e5e9079dee49514f3396f6f0155fd310063713a975d747221d8e34 SHA512 5794f1eafdb852732e35433b7ba06975a65ec25363b8c7dedf154644fbf65ecb8b929da538f1a49ad4e767b286f7e8910cd06fa6f41f5ccc6f0e8a62f498c56e
 EBUILD shoulda-matchers-3.1.3-r2.ebuild 553 BLAKE2B 4018b0649c13383d4910d292b0bdfe09f53a9288bcf324bd0181f17ff02de1812b6029d69e87da7defd15cbc2ffe5b2c9f2853749fefdd108f8d75f0f54fbb59 SHA512 cf36111ec1b63f418bd29f5206a0b707269f3db13369c0e20b870cd3083acf5199059283b880bb1e13e60fe68dbb755068f61bd20df9b2780279b542730a4c8b
-EBUILD shoulda-matchers-4.5.1-r1.ebuild 827 BLAKE2B b7855f75f7aba0044c15eb92349735f7107a65db0b3d655ec029d3fb3b82e883206604dcf3bbee044d65932083629325abfa28c5a179892d718d902f8fd0c93c SHA512 8a656bcff60fbd1956b9686904c817fc974c68753e4e5197015084e02f7b5a7780fec1483e92ee7e4ac4df713fc960dc89dd4b4ca0c2d7070e799efa8f62c1c9
+EBUILD shoulda-matchers-4.5.1-r1.ebuild 827 BLAKE2B 054435c826e79506146adf6583a0985876c35e1198110d60f816da3931c14a9cc47b2822652da5656c98856429865dfc29a8cb73212f60cd7f067c5a32e3133e SHA512 a461c9604d5ed04819bb9968b40a9ebbb4cd7c0834b79675264a57d2935644dbb41aab31a7a58fbdf4f980d63c15b272f683e5481a64777279e8576856b055bb
 EBUILD shoulda-matchers-5.3.0.ebuild 1616 BLAKE2B 766f661a3809b927a18ff0b059dd039305e8a26e27537b1e212de1a99685a29f4348b7b16a32f34216554f81722c1670b2dfadc25bc91f05c18a1e01e4fd5aaf SHA512 82dc96d8f7fff971e8c68e2a2a5fe32b2c1c7ec981963ca795a963a60e5abb9bdeec8274287dfa5b67c114a1f90329eb8ed362a2d6f7ebeaea6428bb57a4bb4d
 MISC metadata.xml 468 BLAKE2B deac17b1815c5381c7220dfd64c5b07dfcbb40ab1e9a3d60c69113e28d4132b0347e825a7c2ed836a541f3f97a898e794f4f0a9712045959c490962c757f95fe SHA512 b6dd01f25c76a89d822835ef56d8968eb53138ccd44507d7863e45834674eaac84092b825b5ef107be02109f82c5dc5d4ce60d21729da071b375f52f8fda4c4c
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
index 7c99a9c59aab..bcc4b19232fb 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 3a25205caff9..258e9763dc04 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -3,6 +3,6 @@ AUX sprockets-3.7.2-kwargs.patch 829 BLAKE2B 406a79b455e18464e4f8e1028785f0c4d39
 AUX sprockets-3.7.2-ruby31-host-uri.patch 3066 BLAKE2B 7bb5149577e44500a75ffda5c85d7f3490ad686f683430d477c4c09313453a91f9f4337a9dc9427fea1b035a7a167754784043498e9c5deb889fe0ab58403c9e SHA512 da5cb0c5177000a028711f32dce1dcd44542e547ccd709bb06b812002a37ce0634b5151ab77e8feeba5c61f4e18178605b0abddef81683bb98fb608492c3f5d7
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
 DIST sprockets-4.2.0-git.tgz 422096 BLAKE2B 466e328895e318b9e0eecf46e91e0c6b3c04cf5dcc2b6004de2b81b6d2ab4745b9bb8b2a14bc6b9927f169e0b936c19005aa01aa01e805007d37f297750c253e SHA512 8b22cafcb439dee7f4397fae64108854047ea21d7b8faf80d60b2907d8318f28d168014645b48f35f6a765a7ec925697c3755e4ed8d7724f453cbfae1f10880b
-EBUILD sprockets-3.7.2-r3.ebuild 1798 BLAKE2B fc2680d7483a8ed481db6d2155f9511ea2a014d1e94322ebbd2dd64bef74cc82e2c33720dda60f282fbedafea4e923be8c409d83d4cf5e178fa7221e04f7c073 SHA512 62cdba2ded9828a4d7573daa8313d94b8d455bab9502350c440f780e2eff5c28df27efd6e1cd8757327efa6156252414817683b996d8ae7e2f77771716082f99
+EBUILD sprockets-3.7.2-r3.ebuild 1949 BLAKE2B dc3b76c667f806be09255c16b33696a996e6dd9c3b1fd3683d0bd144e4829aee3aa6c69f4113642a0ecb679d28b28b29667836c1dc210fc0ccbee61507344be1 SHA512 25ac8a60b1cd54b26ea3fea304a08d16a56d5ca453219f054ef05d812b5448447b12817bd9778063a5cf7ba549fb530a3895590fa2ca2d801d58182d864523f7
 EBUILD sprockets-4.2.0-r1.ebuild 2086 BLAKE2B f8996f42608c753dfd3ebf5088291e673b36ac22de23414bfc025f37767ed4691f85edc573eb44f388853fde3e21a0b060efd30f9354062a1780f067e3000135 SHA512 4b51dc0a061c33c73901606db55b3e30d38be01d5a2f0057e844dbdbb61d56afa68bfa72bc5212a97aec97ff6310bb7e3f7bea32e2fcce47881ffb9b3c0742c1
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
index 0f9f971f3c7b..d9704edc5370 100644
--- a/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
+++ b/dev-ruby/sprockets/sprockets-3.7.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -36,6 +36,7 @@ ruby_add_bdepend "test? (
 		dev-ruby/rack-test
 		=dev-ruby/coffee-script-2*
 		=dev-ruby/execjs-2*
+		dev-ruby/nokogiri
 		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
 		dev-ruby/uglifier
 	)"
@@ -50,6 +51,8 @@ all_ruby_prepare() {
 	sed -i -e "/bundler/d" Rakefile || die
 
 	sed -i -e 's/MiniTest/Minitest/' test/sprockets_test.rb test/test*.rb || die
+	sed -i -e '2igem "rack", "<3"' test/sprockets_test.rb || die
+	sed -i -e '5irequire "rack/lint"' test/test_server.rb || die
 }
 
 each_ruby_prepare() {