17 files changed, 123 insertions, 250 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6b487f03262a..e7655e9207a7 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 43a741a46e7f..b40a422ec6f9 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,13 +1,9 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
-DIST haml-6.1.2.tar.gz 669696 BLAKE2B 81398ca33af69a1cf79cbe6d49d82ca27489584dc8c4082c079606f1f029b99e6b4c6fb350a5b50da31349ca3cbd7b7d2913e521b401634f7442e03279753e18 SHA512 c059b96111c6e477874cf37f0463dd9150d00e2e5261e9dab8251e1f66cacfa647009bf4d7ddd60fd11582c3f41ce06515f5aa448358aa58a9df2c8289660151
-DIST haml-6.1.4.tar.gz 669960 BLAKE2B ae4194a7af653e60ec1f5a494a4f8db61a53c99790a9f859cf294961d6cf2d215ad5d2dc78f61355c65935aca0d5534604f0b2fe77dcaf9d3a6cfd775c173701 SHA512 fe866b524fd2f5e85e458897642cb39a97802fdf728182ae3ca2e828931d5526e0568e771a067161610dbb600d962808f417f9dee8b08ffe4baeb71a5566f502
 DIST haml-6.2.3.tar.gz 666083 BLAKE2B 8f6c3e6b3538fdd8b6937278073d532245d7ce53bfbb81f2ebc394160af50e8022475bf7225d3e8f8846d0088120de58829dacf91864b91bab4f0ffc18479322 SHA512 28c0031b62c44cf6b057ee88ffb522d2081e92f5d70fc25999b64a59a4430acd63bb9ee4e3fc34139a1a6fe6f678cde6c3ce08b9a5ed5d433d30d661c5983b81
 DIST haml-6.3.0.tar.gz 666327 BLAKE2B 0672d39857fa0dac466bc29468a76e71d583da6637ce8534eb4d84aa4388bdc0f42d747d74cc5389bd24faf428076c13cf1897edc93317b2da7b770830d53b37 SHA512 64ee2eb7fad2e0b77307dd18a268b53a7f21b78b99a8bf80831cda9f8b6d8be983e7a23ba62942d251e7baf2c9732e38c18b842052690e5bbeb27961ca139c73
 EBUILD haml-5.2.2.ebuild 1451 BLAKE2B 7e69cae6af682922121eaa2533730e193a8d559775825cdb1df218832448e727bed7625b512602f2a2fb44ccb18f9bdf27875cb5d4ba527bad9cb809798783cc SHA512 51556e02ae68e0cbe0546ea6a0953cb1157b0f046a8add4959470e083baefe9e97a8989ca24cf730e46a0c5ee115c056a7b9937ac4f99894de1ff07598bcf5a0
 EBUILD haml-6.1.1-r1.ebuild 1611 BLAKE2B 78a927e584ca28ae8caf906d05d4ef2e4cefbb44755edc40eac42ec0f5ae4ee0eea4ca504b66513afeea7e5b226e0f654b847dc116579c9aaab650e027b2506f SHA512 4cebc604ee017ed24c4b1e4e7481dcce78cd5c0f817e3c1c9fdfe09c7b3409b12838c332bab795dcd3c02e2536ab5806586d4967f776aa2fc69ecc44331d0bb0
