14 files changed, 15 insertions, 651 deletions
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 321e1dcf61cd..2d1078ca2ab3 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,7 +4,6 @@ DIST ruby-3.2.9.tar.xz 15141728 BLAKE2B 3cc7350c756ef84da7626142c492e0c7a28aafa4
 DIST ruby-3.3.10.tar.xz 16450140 BLAKE2B 3255782d85e6c5dcfc165b3dc209e9a754112fd0e18b9db66cd0b182edbc5c0ef78e9fcf114570ba1bc6a1ed43d648d5254cdb4bb85c571486e6a4dced2c6843 SHA512 8b81cab7b98acb6ff7bdf864da5e97596ee1efa441e2a65991e12a7e3f3ad3d83b1b5c65ae108484252ec8f6d85db60eb381a174c759023beb202b5a0d20818a
 DIST ruby-3.3.8.tar.xz 16435924 BLAKE2B a10c5cfbab9879abcc9c9ae6752718005a2ba1f21a5c67080d9529579d25194e3ee39a13dd20aac756689939a110daa2281b64a41cf86441b7400ac4d5955bd5 SHA512 71c2f3ac9955e088fa885fd2ff695e67362a770a5d33e5160081eda3dd298ca2c692e299b03d757caecfbc94043fedc4ad093de84c505585d480cb36bbf978b9
 DIST ruby-3.3.9.tar.xz 16436904 BLAKE2B 1f809d982f0ac60025ac98d2ded28697f1e68eb61a40a6e95a561ee0a5ae87b150b2341aae1ae5d52a4ac1cb370a60fdb5306c3d241d80329b3af3245d71a8e5 SHA512 52be800daf9e983dd7539f6961ee6d4e863c8f4eefdce4fb1091fdfe05339531832dd88d2a8b6f5cdcd790f9d5aefa3bc08574fcb2bab399200d20fa0ad1db18
-DIST ruby-3.4.4.tar.xz 17255388 BLAKE2B 0c9b61784beb6c6f8b082cad4299f52de994ecb49e6bf5e9ac263c1d4fc2618119ddb1276d7060772856d297d9c2765590b54972fa2234738b3dd5c4020332f8 SHA512 0d258cf790daad424c866404b5cbdc8adba0e4e13764847a89adf2335229e5184095c9f3e9594705897697e48bcc322d9a9f919b04047abb2075daca9fce8871
-DIST ruby-3.4.5.tar.xz 17265032 BLAKE2B 79042684a91f1595925f81d53d00db7b8864af56ecd9e4a4e9a68b3d315d823a652cda59449d4fffce5caf10ee050aba4eb3c205626e32564044330e645e0ee7 SHA512 1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560
 DIST ruby-3.4.6.tar.xz 17303436 BLAKE2B 1e3b85780821c9df4f82382b7f48b1c543fb8031595de46d0dd33aeb7a2719b4a03ca29d39def056c6040f27e4dc3ca442035e0febb5fb8def8ef837b10786e7 SHA512 29000b3396ab95fc2dc13d2d78441ff5c34258e5421115181c54b1b4d55d5c0d4f3d0c3cec6b32b9a1bb8de5c51b383fcad4369ec3fb244fd0ce182afbe79ba4
 DIST ruby-3.4.7.tar.xz 17312044 BLAKE2B 27732452672e30c5d3d11b6aa6f6e3ebf1c363492145c3e43244804e522d83230f68075d81c6361b4504ad4b9dcb5ac23335412d1f290c03c44a83f940024e8b SHA512 a6b99a2f1d0115d5e7efa710da440b9066c524c335928367c80852630f8db5da36c0a82d6e7ace90e8c40cb20c6097cbdca15a51c343254cadf5f0adf60f8505
+DIST ruby-3.4.8.tar.xz 17320860 BLAKE2B e40144cea391c32a4ce1e6c576884dd9ca3a31398b0110bb67e96eca90dc1d8cb0376269e691a1b48b06bbbb23b0137e67bd05ae4aeccb5c26d163fbce5cec55 SHA512 b6289654685c2d381d15123cf07a131fd088edf13a5336966af5a2e8fad9adda42d14caa7bb0998331831af71e35c546091db55c82089e89b9508603ff5f92d6
diff --git a/dev-lang/ruby/ruby-3.2.7.ebuild b/dev-lang/ruby/ruby-3.2.7.ebuild
index 2644e645a2d4..01241122a5e0 100644
--- a/dev-lang/ruby/ruby-3.2.7.ebuild
+++ b/dev-lang/ruby/ruby-3.2.7.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.8.ebuild b/dev-lang/ruby/ruby-3.2.8.ebuild
index ad72053cbea8..4ea0f13d6f49 100644
--- a/dev-lang/ruby/ruby-3.2.8.ebuild
+++ b/dev-lang/ruby/ruby-3.2.8.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.9-r1.ebuild b/dev-lang/ruby/ruby-3.2.9-r1.ebuild
index 59616e51fd44..1e2e71e01bb7 100644
--- a/dev-lang/ruby/ruby-3.2.9-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.9-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.2.9.ebuild b/dev-lang/ruby/ruby-3.2.9.ebuild
index ca23aef6ca0c..f444f1b235d3 100644
--- a/dev-lang/ruby/ruby-3.2.9.ebuild
+++ b/dev-lang/ruby/ruby-3.2.9.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.10-r1.ebuild b/dev-lang/ruby/ruby-3.3.10-r1.ebuild
index 841f5541fd29..f324894fffc6 100644
--- a/dev-lang/ruby/ruby-3.3.10-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.3.10-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.10.ebuild b/dev-lang/ruby/ruby-3.3.10.ebuild
index 6bed5e2bd60d..d97a324684c0 100644
--- a/dev-lang/ruby/ruby-3.3.10.ebuild
+++ b/dev-lang/ruby/ruby-3.3.10.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.8.ebuild b/dev-lang/ruby/ruby-3.3.8.ebuild
index 2bdae2d5b107..0359aa478e0c 100644
--- a/dev-lang/ruby/ruby-3.3.8.ebuild
+++ b/dev-lang/ruby/ruby-3.3.8.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.3.9.ebuild b/dev-lang/ruby/ruby-3.3.9.ebuild
index fae5cd5fb46f..e3f22f9bba49 100644
--- a/dev-lang/ruby/ruby-3.3.9.ebuild
+++ b/dev-lang/ruby/ruby-3.3.9.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.4.ebuild b/dev-lang/ruby/ruby-3.4.4.ebuild
deleted file mode 100644
index 143d1d08dc37..000000000000
--- a/dev-lang/ruby/ruby-3.4.4.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_OPTIONAL="yes"
-
-inherit autotools flag-o-matic multiprocessing rust
-
-MY_P="${PN}-$(ver_cut 1-3)"
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/$(ver_cut 1-2)/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${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="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( ${RUST_DEPEND} )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-debug/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	virtual/zlib:=
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20241225
-"
-
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.25.4[ruby_targets_ruby34(-)]
-	>=dev-ruby/power_assert-2.0.5[ruby_targets_ruby34(-)]
-	>=dev-ruby/rake-13.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/test-unit-3.6.7[ruby_targets_ruby34(-)]
-	>=dev-ruby/rexml-3.4.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/rss-0.3.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-ftp-0.3.8[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-imap-0.5.4[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-smtp-0.5.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/prime-0.1.3[ruby_targets_ruby34(-)]
-	>=dev-ruby/rbs-3.8.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/typeprof-0.30.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/debug-1.10.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/racc-1.8.1[ruby_targets_ruby34(-)]
-
-	>=dev-ruby/mutex_m-0.3.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/getoptlong-0.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/base64-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/bigdecimal-3.1.8[ruby_targets_ruby34(-)]
-	>=dev-ruby/observer-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/abbrev-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/resolv-replace-0.1.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/rinda-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/drb-2.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/nkf-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/syslog-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/csv-3.3.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/repl_type_completor-0.1.9[ruby_targets_ruby34(-)]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby34(-)]
-	>=dev-ruby/bundler-2.5.11[ruby_targets_ruby34(-)]
-	>=dev-ruby/did_you_mean-1.6.3[ruby_targets_ruby34(-)]
-	>=dev-ruby/irb-1.11.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/json-2.7.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/rdoc-6.6.2[ruby_targets_ruby34(-)]
-	xemacs? ( app-xemacs/ruby-modes )
-"
-
-pkg_setup() {
-	use jit && rust_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/015*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/016*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/017*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-
-	# Avoid the irb default gemspec since we will install the normal gem
-	# instead. This avoids a file collision with dev-ruby/irb.
-	rm lib/irb/irb.gemspec || die
-
-	# Remove tests that are known to fail or require a network connection
-	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
-	rm -f test/rubygems/test_bundled_ca.rb || die
-	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb \
-	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb \
-		spec/ruby/library/socket/socket/connect_spec.rb || die
-
-	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
-	rm -rf tool/test/webrick || die
-
-	# Avoid tests using the system ruby
-	sed -i -e '/test_\(dumb_terminal\|tty_amibuous_width\)/aomit "Uses system ruby"' test/reline/test_reline.rb || die
-
-	# Avoid testing against hard-coded blockdev devices that most likely are not available
-	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
-
-	# Avoid tests that require gem downloads
-	sed -e '/^check/ s/\(test-syntax-suggest\|\$(PREPARE_SYNTAX_SUGGEST)\)//g' \
-		-i common.mk || die
-
-	# Avoid test that fails intermittently
-	sed -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' \
-		-i test/rubygems/test_gem_commands_exec_command.rb || die
-
-	# Avoid test fragile for git command output not matching on whitespace
-	sed -e '/test_pretty_print/aomit "Fragile for output differences"' \
-		-i test/rubygems/test_gem_source_git.rb || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# Ruby's build system does interesting things with MAKEOPTS and doesn't
-	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
-	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
-	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
-	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
-	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
-	export MAKEOPTS="${makeopts_tmp}"
-
-	# Avoid a hardcoded path to mkdir to avoid issues with mixed
-	# usr-merge and normal binary packages, bug #932386.
-	export ac_cv_path_mkdir=mkdir
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	append-flags -fno-omit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Fix co-routine selection for x32, bug 933070
-	[[ ${CHOST} == *gnux32 ]] && myconf="${myconf} --with-coroutine=amd64"
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	# except on Darwin, where we really need LIBPATHENV to set the right
-	# DYLD_ stuff during the invocation of miniruby for it to work
-	#
-	# --with-setjmp-type=setjmp for bug #949016
-	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--without-baseruby \
-		--with-compress-debug-sections=no \
-		--with-setjmp-type=setjmp \
-		--enable-mkmf-verbose \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support) \
-		$(use_enable jit yjit) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		$(use_with valgrind) \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 check
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md README*
-	dodoc -r doc
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(30|31|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.4.6.ebuild b/dev-lang/ruby/ruby-3.4.6.ebuild
index 4713012f2bba..363051469b4d 100644
--- a/dev-lang/ruby/ruby-3.4.6.ebuild
+++ b/dev-lang/ruby/ruby-3.4.6.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.7-r1.ebuild b/dev-lang/ruby/ruby-3.4.7-r1.ebuild
index 6205af5aa2ab..59425f37fff9 100644
--- a/dev-lang/ruby/ruby-3.4.7-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.4.7-r1.ebuild
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.4.7.ebuild b/dev-lang/ruby/ruby-3.4.7.ebuild
deleted file mode 100644
index 4713012f2bba..000000000000
--- a/dev-lang/ruby/ruby-3.4.7.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_OPTIONAL="yes"
-
-inherit autotools flag-o-matic multiprocessing rust
-
-MY_P="${PN}-$(ver_cut 1-3)"
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/$(ver_cut 1-2)/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${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="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( ${RUST_DEPEND} )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-debug/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	virtual/zlib:=
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20241225
-"
-
-DEPEND="
-	${RDEPEND}
-	valgrind? ( dev-debug/valgrind )
-"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.25.4[ruby_targets_ruby34(-)]
-	>=dev-ruby/power_assert-2.0.5[ruby_targets_ruby34(-)]
-	>=dev-ruby/rake-13.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/test-unit-3.6.7[ruby_targets_ruby34(-)]
-	>=dev-ruby/rexml-3.4.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/rss-0.3.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-ftp-0.3.8[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-imap-0.5.4[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-pop-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/net-smtp-0.5.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/matrix-0.4.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/prime-0.1.3[ruby_targets_ruby34(-)]
-	>=dev-ruby/rbs-3.8.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/typeprof-0.30.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/debug-1.10.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/racc-1.8.1[ruby_targets_ruby34(-)]
-
-	>=dev-ruby/mutex_m-0.3.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/getoptlong-0.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/base64-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/bigdecimal-3.1.8[ruby_targets_ruby34(-)]
-	>=dev-ruby/observer-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/abbrev-0.1.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/resolv-replace-0.1.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/rinda-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/drb-2.2.1[ruby_targets_ruby34(-)]
-	>=dev-ruby/nkf-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/syslog-0.2.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/csv-3.3.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/repl_type_completor-0.1.9[ruby_targets_ruby34(-)]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby34(-)]
-	>=dev-ruby/bundler-2.5.11[ruby_targets_ruby34(-)]
-	>=dev-ruby/did_you_mean-1.6.3[ruby_targets_ruby34(-)]
-	>=dev-ruby/irb-1.11.0[ruby_targets_ruby34(-)]
-	>=dev-ruby/json-2.7.2[ruby_targets_ruby34(-)]
-	>=dev-ruby/rdoc-6.6.2[ruby_targets_ruby34(-)]
-	xemacs? ( app-xemacs/ruby-modes )
-"
-
-pkg_setup() {
-	use jit && rust_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
-	fi
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	touch gems/bundled_gems || die
-
-	# Avoid the irb default gemspec since we will install the normal gem
-	# instead. This avoids a file collision with dev-ruby/irb.
-	rm lib/irb/irb.gemspec || die
-
-	# Remove tests that are known to fail or require a network connection
-	rm -f test/ruby/test_process.rb test/rubygems/test_gem{,_path_support}.rb || die
-	rm -f test/rubygems/test_bundled_ca.rb || die
-	rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb \
-	   spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb \
-		spec/ruby/library/socket/socket/connect_spec.rb || die
-
-	# Remove webrick tests because setting LD_LIBRARY_PATH does not work for them.
-	rm -rf tool/test/webrick || die
-
-	# Avoid tests using the system ruby
-	sed -i -e '/test_\(dumb_terminal\|tty_amibuous_width\)/aomit "Uses system ruby"' test/reline/test_reline.rb || die
-
-	# Avoid testing against hard-coded blockdev devices that most likely are not available
-	sed -i -e '/def blockdev/a@blockdev = nil' test/ruby/test_file_exhaustive.rb || die
-
-	# Avoid tests that require gem downloads
-	sed -e '/^check/ s/\(test-syntax-suggest\|\$(PREPARE_SYNTAX_SUGGEST)\)//g' \
-		-i common.mk || die
-
-	# Avoid test that fails intermittently
-	sed -e '/test_gem_exec_gem_uninstall/aomit "Fails intermittently"' \
-		-i test/rubygems/test_gem_commands_exec_command.rb || die
-
-	# Avoid test fragile for git command output not matching on whitespace
-	sed -e '/test_pretty_print/aomit "Fragile for output differences"' \
-		-i test/rubygems/test_gem_source_git.rb || die
-
-	if use prefix ; then
-		# Fix hardcoded SHELL var in mkmf library
-		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# Ruby's build system does interesting things with MAKEOPTS and doesn't
-	# handle MAKEOPTS="-Oline" or similar well. Just filter it all out
-	# and use -j/-l parsed out from the original MAKEOPTS, then use that.
-	# Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
-	# is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
-	local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
-	unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
-	export MAKEOPTS="${makeopts_tmp}"
-
-	# Avoid a hardcoded path to mkdir to avoid issues with mixed
-	# usr-merge and normal binary packages, bug #932386.
-	export ac_cv_path_mkdir=mkdir
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	append-flags -fno-omit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-
-	# Workaround for bug #938302
-	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
-		export DTRACE="${BROOT}"/usr/bin/stap-dtrace
-	fi
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Fix co-routine selection for x32, bug 933070
-	[[ ${CHOST} == *gnux32 ]] && myconf="${myconf} --with-coroutine=amd64"
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	# except on Darwin, where we really need LIBPATHENV to set the right
-	# DYLD_ stuff during the invocation of miniruby for it to work
-	#
-	# --with-setjmp-type=setjmp for bug #949016
-	[[ ${CHOST} == *-darwin* ]] || export LIBPATHENV=""
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--without-baseruby \
-		--with-compress-debug-sections=no \
-		--with-setjmp-type=setjmp \
-		--enable-mkmf-verbose \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support) \
-		$(use_enable jit yjit) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		$(use_with valgrind) \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake V=1 check
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	einfo "Removing default gems before installation"
-	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	local -x LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	local -x RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-
-	# Create directory for the default gems
-	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
-	fi
-
-	if use examples; then
-		dodoc -r sample
-	fi
-
-	dodoc ChangeLog NEWS.md README*
-	dodoc -r doc
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(30|31|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.4.5.ebuild b/dev-lang/ruby/ruby-3.4.8.ebuild
index 4713012f2bba..59425f37fff9 100644
--- a/dev-lang/ruby/ruby-3.4.5.ebuild
+++ b/dev-lang/ruby/ruby-3.4.8.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 RUST_OPTIONAL="yes"
 
-inherit autotools flag-o-matic multiprocessing rust
+inherit autotools flag-o-matic multiprocessing toolchain-funcs rust
 
 MY_P="${PN}-$(ver_cut 1-3)"
 
@@ -19,7 +19,7 @@ SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
@@ -175,6 +175,8 @@ src_configure() {
 	# In many places aliasing rules are broken; play it safe
 	# as it's risky with newer compilers to leave it as it is.
 	append-flags -fno-strict-aliasing
+	# Workaround for bug #965095 (gcc PR122610)
+	tc-is-gcc && append-flags -fno-ipa-modref
 
 	# Workaround for bug #938302
 	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then