6 files changed, 50 insertions, 56 deletions
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 7050a82d9beb..46259bb430dd 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1 +1,2 @@
 DIST dalli-3.2.4.tar.gz 71999 BLAKE2B bb4ea91328e60740d8be0664b2a359007230efcc87611e620b08cc18292e85384780afcc09de575314f3bd39d261b8d26c558f4329ba55f13f1306681ce0ec71 SHA512 5f5f802a76b1d611b42251c8eb70538cb1da6b43bb681fb7e0b4a7124bf46ab4d89be4ab31bb071d7205c897ba940ef523384efa18b5723d57d8edaea2198350
+DIST dalli-3.2.5.tar.gz 72496 BLAKE2B 2a8665aad98629ccab873a2b6b6661304b25dd2374ed3685f97dee83bf43c604088e43229ced951453d889fab7a1ec35b7fb3f0028858cf890a6013ac82b64c1 SHA512 ace079e3c9f7c30e2f266a07f87e58cbf4276f5ca4744ade76782a6a6047296bf5e23d40a4c1f4596b1eb150501c460f7cf89b33f308a774bcfe5825ec635760
diff --git a/dev-ruby/dalli/dalli-3.2.5.ebuild b/dev-ruby/dalli/dalli-3.2.5.ebuild
new file mode 100644
index 000000000000..cdc6ec7366bd
--- /dev/null
+++ b/dev-ruby/dalli/dalli-3.2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4[ssl(-)] )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/connection_pool
+		dev-ruby/minitest:5
+		dev-ruby/rack
+)"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; require "dalli"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	sed -i -e "s:/tmp:${T}:" test/utils/certificate_generator.rb || die
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 11e915f6d1b5..7a5b749edd54 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,4 @@
-DIST rack-2.2.6.3.tar.gz 279185 BLAKE2B 4757add4f591a5e9baca2db060736f1369b04be547a834360a5d84d210db2c550febf654eb6ee9878e38d802227b94e7ae2c38bfe4c5fa045582d905ade61c4a SHA512 e69de4dcbb97c9481ce55e3d1c43c7b1393314d2c42fbd7660abb939b74453ea77a4bf1eaaab2a7c9ac2cca46fc3ebff40eb5cd91b6567f50e3a05e2d40dac24
 DIST rack-2.2.6.4.tar.gz 279212 BLAKE2B 381baa25cad48603891c0b40c463843d112b380d0e99cb985ae2d6d59b84dfe9dd33865bfcf3602af81cfe54f8e0fa57166dd4764069b2de054dd1826b3da993 SHA512 3b7cc5ed8b74d8e03a343fbc13c808f7cefe185330e6d020aebbcb6d4852b2485a1b780e14c8593c02fa264ba31b3005c47c6c5d9a432cbf5bc7ec208e279f4a
-DIST rack-3.0.4.2.tar.gz 788276 BLAKE2B 9934c4e448ee09c9a910ef8259957737e4d213d7ae5b37380b87441eb00845f2793e23fa16da26a5fe441e8449a95a5893cc52a019087402e7cae7559a2f6fd5 SHA512 9cd2c9bcf41a6203e72b63fbd0e78f4a0f461751e45e643f40a4f823f3922b05fc0caaa10fe79885cd8fa48948e79e0ccd5727f9abeca2a4052a737d4632e76e
-DIST rack-3.0.6.1.tar.gz 789191 BLAKE2B 1431e6e97afa503a03dbf3deed67e438b00ad0b74d93df91d248235bd135c7bc6f45da3d488f531b9f00a62f9c193bfec0e301507250543abc1f66db6fe69b8e SHA512 afcc93723c797bbf7a231e70ef8336053443dc8028bbb26bb58d4e1c17ed6a53d178d56fc9b2d33be5bde88ab634fbb233ac133b8a991258469c564afdd5758f
+DIST rack-2.2.7.tar.gz 279222 BLAKE2B 0c7fb54aaa20c2e840a791240199e3981f70634f9d241d1167b3efca53156d1bc7129c64a7c3f0a82f6001bb46632969041b5310020601d55719beb538972f5c SHA512 c89b7ed8bfea7f53e6f2b507d9668af8220750be336180d0ccea76d86359e7cacff74e6a55e5757ff7f79d2377049f4268d1851f4b83d6ff474f0002310a0d29
 DIST rack-3.0.7.tar.gz 788611 BLAKE2B 99f4b7394c7b7d78ca3c7888369355437383ed5e3f3bea1bae7117019df5588a2c778270308309908223f5c509c97e6792b2edfeac6b3e3d6815e147bcdab375 SHA512 7ed94b59a4c8886ad94898eb1a7dd3e363fd1b2cecb79713ab744853e7c3da7a1d10034235a1aa5da4cb50c1a5d7c86c4d524ba2a328bbbb6289e9f1f7e37edd
+DIST rack-3.0.8.tar.gz 788610 BLAKE2B 9a591242e37f10021a2779bc495ab0ef954eb6474efe279f2bc6417e4255d83a92f156a9bc52fe90c098dc23c26eddf802119fdcd739a05332bc398db1c12456 SHA512 045a1de846e984d2067ce647d0b3652c810a264fa4f84e9791a623ac5c5cfa5ab4b961c4cb0328b51a71f66082190741dbaac3f4dbafad7c5a8e97a71b169448
diff --git a/dev-ruby/rack/rack-2.2.6.3.ebuild b/dev-ruby/rack/rack-2.2.7.ebuild
index 40d0c44be96c..57ee5a5c1efa 100644
--- a/dev-ruby/rack/rack-2.2.6.3.ebuild
+++ b/dev-ruby/rack/rack-2.2.7.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_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC.rdoc"
@@ -17,7 +17,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
@@ -25,8 +25,7 @@ ruby_add_rdepend "virtual/ruby-ssl"
 ruby_add_bdepend "test? (
 	dev-ruby/minitest:5
 	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-	=dev-ruby/psych-4*
+	|| ( dev-ruby/psych:5 dev-ruby/psych:0 )
 	dev-ruby/webrick
 )"
 
@@ -34,9 +33,6 @@ ruby_add_bdepend "test? (
 # memcache-client, thin, mongrel and camping; not sure if we should
 # make them dependencies at all.
 
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !!<dev-ruby/rack-2.1.1-r1:2.1"
-
 all_ruby_prepare() {
 	# The build system tries to generate the ChangeLog from git. Create
 	# an empty file to avoid a needless dependency on git.
diff --git a/dev-ruby/rack/rack-3.0.4.2.ebuild b/dev-ruby/rack/rack-3.0.4.2.ebuild
deleted file mode 100644
index b12b68b4382d..000000000000
--- a/dev-ruby/rack/rack-3.0.4.2.ebuild
+++ /dev/null
@@ -1,45 +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 ruby32"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"
-
-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/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
-
-	sed -i -e "s:require_relative ':require './:" rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-3.0.6.1.ebuild b/dev-ruby/rack/rack-3.0.8.ebuild
index e01ec370183d..0616395f475e 100644
--- a/dev-ruby/rack/rack-3.0.6.1.ebuild
+++ b/dev-ruby/rack/rack-3.0.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md SECURITY.md SPEC.rdoc UPGRADE-GUIDE.md"