-EBUILD haml-6.1.2.ebuild 1607 BLAKE2B c370cf85f1f35831f8ec35a3d1bd6bc0e1f9e41cf0ad3eba639af4ad394507f737fd55dd9d29bbc236e3a995a633e4f16cc771392658b5213d22b7793de36301 SHA512 3adb55b0165cffe45ddc84de30675075a378c3dff533328a2bd144d325705eb5a5ab0c993ab4a76c0ca93f824c6f0bd6af76227891d7b5e7dbe7b2c1de233cdc
-EBUILD haml-6.1.4.ebuild 1600 BLAKE2B fb81a92258504eb0feb922b57475372fdc68ed5a9a606bcd41d6147f1b424f10206c602a9fb7e761b4ce67a83ab132ddd87ae6172dc4c924259f4bedcd1049a7 SHA512 fb634c30b0af3bf3d39b2a3f1982dd306132c0827a7b4ee91e361dd0cc71bfbd8e252a2ac5f02245a03ac3afbfb239f9233e4f0fe38ceb3c418de3135f3bb465
-EBUILD haml-6.2.3.ebuild 1426 BLAKE2B fef69074b3d39dac1334567221f81d31a9fc0637715e551791ba312da43c18cd7babdcefff3a23302ec21d79dbae382c9780f254866931da28485c0c94b69c76 SHA512 0f0c9c54556646120eecece52154ef4ac6906592de97fd315eb8be267f4af9d8bb11b0dbc4e92ba6821643b79f6805bafae1c10a8db46083de3f8fad69755caa
-EBUILD haml-6.3.0.ebuild 1426 BLAKE2B fef69074b3d39dac1334567221f81d31a9fc0637715e551791ba312da43c18cd7babdcefff3a23302ec21d79dbae382c9780f254866931da28485c0c94b69c76 SHA512 0f0c9c54556646120eecece52154ef4ac6906592de97fd315eb8be267f4af9d8bb11b0dbc4e92ba6821643b79f6805bafae1c10a8db46083de3f8fad69755caa
+EBUILD haml-6.2.3.ebuild 1679 BLAKE2B de044ba409a6df48f95f84ea7d117c2bc92c2dc2d6b975215d72b446c1b62a664988c297006599b20404ce7bb5fe191dddd1b2e8dbea2cf910c3ea06317e6a00 SHA512 ab348560f3990191de81aa37837af9ee04eebfc13bc1750acadba1bacc3c02e30d6f406b67674758fd0ea89f3fc761c28d43d0a40d1f5cd35907e3d05db51d7c
+EBUILD haml-6.3.0.ebuild 1681 BLAKE2B c2b25f3e5f3c1975645b330cb29a0ee7a23b83d43a5cc3925ac801598a669e9e9f5855f3bb35787e11d3a11939ffdf57e84329c787b46281f226d28631f60154 SHA512 9de873a045d9d7cbcd05699a7ce94f4b7983abb2f53c2eb0e1cdc41d454c2fe72ef3a7c5e069dc7d79c9e82a8ddc8722037593c9d571aa0ea54391cf79410820
 MISC metadata.xml 384 BLAKE2B 49a1ec969b1de2c61646aef404bcb19961d7f7b6b8c0324c1f447c8847adb0d3667e653b4273ed1c7e177e7e5216e6275a7c664ee6917ecb48e69d89554a33c6 SHA512 047f50785afcb708d07a770c38e40d7c8be01455832f01bbd006608eb18af8a8470a21ab0c57b7304ad4e2be39121310d0feb1ac64163a1b5e4c1cbf61cb8bfb
diff --git a/dev-ruby/haml/haml-6.1.2.ebuild b/dev-ruby/haml/haml-6.1.2.ebuild
deleted file mode 100644
index 90cefede012b..000000000000
--- a/dev-ruby/haml/haml-6.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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_EXTENSIONS=(ext/haml/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5.15
-		dev-ruby/nokogiri
-		>=dev-ruby/railties-6.0
-		>=dev-ruby/activemodel-6.0
-		>=dev-ruby/actionpack-6.0
-		dev-ruby/unindent
-	)
-	doc? (
-		dev-ruby/yard
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	# minitest hack just to match rails/activesupport
-	sed -i \
-		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		test/test_helper.rb || die
-	# Remove tests that fails when RedCloth is available
-	rm -f test/haml/filters/markdown_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
-}
diff --git a/dev-ruby/haml/haml-6.1.4.ebuild b/dev-ruby/haml/haml-6.1.4.ebuild
deleted file mode 100644
index 87b992e5e5ee..000000000000
--- a/dev-ruby/haml/haml-6.1.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/haml/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5.15
-		dev-ruby/nokogiri
-		>=dev-ruby/railties-6.0
-		>=dev-ruby/activemodel-6.0
-		>=dev-ruby/actionpack-6.0
-		dev-ruby/unindent
-	)
-	doc? (
-		dev-ruby/yard
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	# minitest hack just to match rails/activesupport
-	sed -i \
-		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
-		-e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		test/test_helper.rb || die
-	# Remove tests that fails when RedCloth is available
-	rm -f test/haml/filters/markdown_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
-}
diff --git a/dev-ruby/haml/haml-6.2.3.ebuild b/dev-ruby/haml/haml-6.2.3.ebuild
index a4ac5c0cb899..bf2b489c8e40 100644
--- a/dev-ruby/haml/haml-6.2.3.ebuild
+++ b/dev-ruby/haml/haml-6.2.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 IUSE="doc test"
 
