gentoo auto-resync : 21:07:2024 - 12:30:10

14 files changed, 100 insertions, 151 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ec0b0273426e..17b209df17ba 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index f5075855aaa8..d024df1281b7 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,9 +1,5 @@
 DIST dalli-3.2.5.tar.gz 72496 BLAKE2B 2a8665aad98629ccab873a2b6b6661304b25dd2374ed3685f97dee83bf43c604088e43229ced951453d889fab7a1ec35b7fb3f0028858cf890a6013ac82b64c1 SHA512 ace079e3c9f7c30e2f266a07f87e58cbf4276f5ca4744ade76782a6a6047296bf5e23d40a4c1f4596b1eb150501c460f7cf89b33f308a774bcfe5825ec635760
-DIST dalli-3.2.6.tar.gz 72683 BLAKE2B d3cf252862d796cb0e8320df0b35af91678949b1dc564054585252e98caed70681609857b7606663b4bda08a27112bc1d51779fc29ef045d0ec087ba80d6dfdd SHA512 93aa808123adb671c096543271407e497770a8f7481a961f48f11493f3a313113f0ec7829708d7352c0ade1f02a9842ecfc22ba7d93beb138db981d2bd1b94a9
-DIST dalli-3.2.7.tar.gz 73058 BLAKE2B 8baba122e1bba1254e38ed021ac0c494c27bccf65d99aa16f379824073457e2eb7f79b2e9ec4cb49153b682c48d6bdfdcbe64966a286dba7b45349ace81ca4a1 SHA512 771bb0863e86cd7c252cfc1a688dd820b3efd24d6038be8789e2d4c2604703b78b64d36d0b32bb81001d625fc116eb86b4421cb3b32de8918912a3995e68ee70
 DIST dalli-3.2.8.tar.gz 73367 BLAKE2B 1680fda0d272d135f8e88a0ea2e16a08cd1027808f0503334b8c53dd85472cc7c37df3649623f8347169f5b8cd645c9a1a4d98343e45d4369ce8d08cc1306316 SHA512 85a0d8121fd0e539b0fd6c15716971d91e91741d36850cf8e887d8fef17d6b49ea6036ce66c986aafd008aa0e744cd798bc574e9376383b9af33b0971e31e25c
 EBUILD dalli-3.2.5.ebuild 1203 BLAKE2B bfb81d0688532d7f62877c0957b7a5cc06c4ba8e54842b267ed7f2bb8d41ca01c25cf85ed819aea287b7300df9bcdf40069077e33f525981aab8cc2242fc3b36 SHA512 181bd9419243aa6d5b93c8ff9b8df1f43a790f46a7071a4dd3f23125c459d78339ac240afecf1726aad494581b245794555498a70c49ac385325204e88f30996
