8 files changed, 49 insertions, 57 deletions
diff --git a/dev-ruby/database_cleaner/database_cleaner-2.1.0.ebuild b/dev-ruby/database_cleaner/database_cleaner-2.1.0.ebuild
index e85d98e4f3f8..927e0a30b685 100644
--- a/dev-ruby/database_cleaner/database_cleaner-2.1.0.ebuild
+++ b/dev-ruby/database_cleaner/database_cleaner-2.1.0.ebuild
@@ -17,4 +17,4 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-ruby_add_rdepend "|| ( dev-ruby/database_cleaner-active_record:2.2 dev-ruby/database_cleaner-active_record:2.1 )"
+ruby_add_rdepend "dev-ruby/database_cleaner-active_record:2.2"
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 2a327d8bbba5..5688d2bc4ffc 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,3 +1,4 @@
 DIST net-imap-0.4.17.tar.gz 254727 BLAKE2B 57311009a92d1e68cfa833dccdcb7d42d56cd3b10909d61e1f41fef4772dd5308c29326b446d8a3f8c0cad078adc1333b522e7c9aafc4df20dc9bf1724c33320 SHA512 9863a79a469ed5fde839c419f01d3f8658ed593369bbf35bf235b9c80098ce32b626eb4458bf7324fdae4d9017803e7c7ec098489e3d90140911819f2981a308
 DIST net-imap-0.4.18.tar.gz 254836 BLAKE2B b4980717dbebae729d83899265c3883f18afb5d63f8b26b7df7e1ca50df1b3a9c72d6b53563439720f11b27a936549505a7571d273e6f7d44f1b285cec616dd7 SHA512 d98e382f2a6c194a487c20fff16f7ca2427704630f79f3e0e71c30096118d69f358afc190e41e25d00690277173732be01133e194caec303315e9450b27f382f
 DIST net-imap-0.5.3.tar.gz 277208 BLAKE2B f518b18203d67c01f8ebd44f8f642de1e3cd33b1e5d99785611eee6a0cfb44e1e34845d19d082d28299241b3347116b685848b7c5e0ace946122c431280bb99b SHA512 2e50aca7e577a556b29b6301f93afbd3e4cdcf534fb298c37a8816e21b20b3497c773e78954e23a18608fcc4f75297892fbc3ddd1a68384ea43468cd52e10bef
+DIST net-imap-0.5.4.tar.gz 279986 BLAKE2B 2a294b89b9940ae132aee3120d7006d6b41b84445809ee5689b94c66a09a222569cf7b2755e98c52cbeb1b8fa3241ba5a255762970b0660721779f32ceea240e SHA512 e013b6c2c2933e69689a1b4912f4b5bd27e29118da04d74311d4f87032e9d5e74ca1ddd8bf3362763908eceab5f17dc4415ddaecac25cab7e6bd25c2fe6294f9
diff --git a/dev-ruby/net-imap/net-imap-0.5.4.ebuild b/dev-ruby/net-imap/net-imap-0.5.4.ebuild
new file mode 100644
index 000000000000..cf33c1c70711
--- /dev/null
+++ b/dev-ruby/net-imap/net-imap-0.5.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-imap.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby client api for Internet Message Access Protocol"
+HOMEPAGE="https://github.com/ruby/net-imap"
+SRC_URI="https://github.com/ruby/net-imap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/date
+	dev-ruby/net-protocol
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/digest
+	dev-ruby/strscan
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-i test/lib/helper.rb || die
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 261bde88aab7..2603c0112bcf 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,2 +1 @@
-DIST net-ssh-git-7.2.3.tgz 233375 BLAKE2B d8eda3964b66e7a7c55f70a1ba763bacf192edcb6f32f679d36b4c589c6184af9911db6db4cb28e273a27ac4bd68afc4b0a0767d98955b2e37bcd65444c77d8a SHA512 621eb0c8080347614e924c236646cadaaceefb0894a818dc60cebc7c09c87d6ae6117f33628ed48fa8598fdb74146c9d2f114b178bd119908df8396103ceb4d9
 DIST net-ssh-git-7.3.0.tgz 237275 BLAKE2B 70e463207f38a1ca45c3b0218289c99a7d0c212ff09f9178d1f929002d3b99af52d6fe2c397833f7e3c6742bf099b374ce62a51516db0a1620b60286724230a6 SHA512 d6278942511d4b5423af6e6f802b7ee20c795c534d0a7b08658d8962b2da49444c545d146851c0d214975fe0f1133b416a9295b9605629edd611160651698673