@@ -49,6 +49,11 @@ all_ruby_prepare() {
 		test/test_helper.rb || die
 	# Remove tests that fails when RedCloth is available
 	rm -f test/haml/filters/markdown_test.rb || die
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/haml/haml-6.3.0.ebuild b/dev-ruby/haml/haml-6.3.0.ebuild
index a4ac5c0cb899..1f9d7e635988 100644
--- a/dev-ruby/haml/haml-6.3.0.ebuild
+++ b/dev-ruby/haml/haml-6.3.0.ebuild
@@ -49,6 +49,12 @@ all_ruby_prepare() {
 		test/test_helper.rb || die
 	# Remove tests that fails when RedCloth is available
 	rm -f test/haml/filters/markdown_test.rb || die
+
+	# Remove tests that require coffee-script (does not work with x32
+	# and coffee-script is obsolete anyway).
+	rm -f test/haml/filters/coffee_test.rb || die
+	sed -e '/describe.*coffee filter/,/^    end/ s:^:#:' \
+		-i test/haml/line_number_test.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/net-imap/Manifest b/dev-ruby/net-imap/Manifest
index 6d0de9369da5..94eb2440f621 100644
--- a/dev-ruby/net-imap/Manifest
+++ b/dev-ruby/net-imap/Manifest
@@ -1,17 +1,11 @@
 DIST net-imap-0.3.7.tar.gz 138906 BLAKE2B d6bc143d3947ec8a97cd7e0628e05447574f83296c78275dc7414d9cc744e820bcb6b8917de9215152be8b6141f69d4d6a1ea9e2265791eb4989dcdcce09b10c SHA512 6917d3bd980bbca86938232a59104dd924ffe7ec2f095e8c997165c726ada8020c821b26a0e8748433df49cf8802c4a434c805bd27f415d1f2644ddea1a94db8
-DIST net-imap-0.4.2.tar.gz 196932 BLAKE2B ab58a3c2a5cea223f23f7325b9b632157dea48bea17c60cb6e21bbb2a04c73a4d80cfb4f25f5752ebf30f6d30d8adbf6dc47a737d6dfa9eb64a476d4bc8e61e6 SHA512 a3631d004aa07830e8ace3fefc0dd95cdf4b50b1442147b473430d2dd0c6e8a4170a0a0d20485317d9c8dba3b089734d0e5cfef30d8662d4b98e83740d4bb0d7
-DIST net-imap-0.4.3.tar.gz 204911 BLAKE2B bed0cc6f61dc328161f48b97a23e83724956b449aa95a119ba45efbc94d68ab8a676b9e4a00f2ec5300ce5049cb732e1953532a9a4f327fe09d9deb63207a151 SHA512 f294b1455514a47a30456dd1d6b58404138f15ca5de61b5a24774836ccd0227f41900921814d608a7132a02053a296b0ddc9760a3a7058c6699c7959d92ad121
-DIST net-imap-0.4.4.tar.gz 205669 BLAKE2B 995657acbbab35f74da8c8d09f6cb82f0d44bb4a111ca3e413de9f092ba291a44f4c2732acb7dc869b7794f3d2af56b96c00cd4f7601112cc691a2b077a6c43e SHA512 4468c0b4b1f2b5eb99fb3c06f421751eb8e156a14fcd68efcfbda7190be542e03ccfd0b21b8944eaed3b92763df4552e58a1d2f9b5952d8199150fcc6964c877
-DIST net-imap-0.4.5.tar.gz 218668 BLAKE2B 14d6c77d566b4c8dd93844c788fa330e2e2c5b7936c494e8881f3e8167e3988b047cc66d53f7faee24c81fb647dfa8510ddc75f86aa405216fd9cfad699cd34e SHA512 2480aca844cab769f8ae1544ed91cb451c426f58d35a8f117f6684f0af20d56ca2f7373a045144be5e6e781507941901ade55ee439c307f37d9ccec0418a833e
 DIST net-imap-0.4.6.tar.gz 219179 BLAKE2B 8b354156c672d308849b4b082ea980113f502d384be1f40004b7b4caef222a9647332baf9972df563d0b59d89d6e6faf0fb62c26dcb9812349840e5f97a3d801 SHA512 d4a3f0f47b8b7006232a88406f446ab799e2172bf2b058a22e594369d03dbebd81cf0fb44062d05a10c020ae0b9cecbd9964498a3f3c56a4d8a011e418fa549a
 DIST net-imap-0.4.7.tar.gz 220063 BLAKE2B cbf68cd80a273593a7d44fc890cd0d98de1ac8e6f4bd1f3b5ed7e6281e072fbba3e75e2bed582b798ae9cbb355459d5c4c2a63d3cffaf3856b4b3ae2e552a6af SHA512 f54e4564050899a6f1d6b4174d7c304139bc736e373c8936453b93ad2e63a1f2fa43578b2cc04cb04675c6d52c137e27fea0df13c78ae6ebb48e63e8e258479b
 DIST net-imap-0.4.8.tar.gz 241002 BLAKE2B 55877b593422aaf817557b8209c7bbba21ffec0f0e6c07c269d87ff40634a77ee2554d30e517d24703037f4ccb81fef77a5a29357f125e026a8291a55231fb29 SHA512 0515421b3defeebba4b3c2e1f5785e9755227e31c26022a913293e3843c9bb688238a9c3c221e79e1c8ce7e4395c0f8d4d29b53077578185b05a05acd40a70a3
+DIST net-imap-0.4.9.tar.gz 242076 BLAKE2B 6f88ab0b766c3269eee73189af73968c81b14e479de9c80c9a5c75ba7a8e72e48d30ad6f6f06e2a7cd3db5a298c399a5d4362094ad6f9d01ed4b13131e50823c SHA512 1d4cec402e022daa74245a6e506d5dcf3cff5a534265f9d1fe078c15ac0990a64e363d11b4fb7819f3578e51f6f090c1545e911e7a92c22a8193f6d54ea003b9
 EBUILD net-imap-0.3.7.ebuild 937 BLAKE2B ad75d1bdd852d6928798558c7585e918db157ade5867035b8b7643bad8a5c7a0e754d7c53e922461798562cd43799ae4dbc787c5f5b77cd71133466469d57ec3 SHA512 be0a555c97b313ad36cc258d73fc169d950d5f68c557ab4bb983ff70dc1cd04bbef15619c04cf4f95802624038472ca32ef66e0fdef3a3d1133f27caf2f445b5
-EBUILD net-imap-0.4.2.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
-EBUILD net-imap-0.4.3.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
-EBUILD net-imap-0.4.4.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
-EBUILD net-imap-0.4.5.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
 EBUILD net-imap-0.4.6.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
 EBUILD net-imap-0.4.7.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
 EBUILD net-imap-0.4.8.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
+EBUILD net-imap-0.4.9.ebuild 1003 BLAKE2B 7d3fa0ccb178d56cbd31fd716f5083e2c2fcef20dceaeb96a0a14d375177cf8dd46f14115ce0b2e9112cdfbd1b4bc91ee01d4c6b8fd889b92613da745b744606 SHA512 34c04bd59b7670196f7982229911ae3d84daccfda522009b4966df22af2b87247d737e751befcbbd4e48e95aa3dc10f1dde2df4ad82011519d4a95a5bacc821e
 MISC metadata.xml 340 BLAKE2B ce089ee2eed44b5b96fa730c464c6e0299db5bbee1db0052a5c5e959079e7c14c23c0a7d1b6bd8d8e7faf83ed8379535d5059c10ff75b69cdb9d522c5d0099ce SHA512 ecf13d294eb224c7510bfedb5a093c78de5d2537431335708bc1046254941b583b3c013006adeea41d2f8df147dcf45c46c6c9b50841500761d6a6f0e0c71bdc
diff --git a/dev-ruby/net-imap/net-imap-0.4.3.ebuild b/dev-ruby/net-imap/net-imap-0.4.3.ebuild
deleted file mode 100644
index ff9ad346395a..000000000000
--- a/dev-ruby/net-imap/net-imap-0.4.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-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
-}
diff --git a/dev-ruby/net-imap/net-imap-0.4.4.ebuild b/dev-ruby/net-imap/net-imap-0.4.4.ebuild
deleted file mode 100644
index ff9ad346395a..000000000000
--- a/dev-ruby/net-imap/net-imap-0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-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
-}
diff --git a/dev-ruby/net-imap/net-imap-0.4.5.ebuild b/dev-ruby/net-imap/net-imap-0.4.5.ebuild
deleted file mode 100644
index ff9ad346395a..000000000000
--- a/dev-ruby/net-imap/net-imap-0.4.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-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 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-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
-}
diff --git a/dev-ruby/net-imap/net-imap-0.4.2.ebuild b/dev-ruby/net-imap/net-imap-0.4.9.ebuild
index ff9ad346395a..ff9ad346395a 100644
--- a/dev-ruby/net-imap/net-imap-0.4.2.ebuild
+++ b/dev-ruby/net-imap/net-imap-0.4.9.ebuild
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index 2cf9581deaa8..255fcaee743c 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,5 +1,7 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
 DIST network_interface-0.0.3.tar.gz 13584 BLAKE2B 61cd72974e9ec1b72adb9c6a7f77e43ff3a025e4bfddb70b1e899ee34ca0fe42a56f81095ee0cff66e2da1712af7854ee811d26d7af316cb6c5fb905b3a8ad4b SHA512 9a2c9ae4a49666f27a1afdd188bd3be614f5aba7ec548f6b081627a9aaff5b5cdb2d7f5b98e8687eb78ea05ee3e90cf8f942403256076d80710945b5f2a429c2