-EBUILD dalli-3.2.6.ebuild 1212 BLAKE2B ffa04018a31a44160bdd8161ba00c1b40be26e6bb1db6e021c19ff6d7f09e970d9d7e2275b30198623d231d49b82eb7404fbfb746db55210058dca905ec3d2cf SHA512 b5bc8364dfd785d8ccdcd7986b655031f2d1bb3e01dc3704270bc9820986074292178860e37a41db0e80b2b4786e2a1dde4fe99ca72df327303b5d0414e19078
-EBUILD dalli-3.2.7.ebuild 1216 BLAKE2B 76a443e2768a3f97cdb8ea7aa52001bb8d182252b6feb276a8e0e33f248e56a095d47b0a2234756c0ced8bc242343bae7c35c3d6652ff8f69be27be52faae25b SHA512 d236897d1aea6edad805e02037b0f2436e487fae3efd633dba298bc9a7b5c00ba243e5739e4831ffe01fc7c2241a334e19d565eff9cbe81d4f342df5c0ed5528
 EBUILD dalli-3.2.8.ebuild 1216 BLAKE2B fcdb7564c4c3b0abaebf2e7c785a4605bf63db6922a930b8eadf599bc87b6dc86b06f586719c46004690000e9ee62c98bc3c67ad5f34e293d81602099eda8f0d SHA512 b1d06cda8383f767e2de67d8c450dda902c6afed44cf0ecaa1b1a33e656ea8a39cb99716165f3ba52b865d53a96884d1139e8b0cfbd2c5c41b15d577e52017cb
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-3.2.6.ebuild b/dev-ruby/dalli/dalli-3.2.6.ebuild
deleted file mode 100644
index 9e4f2ecb1ef2..000000000000
--- a/dev-ruby/dalli/dalli-3.2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 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_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="~alpha ~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
-		dev-ruby/rack-session
-)"
-
-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/dalli/dalli-3.2.7.ebuild b/dev-ruby/dalli/dalli-3.2.7.ebuild
deleted file mode 100644
index 41af68f1391e..000000000000
--- a/dev-ruby/dalli/dalli-3.2.7.ebuild
+++ /dev/null
@@ -1,44 +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_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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
-IUSE="test"
-
-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
-		dev-ruby/rack-session
-)"
-
-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/facter/Manifest b/dev-ruby/facter/Manifest
index 82779432b46e..0434dc9347a1 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,6 +2,7 @@ AUX facter-3.14.23-gcc12.patch 302 BLAKE2B ebb0251449a861db1fe55f005d62df7d14c8a
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 AUX facter-4.4.3-rspec-gentoo-tweak.patch 2991 BLAKE2B a7bc8342d27a99d6230c46f7a238ad81716ff59e10028aca27e0260c7ac2bf4b39ba002758379fdca608d6a23f60d16252c12fbae4eb19be7f590cb73dae1057 SHA512 5b60dc7ca96465af101e823326187ae7e22decce106ce11d62f13126bb36cfa96031431628ee14ce16b82f454eb9f8ca63a13246e0019954fa9e5a5f57696d71
+AUX facter-4.7.0-gentoo-thor-gemspec.patch 1652 BLAKE2B 10e0add5616e15b2ab29b811c042272553137a41f1448d9caa8985c7d61509d7d4452076cfd93f4d75877559ba948771e177583a246a7743128a57959cdb0ec2 SHA512 1da00c4194ac8c938f3b8cd5d5ad14b58fd3770b7073e2d96129c711159f87f57f92910c79f521dfcbe09b2bb34a026a3f887ee5de7a4f887c30fc75056f40fc
 DIST facter-3.14.24.tar.gz 410547 BLAKE2B 69d2fd3b1bf9f91456ca570f9fef44ddd6e7656a285c035ecb42df2553c461be137d06232fc1f96f239598143912928dcfaf0d9b3078f4335dfc83163eee5120 SHA512 88e47271f213570fb7819630f7b08076bd8b234612a2bb885de760acab48c37b588c1f214da11c5096f0db6b7df4a516b6e83abc56a1d95779b6f1353831e588
 DIST facter-4.4.1.tar.gz 492785 BLAKE2B b8f173aee1e2c3a6e9b650e1962ee6a7f860cadb0ea09254f396cce60cb01d702feaf23e0e147a80ca95554bcf835bd23df59d4faa78404dc92fd86defb65472 SHA512 c9e148141b3348977c9d6209ed3d72ab1eaaff46e0ada2ce5c3452ee71c3cbc051605bf0d9aad77c249559639e52fbb423c6b3e0cb784f2c208ea206fb3f4fd8
 DIST facter-4.4.3.tar.gz 493663 BLAKE2B 19f670e503b5ccf3d78b7fa72b0f3d25cef827eacf9939182fa4bfd6591fbfae6091425d6fc4d00c87ee587537dbcefdc1ff8d3a6d713c21ad6e167b55753835 SHA512 9e8867b00665559562e5778783247bf97a8fce154c857fc1b2e4cb193a66c9029edcfa09dd4e3ca8a0ad16b8dec272b440441f4cffab899366d543a66d1e26df
@@ -15,5 +16,6 @@ EBUILD facter-4.4.3-r1.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957de
 EBUILD facter-4.5.0.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957dedc9844c6b030655f9808d1ba7ede95f85222fe9eecbc3cff6adf9d84e6fba9aef279ef8f61676adf124be3c6081 SHA512 711e99625f8ab76c1d8576a9741363011a780820f0321f5a51833ddf978290cd01a72b1b839fa8790eb4ae48733c629cfccb83007060ef55f2e519e75c55dd0b
 EBUILD facter-4.5.1.ebuild 1543 BLAKE2B fa9bbb6b95b02ffbd0bae5e2f1984cb2957dedc9844c6b030655f9808d1ba7ede95f85222fe9eecbc3cff6adf9d84e6fba9aef279ef8f61676adf124be3c6081 SHA512 711e99625f8ab76c1d8576a9741363011a780820f0321f5a51833ddf978290cd01a72b1b839fa8790eb4ae48733c629cfccb83007060ef55f2e519e75c55dd0b
 EBUILD facter-4.5.2.ebuild 1543 BLAKE2B 277bf50de60663ac549fe997a139e4df5c2f82acb6432eb197df753ff104f6b04f5502ff4fd6f3c2e3963e71a480eb2aab51533a28b18bc8c533751213e9ec9a SHA512 0b7e05365576ba7b2b9637ba10f6bf0e7e10e4810c95f212ad19c596c2e2735c151fd6cf405c8ad542ae90b88466867fe4bc6883bd33888c240a22a15586f4ed
+EBUILD facter-4.7.0-r1.ebuild 1604 BLAKE2B 41c60aaa31322ed0a9120f62cdb0dc070b2e8ee958d190fff20de47f15430db201eb3a96b437ca2f333430b5327e02d59d42fb38f1d163f7811f47d71e1df667 SHA512 88317996e8ff3dfae108f20580e027607a9b2d088494f3da7dd915c3f285d9466fda74937378dc5dbd7b7a934503276ed8f2f5e6d72c542ec3e8e86d23785eba
 EBUILD facter-4.7.0.ebuild 1548 BLAKE2B 83d4ef9d27e9a92020b7c4213c6d54123669633d1093ec0952e76d1ccb9b0018afd6690106c487137c9db593f95dc457604189be0730c8bce9bbffe3071ab3e2 SHA512 a08b3b56ad1607755483daa72ac68849ae0d8f8d25e6b64410cb8af326320d6d339ed98c3e4e8388198f91309fe963f711121bfb2514cfbb7ce3f3f763e7311b
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-4.7.0-r1.ebuild b/dev-ruby/facter/facter-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..6c7cda531d76
--- /dev/null
+++ b/dev-ruby/facter/facter-4.7.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+RUBY_FAKEGEM_GEMSPEC="facter.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~riscv ~x86"
+	#KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+#RESTRICT="!test? ( test )"
+
+ruby_add_rdepend "dev-ruby/hocon <dev-ruby/thor-2.0 dev-ruby/ffi dev-ruby/sys-filesystem"
+ruby_add_bdepend "test? ( dev-ruby/simplecov dev-ruby/timecop dev-ruby/webmock )"
+
+PATCHES=(
+	"${FILESDIR}"/facter-4.4.3-rspec-gentoo-tweak.patch
+	"${FILESDIR}"/facter-4.7.0-gentoo-thor-gemspec.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+	ruby-ng_src_unpack
+}
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	# Breaks tests; handle deps ourselves
+	sed -e "/require 'bundler/d" -i spec/spec_helper.rb || die
+	# dev tasks not needed, but block tests
+	for f in tasks/rubocop.rake tasks/check.rake ; do
+		test -e ${f} && mv -f ${f}{,.DISABLE}
+	done
+}
diff --git a/dev-ruby/facter/files/facter-4.7.0-gentoo-thor-gemspec.patch b/dev-ruby/facter/files/facter-4.7.0-gentoo-thor-gemspec.patch
new file mode 100644
index 000000000000..67a47b345439
--- /dev/null
+++ b/dev-ruby/facter/files/facter-4.7.0-gentoo-thor-gemspec.patch
@@ -0,0 +1,36 @@
+Upstream Facter still supports Ruby 2.5 due to Puppetserver 7, but the Thor
+dependency dropped Ruby 2.5 support in the 1.3 series.
+
+That doesn't matter for Gentoo, because Gentoo dropped Ruby 2.5 long ago, so
+tweak the dependency to permit newer Thor.
+
+This stops the incredibly vague error:
+```
+$ puppet parser validate ..
+Error: Could not initialize global default settings: Gem::MissingSpecError
+```
+
+Reference: https://github.com/puppetlabs/facter/issues/2687
+Reference: https://github.com/puppetlabs/facter/pull/2674
+Reference: https://github.com/puppetlabs/facter/pull/2686
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff '--color=auto' -Nuar facter-4.7.0.orig/ext/project_data.yaml facter-4.7.0/ext/project_data.yaml
+--- facter-4.7.0.orig/ext/project_data.yaml	2024-04-05 10:45:18.000000000 -0700
++++ facter-4.7.0/ext/project_data.yaml	2024-07-20 10:20:06.637005127 -0700
+@@ -15,4 +15,4 @@
+ gem_required_ruby_version: ['>= 2.5', '< 4.0']
+ gem_runtime_dependencies:
+   hocon: ~> 1.3
+-  thor: ['>= 1.0.1', '< 1.3']
++  thor: ['>= 1.0.1', '< 2.0']
+diff '--color=auto' -Nuar facter-4.7.0.orig/facter.gemspec facter-4.7.0/facter.gemspec
+--- facter-4.7.0.orig/facter.gemspec	2024-07-20 10:18:09.763758108 -0700
++++ facter-4.7.0/facter.gemspec	2024-07-20 10:19:55.470346750 -0700
+@@ -46,5 +46,5 @@
+   spec.add_development_dependency 'yard', '~> 0.9'
+ 
+   spec.add_runtime_dependency 'hocon', '~> 1.3'
+-  spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 1.3'] # Thor 1.3.0 drops support for Ruby 2.5
++  spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0'] # Thor 1.3.0 drops support for Ruby 2.5 - which doesn't matter for Gentoo
+ end
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 37220556f707..ee58b000c295 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -4,6 +4,6 @@ DIST nokogiri-1.16.5-git.tgz 11014565 BLAKE2B 0158c23c1479a4c05074906afbb1f75078
 DIST nokogiri-1.16.6-git.tgz 11014594 BLAKE2B 5a2becbbaf52d753569d778fcf2c84b521a30aa52abeb923970dbc8abea56277b807e70538032edfb883552c9385b7c225885cdbab111462f51a741a0b8d3bd5 SHA512 c90e0dcd9c90980344551a5b660e15cbdf1f42a139c123f936c728952f0d8d07f8ca4810cf6f8dd51070bff66398dca3cb29ed60f8e2242930233dd594efe843
 EBUILD nokogiri-1.15.3.ebuild 2702 BLAKE2B 8934088d9edfb342b53b74f5fcabf397cf9cdb050c5c8d5ebac1686a15070ae4c1d22d3320de67ac0d055d18384f177353ffa05683e0ba17663c1cba2ae2f9e7 SHA512 3add6c7af7cc8bee29064e8fed1cea2237b401381f6451f5b5938728df1f60046ea4e342cad334630a5e00ccc54fe39a31d8c59a8f10051a56c3219c83e62f9a
 EBUILD nokogiri-1.16.2.ebuild 2725 BLAKE2B b4cb761c77111b4f3abf8bd0626c9f866ac6e5aa6edf078f43173d9c79eeb1293e7fb90479825c0ac93650a9ec2de0b290985bdbb876507130ac83652ce206fc SHA512 778595850b73d5d9639f03bda58e7f5b94a764275768916f28e2b6c19c81cb61a1c722672627bad92e3ce7b4fb6849448fa511c0b32405453194216416060292
-EBUILD nokogiri-1.16.5.ebuild 2731 BLAKE2B 631a8f5afe77352d3bf7e8104a4c73b66da93f81e5f05900204b05c2dc6d952599d5f219c5e3715e54741ba4c98f8eaac0e419f4b7e356cef18275b01ff1e058 SHA512 27730c71fab4705edb40b90058888291aca9c99da69044e7b219c1b6b265864e0ad6f9cb3596772d8514933c9abb3e35996d9d8e5e0809483f470e73090f5e84
+EBUILD nokogiri-1.16.5.ebuild 2727 BLAKE2B bc5d3495278dad04af906d922471d091adf6bcff87a1d814552b9dbec01d70a0b9830b2ccdc62f44f8f43af46dac919060c6275941cf77c4fb49d88e31cb3509 SHA512 a9965e5ee0c8a0e1f73a68dbbbb0ae50c6d178ca5849dfff3baf019ef1f7953a1eaafec3118859daa6b3c453a6ed231632a48ccc6471fbf08e9d96fd94631c3b
 EBUILD nokogiri-1.16.6.ebuild 2715 BLAKE2B 20e9705fd38ca9b623e12de65857ff505d5dafc440fb262b77003d7dc854ce9f700c09cdcbee21e0c5adabf7205df12db235eb9ec76fd32f5324c57f5b5ce477 SHA512 beb7b749b0b4246e968eeb7c268b2f143402e4759d205613696f7e4d000394723805040ecd581a3f5efb7f90051101ca06d9ce70c1ba3d9987ab985d5d3f65b8
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild
index 34d949f426af..9399f98f6e02 100644
--- a/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.16.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="test"
 
 RDEPEND="${RDEPEND}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 637840e36c1a..9f940a51b086 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -6,12 +6,12 @@ DIST rack-3.0.8.tar.gz 788610 BLAKE2B 9a591242e37f10021a2779bc495ab0ef954eb6474e
 DIST rack-3.0.9.1.tar.gz 789318 BLAKE2B 300be59512a1497b832fe553ae9d957e380c5399707c891b67a950db32682ee8e2539dab02e656fdc855a8c821d7a5d8674b9208d4cc701f534eb8f1a8767fcf SHA512 0aacf814463dc03a95aaa7ec979caf3464d9e19d5ab9c3842978c2c94b81e8b2ed040f3f4028fd046c73e0632ee7754755cd35afc81ca47e22d43d4882086dc0
 DIST rack-3.0.9.tar.gz 789232 BLAKE2B b71eb67ff796a1389bba79c3132608bec30a65d44fa8dd302a5c4e40a42b30b0284aeea6b0b5a1c73ec823e134c25ce426375bfa8772242a8f6b05a4187ee36b SHA512 0a69f4755119aae5c6e0ab8b1541eade221a701a9cdba3b10afd2bbd2a37e8b0faa80aad92304cf29793b2536b05e8a5ae3c0e0e986b021af1566bda8d387353
 DIST rack-3.1.7.tar.gz 791460 BLAKE2B d911d4b8b40d4eb206535fd017697e5a655fbfbc1e78c204739a613740adf1cb6ee6d7a0b5dea5c305f468a2b9344aeca87363f608c3dc5fd299e0dac8792c40 SHA512 3c92880ba92ae748f573562396e90f5fc4b40d2c48a40c45fb1026c4d187f6782f9239da7ab44c1b652a884c575c1da6841728f90e22156eae0531ea006c1460
-EBUILD rack-2.2.8.1.ebuild 1689 BLAKE2B eafe390444892fa639f6b1236a91065c06f887aa89afe6adff7705eff0fc90da550eaf1b78b3492ecc104206fd4baf5e175a75df123b4947623e7896ddb69532 SHA512 6c5c386fdd04aa5abdfcaff4ed70195f84be13bcab1757cfe5ce600b290f5a7cc9c63cbfb4f3136f90c08d136d7110819cbb532a96192cdd72736d28c759fc5c
+EBUILD rack-2.2.8.1.ebuild 1684 BLAKE2B d4a6944c6616c44cd13f9bfa012b2d17f17b0215333ea54896f2a91718ca5ef8d3ccd10528bbe5eeef24eee87dfb41c3ba5b19ca19a2099c6d390dc73b9b2a65 SHA512 b2456e5b5aadfed88ef177810fe1256ed77a890c25e3c3b049606c039b16a497215e3ebe865b4ebacd036254ea2e2df17fdda245bc36dd52ab85f309a19fdd4d
 EBUILD rack-2.2.8.ebuild 1680 BLAKE2B c87491cd041c2dfe5d45b8456f815a42653e068cb75efb786e45550d42416970f7030925e30fe07f2eb54ba6f959e69b1252f4d5630af239b77e03178fd762ed SHA512 40beed1fb1ca7194a43eefc8adf86c4713b3ca2bbf2c42c94b04fdcc254ecde81c72d188d296041edd49c247b061d8c1b9e9d4f5e9d3de263ec5d0cad04dcc84
 EBUILD rack-2.2.9.ebuild 1691 BLAKE2B bb05db363e69bb5759c2529a9683c57e43db830a1cc6ec5fa0d4946e8998635e7513ca79cf6107710bbf225a0c8046f134e60d263fc7d9cfa886d888ff61d199 SHA512 304b2c4df580923e6181fb1c98ba7b8ab46d0563da15edf609e37232f0c6b2e3cd380cee69f939627d04a48a56ce202da518caa13d240b61339e2ae233309b0e
 EBUILD rack-3.0.10.ebuild 1297 BLAKE2B fa241be6f8149be1d9c5d029d7c7dc247411a0151794bf0a6c7fd418a3ff8fd32c182dad96017b8c3a8f416228a774fccf1712c58a9403dbfed781fd25a519e5 SHA512 df2c9aa966c27f526bede22d2fd7982b0eff8279e87efb21ec361602e7a6b9cae49c134b75c1b7d439959b64f39f687589736bf093af8f66e0fc0d55a424baad
 EBUILD rack-3.0.8.ebuild 1286 BLAKE2B 7c94462d6337d220e8d1bf463c9e2b4b6b5a62eea53936a4a8035579f2006b73d784dbe7e48e6518b8cf86ab22efd391f2b6041c1e66d4f384f5ce108edac765 SHA512 e747da8239db0af2e2afa1c15f29ef882acd38a51ec8f81e817ee047bb89cdd5962ce4913d1934bcbccd3cd0bd5bc10b629a04615a0f0a77af692e63a82f9bba
-EBUILD rack-3.0.9.1.ebuild 1295 BLAKE2B 0c42b68def8abce7584fef95f94061ec3b0ff0d75d924a859ab3308b2c5db2991caa544e67af0d09e0d40aa3c5016ef3a59466f30df06596a4a311fb7716ccb7 SHA512 0439b2a80035d3a3264a5206faa7dd70fc3f689d2519a3db588032226b5b8d4c5e757c4d6dc8125452dc2bc74beb5a3305aaa7915efe4d70d7e3df08551e90bd
+EBUILD rack-3.0.9.1.ebuild 1290 BLAKE2B 3b98c10f1f11c546f77448ac0429c891d7c106237e3f1755019f9ea3b13b6f2a92f53ddc74e13acef3f1f8391b928a942a688e871939ba52fc855a82c6ea5730 SHA512 3e9b95daeaecebd6f30fba3890395222bd1fb30869f7041bc2c952e690c0f5f12167cc348f57d5357d252e8d6ee302772c331fb9c5fa96496b7e885a531f1dd7
 EBUILD rack-3.0.9.ebuild 1297 BLAKE2B fa241be6f8149be1d9c5d029d7c7dc247411a0151794bf0a6c7fd418a3ff8fd32c182dad96017b8c3a8f416228a774fccf1712c58a9403dbfed781fd25a519e5 SHA512 df2c9aa966c27f526bede22d2fd7982b0eff8279e87efb21ec361602e7a6b9cae49c134b75c1b7d439959b64f39f687589736bf093af8f66e0fc0d55a424baad
 EBUILD rack-3.1.7.ebuild 1297 BLAKE2B fa241be6f8149be1d9c5d029d7c7dc247411a0151794bf0a6c7fd418a3ff8fd32c182dad96017b8c3a8f416228a774fccf1712c58a9403dbfed781fd25a519e5 SHA512 df2c9aa966c27f526bede22d2fd7982b0eff8279e87efb21ec361602e7a6b9cae49c134b75c1b7d439959b64f39f687589736bf093af8f66e0fc0d55a424baad
 MISC metadata.xml 537 BLAKE2B 998152d25abdb228da5fc7b39719693fd0811ce6dc0d831cf90a5ecbb88e540d76dfb6cfddb3584748f46f6d66aa2d1bc73d492c9e810db1c0e44895108d5e17 SHA512 4670ef4b5b33270c48d212fa995b965305f558c5f670e7eccbe2e44f9ba8d1628c112de5a9305c2ad90adb6e2996cab6da385e5f473d850b287e92f7594e0d21
diff --git a/dev-ruby/rack/rack-2.2.8.1.ebuild b/dev-ruby/rack/rack-2.2.8.1.ebuild
index 8fda1bf98108..e535821cc9dc 100644
--- a/dev-ruby/rack/rack-2.2.8.1.ebuild
+++ b/dev-ruby/rack/rack-2.2.8.1.ebuild
@@ -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="test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-3.0.9.1.ebuild b/dev-ruby/rack/rack-3.0.9.1.ebuild
index eb29e9bc09cb..d08502e40f68 100644
--- a/dev-ruby/rack/rack-3.0.9.1.ebuild
+++ b/dev-ruby/rack/rack-3.0.9.1.ebuild
@@ -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="test"
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/redcloth/Manifest b/dev-ruby/redcloth/Manifest
index c0a2c4ea6603..9a5616b6f05c 100644
--- a/dev-ruby/redcloth/Manifest
+++ b/dev-ruby/redcloth/Manifest
@@ -2,9 +2,7 @@ AUX redcloth-4.3.2-cve-2023-31606-1.patch 869 BLAKE2B ca648a75300628168a2672efd6
 AUX redcloth-4.3.2-cve-2023-31606-2.patch 844 BLAKE2B 070c76abc03d1b66f35b82079b1a7703a34fec6315d9a4026c472d145ee26ad3287046dc0e32a9c3ac9e4cb30763deab2be328d3cedbaa7f10bcd32fdd3de9e9 SHA512 85de784726bbc05992411fc1c89475d146fa774127e4e6f5a659c217b53c47d60c055e81632fafe61750777a519403dd7f548678dc092a0e4066dab47a8ed757
 AUX redcloth-4.3.2-load-documents.patch 988 BLAKE2B 75e2a385abaf14caef523ae418e87b000900c93d3afe4491300335dd9d5a26fef28a34b3318fada0625e91cafba42a82fb05a2d8acfd6c5afcff4e8ac491890f SHA512 cce18ba0c30d6820020d71dd032d1b193976eaa103ca7bb294a7b1cfb0e61b82aa31e0d8bd8b8d9305e8c087a4109563897a7cd77ec9c020b453c8dc97d48003
 DIST RedCloth-4.3.2.tar.gz 91880 BLAKE2B 0feac1ec59e23fcff39e2fdf9beff896be7949764e53a5a834c5f4e7d18813dc59bf354103d4fab82a709341a0f1b6919bbd3a463fd601564888672dbe73d343 SHA512 377fef21e646beb1658a4b8b8d0228e9730c6c8f33075a14137afcf80e8d37501ede8c05b720d0dfb36a680017f4dedd01565fe9b326ae06ead77afee6f122ca
-DIST RedCloth-4.3.3.tar.gz 92704 BLAKE2B 8de97317fa8ed3644a858376cbc73b4dfa91db565ef0a8a9dbbc2002da563eafd0ac975fe2c466519c38df7bb7be40f1f99ac4a7f2217c4a639760a95a32c79e SHA512 d45bad056e7d3d18bc123cc932ee35a808ab19dcee436a715dcccdd081dc6fbc06bbb56f792037fae031951c5b69f864c2fa0e80bf9ccece79789260bf69ca8b
 DIST RedCloth-4.3.4.tar.gz 93256 BLAKE2B d18146010b506ad6bbe78d28578bd7543c67c3c4ad001f0ccc4aa2bf791957283602282a0cc651d0454d02e84594b8df6e82cfbddd525805d5fb7636732108b0 SHA512 f6ec16056b60c3469e628558dbe4a9412f7338c57fc9bf70064946d532def1e3220686e5f726ed9d7e44c9ee902623a3e2ed625d483ff0e9b40ab0624c977cea
 EBUILD redcloth-4.3.2-r5.ebuild 1406 BLAKE2B 865a1fb13ffbea0a4abd6343ff1099be5b554fd736be26c5978df607e22fdecca7945314dbb286e424a05a134d62d4df1df860da19cc8f50d0eb1371adf60569 SHA512 a468c8c0e2ffc57a1e1a8238699c69d6af3ac6c617355968fbd4ff021b415cc698d9105ead2252052e3068c6d3191790deb6a8ce70849f8ce1a586e87124d5c2
-EBUILD redcloth-4.3.3.ebuild 1272 BLAKE2B 331c37825eb4bf0954913adb054f39505d5fc7ff9832fe1d81c2c342e452caa17b2390a431f4af86d7e98231b743cdbc08dc507254b7d585b28f4ac998eb38bb SHA512 0ffd99f8cb5407545b98179defa95e2f61946c8c779517a63475a96f151de73616032d346167a7c058608dcc7ffcd9adff3f4069754d10f10272464892a08121
 EBUILD redcloth-4.3.4.ebuild 1272 BLAKE2B 331c37825eb4bf0954913adb054f39505d5fc7ff9832fe1d81c2c342e452caa17b2390a431f4af86d7e98231b743cdbc08dc507254b7d585b28f4ac998eb38bb SHA512 0ffd99f8cb5407545b98179defa95e2f61946c8c779517a63475a96f151de73616032d346167a7c058608dcc7ffcd9adff3f4069754d10f10272464892a08121
 MISC metadata.xml 343 BLAKE2B bc8d08f10a63e9472843d4dacf05c70f08fdf9587b6811e062360185ad66f9d144f0f871369f6a4f049a51a292965b902a3ba346e649671a4a283cf93fbbaa7e SHA512 89848472f2bf75c4286766d4aa62799db98fc22aa2be9cd2c05453e0e6c1868fe61c46b7bc0e83ab97ec85f959826699eef36215c4fcd6186e70ee975ec878ac
diff --git a/dev-ruby/redcloth/redcloth-4.3.3.ebuild b/dev-ruby/redcloth/redcloth-4.3.3.ebuild
deleted file mode 100644
index 719391936535..000000000000
--- a/dev-ruby/redcloth/redcloth-4.3.3.ebuild
+++ /dev/null
@@ -1,51 +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_NAME="RedCloth"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGELOG"
-
-RUBY_FAKEGEM_REQUIRE_PATHS="lib/case_sensitive_require"
-
-RUBY_FAKEGEM_GEMSPEC=redcloth.gemspec
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/redcloth_scan/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="A module for using Textile in Ruby"
-HOMEPAGE="https://github.com/jgarber/redcloth"
-SRC_URI="https://github.com/jgarber/redcloth/archive/v${PV}.tar.gz -> ${RUBY_FAKEGEM_NAME}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-DEPEND+=" =dev-util/ragel-6*"
-
-ruby_add_bdepend "
-	>=dev-ruby/rake-0.8.7
-	>=dev-ruby/rake-compiler-0.7.1
-	test? ( >=dev-ruby/diff-lcs-1.1.2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile ${PN}.gemspec || die
-	rm -f tasks/{release,rspec,rvm}.rake || die
-
-	# Fix version
-	sed -i -e '/TINY/ s/1/2/' lib/redcloth/version.rb || die
-}
-
-each_ruby_prepare() {
-	${RUBY} -S rake ext/redcloth_scan/extconf.rb || die
-}