gentoo auto-resync : 10:11:2024 - 03:03:09

8 files changed, 103 insertions, 64 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4c67b7846208..7f8151ca4ccf 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -30,11 +30,11 @@ DIST ruby-3.3.6.tar.xz 16398228 BLAKE2B 7e2fb58ca1f5ee7ab9c2fd7b24fdbf9eef980532
 EBUILD ruby-3.1.4-r3.ebuild 8517 BLAKE2B 8a89694e604a5c61c51154246598a4f57465c6f4443ae0c103e8ee6825a6f7ad2709a6bfd3e12fc141321a5fbc7fd549ffeca7d75d4db79d564483494285f9b3 SHA512 0a422dfee5abcce9fd9c27009370c92c9ca58eeb129a2e2384eb6747f83a6e7418e0de58d562c175fea52ab7519bc2105ae64925e845fda169482b3be26cf211
 EBUILD ruby-3.1.5.ebuild 8842 BLAKE2B 322f5da3ded0e48fbb70d222d0df8a64c6c91e1445e710ddddfbb24afcbd2f4ba6ce563da93c89477efd4f940d82a182ec5e9617132c446155fda021a71ac70c SHA512 1e182e9b425f2c92fb915c89e10e745c2c06ee010dd5f4477a21a42909ac4672e8fb2600323e5c781f564f4d7377ecd997d83860a0b59294d3bc6c184291bcc1
 EBUILD ruby-3.1.6-r1.ebuild 8913 BLAKE2B e3efb05d75ac99b2f4b7b15a987e799ea949bf372eb9893d285868e3e616807479faeaf236fa7c874bbc93d2dda002ef061d97ff46ff7652158dfb3f90ee82dd SHA512 ab9f147269222231d65c92469573a1261a4ebe68a994b38c4eced06e5cb204d991a345986c31440198a96adef24e05ca905839bd218e66053c93e94bbe36fe95
