14 files changed, 99 insertions, 175 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index c527e4999b0f..77d8a93cc07d 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/faraday-net_http/Manifest b/dev-ruby/faraday-net_http/Manifest
index 881566185559..d86953d280ed 100644
--- a/dev-ruby/faraday-net_http/Manifest
+++ b/dev-ruby/faraday-net_http/Manifest
@@ -2,8 +2,10 @@ DIST faraday-net_http-1.0.1.tar.gz 8436 BLAKE2B 16feb3c79af7db3b69373826a2fc55a8
 DIST faraday-net_http-2.1.0.tar.gz 9061 BLAKE2B 00e461718f4a92ff424e28074aa62d79c4ebfc9ca3a22036eef28c57fe90199b6fb49f5f9a02ff89cfc701b07c5fbb798446f1cc7ebf860dfeab9208e61b92d8 SHA512 797aa930d33a372fccb6fc497fe504f15b63a2fd87aa2301b84098a23de321fe60b6af43f35d9ed670705e90284096a21e9e83c80abe800c81240dec937a27d8
 DIST faraday-net_http-3.1.0.tar.gz 8975 BLAKE2B 254f0f3eac4361866b4e8a0b2461fa4e2fb76cfbcd145e122fdbfd65a4565ffd176375fd962dbb1ec899c3be993526d3232e166105840f43af1027220d9cd245 SHA512 dfab2515f7d567d34fd11c4a5ceff2ad41399a6ff262dc4bc52349d4229cdd8d9563c31d4dee1acfcb185a5bcf647e574758965cb6324c024244c9e48a42568f
 DIST faraday-net_http-3.1.1.tar.gz 9012 BLAKE2B e37f08ca50185c5809ed2ad0fb9430ca0ee0ac1aaf0a87c846238bab96de15a4870a1efd2a666be4b63740b19ec19c8b82e42ce0b665c8087c9b338f669138ff SHA512 707ccbc19c3d8795c1952421573c6816f5ebe247e0728d7849aac24609619416c80c6cf10aff19f40a57c7f53170463df67bd0163e47f18bd072cad6e79f9e5e
+DIST faraday-net_http-3.2.0.tar.gz 9232 BLAKE2B 07ada54d9430d5255d7683d6eec0b86967657d9eceff631a343a49a943ed2fad4168a48f0faf1ddef7d680ec1d11f34c2a560272bd9701c8e0be89dfb43ce082 SHA512 27966aaa0da55d398869fede0196de9859750227189564480f6129684a76fe617a477142559a717d5431c568aeea8357474f89ae8226f2398f3a4372001e8554
 EBUILD faraday-net_http-1.0.1.ebuild 715 BLAKE2B db9f3786fbbc2a6f389500d4e6a32449132dfcd70775d87b0b260d4b4062d59fa6552a51db728317f90b687eb550a2ed29bbd9d94684276a5d1215e25cf10929 SHA512 c35eea64b51e5cb7a9da1095fd562f78ff75ddee3c5aebebbfb6a469f889b983b99fb79f02c859c8b30401f032e2989e2493b4f6f50dd96214249c87aa85bac9
 EBUILD faraday-net_http-2.1.0.ebuild 755 BLAKE2B c0c6404ac1756d3853748a2f2b7e62d9dcb5318094140c1bbb001a5ad37e8441886a1265ea3bd51793cf5bab5655bf9ba4fc450928d90b84444e969e1b528600 SHA512 874462973a4926db54cf1d9f2dfad02f57490bd515963ba43bccc138b9cfb9067365bbee8b919616f3c358098448b6eb1b5702e8318f63b4b2156f9872a41ba3
 EBUILD faraday-net_http-3.1.0.ebuild 722 BLAKE2B 8df5845ddc7cf70941638cab9f672d531c4273b44ed99580d041873b445ca27c2739dd90b0bd95e520e2cdd57e20c37872d5d2e11fb3d9097d37b7299702fe90 SHA512 46b29a11b251e3e723092325f62250ce4c5c8cec44c7bdb9d9936bd72ef1a0d8ca2cea8dd734b0e442e489e071f2facfa6f86835aecfebc82c31dd0fedac4f79
 EBUILD faraday-net_http-3.1.1.ebuild 752 BLAKE2B aee19ecbcc46ace7ea2712f30436843fe761a361a50cf3f7797e01c71798a767dafe0cbb341da1e3088c2a793595c8dcb47ae424eb03bdf5c7967a8ac8235416 SHA512 8b46b5df66b55d3313e7b337c4c5804bc332626afabc6f8c72228780cf750774e2829ac12cf9c275a58cfb7e79a8dcd0555e3ebe9ecff6c8db358fb60d643fa1
