gentoo auto-resync : 13:07:2024 - 12:26:41

12 files changed, 70 insertions, 152 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3a9bec0b7cd7..be7c268da915 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,16 +1,13 @@
-AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
-AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd
-AUX 3.0/900-musl-coroutine.patch 842 BLAKE2B 21b58911e2c020ed956a837f006b20f30a123f96a52b19c62093f9d9fabb2f812fc3de8539c67a1b9aa4d106d5b7b2e91729e7aba030ebbdc67b1b3f590bf560 SHA512 ba292e5465c09df675fef34a77bbf4e16ebd807d2e5174d0e3f94be26e0694ea84dc46ee25de2d3b882b906779f0d08a173ee4c708f20b4f7f1032a238d8896c
-AUX 3.0/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
-AUX 3.0/902-hppa-pthread-stack-size.patch 1690 BLAKE2B 679a69e08e7dcf9888a99cfbfef23139c5895be30e293f4df8cf20c16923498f2cc1f0355afbdd2ec3191131925bac48dbb4812c1e83f45fd85349970dea5bcc SHA512 d55e21b5d2fd914dc014db4a82aace55b114826825681f7c01f72813d6043a1c987dd2b7749bce46eb1a9f88dfe170a2cedb710b155f2c4fdb386499067d69c0
 AUX 3.1/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00
 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/012-test-readline-without-tty.patch 1307 BLAKE2B 6aeea4229e36aef75d9e56aa4d0eb65f3b95df1fb861953d63d4e00bc0f9c57aead2cfc5a68d3f0d3f8400dfe8508161a8b5b8320221d160a871aa804d52f2b5 SHA512 813bf292fe132dd52f2c11a530e09e5c58547fd146bca2509b212c175b4359d98e6464709b5693656db935bf0ea27c8846d7510c4327bd79a419c1ff6fbd7007
+AUX 3.1/020-arm-readline-test.patch 1289 BLAKE2B d441f04a6a11230df89340560f23897926d1982d46dffd5378c92956f07b9c5a062413484a62b2ba6b799e73d2008f5d19c549a864d61c2fb77b5de2c7a0db07 SHA512 7023b78255229ae124415274bb57077913a6a1f4667494491c00dd8933492f763dfb803eedf3a72251d2362d54eaa6723af6c68b84583fbdee21320cb6b7c66d
 AUX 3.1/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
 AUX 3.1/902-hppa-pthread-stack-size.patch 1690 BLAKE2B 3d402e1f2e0dddc1557ed78d802516ec3f8e122b046fc153a702090aa3c5cac1ec4005fee4cf2e5c28c4be6e3183c5a12d4fb3a3c9fc07ea3f068cefd12b8b2b SHA512 87caf7fc61cd94ec45f68a799ab87caa740a2d0fa8eef60b1fa9f33f95586ecfaed7ed1466f7feeeed725d9b92d40a730e0835bf08f9eba9505790ed84b42125
 AUX 3.2/010-default-gem-location.patch 356 BLAKE2B f44459799fff80c7f14e5e7d674ee9ed22863cdb84838e0fad55a66f615fa91e3e4de30377c04a385927feea67c6046c837eb7a647fbe162685309ea3f9ea420 SHA512 894075663d409a117ad94abd63d6562c90b87a725ef56d02ad7c187532b99a56128be2f5f64d0e72763d1c14213707de84c920415107df875218489796bc4a5a
 AUX 3.2/011-arm64-branch-protection.patch 1223 BLAKE2B 57ec142850e430f51aeca7c4f70ad9bac22a2a3fdd99616d8718520588b0f23e07f4c0ddfacc02edb9349fb0af38fcfc5b1b288dddedd4f6918511a5398980f3 SHA512 6fff70749a8b3eb6cd1b05a4b667613ead00097ecf4674fad710f3c785c97d55989a703569f0a041f1d75b82dbeb8f80bb9eef9b581e4ef3dd1c9907f6cc2634
+AUX 3.2/020-arm-readline-test.patch 1418 BLAKE2B d5d8b5cad404b068b065757fe8c9cb9c5521fe2ef52dc90b8e3d9781e717309d4082d8beb3360cc46fd2e4cb7a41209ace3fd0bb0c49da6775aff53fc4f452b8 SHA512 402ae9c27f4a3d9e153c1a01e6cd7bb6be79833eed90206a1fbef76198122cff70e8e52a3e6e4b1794e57151113017fcba5f6f1fc5fc77c91a2d96a6dcd27c0d
 AUX 3.2/901-musl-stacksize.patch 749 BLAKE2B 422d53ef7fc1e76bd7466ff67da7cefd3665282ce0e29d16e2455e8f2bcbe081c0b9d31119eed6d6b53f6200fa72d623e9c04e0ebd6594397cf1dad344e8049a SHA512 f9ad0a50a0672a88b89cba9c452c090e0fe47fe41c640951b1b14970e1219a27c9ef3a1b53650b135d607830ae7a09b6a8916e45263415b58122c07262e90b1b
 AUX 3.2/902-hppa-pthread-stack-size.patch 1690 BLAKE2B 84c8478a69e108c68f96eeb0f36b1f94e069193ce124c0ca5c6143c0c9a2f0c62c7927a1a61a85270f449d03b4c6f5bd735e02ce1da1df0749602e655f177778 SHA512 d871b1c0a5d58bb197def0e00310e38fc145520dbbd1245079b2ebab0f89878f21a22f27c388fe2a7557244db28f0acb97edddf9bdf4adbeb00327e01c5215a6
 AUX 3.3/010-default-gem-location.patch 356 BLAKE2B f44459799fff80c7f14e5e7d674ee9ed22863cdb84838e0fad55a66f615fa91e3e4de30377c04a385927feea67c6046c837eb7a647fbe162685309ea3f9ea420 SHA512 894075663d409a117ad94abd63d6562c90b87a725ef56d02ad7c187532b99a56128be2f5f64d0e72763d1c14213707de84c920415107df875218489796bc4a5a
@@ -27,12 +24,12 @@ DIST ruby-3.3.2.tar.xz 16349500 BLAKE2B 2a474df10363555e8f0b9ad73bb854ad34f3d148
 DIST ruby-3.3.4.tar.xz 16366580 BLAKE2B e10b81ad7838e3d443ce0b12b8372faebb001f00a32dc0fa1f5e37c46baae99ea714e7f2a8741f0294255312030e844f32fc5d1c3695545cf8303e85b3255f21 SHA512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb
 EBUILD ruby-3.1.4-r3.ebuild 8352 BLAKE2B f3a592bd500c5319ca351544666a87446ad794158e3271076b8bcbec1e827ab8d9f7e70e1a0c4548e203d3a758a29e0d790285ff48d99b69816c6107d0d03bdf SHA512 e191ef30979b3fb967379345474609382629e555040b388c92fe54e45b3afd097b1e7c9f4bbbf611b740d799cd1c26973a6aec60dcc35c54c9182f3911a47485
 EBUILD ruby-3.1.4-r5.ebuild 8504 BLAKE2B 2ee7c9aef7c65d9601cd31918addaa7a42bf806d08237f75e894db1e564e6fc282892c2c517badf366cd0584debcb51d0c754353af656d26bdc94389d5ea7e01 SHA512 1fb62ce8b8fc7288a954abe23af104ce7bc9124c157f4dcf68fd499d7f103bc8b396fdb5089431b4cf7c76c9c7adabe11f3a4f9b172c1d12c14165ec2de8d306
-EBUILD ruby-3.1.5.ebuild 8636 BLAKE2B 934237cb9c2e53f5ef4b2b56271c46489d54f79e242570f09438a19fbe18ba7d8f2aadbd5b6d90c40086dbb13fbc02fb416dda30dbd4801822a17a89ca920bec SHA512 3ba29e1828c78de7ad682207aaca44e1b77b41eaeaeaf883b90402e52f9bf4a4646342a8fd44a7fa69f2bd20777b96d960f1223043ae2184ef064c72147b78c9
-EBUILD ruby-3.1.6-r1.ebuild 8992 BLAKE2B 9af8a4b9de63e98673779886d9ca9ad2dcc1691d6809b0f2c78426b7a8ea871e2ab34177936a57cfee23c7cd05ab3aa791c7673661b34fdab78746b035c21bbb SHA512 219b2410e35155d7a75444995a75af93cb3739b2a877f570550c38a9b22e581b61826f96a630228d66a65149ec4710a8143ae1984d30fdbf4c661c9142f1c57f
+EBUILD ruby-3.1.5.ebuild 8679 BLAKE2B 4a20849deb5146fb9d563d31d06ea206dbec6d0dba772fe0f26f09070b1694efd588130bb3a24496eff6482a8c6d40f7db1e7c2856a6c869a449c038ef4145e0 SHA512 3466d1059d97d7dbd2674a835940d1a56854efaf74dabef024ce09ec23429a59cfda2e1de6dd0a6628f2678a34ec030c3147824a8dc6f09f335dc92c1207a4d8
+EBUILD ruby-3.1.6-r1.ebuild 9035 BLAKE2B f5baf8b953f36ee101da6b1b77a64fd4baf266106ea5e60fac2eaeed41567c5a068da1e20e62df3e5f755aeebcf48179357ba3eaa73bb336d53b1f6e1a8b0142 SHA512 587039bf1cdcd7693ebdf109a061a9a1e27d14cfbf4b2938806624e84b9a6b48c122612d55747b60886dd41927c044ed1f404adb418fcc706e2940470c5a6cea
 EBUILD ruby-3.1.6.ebuild 8844 BLAKE2B 35f1b99e2505df7b0deb14e186604e2169cf38812f442838fe2e4e8b50a49b412f8d25ebae4b67a056895b37b991ead09e73236e11bdb781d224a2495bedbc4f SHA512 01881562844ea0535303c5d88e2c9d78d5e608790d3c8c626d1d71de7da85e1dbaceaaff52f96e72a03e8dc89758e0c08b75bdb0ef07ae6a52e80d7fde42b586
 EBUILD ruby-3.2.3.ebuild 9534 BLAKE2B 8383353bf02c2abba8dcf67cbdffcc197d085fce1c961c56d0d493ccc840f0970efb105b916a28d590c6f6caff42e654651361f685bce545c969082981cbd25f SHA512 78f8270db8c06b960a84b03b20b31f3aacc455905637e8cf3e040724d1c39b43aac19e296205902cf6c958e5c64ed0843e6854ae9997e612598aea6b3965c6d0
-EBUILD ruby-3.2.4-r1.ebuild 9687 BLAKE2B 9a2d8d6baf712752940939dd30fbdbbb352e22b6280af67b978c18a0d5f2d4a444e982b057054ef87a87a67d0cf2ef60b7c9cc3331ec22c073692b0f2049affa SHA512 1e9c5ed390df60260e67bb55a4db3e012536f3579396028725a68323cb78dabac393f56283e34c7c56f44925bfe9d96dbc4cc6bc78ec796f783f21297e373c55
-EBUILD ruby-3.2.4.ebuild 9537 BLAKE2B bf3f6077988fd69514364e6a25ee4765644835366910efaa2378f76e4b9bf8e8eaa91e6c96e4f185c5af8250d9e0fab259056fe54af4d3757cdb92fb79748850 SHA512 8e4a6a303982962cf42cea15741f056c965c22873c389fa47a93b136d51b92072daa2f154c6938fb61dd6c9d65110cdf76589ce925f92021cf7d9087a1db8bc3
+EBUILD ruby-3.2.4-r1.ebuild 9730 BLAKE2B d632c75cd778e7109aef58842b195c24c78c9d7285a23376bcfe5d18cd47183d6d2a311ed1f186c38bde8fa9e3f94253f346b474df253ce1f5ad74a953c4b8b0 SHA512 711e1f7e70144d1d852896a36c1ec3ae461de320a959dcfb340fa0bb9485b4c933b1c608f13ffd5bdf5307ef0d61e4bdc1242d35f3ecf506016855b4e25ad824
+EBUILD ruby-3.2.4.ebuild 9580 BLAKE2B bc4d298bb3cb99537e4cea4cd329aa00d73d5adaabf89493c373cf4b5b313feb423591b29c98914a5b24108f5ece81db04630074a05c2b625896783e9cde806b SHA512 19f9ffc2ad5a679917ad2b93a973ea0db71eccfa71341605311a57564d0154d80c45581f6cee7f24218f7e57fba5abf1a2ca44c54cb1833d32dad6daee0cdb50
 EBUILD ruby-3.3.2.ebuild 9269 BLAKE2B 3f9971414512fb66be404c5a7ed5553e8b581b5f19874d7ab733d5d6aad3cca489163764d3bc2aa81a6f5d2981026290e4a197cf4b3712218741b4aede3268ee SHA512 44419e0bac61f0e9215e4c131ede309b08ef3d021c476899c0adadf35d54d661e86beb75a5e80a95dc7915131b748823e9ea5b53af3f8bce6fb7ac11c178690c
 EBUILD ruby-3.3.4.ebuild 9419 BLAKE2B 2c14e01cbb092ee4662b887472ccd89b17f9f1fa244d49b777b80fc31f86c2b647be42d6ed9f76d96c9ca9f5e18efefd851aca438dfbca8a27c0327e1be93e95 SHA512 050c4ed23770373e183a9a1b404e2ac9f2f631e134249ce8614f5002d9795748e4087b0bc9902cbc54ce79b99618773d4bcca7a105b01d3dde5763c828984fa4
 MISC metadata.xml 504 BLAKE2B ca7743b107a6825dd029e0798cf1b0d048e3ce730382245565692e9242d09553db2c09edd1d09195602d9d96167c8606f3e7ddd5a27e1473eb9e4fbbc9074d1d SHA512 c2cf0a52fe03067cc09edc660d981af2465e4a733e53ad601d0e6377fa61072a60be4ec916cae94023328600e52a29f18621b47e839bddc897fa00db44feb9b1
diff --git a/dev-lang/ruby/files/3.0/001-socksocket-fix.patch b/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
deleted file mode 100644
index 1a79e25491cc..000000000000
--- a/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix compilation with socks5 USE flag.
-
-Patch by Phobos Kappa in https://bugs.gentoo.org/762253
-
---- a/ext/socket/sockssocket.c	2020-12-25 05:33:01.000000000 +0200
-+++ b/ext/socket/sockssocket.c	2020-12-28 15:42:50.310029778 +0200
-@@ -34,7 +34,7 @@
- 	init = 1;
-     }
- 
--    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil);
-+    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil);
- }
- 
- #ifdef SOCKS5
diff --git a/dev-lang/ruby/files/3.0/010-default-gem-location.patch b/dev-lang/ruby/files/3.0/010-default-gem-location.patch
deleted file mode 100644
index 060579b4f339..000000000000
--- a/dev-lang/ruby/files/3.0/010-default-gem-location.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/tool/rbinstall.rb.~1~	2020-12-25 04:33:01.000000000 +0100
-+++ b/tool/rbinstall.rb	2020-12-25 10:05:34.629096405 +0100
-@@ -897,7 +897,7 @@
- end
- 
- def install_default_gem(dir, srcdir)
--  gem_dir = Gem.default_dir
-+  gem_dir = ENV['GEM_DESTDIR']
-   install_dir = with_destdir(gem_dir)
-   prepare "default gems from #{dir}", gem_dir
-   makedirs(Gem.ensure_default_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
-@@ -943,7 +943,7 @@
- end
- 
- install?(:ext, :comm, :gem, :'bundled-gems') do
--  gem_dir = Gem.default_dir
-+  gem_dir = ENV['GEM_DESTDIR']
-   install_dir = with_destdir(gem_dir)
-   prepare "bundled gems", gem_dir
-   makedirs(Gem.ensure_gem_subdirectories(install_dir, $dir_mode).map {|d| File.join(gem_dir, d)})
diff --git a/dev-lang/ruby/files/3.0/900-musl-coroutine.patch b/dev-lang/ruby/files/3.0/900-musl-coroutine.patch
deleted file mode 100644
index a323cdd6e770..000000000000
--- a/dev-lang/ruby/files/3.0/900-musl-coroutine.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Adapted for Gentoo version 3.0.2
-
-From b570e7de87aaad8c903176d835e8124127f627b3 Mon Sep 17 00:00:00 2001
-From: Andrew Aladjev <aladjev.andrew@gmail.com>
-Date: Sat, 26 Sep 2020 12:58:06 +0300
-Subject: [PATCH] fixed default coroutine selection for musl
-
----
- configure.ac             | 5 ++++-
- coroutine/copy/Context.c | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ab5d532c103b..084f0936c006 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2364,7 +2364,10 @@
-             rb_cv_coroutine=copy
-         ],
-         [
--            rb_cv_coroutine=ucontext
-+            AC_CHECK_FUNCS([getcontext swapcontext makecontext],
-+                [rb_cv_coroutine=ucontext],
-+                [rb_cv_coroutine=copy; break]
-+            )
-         ]
-     )
-     AC_MSG_RESULT(${rb_cv_coroutine})
diff --git a/dev-lang/ruby/files/3.0/901-musl-stacksize.patch b/dev-lang/ruby/files/3.0/901-musl-stacksize.patch
deleted file mode 100644
index e5fcfce2195e..000000000000
--- a/dev-lang/ruby/files/3.0/901-musl-stacksize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-musl has a conservative stacksize, as compared to glibc, so treat it
-like other systems with such stacksize
-
-diff --git a/thread_pthread.c b/thread_pthread.c
-index 951885ffa0..e2d662143b 100644
---- a/thread_pthread.c
-+++ b/thread_pthread.c
-@@ -721,7 +721,7 @@ ruby_init_stack(volatile VALUE *addr
- {
-     native_main_thread.id = pthread_self();
- 
--#if MAINSTACKADDR_AVAILABLE
-+#if MAINSTACKADDR_AVAILABLE && !(defined(__linux__) && !defined(__GLIBC__))
-     if (native_main_thread.stack_maxsize) return;
-     {
-        void* stackaddr;
-@@ -1680,7 +1680,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)
-
- #ifdef STACKADDR_AVAILABLE
-     if (get_stack(&base, &size) == 0) {
--# ifdef __APPLE__
-+# if defined(__APPLE__) || (defined(__linux__) && !defined(__GLIBC__))
- 	if (pthread_equal(th->thread_id, native_main_thread.id)) {
- 	    struct rlimit rlim;
- 	    if (getrlimit(RLIMIT_STACK, &rlim) == 0 && rlim.rlim_cur > size) {
-
diff --git a/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch b/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch
deleted file mode 100644
index 7978566afc7e..000000000000
--- a/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/701494
-
-From 794b6fce94343c4f9dceca5d08224b0fb364fde8 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 7 Apr 2023 11:46:12 +0100
-Subject: [PATCH] thread_pthread: Grow main_stack if required (fixes tests on
- HPPA)
-
-On HPPA, test_insns.rb fails (along with various Ruby gems) with
-'stack level too deep (SystemStackError)'. This turns out to be because HPPA
-defaults to a small(er) stack.
-
-With this change, most of Ruby's test suite now passes on HPPA.
-
-Thanks to both Dave and Helge for the investigation and coming up with the
-patch.
-
-Bug: https://bugs.gentoo.org/701494
-Bug: https://bugs.debian.org/881773
-Bug: https://bugs.debian.org/881772 (for PPC64)
-Bug: https://github.com/rack/rack/issues/1640
-Thanks-to: John David Anglin <dave.anglin@bell.net>
-Thanks-to: Helge Deller <deller@gmx.de>
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/thread_pthread.c
-+++ b/thread_pthread.c
-@@ -681,8 +681,22 @@ size_t pthread_get_stacksize_np(pthread_t);
- #   define MAINSTACKADDR_AVAILABLE 0
- # endif
- #endif
--#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack)
--# define get_main_stack(addr, size) get_stack(addr, size)
-+#if MAINSTACKADDR_AVAILABLE
-+static int get_stack(void **, size_t *);
-+static int
-+get_main_stack(void **addr, size_t *size)
-+{
-+    int ret = get_stack(addr, size);
-+
-+#ifdef __hppa__
-+    /* On some architectures, the initial stack size may be too small, but fortunately,
-+       it's growable. Bump it up to the minimum needed if it is too small. */
-+    if (*size < RUBY_VM_THREAD_VM_STACK_SIZE)
-+        *size = RUBY_VM_THREAD_VM_STACK_SIZE;
-+#endif
-+
-+    return ret;
-+}
- #endif
- 
- #ifdef STACKADDR_AVAILABLE
--- 
-2.40.0
-
diff --git a/dev-lang/ruby/files/3.1/020-arm-readline-test.patch b/dev-lang/ruby/files/3.1/020-arm-readline-test.patch
new file mode 100644
index 000000000000..3bc40baf00db
--- /dev/null
+++ b/dev-lang/ruby/files/3.1/020-arm-readline-test.patch
@@ -0,0 +1,28 @@
+From 868f873a78034016fc05d79061245695e3c372fc Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Thu, 23 May 2024 16:10:32 -0400
+Subject: [PATCH] Skip test_interrupt_in_other_thread on arm32-linux
+
+This is a combination of main Ruby commit
+https://github.com/ruby/ruby/commit/aefc98891c42024039f19ef45bdfe93fbc590b7c
+and my PR correcting the regex https://github.com/ruby/ruby/pull/10819.
+Upstream Ruby requests that changes to this test go to readline-ext repo
+before being backported to 3.2 branch.
+---
+ test/readline/test_readline.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
+index 746a3a5ba1..86d3862739 100644
+--- a/test/readline/test_readline.rb
++++ b/test/readline/test_readline.rb
+@@ -481,6 +481,9 @@ def test_interrupt_in_other_thread
+     # likewise with 32-bit userspace on 64-bit kernel
+     omit if /\Ax86_64-linux-(?:x32|i[3-6]686)\z/ =~ RUBY_PLATFORM
+ 
++    # Skip arm32-linux (Travis CI).  See aefc988 in main ruby repo.
++    omit "Skip arm32-linux" if /armv[0-9+][a-z]-linux/ =~ RUBY_PLATFORM
++
+     if defined?(TestReadline) && self.class == TestReadline
+       use = "use_ext_readline"
+     elsif defined?(TestRelineAsReadline) && self.class == TestRelineAsReadline
diff --git a/dev-lang/ruby/files/3.2/020-arm-readline-test.patch b/dev-lang/ruby/files/3.2/020-arm-readline-test.patch
new file mode 100644
index 000000000000..4edbc7b2b0c5
--- /dev/null
+++ b/dev-lang/ruby/files/3.2/020-arm-readline-test.patch
@@ -0,0 +1,32 @@
+From dd77934ca6e2e8b2b894f2460017323b33b619b6 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Thu, 23 May 2024 16:10:32 -0400
+Subject: [PATCH] [ruby/readline-ext] Skip test_interrupt_in_other_thread on
+ arm32-linux
+
+This is a combination of main Ruby commit
+https://github.com/ruby/ruby/commit/aefc98891c42024039f19ef45bdfe93fbc590b7c
+and my PR correcting the regex https://github.com/ruby/ruby/pull/10819.
+Upstream Ruby requests that changes to this test go to readline-ext repo
+before being backported to 3.2 branch.
+
+https://github.com/ruby/readline-ext/commit/868f873a78
+---
+ test/readline/test_readline.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
+index 7838f4f52e864e..ab70e4371122f0 100644
+--- a/test/readline/test_readline.rb
++++ b/test/readline/test_readline.rb
+@@ -496,8 +496,8 @@ def test_interrupt_in_other_thread
+     # Maybe the same issue: https://github.com/facebookresearch/nle/issues/120
+     omit if /i[3-6]86-linux/ =~ RUBY_PLATFORM
+ 
+-    # Skip arm32-linux (Travis CI).
+-    omit "Skip arm32-linux" if /armv.+l-linux/ =~ RUBY_PLATFORM
++    # Skip arm32-linux (Travis CI).  See aefc988 in main ruby repo.
++    omit "Skip arm32-linux" if /armv[0-9+][a-z]-linux/ =~ RUBY_PLATFORM
+ 
+     if defined?(TestReadline) && self.class == TestReadline
+       use = "use_ext_readline"
diff --git a/dev-lang/ruby/ruby-3.1.5.ebuild b/dev-lang/ruby/ruby-3.1.5.ebuild
index 97976505b293..7fbe2e40ec4c 100644
--- a/dev-lang/ruby/ruby-3.1.5.ebuild
+++ b/dev-lang/ruby/ruby-3.1.5.ebuild
@@ -72,6 +72,7 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/012*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
 
 	if use elibc_musl ; then
diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
index f80ca0f497a0..358461b38718 100644
--- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
@@ -72,6 +72,7 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/012*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
 
 	if use elibc_musl ; then
diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r1.ebuild
index 567f50286b60..e469c52ff3e3 100644
--- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4-r1.ebuild
@@ -79,6 +79,7 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
 
 	if use elibc_musl ; then
diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4.ebuild
index 029b41caa4e7..9d52787b6b18 100644
--- a/dev-lang/ruby/ruby-3.2.4.ebuild
+++ b/dev-lang/ruby/ruby-3.2.4.ebuild
@@ -79,6 +79,7 @@ PDEPEND="
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+	eapply "${FILESDIR}"/"${SLOT}"/020*.patch
 	eapply "${FILESDIR}"/"${SLOT}"/902*.patch
 
 	if use elibc_musl ; then