+DIST network_interface-0.0.4.tar.gz 14231 BLAKE2B 140db70e0ed3091b0b76af046a46827d7cf660dd0823157d5c4e67be8e7d158a532392c499a4734b5f412b7ae58aca422428712e5cd5dc966429c7fc75108843 SHA512 68e19a657d95a49cd771447687d74991d7e1e58191c94c69ab594d11ee2491c89b8ddad7c2708021eedd093ec6a5bdd2434a5ecb9d695663d11aa5b9971c9584
 EBUILD network_interface-0.0.2-r1.ebuild 637 BLAKE2B 46db5f72535b0088a993257b8efde3f2988d41a4c8d699a2cb91dd3e0e98da52c9092c6ed4b57a8ca7629fa8ca6985247ab430b79d0b5638d40d7c63a32456a5 SHA512 f0648b096cfad16fdce954bf5a647551a0484007416586d1fca2527ea7774ddc2e08ab7790ea74011219815b7fe2096f9ce53558f2dd29832902a28a63ad820d
 EBUILD network_interface-0.0.3.ebuild 881 BLAKE2B 7fbf9b779926bdae13c2f720db8ab2a5ccc9947f26aa16b20b3fff06c1bf26cc64021d26239ebc340b93993e18142be38fcdd16b6a4e3f88f7014e0b245150db SHA512 6ce2adb47637a783a8cd1ae9f4119ad2307dd91c75fa624c9a623a2ca7def6e88f1791fca5741a03db8f4c040cb87edf69da1456c14c7350f3fcebc7e40f853d