+EBUILD faraday-net_http-3.2.0.ebuild 752 BLAKE2B aee19ecbcc46ace7ea2712f30436843fe761a361a50cf3f7797e01c71798a767dafe0cbb341da1e3088c2a793595c8dcb47ae424eb03bdf5c7967a8ac8235416 SHA512 8b46b5df66b55d3313e7b337c4c5804bc332626afabc6f8c72228780cf750774e2829ac12cf9c275a58cfb7e79a8dcd0555e3ebe9ecff6c8db358fb60d643fa1
 MISC metadata.xml 354 BLAKE2B 1273b11e3f0f51d2b444d56d37d0c620248e5932a974de9de6ee0d5d734fdb7354e0e4b8b31d481ab05bbb66be3bc8169c6a375bba61cdf19fd495846e983654 SHA512 8f6bb7b8ec5d8a3e57b9ef8a668fd49ddc7feef6b13b0df48495ff51b9712c8710bc2e43fcc265e66be8078d4fe67cff61172a533683ba9e932a22fd6fa369f9
diff --git a/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild b/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild
new file mode 100644
index 000000000000..2780a3d11576
--- /dev/null
+++ b/dev-ruby/faraday-net_http/faraday-net_http-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Faraday adapter for Net::HTTP"
+HOMEPAGE="https://github.com/lostisland/faraday-net_http"
+SRC_URI="https://github.com/lostisland/faraday-net_http/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+# net-http is a default gem
+
+ruby_add_bdepend "test? ( >=dev-ruby/faraday-2.5 )"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 92d3607057fb..68a3dbac4ace 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -1,7 +1,9 @@
 DIST fast_gettext-2.3.0.tar.gz 93620 BLAKE2B 2f4dd0f6ad74df593573ce73ee40da549e506fc6fc7ca9ea17dacaa120cec97c202ba31b1fe32b628006fa1381572858dc314110a76c1ee7a91c049664133ede SHA512 517499785022922e54278ad4427abaabb63fd9d0470398cfca1c1804f3ca4992c01105ea727d152d2b8d1cbab86138a7552dfbbd4b3b3241b5fc1a3298db7dc2
 DIST fast_gettext-2.6.0.tar.gz 94293 BLAKE2B b7b955fa87a010c85a22824a9bc5d6835836219cad13c82f42c16b1102a55b5d33a7386394efd2ba2baa299445d29e444ffcc750733ae51c9defc297a769a06a SHA512 1f0b824a8335572646a8486487e22b9fbe4ee63d0e67985a6b56806afac565610492834d34d5e45dab7908e986cc34ab80261aaea87489898e90b6fbe51a4f0a
 DIST fast_gettext-3.0.0.tar.gz 94279 BLAKE2B bc1988a87f9dfe3b6a68d6d614e0d42ead3b6eb6d698a55596fb394ca646fd373a066a49afd9d69806e3dbbdc48e8150249a64aa5f00ab75d88fa650ee02de8b SHA512 870263485465d02e03363ac4db3116cea1ecf2c71db7d5432fec10857de7653bc200241b8cf38ac30a17c51c498c3e1401b5fca3a27fc57a60c9940c7ace4ccb