-EBUILD ruby-3.2.4-r1.ebuild 9892 BLAKE2B 696d341ade6acdd7bd06976cab37c3d1d80baf529ef8f2391ae1bb9ba1425177d3aed10378dbb1a450a391b6682a3b5756ddfc51d852947253d1475995f24388 SHA512 0563553a5d2a15e2d3eebbe466f50e59840cfa60431840208340bdc0f03c9b239ba4e20e2bb690b176d1ff7475834ceb7c913a7e010ebe6105b5d5630aaa2039
-EBUILD ruby-3.2.4.ebuild 9742 BLAKE2B 174541eaf3f3d584a0ab60788bdff59b2aac6d20d26ee5cc4079a6e4c5dd5860ff05bc4d94d86fc9a669aaa88cc4e0fea70e3b0fd4a25881e2e5039f355224cc SHA512 00210ee3cd7b54cfd8122b77bccc7c6dde0c42fe07246e26918f5c343a8ebf893c375f08ca90042774c63121c20d1b3cb1de795f6956a29aa0e6691cd0326cef
-EBUILD ruby-3.2.5.ebuild 9423 BLAKE2B dc3283b4d8c20b5229f37fd5c3aaf96149f3b3586bc69b2641987527eab960bba429bbc8634cf54504db2cecd27330e1c1f11ae0e33fceeeb24e5997b62ef32d SHA512 5b4db3b8884098a7d76565e90b0e831cbcdff19fbcc5efa1b59431c34d3332c8591d7d79dd4cea93d79148c8dd59c15bb3ad600fda66d028796d360b21b46b10
-EBUILD ruby-3.2.6.ebuild 9429 BLAKE2B 55f93dd24fed1f5cccfd6e3667197d3e131ec8e860628ee805a533efc4bd094938cf1a77d34d6ce2c53bd85840958e751f2139d811cea20b593d574f53d02537 SHA512 53f44e1602e44d92aaa8aaa8b4e192ff390fd4d18c99f01c28c558afc3af489ec90f056bf0b379a35cd6d1b5162be5eefc87377d688a1e977d01526b9eada946
-EBUILD ruby-3.3.4-r1.ebuild 9280 BLAKE2B d97425d417d9a5b6b3af2a1da9fc55b80d8830eb7dc28365cc1c815d6bb2339ab92b9b427f993b2934758081f743d2754defd03284c36e4e1003edfe22f6bbd2 SHA512 6e8d50eaa87948d36f08f34bf65c92b8f7ff31fe8458aa17181725785a7eed2c98cb52346e6256a060124c99b8f39cd889298b94875b8feacefa0e2931914388
-EBUILD ruby-3.3.5.ebuild 9280 BLAKE2B d97425d417d9a5b6b3af2a1da9fc55b80d8830eb7dc28365cc1c815d6bb2339ab92b9b427f993b2934758081f743d2754defd03284c36e4e1003edfe22f6bbd2 SHA512 6e8d50eaa87948d36f08f34bf65c92b8f7ff31fe8458aa17181725785a7eed2c98cb52346e6256a060124c99b8f39cd889298b94875b8feacefa0e2931914388
-EBUILD ruby-3.3.6.ebuild 9476 BLAKE2B 5becaf1a2d8f6ff158eff3aed381739c7f7a3df2634fed637504a26b9031e479e6cd011db728b985e141780cc200d753549da8ae498e89df759f87891e2c4cbd SHA512 30aae814f559eaf7ec716208edc11606218fcf80cf07676c625c1306888ce45e05b3326d58a1c527b09b7ceb8e054a961d48c281804155e5ebdffae0ee5126b3
+EBUILD ruby-3.2.4-r2.ebuild 9788 BLAKE2B 073e9cbcef0904b9a0b02036da3b9df8f98b9033d759116939e47625f14ee8ef27da0c9f4122a596eaded97114a168750a5a2c7ae72b27612852e9fe31879ea2 SHA512 0c5bb6a2072b22c654c1274752dce31541c81fddd7bdc5674e0e05271c69891540310d2d2ddfcb8fc64fbba6b712e9d5f932fc8e1cf4793555e4f41cc6e5ee61
+EBUILD ruby-3.2.4-r3.ebuild 9938 BLAKE2B 415b6ecd80cc7a1714bafba54bed731a454bbdb03ceeb1fff73f52989282e1a56eb826cdc069019889cc4056ceebc20d40951279d1feb20b00088ee9f4dc21b3 SHA512 7402f3660abdf40c2b2329421ec959ba3da50f9a495a7de524e2d8412d20a866dfe82694cf46d19be41e74e60c52ebe754b355ccf79b1fd618f4195038a593cf
+EBUILD ruby-3.2.5-r1.ebuild 9469 BLAKE2B a68bd83f4abdf50b739bda749e0d3038d03a08a580524ed348d7ca573c109960f69c784d27ee34434d2503d8d6bd889e8dbeb72ed91d7d59a0a93f914cd8138f SHA512 dcc6bb8ff516a69fb6958b91a0241bd3c2323e224931996e9a3ab88b0d28163c7a553b23ebd9c8db872daf8dc944824b626b74495ac9441ba2ab6d5b3e64d29b
+EBUILD ruby-3.2.6-r1.ebuild 9475 BLAKE2B 9eee6a906e478ef68836ef00cf19b50b498a3403e0a58f47e75d6f4011fc98793a304484f9f31cfb7285c0c98d9890abde1b422d85d157605ab8328b0b08bc7a SHA512 140c7a37431383d121e0784f68cbcddc63dc12c47c1be64d407518c0a15ec5daeb6cb61bf71317fe5ef5bae95f2fba7affea4cb555097c8288fc09f3e521f0dd
+EBUILD ruby-3.3.4-r2.ebuild 9342 BLAKE2B 1fb9189635dda8aeec17105c784b4fa5b4158853c2d4a51a02f640067b9d6b5ed9e268a99df931f197bb877c6c38b5eea7975775235d3b19909a74ab36339844 SHA512 019a14c2ba878385d12ef1fcfa00c4dcb09c504c5d36817822989b883eb76eca17558cd78548c3777b740346c0db570c1b8c1cc77c593d557685ff1f60fbf19a
+EBUILD ruby-3.3.5-r1.ebuild 9342 BLAKE2B 1fb9189635dda8aeec17105c784b4fa5b4158853c2d4a51a02f640067b9d6b5ed9e268a99df931f197bb877c6c38b5eea7975775235d3b19909a74ab36339844 SHA512 019a14c2ba878385d12ef1fcfa00c4dcb09c504c5d36817822989b883eb76eca17558cd78548c3777b740346c0db570c1b8c1cc77c593d557685ff1f60fbf19a
+EBUILD ruby-3.3.6-r1.ebuild 9538 BLAKE2B 3033453c764967229bc140d0851881a471c6fb02a8366657787b4b9cb139777443ca9fd50392ffca90b3ff1b91f51ba526bd1a58d4fcd2b471c297fe201ea252 SHA512 d979cd2df7949b4fe22bb5ca28c9a39e6256df024dab2c906d9abb1dec7e843b2c0150d875b27ac07936239a9583cb0b8429105a3436be8f4858a6fecd6789cd
 MISC metadata.xml 504 BLAKE2B 49be2bb1dba034b23a8294cca0e5419099b487973a43db31c0edc4b9a2a08eb1b54437b0c7e6a9e6d8a5c0145cd73464f830ec04ca62540416c32b2d094cdd63 SHA512 e9991c588874e36f6a0abb12125bcd3f2b1e787df62d9f7089053959286b56676a9f35c7e82116274f169bfa22359be8df59fca6454be559e7669d2e78dc4c22
diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4-r2.ebuild
index 524d5af27834..229a1aacf8e0 100644
--- a/dev-lang/ruby/ruby-3.2.4.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r2.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+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/${SLOT}/${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 ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
@@ -180,7 +186,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+	myconf="${myconf} --with-lookup-order-hack=INET"
 
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r3.ebuild
index 7152cb0f52fc..1fd84f4d54ed 100644
--- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r3.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+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/${SLOT}/${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 ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
@@ -184,7 +190,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+	myconf="${myconf} --with-lookup-order-hack=INET"
 
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5-r1.ebuild
index a7a40d60ef35..8216cc259a34 100644
--- a/dev-lang/ruby/ruby-3.2.5.ebuild
+++ b/dev-lang/ruby/ruby-3.2.5-r1.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+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/${SLOT}/${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 ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
@@ -167,7 +173,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+	myconf="${myconf} --with-lookup-order-hack=INET"
 
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
diff --git a/dev-lang/ruby/ruby-3.2.6.ebuild b/dev-lang/ruby/ruby-3.2.6-r1.ebuild
index 988bb6012c76..c5c91c8a1c6c 100644
--- a/dev-lang/ruby/ruby-3.2.6.ebuild
+++ b/dev-lang/ruby/ruby-3.2.6-r1.ebuild
@@ -3,28 +3,30 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
+inherit autotools flag-o-matic multiprocessing rust
 
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
+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/${SLOT}/${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 ipv6 jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
+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? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -76,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
@@ -167,7 +173,7 @@ src_configure() {
 	fi
 
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+	myconf="${myconf} --with-lookup-order-hack=INET"
 
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
diff --git a/dev-lang/ruby/ruby-3.3.5.ebuild b/dev-lang/ruby/ruby-3.3.4-r2.ebuild
index cac3085b6240..a48e45203585 100644
--- a/dev-lang/ruby/ruby-3.3.5.ebuild
+++ b/dev-lang/ruby/ruby-3.3.4-r2.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+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/${SLOT}/${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
 
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.5-r1.ebuild
index cac3085b6240..a48e45203585 100644
--- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.3.5-r1.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+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/${SLOT}/${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
 
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch
diff --git a/dev-lang/ruby/ruby-3.3.6.ebuild b/dev-lang/ruby/ruby-3.3.6-r1.ebuild
index 9ea8087ae9f1..7680cec58196 100644
--- a/dev-lang/ruby/ruby-3.3.6.ebuild
+++ b/dev-lang/ruby/ruby-3.3.6-r1.ebuild
@@ -3,21 +3,22 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic multiprocessing
+RUST_OPTIONAL="yes"
 
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
+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/${SLOT}/${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
 
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm jemalloc jit socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
@@ -25,7 +26,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc:= )
-	jit? ( >=virtual/rust-1.58.1 )
+	jit? ( ${RUST_DEPEND} )
 	ssl? (
 		dev-libs/openssl:0=
 	)
@@ -77,6 +78,10 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )
 "
 
+pkg_setup() {
+	use jit && rust_pkg_setup
+}
+
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/013*.patch