+EBUILD network_interface-0.0.4.ebuild 874 BLAKE2B 1631205b475832437b5215fd3a8f532c7f671a6d262928e5383b797d0ebfba4d0157bc49fe31489864e7e2c5a9f739416d73f78c8c1041642f6b85d0f316230b SHA512 ee38ccb6f27c747196cc11ad2a1aff0f4bb2411d8af3c20375ce61d907a83eb89c91a847c7a739720ae8aa2c884e135746eaeac16403e68524af26b92b8a23f5
 MISC metadata.xml 347 BLAKE2B 145ba4bea55a624f1bcd5bc1792e13affd91c283ad59e9c3934048ad2298c9724fa156df4325a751b4a60376197e4eeb1f2ca6a13b04e6675697704df7fcd1e3 SHA512 0f338ef12f1d7196fe43d2be855281ee4f947298bbc6622d4280d827e671643f9e8f4f4d54fe9dd56f60ca4e8a14b51d7ba94592205fd241261f1f09a03eab4e
diff --git a/dev-ruby/network_interface/network_interface-0.0.4.ebuild b/dev-ruby/network_interface/network_interface-0.0.4.ebuild
new file mode 100644
index 000000000000..fb8a583fcb9b
--- /dev/null
+++ b/dev-ruby/network_interface/network_interface-0.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="network_interface.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTENSIONS=(ext/network_interface_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="network_interface layer from metasploit pcaprub"
+HOMEPAGE="https://github.com/rapid7/network_interface"
+SRC_URI="https://github.com/rapid7/network_interface/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+# Tests are brittle as they cannot deal with all network interface configurations.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
+
+	sed --i -e 's/__dir__/"."/' -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/set/Manifest b/dev-ruby/set/Manifest
index d9f78074c4a3..ac30d22d5e91 100644
--- a/dev-ruby/set/Manifest
+++ b/dev-ruby/set/Manifest
@@ -1,3 +1,5 @@
 DIST set-1.0.3.tar.gz 14549 BLAKE2B 73ced396e10bd65df7e11edf0c553b7fd517dbc74c6f0721c61dba5e70ec730ed98fe45a834224059a5fb84ca60f194b535763f698b7f5e96b45a6118233ecc3 SHA512 5e4effabcfb7034b054ad5276243bf1aab378d0446790fe99c6911970ff1881acc9b704607acab836db75117903b8187d2aeb33e33d9e39d0ee53b41ea7a6086