+DIST fast_gettext-3.1.0.tar.gz 94367 BLAKE2B 9ac9716397eb8ae433a112b8d86451506a80dd3fbd92585ba5a2e24ce3a90d7926feb32ceb2ceda217858c696cdf5e05e6a2166653a5a2fde3e016768857f6f4 SHA512 71d3a9a0ce2ebc09fa462ea2ddc65c4fc6e6e5ae345e7c831dcfe02c1303d2c26700a14dadff31a457e701961dd3cc076bb50dbf9c654640636ce797cc9e7d5a
 EBUILD fast_gettext-2.3.0.ebuild 1721 BLAKE2B 5ae27f2b1f08fa81452d36c69e203d049b75369d838797ecdbfc53861303b8290c8687b8ed757b5d60ceb72f729652463293aee244451bad3ff8f0d5e796732a SHA512 58eef293191d6fee9ce92059f232271ed8a2cfd85fcac7c5447d39c4fdf0eb00cb25267fdaa37260e831ff97b2ea80aff3800c8bd0ba802ece1c466d15fb5c1a
-EBUILD fast_gettext-2.6.0.ebuild 1757 BLAKE2B febb9360e1c1b1451e39c3cdc7ee69a4c733b620def311d75f3b24abec7e09b1149a7d3adbfebcdc97325cb5914bba473df7ec06fb221c2cdf463ba21042ceb0 SHA512 ebd76b90c3195015d11ac28b39a8b11f10adf2b84afd7a319d69b38a8ba5dd1311536806154cbba962fca33fcfc60861be1d21010405a18537c4078f39025b5f
+EBUILD fast_gettext-2.6.0.ebuild 1755 BLAKE2B efea58c4d5299eb89b7fe5f287154f4dfd0c04b0b70118c17475b5c1bb27a531f04d2b44ceaeae45e1c379c353702c97aab567dd945f823a79d7795bbe122e07 SHA512 2f85accdcfd8dde1c36551cb492934a7692602b22559f29431a4f800d97c503b50ef3c9ef1b56d729ab80ac775a01373a84e3676273132f6b4674eef16ea2146
 EBUILD fast_gettext-3.0.0.ebuild 1768 BLAKE2B ab2212d200bb86eabee403a30d1bf17ada52feaba089013c97e3ed7d626b0a36d10c8be61057a2e55a5e0ad2a680e3e8a1aaa397fe94e423850cd373036be309 SHA512 0cbc62ae235b63beb9e1a2dcff632b5288215ded36066b464c9d2639e5f272f5c76d793307c9c877e9f461c915e46dbd588abff24efa203b9e2cd478a110665b
+EBUILD fast_gettext-3.1.0.ebuild 1768 BLAKE2B ab2212d200bb86eabee403a30d1bf17ada52feaba089013c97e3ed7d626b0a36d10c8be61057a2e55a5e0ad2a680e3e8a1aaa397fe94e423850cd373036be309 SHA512 0cbc62ae235b63beb9e1a2dcff632b5288215ded36066b464c9d2639e5f272f5c76d793307c9c877e9f461c915e46dbd588abff24efa203b9e2cd478a110665b
 MISC metadata.xml 347 BLAKE2B 4e31a112651c27ed99d38aa80ef658f244f365711abef6b17a30a89a39b1b86c183529aea6332260a424aa4024a43ed9502ba4ae9fd00e33218ef8ad3c9b9275 SHA512 d5284171ff8ee29ff612e0cdb406696963a90006d350e549ae09bb9d596e305b1901c6010c832f20071b91624fb5958575499b64561450e456890ddf64741ed6
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
index 67479c606646..4fb4f7e42d72 100644
--- a/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
+++ b/dev-ruby/fast_gettext/fast_gettext-2.6.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="test"
 
 ruby_add_depend "dev-ruby/prime"
diff --git a/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild b/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild
new file mode 100644
index 000000000000..a2f8fdc3d20d
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-3.1.0.ebuild
@@ -0,0 +1,54 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsafe!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+ruby_add_depend "dev-ruby/prime"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index 9e42072a5122..505928c9a858 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1,8 +1,6 @@
 AUX puppet_forge-5.0.1-typhoeus.patch 626 BLAKE2B 6eb5f313a792cff16a5ca7ad6719f5e3e0d1900dc761234631b963e79cd9fb1577a2113654ea1f52a6eff962a59b4633c0f66595cdbfdda410ab639ce327781c SHA512 f002f898207f82053431d997dd751f1d4e6bdce341ee275ef0adfeb0308bbfc46c578df1715152d796ad213e8a45a99086d7c96efe753a2ecb67a4becc73ec02
