gentoo auto-resync : 03:12:2022 - 21:00:43

12 files changed, 6 insertions, 1067 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index aec0e0308a26..47ff1dbd10ab 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index eab415fadedb..7e4561ba4b59 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -21,5 +21,5 @@ DIST erlang_doc_man_25.1.tar.gz 1714586 BLAKE2B b37b03f60d662d02018515de5ca16b38
 EBUILD erlang-24.3.4.2.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd
 EBUILD erlang-25.0.4-r1.ebuild 5017 BLAKE2B 0c78785a21f4e4e59a2718443f923b5a28bfa624bb4b1d041c7e02619e6f5f9fece80a211a5d3624de17c914732d60860bc87a4284631226b5342a266a465ab9 SHA512 926fa60cad6aa995bd316f60be1e3303793531cd3cd16328142be94ce1c2cd65ba30020febeec9d67a5f249355db122f31e6bc0a687c0a8a61193762b24a8bb1
 EBUILD erlang-25.1.1-r1.ebuild 4979 BLAKE2B 499d8465709c320d2dadb8d353853d3d5c1ce9c9626e500162a2716bbd742ad415e67b58441e95bf990e4eee572fccb833159d9e211cf830a7847b97aa0762cd SHA512 6ccadee9a1644526f67bdb2365ef9c2c17a3ff43260883276545a879e4fa291e21a21149db05e629eae2bcc9a003a109fa73d1c45727d522da577bc042ee5164
-EBUILD erlang-25.1.2-r1.ebuild 5096 BLAKE2B 966bb4887d7f7dc976052f0736b18453326d8b119c2ea45c5c0efc7d401826a02787fddb37c823c7b2f40b470b2150be142ccac72cc3c306693c5b60aae1d633 SHA512 7c798913c9bc6413cb4eb2d2adcaa9fe6023c1acdf65e7c62ac7fd9b334487c892730626573218fa2db8873df68f8888d6bcabf85a7821ff63ca86fb0ccb8de3
+EBUILD erlang-25.1.2-r1.ebuild 5094 BLAKE2B cf29f00b1e74bee34bdb3763adbb6c3f6da6065c912cbd05413f4c3148b24aedc7f697325a293ce66909894c5a6c3779de5e5bc7b75dc2d0248058b3d1c57f60 SHA512 e7c86f242b29a6757b4eaaeceabd61b37e181cc1bec4cd77546619b10cf682359f575f1051c470ffd9158c72f5960dedb0e30738e0492758e107ad7aa603cbf0
 MISC metadata.xml 749 BLAKE2B 32f06b2fa8579a65cdf259a76df093da6e8d5c27497f8167d8288947076a11960606ad23567bb4984d6b24270965dbd7563b8c9ae08f8f69a8968ac102f32a8e SHA512 4dc1b01adfab93b5ea99876cbd7a4a9a39e66f6417b7e84a9341dab91f3d63fa903b69e4d827a656a709d4308f32ee0bd4a9594b87b3d3d05543249c847ca3c0
diff --git a/dev-lang/erlang/erlang-25.1.2-r1.ebuild b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
index 7c7535e10d28..3f91fc88f1df 100644
--- a/dev-lang/erlang/erlang-25.1.2-r1.ebuild
+++ b/dev-lang/erlang/erlang-25.1.2-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 9b2ea1680ba3..5c31322f239a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -15,17 +15,10 @@ AUX 3.1/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9
 AUX 3.1/010-default-gem-location.patch 715 BLAKE2B 1a3b0a3479210f6bafe89bfea4580ebcf44bb5c42b72a244dee9fa53371c095d6c8ff39feb58296518779b5841647ed89732bed33c542ad24d5b93ba97097cd6 SHA512 e0d0ebfc6de8dfb81cee309f0d1b7a9ccf64617ea16ad6d8d3ea715b29fb7b3bb6d962072503eee7125ffc1e5ba53035453e887935e681de3d35df279d7c0dc8
 AUX 3.1/011-default-gem-location.patch 689 BLAKE2B 754bb18d8d028e763cc4e91e5a0a543beee807d0dd9d68e3bef52beafd2a28896372e20e5b9ee9fd6556323f7369f30a0c65d676e5de869bb81f978b6f7e655b SHA512 71e9ec7e0e6353cc4b973ed6dbe3c12c7784173705dc17a2e772f653aa592f2252749955f7957aa7526071eceb927711ef9055430ed3671025e35f57898ca754
 AUX 3.1/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
-DIST ruby-2.7.6.tar.xz 12084408 BLAKE2B 4b40e66aeeca3884983fffcf31c4713eb4fcdd62232e795dc5a0c03236c3c05200068902c0cb987455297bec2bcfc2a9a24f2841d18a480c7d09b86318daab3f SHA512 e86410b59d5917786fe43b00fd75dedd0e7f84611286b9274c542d2e562088fcee6bcc6c2596c30ccf793280d2bac6bfbb2619ef0513b3ca31f10f88684c7b1f
 DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
-DIST ruby-3.0.4.tar.xz 15830368 BLAKE2B 3d1f2e6329269febbd02ac8a68aafd57d5ca858c816a81e754adfc9aa2990274d190672447244520fe9fbf9a1d337d17c845a97800f964e2046b2ef9eef733ee SHA512 53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
-DIST ruby-3.1.2.tar.xz 15101588 BLAKE2B 3f06d432f023d65c4808379140c18a922ad6c6443cf7f4b5ed3d44d2e0b7e19cbf0064b5214b46f3c5335f4e61ff473943fd565082ef0b645558b83e89dd0533 SHA512 4a74e9efc6ea4b3eff4fec7534eb1fff4794d021531defc2e9937e53c6668db8ecdc0fff2bc23d5e6602d0df344a2caa85b31c5414309541e3d5313ec82b6e21
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
-EBUILD ruby-2.7.6.ebuild 7913 BLAKE2B 8330eaa1563f2880730eee59532de22372aad9bc8c7ea94ee489869100875890316306ee5edc268acc105be2a54b2fdb0a456364290e69bd5b046acfbb189012 SHA512 224412dcc37ec8368907190e14ac3dfe16f5636b442d92f029b55a1cfdffa036828c279e8da9af61ccbd3c218e138068e35e3cc2d2614424c15395281a2cad9a
 EBUILD ruby-2.7.7.ebuild 7919 BLAKE2B 1e6c1c39b7213fac6b657a059b9648e46bb3535e142335aba846ee323a39d4c1ec55dbab65e418670fe6207f33b8e0f1db72ceac56468acc27664aafa092de34 SHA512 7050b5d05734f0b588877c33b1b531d8d50d060234f12c29d5a209ab8dbd440bfc223f038002aac30837dc2f76d8774e18b661dbef53efb3ee8b0b4dc8e8fcb5
-EBUILD ruby-3.0.4.ebuild 7768 BLAKE2B b20ea1f1c0cbc583a41587f7c32e83def9a50045cc6bf6607a0ef6f90b6712d0bc242abb5ad15a152b3b6b037d3038c38006e34b4b6d777959ec84250ccae6fa SHA512 9ae32072ad97f3fe39a98bcd6ec249a6d1be97e8104b8482dd3d56c53b945c154cac4b67012938fb9b87352e984c510cd48c9e0ed602577c90881b3fb845ec2f
 EBUILD ruby-3.0.5.ebuild 7774 BLAKE2B 7ccf3d999e50ee855c60969763c057dbe9354b090fe9928dddd322b6189f526b2e94504f9fd6b0f352f3dca039fd74fec3770f1777ce7f7ae9ec0e41e798907d SHA512 b10709b08711b5f3292813f60d0fca56fbf1d66e1893312e77812759ee056ec8fe5883d94d57b103947d518e0ec392e02bddb8370cf6508366f8293715a2ef62
-EBUILD ruby-3.1.2-r1.ebuild 7386 BLAKE2B a9d1ddefbfb87658518a66a49cbd69b3f17907c65997468489356510733f51a8e02b560303e0581dcfdecd6ccf0c2b4ac57c21b4b69505d151bc15c9f1d508ee SHA512 ada276970c6f78ccb8085f8c2b898bc38170b62efb32f3fa024b8852f60bd3f723c4d3c9c0b6cd1b6877486f91372a6880c38ee01aea2cf3bafdc0abe85d6553
-EBUILD ruby-3.1.2.ebuild 7716 BLAKE2B bbdc7631efe895a8eb09c8bd6d0e04fab70a98e372e8fb0118f5af69a7202df4235481312bfd335034642f18cea15af20cef230bed5ec0fb133801263828006f SHA512 bf97f0af405bfa386fb35b596663d2b75641d175902eaf2d93230561c4e2da1d6fc02c8bc9b9c12c963dbed2125de836eb9bb51b3107b69c28e792a4c6de610c
 EBUILD ruby-3.1.3.ebuild 7518 BLAKE2B b2ed93e5681dad89f143af813c75e515d96c0c698f21a6a19a7ed959d5eb165352f6d87dc7a76395f9bbd43f8d17995c4f3511a37b8afa397a7b67f051a66d6e SHA512 b45cd6530aebf890663d1481fb0354363de0e7ca8a04b575d14e643b40b68eaf4d47d9c372165860ec49382d3ea9b6b078567c92b29042d75c69679e35615c0d
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/ruby-2.7.6.ebuild b/dev-lang/ruby/ruby-2.7.6.ebuild
deleted file mode 100644
index 94b3749a7ecd..000000000000
--- a/dev-lang/ruby/ruby-2.7.6.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20191222
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
-	>=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
-	>=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
-	>=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
-	>=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby27]
-	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
-	>=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby27]
-	rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/2.7/{003,010}*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/2.7/{900,901}-musl-*.patch
-	fi
-
-	# Reset time on patched gem_prelude.rb to avoid the need for a base
-	# ruby during bootstrapping, bug 787137
-	touch -t 202001010000 gem_prelude.rb || die
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700.
-	rm -fr gems/* || die
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || 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
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-
-			# disable using security framework (GCC barfs on those headers)
-			sed -i \
-				-e 's/MAC_OS_X_VERSION_MIN_REQUIRED/_DISABLED_/' \
-				random.c || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-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
-
-	# 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
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# 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
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# 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 doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-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(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.0.4.ebuild b/dev-lang/ruby/ruby-3.0.4.ebuild
deleted file mode 100644
index d580d6d5147b..000000000000
--- a/dev-lang/ruby/ruby-3.0.4.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
-	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
-	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
-	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
-	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
-	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
-	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby30]
-	>=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
-	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
-	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
-	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.0/900-musl-*.patch
-		eapply "${FILESDIR}"/3.0/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
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || 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
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-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
-
-	# 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
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# 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
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# 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 doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-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(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.1.2-r1.ebuild b/dev-lang/ruby/ruby-3.1.2-r1.ebuild
deleted file mode 100644
index 58c5cbb1c2bd..000000000000
--- a/dev-lang/ruby/ruby-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
-	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
-	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
-	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
-	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
-	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
-	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby31]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
-	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/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
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || 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/rinda/test_rinda.rb test/socket/test_tcp.rb test/fiber/test_address_resolve.rb spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.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
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules="win32,win32ole" myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-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
-
-	# 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
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# 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
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	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)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# 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 doc/NEWS* README*
-}
-
-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(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.1.2.ebuild b/dev-lang/ruby/ruby-3.1.2.ebuild
deleted file mode 100644
index df0d23d2bc16..000000000000
--- a/dev-lang/ruby/ruby-3.1.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	systemtap? ( dev-util/systemtap )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	dev-libs/libffi:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	>=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
-	>=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
-	>=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
-	>=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
-	>=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
-	>=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
-	>=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
-	>=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby31]
-	>=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
-	>=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
-	>=dev-ruby/json-2.6.1[ruby_targets_ruby31]
-	rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/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
-	# Don't install CLI tools since they will clash with the gem
-	rm -f bin/{racc,racc2y,y2racc} || die
-	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || 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
-
-		if [[ ${CHOST} == *darwin* ]] ; then
-			# avoid symlink loop on Darwin (?!)
-			sed -i \
-				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
-				configure.ac || die
-
-			# make ar/libtool hack for Darwin work
-			sed -i \
-				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
-				configure.ac || die
-		fi
-	fi
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-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
-
-	# 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
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# 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
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--with-readline-dir="${EPREFIX}"/usr \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable jit jit-support ) \
-		$(use_enable socks5 socks) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no
-
-	# Makefile is broken because it lacks -ldl
-	rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
-	emake -j1 V=1 test
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-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)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
-		export DYLD_LIBRARY_PATH
-	fi
-
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	# 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 doc/NEWS* README*
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-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(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 00d835fa49cb..94d2d272971e 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -67,5 +67,5 @@ DIST rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 054f1b773518a9
 DIST rust-src-1.64.0.tar.xz 2437612 BLAKE2B 9bd5cb64c4ac98ffe60f15bf62517f3ba214ec788d939a27135bca4b770a7a760299ffa43090846e9a83c734a6b2d97102e51f9760f655cb596bda91214012a0 SHA512 a1867ea7a36f669fcde149578dceb8bc7503435d9c740594cd6181e0ea0e4be9d3c8b79f755c0f457bdbc3200149cd94eba17922d00610c5ff6be5fe1f8bd862
 DIST rust-src-1.65.0.tar.xz 2488012 BLAKE2B d48f5591e72e14084f2fb0d66c1365f1648060d514af23c0498e02adfd7223b1a79bd1f512859b058f9cabc4b88b9230d15960df7c30762a5263d1785b877a68 SHA512 247f822a9c2f16d1de29d1cf6fa7ff393b7c7fe01da66a7c0b4add6259d72403922b8b1bd1b511ed8a9cc0b2c12ff574945aa7fc76c731fba620b466bcdc2eac
 EBUILD rust-bin-1.64.0-r1.ebuild 6874 BLAKE2B 712d0b0046332418063598f64fc8bd0c024397e27d846e3c11aebdae6c4d29d7fc3da892b64d2d5fdc31f319b19fb380dfb5f96718cdd3cf7da6c4ee8add2fa6 SHA512 1418917f21689335fdd10249a4c7703b4271d89a103b2fd4762a28a98935944daf2e0f9da9456c8e16ab11c123d34d82cd3d0893393d2492f6e076b5ddf453ab
-EBUILD rust-bin-1.65.0.ebuild 6731 BLAKE2B 7b99f342ca789758847d407d1c90176d50260505bdcfc9b49b27b636e0765b375e48d9c8230fe919b095c84b1889ec6e4c68cb52f290a33c002242ffb7f196cf SHA512 263d90323d4feb1526eb32ec7b51e8d02d55b8f68db16bc286e99a6fab1fccf484c210ff96a23bc13a6b0709c07161918aec28cb733bedea0c5c37341c0ff736
+EBUILD rust-bin-1.65.0.ebuild 6730 BLAKE2B 0f0bf58c8401dbcc858d22585a57e96988e3ee5d9dab120b4e9f955c630aa61d12e15b9deba0f4edf62a1e6c4dc869980081fa21537b014fb9cc897c3881858b SHA512 ec04fa1da0481714bf7b9d43f175f456d01eae4d70f0d914f6911bb7b809c3c133df0b614243a0f1bb0c0c2fa8345b0b6d19e269b5017cbd36252c85fdb4a176
 MISC metadata.xml 696 BLAKE2B d6c2665e1859a18e6b1bf7c04a0de5adda80e34b759994e158a137219e314ed0e4890a8a7f680e1b7bfb940c04e3c0b49eb3518f2fc08dcc9e19cd5fb867d02e SHA512 b93c2ab79c454d8897948e810150cb2512ca606083a2aa2135425a69ac7b7077f64e3d86f8f8b13734640a05e668a870d70003d6dc9fd3d151ca7ffcf2fb3c44
diff --git a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
index 2622c2b69c23..a6d5802e3a9c 100644
--- a/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.65.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 7206406ad68d..67e9e0e0b4db 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -71,5 +71,5 @@ DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e9886
 DIST rustc-1.65.0-src.tar.xz 139674928 BLAKE2B a218263fb67e306b153f5a6dae95b5ec653acaa5eb4b833862d6f0fd4685a8cec097dadc1b8a934e1bf6055672c7a617f9a0ad4a7dbf2e78084297f10b7ada04 SHA512 3d0369ed3028209c4ecb9b9e7b5f5e3a20be8cc05199675df4f091d62a96c0734bc1dbd7630928fe162792392ec6d0daf9ceed10771531ce022200c7b631e3be
 DIST rustc-1.65.0-src.tar.xz.asc 801 BLAKE2B 43ff92011cd6f7f34ce0495fa341379e5907d032ea90f91e533e5edaec6ad518aad50a9d8b2694074d6909ee96aa779403b16e95792e962e79c1b967542ae26f SHA512 75b9be53363022c81333117876cbcc573bbd4733edf767cbb164218644efb1a9c4bfc2aa73aaa1e39f248a84f1adacb1930a94a6e63f60093ff760fb9ae02efc
 EBUILD rust-1.64.0-r1.ebuild 23867 BLAKE2B b9d8aa35b84e668fb038fb813bfc6bc2bae4dce945e381cff0645a1fa9463a8cd30aa92e0018a407263929bd0da169191de136e634c9edacccd1ac0ffb69337b SHA512 4a174b1d34e6f7bfd860629d0bc06e99a7accf9eb7c7bf51f10db8b255237c63b3a5aee1291dd2ceb404676a67f5e507a7414ecc132c5926ee292cc047b0ced4
-EBUILD rust-1.65.0.ebuild 23814 BLAKE2B 85f3750587026d3447efc5c7c6aacfe083e24408b2c19b1ec665608aabee39b0d1787714fac3f720a2678c3bdcfb2879beeae0260618cb3551125edb3e3f1ac9 SHA512 f02ab726b02167a018f924ed46138036beb87d462508f6fa159050e7d0a78b91e65e7c42e832b298bd511dc1050453b888e05d93eec1fd88c24a77f4ab736bdd
+EBUILD rust-1.65.0.ebuild 23813 BLAKE2B ae34400b4569c40d5174f3b739bbfee5719e0c4b30136231b447e40d02918732af673b4bffaf6b92d020043715c6c4bef943d4f0a476863be52225bdbecbb59a SHA512 3253606e2624b94df77d10e8176f1b06a73d2f42677b21edd44dc11b4c4d7b46903c1638afa2c25c70b1da43b984abdd928f3760bb3641798e284db9fd7de1ae
 MISC metadata.xml 1770 BLAKE2B d5881dc5ea39a5bfff7c74fa883dc1a6370db572568e10fce81467c2f2a17018de48123dfa7993d6d9644305bfc5ef5b0f445ef40362065fce943efb4af2e761 SHA512 c914e1a0cee95fa5cb332240f3eb6fbee73e5d8baabfa6bdcdc3e852c9480fea0686e435b969e14f45d8c791655edc6e6a7df2259ac99b6a6e63af65b09fa57e
diff --git a/dev-lang/rust/rust-1.65.0.ebuild b/dev-lang/rust/rust-1.65.0.ebuild
index 2306e80be316..8f141a77a25f 100644
--- a/dev-lang/rust/rust-1.65.0.ebuild
+++ b/dev-lang/rust/rust-1.65.0.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc64 ~riscv sparc x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"