+DIST set-1.1.0.tar.gz 14923 BLAKE2B 6f66a6fa53c7cd7b82ddeb91c1f820a5a062e21b3a9b0ce9df6ae433ed35b1fc9090adde43cb886435b6953f43ea59c1d7e7dc62de2b9d81ffacc342b2e19d76 SHA512 cc7b79ca07d1df9490cf6500c77afc4e972138a4d4c133e8eecbd1c2f80d5622c613040f36771beaeb1a8712f7a6c12dec592833b966f65be9beb454062e2970
 EBUILD set-1.0.3.ebuild 596 BLAKE2B b7c560197584874d8f271abf6692f9456e0ce55855d6ab438153aa940663c79457d1a5fbbff2f62d099e242009b6507b37224c60e1d7dc76f90eb074560b5994 SHA512 bf1eb0cb3b2c598eba6a82236f8e99598fb10f98e236f1481a56deb661df136d39507c6aa485c1ba8bb3a825e89c86943fab17bde8ba53682c6620078ab1ed7f
+EBUILD set-1.1.0.ebuild 690 BLAKE2B a2454585184ca4a7395939a4f8dee0c362a987181f3c80bdb352a431da91493a2a7abec6fbc889fcf61e67e051e3c232398438db3ac3af2cc4ab3f176849a515 SHA512 99b21ca74282f5ed2222bd77a3ce40d7f46038037347b1e867fccc15f996af47d5b9b0a98b419416a494bb1bb4369b939aca0a0aacb35737f6db7c4ed4e6b347
 MISC metadata.xml 335 BLAKE2B 70868772b2593603b9224346d2e656877146cf21f8b633b884f28b93b7a5ab00637e4b2c0af2a5a4942428960007f514366aab71857a0ca7b335f25d9ab96982 SHA512 0be4eaf463e03d3b70e314dd77b68ac50fc5cd30c3468a57c17574cdb4e3a3ed19cc8d03be1a8ffb5054d04d63ede12759e1a8e7877d0b5c2b0006f9280ee87c
diff --git a/dev-ruby/set/set-1.1.0.ebuild b/dev-ruby/set/set-1.1.0.ebuild
new file mode 100644
index 000000000000..eb7710372d30
--- /dev/null
+++ b/dev-ruby/set/set-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="set.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a class to deal with collections of unordered, unique values"
+HOMEPAGE="https://github.com/ruby/set"
+SRC_URI="https://github.com/ruby/set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -e '/test_error/aomit "Fails when sorted_set gem is installed"' \
+		-i test/test_sorted_set.rb || die
+}
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 22aa09b42952..561aa7a2032e 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,3 +1,5 @@
 DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
+DIST typhoeus-1.4.1.gem 57856 BLAKE2B a1562bcaa8a824d40184b043b85f87475f3d31e6488f5bb87d84b9b37933c3fa090cee5a9b2f4910b31c61d2642ad338b321bb741c33713cd43f8cfd77a842e3 SHA512 2970793dfa94a80abf140779a148d9b8d6ab212ca0072c5353b8d158cc625e023e4c7a28ae8471d18ae3bd8cde46f31aae54bbf7a3fde33e980b533af0f81578
 EBUILD typhoeus-1.4.0-r2.ebuild 1037 BLAKE2B a75b53664d3df33a8b73c7fc9828aa3b21fd13454a2cc077434476c19bdd10a1e6f4cb49b64f36b5fb473141945e4bae76690e008bee0e53b85cea22c73d674c SHA512 295b9f299c09013fe4c2eb622442cde312c7a93dc5403c0608958a78d74eaa2e42009fb3d22f3a4cb5a9138556c50fdd622fb0107820757e03e8fe76c3ff1f6e
+EBUILD typhoeus-1.4.1.ebuild 1322 BLAKE2B 19631094e3848349941bb4217c1bf2ef5c75d6df3d7cff09801e280a6c71d0e38e89288fab47b7f2332f0458b96ac5f7d1b6c92d00eb76e4078f571c4e0a0305 SHA512 46df77d3203549617c51ad2ef25b0c10ade465bb6fd1ae5b73fdc6897d0564dd8e02adb0fb7cf00b8879a43aa266c2fe04661c0560187a907010cde06e521a35
 MISC metadata.xml 384 BLAKE2B f9b2404ac92e77233601283e52811ee504d139320b17232b7ea47a43d34cfde7234f4168607c7410f87c19d738a1af7a1447a03b042c62334d0bad2908d806c6 SHA512 3a27d3081fb9b59170213edd8fe3af51fd204fca382c72b074fdbfe7b94ba3ca5d08bca123ed4acefe0f8b6763fdeeb89ef505350ca238f8a8f19b20eab0b71c
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild
new file mode 100644
index 000000000000..a8eebf9e4fa7
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="https://rubygems.org/gems/typhoeus/
+	https://github.com/typhoeus/typhoeus"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Tests fail with ethon-0.16.0
+# https://github.com/typhoeus/typhoeus/issues/710
+ruby_add_rdepend "<dev-ruby/ethon-0.16.0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/json
+	dev-ruby/faraday:1
+	dev-ruby/rack:2.2
+	>=dev-ruby/sinatra-1.3
+	>=dev-ruby/redis-3.0
+	>=dev-ruby/dalli-2.7.9
+)"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "rack", "~> 2.2.0"; gem "faraday", "<2"; require "timeout"' spec/spec_helper.rb || die
+	sed -i -e '/Rack::Handler::WEBrick/ s/options/\*\*options/' spec/support/localhost_server.rb || die
+
+	# Avoid specs failing because default headers are provided or
+	# checked now, probably due to changes in either rack or webrick.
+	sed -e '/calls on_headers and on_\(body\|complete\)/ s/it/xit/' \
+		-i spec/typhoeus/request/operations_spec.rb || die
+}