-DIST puppet_forge-5.0.1.gem 774144 BLAKE2B 2770c0609d93b3518017b36344025dbd7ab51360fea4af8f7ee610f4117f31de25698ad192ab00755564f0a57d9e6b041a7568440dbc5b47e2830a8cb00cd8f8 SHA512 3d29c166e1c22d7b4d45251866fbd8e6756a3026be5e17b1abe8cd6baaa7af4ddde7f2d07b75c21c5716c545cc6df82e36b1070a43a3d3c363214d3a5102843b
-DIST puppet_forge-5.0.2.gem 774144 BLAKE2B 6b01872246dc4791f78cefcb9df213df5768df483c8fac4bad12ddf358210ecb2b827ad129790e37d636ce4d7d0abb381097ffd2ee518a8472b067f5ba6de0a5 SHA512 861ac99a3e5234a8555fe37329b621135140d41c0fbad69648f56b901b10254d0474494c64525ebc4a0b730dfa91e9889ea4cf6ca7e2d5e40453221dd2e7370d
 DIST puppet_forge-5.0.3.gem 776704 BLAKE2B 2ea9e6a17fb5231629551b4dc2ca02f4843d67ded114f43a9891dba6a7ce03ab0b1b8ed38b434e8bcdfc73e940a263964a8254ba18493a137bd14600c3251a18 SHA512 17cb9aaf9c911608b90f2eb3e2561d94bffdfec559cb22bb0fa53d799f4a53f77c332ec261270135a924a4996d35b39945a4a94f7163b44dd9bb10f6ea72366f
-EBUILD puppet_forge-5.0.1-r1.ebuild 910 BLAKE2B b6a2ffc63738119760fb0648b69f1a73bbde470aebc17406ae363b965957e6f99d706dd1ba5c576cb59c8cf688621f728933ff0b6b9539cafa4cbe5508f30b21 SHA512 1d2afddf375238a48cc1e8a6f9af97b456abb978d784ba0b0199c0aa558cfe733932fcf16b44831d469e9c693c7d8ee8563498d5df02e9423f6fd1a682d0f832
-EBUILD puppet_forge-5.0.2.ebuild 917 BLAKE2B 64bf05314736676f562aa458e8af65f128cf8039910f810cf8ecddeb812798a8d4d7233b6284a4ee0e3a182c8422c8217716a3000fd35c9c30c8311fa538231a SHA512 2ac862b2e2cab859420e9fd1a7ed69e8d94a64d4025753777d2a1b0b4532b6d4ec6cb777d378ec0f033affd622c65f3a43b2c63102f60ad108994208b35d70b5
+DIST puppet_forge-5.0.4.gem 776704 BLAKE2B 5b9969ad88f279d1fac639ae28ed1202dc3daf3ab6c07caa60144080e54bf2d075a88381877c97e71e44df520c04780fdec8096ef896685c938ba399851b3ced SHA512 95c90d79b5c3b7c9f3e3775782357550c69599d7134c599daf1bb81d37e26d32ade7e065f6fe45e97dc535d7755ea3ae302025cc475c95dfb0d98af6ff8efd54
 EBUILD puppet_forge-5.0.3.ebuild 915 BLAKE2B 2c6ba1cd1dce834e7862c9e9c4ef953b8b7a3f7fd6da410f4ade380ed5f8b6cd6c02f245647cf4502626bd7e3a5d5a2a3a4b8563cfc7450e58ce2fc3475d8bf0 SHA512 21b83fa5de27cd8a535cacb8e78fc59f7c174a46c70a883810cb51c6553142674f7e934a236d20b52bed1b75a7ba8cae69e7951ffc58b3a38d2a85c81ecc6665
+EBUILD puppet_forge-5.0.4.ebuild 918 BLAKE2B 2e1a9617eb1446cc82147767af96e29b11d35bf48f3e2f3df44544cee03d7e22c4c1ee4971714d332f3c03c6d043b33723c992f42f31ba659d0a0ec1bd80629c SHA512 4fefda65f6422009346a69a3b0f2d0c8126628cf5ff8b3eefd27308882e9b3df4a832f7345f225d229f9518e24685338c517fd32c3026d333eff67629be179c2
 MISC metadata.xml 570 BLAKE2B 34720e4ded1a16b1d177684f1241999043eb3c15bac2c5463be03ba38dfd0d61b769251f598a80a707947d325fc4a8f86227e6a60d2b40c83ffae8a70b0ca276 SHA512 f28a1e45ea6a5acdf6180d18c732717e348d1077fa43752721778a7b203c071592c91bbddfc5f4d867ce3d4c81f6384e844fc6ae31d46fec9786d5c091481f5a
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
deleted file mode 100644
index dc80c18aca40..000000000000
--- a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-typhoeus.patch" )
-
-ruby_add_rdepend "
-	dev-ruby/faraday:2
-	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.4.ebuild
index 642b012de688..1fa7e7bf7d74 100644
--- a/dev-ruby/puppet_forge/puppet_forge-5.0.2.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-5.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -18,14 +18,13 @@ HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
-IUSE=""
 
 PATCHES=( "${FILESDIR}/${PN}-5.0.1-typhoeus.patch" )
 
 ruby_add_rdepend "
 	dev-ruby/faraday:2
 	>=dev-ruby/faraday-follow_redirects-0.3.0:0.3
-	dev-ruby/minitar
+	dev-ruby/minitar:0
 	=dev-ruby/semantic_puppet-1*
 "
 
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index 02e9c1eddc39..8f0d829097e9 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,15 +1,9 @@
 DIST rexml-3.2.8.tar.gz 460176 BLAKE2B 25b7563c1bc6eacf1b39106fde09c20d34040e5b99d7a38502d4e71cf96fffa08772cdf6def0c50d9e2d116af70a6bd0469aa1dd0512d7c5eca043b9e71979b7 SHA512 255bd834f5c7584a87979a8896fef761ada8d0beb5458cc86b16df59d8634bf1446a0fb679935c003a9a5be7a03ffcb2bf86d08e0f26b0d0f7a3dfbaa87da325
-DIST rexml-3.2.9.tar.gz 461496 BLAKE2B 9e379b7ad3808461bc738c66c84c0654c256d790bc2d9ad6b23f3da71b4d12bb198349b93c580fd7f44384fbabe3604d041db96c8a94181abc7fb153f0ff1099 SHA512 9feba575fb9c8f7bb9f2d2d03fa67a011c0d52604630ab3b9f6acd99a86d2f520647d58134ae5cf2068e1f87e9c4ba9b98814e437c158bab0f7a4f368e4be486
-DIST rexml-3.3.0.tar.gz 461623 BLAKE2B d741310000bf06276f7e424fc9a01cf20657d857b79ab80937537f5853cdfd59de86d81547dbc5298de48b63a683a1c09f617923ce123872610641ad08a6aa09 SHA512 b5edd8d06cd404dcd3d39c124ad1ed96a30d1185c9cf045bfcce73d1f71424b05986dc66f8b4701c20b940f78bae640ee46601334f1cbb304537c549ce099afc
-DIST rexml-3.3.1.tar.gz 462490 BLAKE2B 2332c3233bfdd5bec067c548016dd20e8bd97e82e6c924f418242827503221a5ce01f81d9b747967bb984d9768f0652e6402dff41c358f95a643b3783b18e564 SHA512 df35a2481743ac4f857ba1ba6396c37de26e9a306abe763dba943a464be9d5e063e0618182446b6f51011eb04aa6cf094b17e24d9826dd294e02596d5033ac83
-DIST rexml-3.3.2.tar.gz 464607 BLAKE2B 44fc74d6fbdbe213c1bdcb97cb54a5cc74bbc1a74ef2531bb5c3c10c94e5fe061e18c096974e2a94c03918ff5e8d40f5d191d473ae3c49ae0a94a58fd8f641b6 SHA512 fd374b2a2b1751f3762ca95d5d2355e64f8fa0de7fa8c4106f36f700e26dfcb8dad8b239399859fef5268195a3d07a19367afea5f01014ab3122e316d4f2168a
 DIST rexml-3.3.4.tar.gz 467302 BLAKE2B d8b86d51233ae277eaa25a796a4c895f4cf4d8e49dbc623990596e001c0404fc1cfafbdf5e87773fd773bbd6894511625d26b6ef9f94f75560849006c39a8a37 SHA512 928fbd0df229118c180791e75c7b86d4c9a937c92ba1161db1692ac3cc332bd5c241e4fc1d0d67be9bf97796dfbabe90fb19085a849130dcf7b53274145d784d
 DIST rexml-3.3.5.tar.gz 467588 BLAKE2B e32270fa6411f776e2e325f942a235eea6ee6cd72e33bf28cea69eeb6dbd40cc334f84d30c962093dd5644fb6c2cb77589229b415ae23e31d3899ae26f325f12 SHA512 401441a7c54533a0e01607af62c142cd9d767aa46dbadc5d18dc57e7542ff4518eba4c77206ff6c4ed6113eba87f30730b96469f64701efb5cb08cb578cd5a48
+DIST rexml-3.3.6.tar.gz 468635 BLAKE2B ce8e4dfb455fb284fdbd2dd11e452190f4eff94665041aadf0211da339d54ff4978101164a85a108cfa5f4c857f0e4c92629bb5464f38b4110d36bb5b4284173 SHA512 02b4555bd8d1474a123f617d2bd5d23a6769ab97ceb672abfec5244e189a4222ab662e509d064e66d91b5f60443d23b1bdf11c334598f203082617d2cd031fae
 EBUILD rexml-3.2.8.ebuild 1149 BLAKE2B 21dcce1a87f8ca2e42d879cb77d79abed37854b67633d997e60512d7ad65cf67916b02e23dbf8f89056aaa715910c5c3089de55fd0ecbc5be2a5088035930689 SHA512 5bba715dfc97211d341ac972ebeae8dfa787b90c8d77040e2a01391d72e3a4245ace754112e2908b7534c371bbe52b47332e74f1bd688f4dac0c8166dca5206c
-EBUILD rexml-3.2.9.ebuild 1156 BLAKE2B 20856be791740e24c1e6636878166a3826b78cdacc9e88282bfad49b310bcf3dca850adcfdcde630666514d142eb6e36124b69e160f09f662cf729af1e7552c8 SHA512 86671b9d1a9f2f58cbef44d75bd94f82a9a7038bc073559bec38855bf9a3a77dea10a81583e94c310ab69578ef8d8c1fc5d22f90b8fb32c75c2a49a0472dbf76
-EBUILD rexml-3.3.0.ebuild 1148 BLAKE2B 8db9d454019e6acbafcd49a6503e4cd567cfabdaa9b580f89e4470a33b29864ce3b224cc26532a4f9e098a26cd5cc31e070c98653d3f04c9c2e61745c8fd5622 SHA512 bdf293bf35217c5e4fd38e7a03ccef62f41ed065ffddb9abee34ef39dd938f10f43250266a760e19501644d21f05228035e6bd909bba414d6c70742202c9ffb8
-EBUILD rexml-3.3.1.ebuild 1148 BLAKE2B 8db9d454019e6acbafcd49a6503e4cd567cfabdaa9b580f89e4470a33b29864ce3b224cc26532a4f9e098a26cd5cc31e070c98653d3f04c9c2e61745c8fd5622 SHA512 bdf293bf35217c5e4fd38e7a03ccef62f41ed065ffddb9abee34ef39dd938f10f43250266a760e19501644d21f05228035e6bd909bba414d6c70742202c9ffb8
-EBUILD rexml-3.3.2.ebuild 1148 BLAKE2B 8db9d454019e6acbafcd49a6503e4cd567cfabdaa9b580f89e4470a33b29864ce3b224cc26532a4f9e098a26cd5cc31e070c98653d3f04c9c2e61745c8fd5622 SHA512 bdf293bf35217c5e4fd38e7a03ccef62f41ed065ffddb9abee34ef39dd938f10f43250266a760e19501644d21f05228035e6bd909bba414d6c70742202c9ffb8
 EBUILD rexml-3.3.4.ebuild 1142 BLAKE2B c7d014c548ef8f97f3e86a7309b8a69ac7a691ac619a33c8c1fd894b74574c31e73c162834bb84da536093160ed5a6480e2656587750cd5412b636952d43a7fb SHA512 239a0e280e804aa4d0e402a7629084cfd3d115d7bfeb06b25d03a549d977c63f2404bb8ff5be71e3e2613f3bbc2725cb13e21194494365d56894c11538c7bf21
 EBUILD rexml-3.3.5.ebuild 1148 BLAKE2B 8db9d454019e6acbafcd49a6503e4cd567cfabdaa9b580f89e4470a33b29864ce3b224cc26532a4f9e098a26cd5cc31e070c98653d3f04c9c2e61745c8fd5622 SHA512 bdf293bf35217c5e4fd38e7a03ccef62f41ed065ffddb9abee34ef39dd938f10f43250266a760e19501644d21f05228035e6bd909bba414d6c70742202c9ffb8