diff --git a/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild b/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
deleted file mode 100644
index c4bbb8e4bba7..000000000000
--- a/dev-ruby/net-ssh/net-ssh-7.2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="chacha20 ed25519 test"
-RESTRICT="!test? ( test )"
-
-ruby_add_rdepend "
-	virtual/ruby-ssl
-	chacha20? ( dev-ruby/rbnacl )
-	ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )
-"
-
-ruby_add_bdepend "test? ( dev-ruby/base64 dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-7.3.0.ebuild b/dev-ruby/net-ssh/net-ssh-7.3.0.ebuild
index c4bbb8e4bba7..d3a1f4482aee 100644
--- a/dev-ruby/net-ssh/net-ssh-7.3.0.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-7.3.0.ebuild
@@ -29,7 +29,7 @@ ruby_add_rdepend "
 	ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/x25519 dev-ruby/bcrypt_pbkdf:1 )
 "
 
-ruby_add_bdepend "test? ( dev-ruby/base64 dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+ruby_add_bdepend "test? ( dev-ruby/base64 dev-ruby/test-unit:2 <dev-ruby/mocha-2.7.0:2 )"
 
 all_ruby_prepare() {
 	# Avoid bundler dependency
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 6f768dfb62f8..cee1c696c495 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,2 +1,2 @@
-DIST power_assert-2.0.3.tar.gz 17228 BLAKE2B 6a7927102deaf6daf0e4f17e7183ec4a862a57607b965c0051b1ecd22a4bf555c6f6195911405d2839a725f38e1e1b49ef6ca3a4209452ca149996071d28e47b SHA512 f5658d18b3b78e7757ddfc1ccdabc011076c009a7343eaad2748ca7aeb4d112bf19c70621cb938e7dcf1582c8bb7c5512017885ea51503b3ed274980b7d7c0b1
 DIST power_assert-2.0.4.tar.gz 17363 BLAKE2B 94462ece9c487c70fd111b2dbb1c66b307b7d58b70ec36a084de9a9fcfa47e74fda12d5d9672174d1b7b9884fbfa00debb9a6b87d70dcb1aea5c3a0c052f20e2 SHA512 0308104500b6b7ab8fd409455be749d446ba499db7ba04541bcfa7063801c57593ac96b6f7c45ceea4f9bfe3d7e2e4befe4e48f2eced864f5e782902837f8899
+DIST power_assert-2.0.5.tar.gz 17392 BLAKE2B 74c568fa02a2310ca97ccd85d86d04e6b08265900f4fff20180844e8e28d5adc0bfee807442132a237c95c361527cec85c2fa1b5b19411da31b346d7a8bcc1c4 SHA512 52033582b00a1006b05b7ab608c467a0b19cc404de4df291ced26e20109670c9ad33a402ff47a615593581bba3d47fc7f2510aac21832fe19a641e961ff71fb6
diff --git a/dev-ruby/power_assert/power_assert-2.0.3.ebuild b/dev-ruby/power_assert/power_assert-2.0.5.ebuild
index fa9f136418ed..8a49e680c4bd 100644
--- a/dev-ruby/power_assert/power_assert-2.0.3.ebuild
+++ b/dev-ruby/power_assert/power_assert-2.0.5.ebuild
@@ -17,10 +17,10 @@ HOMEPAGE="https://github.com/ruby/power_assert"
 SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Ruby BSD-2 )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
 SLOT="0"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit )"