gentoo auto-resync : 23:12:2024 - 06:31:00

6 files changed, 58 insertions, 240 deletions

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index b44209e3c383..f7793437242b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,20 +3,17 @@ AUX auto_gem.rb.ruby19 509 BLAKE2B 3aeb669d0dc6c6016091375adf8df8f8a2b810d40e11b
 AUX conf.d-gem_server 81 BLAKE2B 2019f1b5085a824e1a9e0551a8b224391b1db777f15aea7fa613faa1c7a51f6c0015f92c16a95c0c368ad701c125307c0535ca1029891345476636fe45289fb8 SHA512 71630a0530ec62f4024d9bfc4e6afe1f409f3bcb5d71ee5876d1e190c9e69016571ca8f500fcc7ffea6cbc36a8dab5eef2d0c61f72de99f2776c9137010b9ccd
 AUX gentoo-defaults-5.rb 1400 BLAKE2B a5dfe38bcb4b366a24e1e03e0bd50a684e29a36fcffb307e478c694056afae9a02a78d9c98b7b48787e0b9a5a214b8a7c7562c6ad86fd4d0dd45acc3bd4c4eab SHA512 1fb092262d3dbfe8f7a05980e6b2a313db0d0283f0842638ad261fe99e168369e49c19a5fff34f49f30b2933d6d5b7147c5c86bad559a1e1d4ec1e7e38d7329b
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
+AUX rubygems-rdoc.patch 1032 BLAKE2B 1a3523fea0f3bb1dade83f7ba3bb2c5d28f395f659b300372ddbf4325ba794151aa56b3c24097d9f941c30a4974b76923e022212cb63873ac47dc3760716d56b SHA512 7f0dbdd99edf52a425f63b329852efc4f80bfb4d368a083ea9c7bf08af47f1a82c4053fab1a2def875150b84a4a138d1cd90347186d25bd430b9139232b55a9d
 DIST rubygems-3.3.26.tar.gz 12995476 BLAKE2B c06400d263f64ee988781b49628eebde2b78b5c3cdf3796fe5e1ce5891cb0b41b5e50313293afc72c9b278ab00415b91a862f4245107c63e8eedb9904a5d33e2 SHA512 5aad9f6f0f7187d7d3f2a77ceb50b4b293290dc2e83fb55654c8fdf8e222568d40ef0c64d603ae2ff0db39e7a39ee89ec3c48bb102d434637145863881851086
-DIST rubygems-3.4.15.tar.gz 15033712 BLAKE2B 01fa4160549d49dbb0fd9e8c2c3c570e837cdb0d074a0ba484bb37ae8b7a19f853387dacb980615f63e4be9ab080e3b8fb9b429da97b6ffe98ea33178efdf2e6 SHA512 37aec02ac91427d3b44b3914308a4262d2c9b2c603b6fdd986ce0858175642290b2588a85540f555d0b5f5342960469337609546c2329d312280bb0accd6c932
-DIST rubygems-3.4.19.tar.gz 15037850 BLAKE2B adf618f326fa83a8eb7febb9872a71f2bf78048dfa7c4db07343c9813ba5d858c86bcd6e54df1a559e60e458ba8d73d2a7ac82ee5e0cbde6e9d8b45c12793d4c SHA512 8d0bc225ef01d3cc5e3ad12a1bf0bbb3923349bb9b79b76a9ac58bb8dcf79666a478a871d19919adc15f1aa2599efde5d3938c61801579277117b569e7007656
 DIST rubygems-3.4.22.tar.gz 15054005 BLAKE2B 856b60bf3a2f477b6e0aeaa4522f17934a6bf8c434f0d3a69afb823801975a74294f27e0906fc940c456414fd5bf94f71809e09676b839b0123a6f40dc3cefb4 SHA512 c69a03524936eb51e6a919ee0ee614c4e0bedf5a0bbe55314a876b3277116b6e8c92e52072368704415286b673d4c4b995b81665cc73b152a12377faee289916
-DIST rubygems-3.4.6.tar.gz 15011157 BLAKE2B a06178a1d5dbd8231493dce9d075451062edaa6b4affee6892d60c727e30ef4b7ff7933baf4ae49fedaa684f9898325ed1313648dac318bd62e9c733de374926 SHA512 d1c23b534f2254ff4dec564098f7eba83462eb9348da59a84de01fc4053ef3be02b2852af4542447de89a36d835f68634606040672d2a2f987c5670b9f373fe9
 DIST rubygems-3.5.11.tar.gz 13541588 BLAKE2B 3cc349776955d1666d67f7e4021c3237cbe16928c60842a334f928dd018e31ddc40a94862ae6e760adf377ff41161445c96151fe07ccbffa58b426d37777a5ad SHA512 611096b4776176d9f166786d2d050c53c1d6284f635a9521b391f11304654b947a7a27b0eb40af0bfa80bc20b21abe8f189f8b60764eb4234c7ccb1e8fbebfef
+DIST rubygems-3.5.21.tar.gz 13169518 BLAKE2B dc0bac435903d84633ac5560f4739d0123bc8a4d8afb70ce47b4503bbe759f3de7642ad9e8d5f9f42cc4c715792edd24cfbe9474b5ae4cf7e642173cd9f26812 SHA512 9739799b020b8e11362f4892ec404fdf16661ff0166193b0130b2433f5a5c1d24db9792d490f448dcbb37cb31298d9ae0e06caa48953c7f48b36eec1d044bd68
 DIST rubygems-3.5.3.tar.gz 13495997 BLAKE2B 1c9e01cc15a7afb0dfeaf61d14cea43fa19844a901cf6337f542b14da608dfa016ba438807276018b372f9c6ce8a44df2ea491f08a1217bd9f3fd04cd1ec57a7 SHA512 50f6ccd9f47c6d56c20c2bc23a35f0ca0edb2d55ae9904749bf03d1181acee499cce668df6a8847a5a59b37de0efb884acf028df6b768cb7cd2f1993ca4f8db2
 DIST rubygems-3.5.9.tar.gz 13538062 BLAKE2B db8b3c17381572f53df222b7fed53c6c16e2d6bfd6a74a21aa18ee4bc43c7824c5918956076ccc15b93e4ed669d9e58bda8b9736b3435c736c8da726161634a6 SHA512 c1de5b5744665590179efb5389829ace8345703007d880ff99dc55a230482aa696c960add4c2e2d5c290f2a762c3a7a469668158c95cdf4acb4afa82c0d67ecb
 EBUILD rubygems-3.3.26.ebuild 3399 BLAKE2B 39478cde41adb8998b8d999cdfef01b813f3542e345a9c367aba8050a641807e38e5e9da828f8d98b9664b4ed77c702eb1151af73ca02067e731888a687750db SHA512 f86a08651f9aadc5be968ffdf830fd85641adff0b9470a605fc16ec993ac53b5a1033b63084ecb1b9fffd5cf2e0b189c59946461f804451e357b9c9ac737a7bb
-EBUILD rubygems-3.4.15.ebuild 3561 BLAKE2B 888400f9367d8a9661a2f66f432bd690f7a3205cbfdddad722a3fcc40510e12d050b89a00abbae6004d05eabbea28e9c730e89ef93f26459c05951752e010adb SHA512 0aec0a7d956ffff8aadd116b1837e086b17c8a46d1c4238de74446bd075b8dc33385f64de6d0c4b04188a5046c447afa78f66071aa4868515b891d062c64c9a5
-EBUILD rubygems-3.4.19.ebuild 3549 BLAKE2B 8eefc262330781766ab500a34bf3c396d39b1c6f042a4975469018a2a75c63c71bd0faf366b19113eabe207dc0d4bec6db687b27736d5fdb1836d01cbf1b2213 SHA512 5c6969e33714a62f610b40906f1dce877ca356c5fa5ee785ab1e9ba310309d7e2ea8b83322bceca2bdc3a4c64a630603adc4203db8a33412fdc31a155259ecba
 EBUILD rubygems-3.4.22.ebuild 3542 BLAKE2B 0c60668905bdc2bc2bf2a54b1725957926d7d21ee3c04277b187b8e67ca49a0206e7a782488bfcedec7e02197f963b8f4bf92074db5a0312a7ef0fd1770f1311 SHA512 5321fb1aa5802fb2ec2a88ae351d53158c90c7d67d485c31b0c1e6d0bd5680f1a28affacf1565dd31d46a2f595a3fd5af6ff1b9586a6a16f0e65053ef84e903f
-EBUILD rubygems-3.4.6.ebuild 3419 BLAKE2B ddc293424602b865b6949c16bfc5540d9da755618429aa99c61a378bb6154370544704929bd82d4e4f09a86007a3692a0b72e74cab5605890ed871a428f3bc8a SHA512 9fe20194b85ed948d6e999d67601374f14b5b39147e1310068aa8c5787fccd2e046c7e5594da9709f226712ceb41e8663ab09f76eacac21421cf8bd8b18f78b4
-EBUILD rubygems-3.5.11.ebuild 3556 BLAKE2B 7c7f6a1ed5c6b1eddf1e857d49c29dc6fe535cdb3f3f873cc6d3a2a733b935982ab2efe580f66eaad1304a6d996042a6ca6a3875c12187f3be0276e3801cb580 SHA512 c30a720d14e05c6109db45931689d553a7848bf0badc289c236b58e3e6251806773e0c3fa3667144ea1f8a83c2ce3d78c610a022eac83b98099dfe92c155e380
+EBUILD rubygems-3.5.11.ebuild 3603 BLAKE2B 528473223a3c2224e93e0406bedb0666efc6c6dc88e06a8f7bdcbed124253d06168d518fdf41d5ce594f4583dfbd190df27eb955d22ab0fcb467c93c764aa819 SHA512 9e20b5b84c3fb4492642b10e79de31862e2b63ac88780254d844381a2b495066797320859433078fad5c29264a364456e8a5b81d178594dcfdd0fb63f6a6e587
+EBUILD rubygems-3.5.21.ebuild 3830 BLAKE2B 8d61fc09ba42df48bb2591863013d8e8037a79a6ce39a6cc6bdc266d178a91a3b3cff8d9d216a6ad33533b62e95f598c2bbcaa8c129d9c980019cd229a43f8f6 SHA512 ce841c99bab7a05430df9d307c27f6fadc42991c5f68e627083e465b16726428fc4da76d02299b0d8fc67576bc8318eddc76391e3433855a08deb283157f7d6a
 EBUILD rubygems-3.5.3.ebuild 3556 BLAKE2B 9fd757bb4d3eac87ea6a2a39b3b484138f4185b8b4d635eba57cc2ad1c4d45c17410f46b62dc435c25172010fb5197061804a0fa2297c0c85a8b7740d1eae18c SHA512 f9cd964bda7e97bd5844f9bcbae832c2ec8294db5fd868d75b5e850471d41328404ec4ff64629a3a956c5fd76267f92e972ac4c80c12d2a5b35358de964c95d7
 EBUILD rubygems-3.5.9.ebuild 3556 BLAKE2B 7c7f6a1ed5c6b1eddf1e857d49c29dc6fe535cdb3f3f873cc6d3a2a733b935982ab2efe580f66eaad1304a6d996042a6ca6a3875c12187f3be0276e3801cb580 SHA512 c30a720d14e05c6109db45931689d553a7848bf0badc289c236b58e3e6251806773e0c3fa3667144ea1f8a83c2ce3d78c610a022eac83b98099dfe92c155e380
 MISC metadata.xml 432 BLAKE2B c63e6f07840e2764fda3c1270275351adef92a243292b67181cc06a0fdbb76ee02e64069149c082d33d75f9407ced54156423b023fc1eb34a800282f0aead9ca SHA512 67ce708fa9f5532770b83481d4b33bb1e21be994dd7c5342c4abcd084b5cbfe544ee692e25a468e99e22174fe685312a3f42bb80f01120fcfe138046fb0a54b8
diff --git a/dev-ruby/rubygems/files/rubygems-rdoc.patch b/dev-ruby/rubygems/files/rubygems-rdoc.patch
new file mode 100644
index 000000000000..ea63212c1206
--- /dev/null
+++ b/dev-ruby/rubygems/files/rubygems-rdoc.patch
@@ -0,0 +1,42 @@
+From 167b713ec4e7546a57a9b1dec4eec282baf26414 Mon Sep 17 00:00:00 2001
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Fri, 13 Dec 2024 15:05:12 +0900
+Subject: [PATCH] Fixed compatibility error with setup command and rdoc plugin
+ on rubygems
+
+---
+ test/rubygems/test_gem_rdoc.rb | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb
+index 19ccf1e5871b..c4282b309c67 100644
+--- a/test/rubygems/test_gem_rdoc.rb
++++ b/test/rubygems/test_gem_rdoc.rb
+@@ -5,8 +5,6 @@
+ require "rubygems/rdoc"
+ 
+ class TestGemRDoc < Gem::TestCase
+-  Gem::RDoc.load_rdoc
+-
+   def setup
+     super
+ 
+@@ -20,10 +18,16 @@ def setup
+ 
+     install_gem @a
+ 
+-    @hook = Gem::RDoc.new @a
++    hook_class = if defined?(RDoc::RubyGemsHook)
++      RDoc::RubyGemsHook
++    else
++      Gem::RDoc
++    end
++
++    @hook = hook_class.new @a
+ 
+     begin
+-      Gem::RDoc.load_rdoc
++      hook_class.load_rdoc
+     rescue Gem::DocumentError => e
+       pend e.message
+     end
diff --git a/dev-ruby/rubygems/rubygems-3.4.15.ebuild b/dev-ruby/rubygems/rubygems-3.4.15.ebuild
deleted file mode 100644
index 29a8044cef95..000000000000
--- a/dev-ruby/rubygems/rubygems-3.4.15.ebuild
+++ /dev/null
@@ -1,116 +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"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' \
-		-i test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Avoid tests that require a network connection (for crates.io or other downloads)
-	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
-	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
-		-i test/rubygems/test_gem_commands_exec_command.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(30|31|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.4.6.ebuild b/dev-ruby/rubygems/rubygems-3.4.6.ebuild
deleted file mode 100644
index 07516f718180..000000000000
--- a/dev-ruby/rubygems/rubygems-3.4.6.ebuild
+++ /dev/null
@@ -1,113 +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"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_depend "virtual/ruby-ssl"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rake
-		dev-ruby/rdoc
-		dev-ruby/webrick
-	)"
-
-all_ruby_prepare() {
-	# Remove unpackaged automatiek from Rakefile which stops it from working
-	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-5.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_initialize_\(path_with_defaults\|regexp_path_separator\)/aomit "gentoo"' test/rubygems/test_gem_path_support.rb || die
-	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/aomit "gentoo"' test/rubygems/test_require.rb || die
-
-	# Avoid test that requires additional utility scripts
-	rm -f test/test_changelog_generator.rb || die
-
-	# Avoid tests that require a network connection (for crates.io)
-	rm -f test/rubygems/test_gem_ext_cargo_builder.rb || die
-
-	# Update manifest after changing files to avoid a test failure
-	if use test; then
-		rake update_manifest || die
-	fi
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc CHANGELOG.md README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(30|31|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.5.11.ebuild b/dev-ruby/rubygems/rubygems-3.5.11.ebuild
index d0c9d9d059fc..9d4c1831a960 100644
--- a/dev-ruby/rubygems/rubygems-3.5.11.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.5.11.ebuild
@@ -20,6 +20,8 @@ RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
+PATCHES=( "${FILESDIR}/rubygems-rdoc.patch" )
+
 ruby_add_depend "virtual/ruby-ssl"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rubygems/rubygems-3.4.19.ebuild b/dev-ruby/rubygems/rubygems-3.5.21.ebuild
index 781d823d66ce..d84bd91a43ae 100644
--- a/dev-ruby/rubygems/rubygems-3.4.19.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.5.21.ebuild
@@ -1,25 +1,27 @@
-# 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"
 
 inherit ruby-ng prefix
 
 DESCRIPTION="Centralized Ruby extension management system"
 HOMEPAGE="https://rubygems.org/"
-LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby MIT )"
 
-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"
+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="server test"
 RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
+PATCHES=( "${FILESDIR}/rubygems-rdoc.patch" )
+
 ruby_add_depend "virtual/ruby-ssl"
 
 ruby_add_bdepend "
@@ -55,6 +57,10 @@ all_ruby_prepare() {
 	sed -e '/test_gem_exec_gem_uninstall/aomit "requires network"' \
 		-i test/rubygems/test_gem_commands_exec_command.rb || die
 
+	# Avoid tests with newer rdoc versions. These tests have been disabled upstream.
+	sed -e '/test_execute_rdoc/aomit "no longer needed with rdoc 6.9.0"' \
+		-i test/rubygems/test_gem_commands_{install,update}_command.rb || die
+
 	# Update manifest after changing files to avoid a test failure
 	if use test; then
 		rake update_manifest || die