+EBUILD rexml-3.3.6.ebuild 1148 BLAKE2B 8db9d454019e6acbafcd49a6503e4cd567cfabdaa9b580f89e4470a33b29864ce3b224cc26532a4f9e098a26cd5cc31e070c98653d3f04c9c2e61745c8fd5622 SHA512 bdf293bf35217c5e4fd38e7a03ccef62f41ed065ffddb9abee34ef39dd938f10f43250266a760e19501644d21f05228035e6bd909bba414d6c70742202c9ffb8
 MISC metadata.xml 337 BLAKE2B 32bcd67d98d6c5b679142524dceab3a59b093b38dfe4d00d1ea01c72b659755e8d4c1a546b5968ca86d7eceb1810eda7b671e0ffe021ea816f88755c9bb2b2ed SHA512 650d4de17e8228c24f0a6ceb5c72ab3e978c75f397c41826b33eb6e6466d965b1c42911b765f464a399f3759331df8b12e1cdf1ea84da494f9318dcc4998de58
diff --git a/dev-ruby/rexml/rexml-3.2.9.ebuild b/dev-ruby/rexml/rexml-3.2.9.ebuild
deleted file mode 100644
index 2e93e18cce62..000000000000
--- a/dev-ruby/rexml/rexml-3.2.9.ebuild
+++ /dev/null
@@ -1,40 +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_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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"
-
-ruby_add_rdepend ">=dev-ruby/strscan-3.0.9"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.1.ebuild b/dev-ruby/rexml/rexml-3.3.1.ebuild
deleted file mode 100644
index 802c814bb1f9..000000000000
--- a/dev-ruby/rexml/rexml-3.3.1.ebuild
+++ /dev/null
@@ -1,40 +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_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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"
-
-ruby_add_rdepend "dev-ruby/strscan"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.2.ebuild b/dev-ruby/rexml/rexml-3.3.2.ebuild
deleted file mode 100644
index 802c814bb1f9..000000000000
--- a/dev-ruby/rexml/rexml-3.3.2.ebuild
+++ /dev/null
@@ -1,40 +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_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-SLOT="3"
-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"
-
-ruby_add_rdepend "dev-ruby/strscan"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Ensure we use the (new enough) gem version of strscan. The
-	# versions bundled with ruby up to at least 3.3.1 are all too old.
-	sed -e '3igem "strscan"' \
-		-i test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/rexml/rexml-3.3.0.ebuild b/dev-ruby/rexml/rexml-3.3.6.ebuild
index 802c814bb1f9..802c814bb1f9 100644
--- a/dev-ruby/rexml/rexml-3.3.0.ebuild
+++ b/dev-ruby/rexml/rexml-3.3.6.ebuild