gentoo auto-resync : 11:03:2023 - 00:05:57

3 files changed, 12 insertions, 18 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1226227fca8d..d97e110f822f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -16,7 +16,7 @@ AUX 3.1/010-default-gem-location.patch 715 BLAKE2B 1a3b0a3479210f6bafe89bfea4580
 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
 AUX 3.2/010-default-gem-location.patch 356 BLAKE2B f44459799fff80c7f14e5e7d674ee9ed22863cdb84838e0fad55a66f615fa91e3e4de30377c04a385927feea67c6046c837eb7a647fbe162685309ea3f9ea420 SHA512 894075663d409a117ad94abd63d6562c90b87a725ef56d02ad7c187532b99a56128be2f5f64d0e72763d1c14213707de84c920415107df875218489796bc4a5a
-AUX 3.2/901-musl-stacksize.patch 945 BLAKE2B 7187ee4c73fb4a9ec00b32a02a176863d88437abae60c20955f28baf939aa76daee7d8accfa5b35c8ae857c25b243d57d719e7542a20439b1eb5952b319fa383 SHA512 5db3e96891498aee8f97f0c5ffe0633c6554b8d8a4975fd73f838ebac1ceea248d18aa4262c2b865b7ca15e9d293d482f7323565ed6ae47ed632cb8a044976e6
+AUX 3.2/901-musl-stacksize.patch 749 BLAKE2B 422d53ef7fc1e76bd7466ff67da7cefd3665282ce0e29d16e2455e8f2bcbe081c0b9d31119eed6d6b53f6200fa72d623e9c04e0ebd6594397cf1dad344e8049a SHA512 f9ad0a50a0672a88b89cba9c452c090e0fe47fe41c640951b1b14970e1219a27c9ef3a1b53650b135d607830ae7a09b6a8916e45263415b58122c07262e90b1b
 DIST ruby-2.7.7.tar.xz 12101804 BLAKE2B 35f53835259217e344bde7fa3e2fe18e24c3e56eed2ca6dffb7385f38def401e6115944189138b280df5bbb0f5ff2e98f88260165f6e1802c60bd24cc6366397 SHA512 a19be3f0dfce040fe79f439e606f179d6750d2cc6e7b64fd65933edd487f5995573f7d0730beec9d3edadf942f8e9216f01ab3fff189d6cbe9d46a9add3e2683
 DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B 581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024 SHA512 1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
 DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41 SHA512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
@@ -24,5 +24,5 @@ DIST ruby-3.2.1.tar.xz 15094384 BLAKE2B 2dce2201c2c44910fdfe3e58013df9432e6b242b
 EBUILD ruby-2.7.7.ebuild 7919 BLAKE2B 1e6c1c39b7213fac6b657a059b9648e46bb3535e142335aba846ee323a39d4c1ec55dbab65e418670fe6207f33b8e0f1db72ceac56468acc27664aafa092de34 SHA512 7050b5d05734f0b588877c33b1b531d8d50d060234f12c29d5a209ab8dbd440bfc223f038002aac30837dc2f76d8774e18b661dbef53efb3ee8b0b4dc8e8fcb5
 EBUILD ruby-3.0.5.ebuild 7766 BLAKE2B ac667961e1ffd320e538ba8faacc9777ca1d0b8d7c9ee2961bfa92280f67a8ab80f45a3e43008d89dd8424d12c061bdd870e616d5c614567bac74cbc8bd5c5e7 SHA512 5ddf1bdf0a4b5c5b1db85800dd2acac3658ab3717293f7a405d0b7a1531dde904da233193766e3f47dd5e1b6029931327d61803bdda3db2699057cf34a1cbf1c
 EBUILD ruby-3.1.3.ebuild 7518 BLAKE2B b2ed93e5681dad89f143af813c75e515d96c0c698f21a6a19a7ed959d5eb165352f6d87dc7a76395f9bbd43f8d17995c4f3511a37b8afa397a7b67f051a66d6e SHA512 b45cd6530aebf890663d1481fb0354363de0e7ca8a04b575d14e643b40b68eaf4d47d9c372165860ec49382d3ea9b6b078567c92b29042d75c69679e35615c0d
-EBUILD ruby-3.2.1.ebuild 8476 BLAKE2B f35a5404a5ff8e9db176ea8101a2dc9db4e4b7668980558ef963177f01b981b1d3e9015a63cee8bc7b9dbbf07efcf6d78fe79a4a9b0124b49f91f96ad49ff2f3 SHA512 0fc79ee82cfc26ea5fffcb540475df889193d98edee577c2fd7eb0c289f3c39b2f40cfdc5f3676a62f7fffb121b405235b67b582936e14d89da5ac83ecfce0cd
+EBUILD ruby-3.2.1.ebuild 8480 BLAKE2B 5abef4176a0494aff896d584e225d1f1fe944fa7bda7927cbd685e64e3bcaf112a67c6c5e32e77814b51fa56f3ac8676be2dfc25f4791c722999965cd4b2bf5e SHA512 e7a02abee0053c409a76b099cbab7af39d2e31c47660e81f1cbc79202567e67471bfb6f0ad628d0dda0bac45f9e27e83b5ea9427372dbb6becd72bc6a8d6d403
 MISC metadata.xml 602 BLAKE2B a6e6786b21d135c4a952d48d7430a1ad545d1ae45687e83eae3164818a20b7322aac330a8b125247f1772411564a799451a3a94f5375986277dbaf824970992d SHA512 3af744c835dfeefe931af01c2b50e721ac2ba82f65ab06160aa4b63a5c2eb6543c0954902f9eee80e86cbcd727d496c2de9a9a8ebfd1cd0af9e995c6f6ab8cd8
diff --git a/dev-lang/ruby/files/3.2/901-musl-stacksize.patch b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
index e5fcfce2195e..f18aa271ea65 100644
--- a/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
+++ b/dev-lang/ruby/files/3.2/901-musl-stacksize.patch
@@ -1,11 +1,6 @@
-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
+--- a/thread_pthread.c	2023-02-08 05:02:20.000000000 +0100
++++ b/thread_pthread.c	2023-03-10 17:46:25.694739053 +0100
+@@ -1033,7 +1033,7 @@
  {
      native_main_thread.id = pthread_self();
  
@@ -13,14 +8,13 @@ index 951885ffa0..e2d662143b 100644
 +#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)
-
+         void* stackaddr;
+@@ -2090,7 +2090,7 @@
+ 
  #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) {
-
+         if (pthread_equal(th->nt->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/ruby-3.2.1.ebuild b/dev-lang/ruby/ruby-3.2.1.ebuild
index 9193389e5f80..d98ad3ab2a5a 100644
--- a/dev-lang/ruby/ruby-3.2.1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.1.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/010*.patch
 
 	if use elibc_musl ; then
-		eapply "${FILESDIR}"/3.1/901-musl-*.patch
+		eapply "${FILESDIR}"/${SLOT}/901-musl-*.patch
 	fi
 
 	einfo "Unbundling gems..."