gentoo auto-resync : 23:01:2024 - 22:46:03

3 files changed, 12 insertions, 5 deletions

diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 203f8e56bd49..b2ea14d85546 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,6 +1,6 @@
 AUX boost-1.79.0-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2
 AUX boost-1.79.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b481576a08138be826f7383a689a6c0725d491a244dc8697fc39fac1a79e4639ba51b3a3eb7ee2f2e11a20883de0ecd3dd3c2fc2c9cd SHA512 28952e7cd791678be0963beb0a29e3e40b54a8c3618c66a8b8d21ab63c414771cfa1e9961f08c0b3818bd4c311c122e777109e15002a71230b0c3c9dbc4d6075
-AUX boost-1.79.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
+AUX boost-1.79.0-context-x32.patch 1374 BLAKE2B 3a81fad70c75c3e579518fe6b3353ffd2e6151fdcc31159cd3915bfe3336bf909d9d4e429c939c3097626f6a853bb9ec9fb24e7e6dd0892b16d349d6315c43b0 SHA512 cc8a51f42d365f8b56899ff1f7ffbb13dcae9845c096e8fbbcad45196d5b48f7a339819412f23844090ad2dd1e4d6e8f6adc47d91ef7ec6a4af9a8b52b8cc760
 AUX boost-1.80.0-fix-mips1-transition.patch 1041 BLAKE2B 03ac38ed4d403f1d75a3ade98076593e93336c77e807ab2ce0f5b9393bb2f7dd59c56a9e0fba647825eca0310e2e3f9eacd52eff17f8363cb76c9559413612c5 SHA512 a61e75322486e1e09efcf2e8f3d341c600c6b871d15ac3478573758b33cf7e9752a8576d4e02c4331dc38d568fb3386e733826502c6183aea2e1e90d9283c1a2
 AUX boost-1.81.0-disable_icu_rpath.patch 577 BLAKE2B 0e8634a6a4594232238d03ed329c0ca56c005ec0f3f259afd431c4b461b6c8d9a0b636b916859b5baa1152395995e5fa5b150ef0ab39480fcebaa9c6c5943b7e SHA512 7383423dd4611482bf3ff3820152152e9fc9643ca408b260e3715baba52b48b444626b14e955950b025e57f72c50158c83ffa6b55b995c2c427da90d0a0a50df
 AUX boost-1.81.0-phoenix-multiple-definitions.patch 292 BLAKE2B d9bae6f053188f936ef45b521ff0fd3ed91cbb9fb90d74d94ac55844213de82f0c8b075796e19cf9e14d840add3154c66e9ccb2b5dcd88e71fee7505d547c4c8 SHA512 6e4f012158ac8ee81a783ab0a937bc127dbed4ae96882128ef802ca866cfea98018a4287a139e06d8918004b9e8fc3a31181da14b4c2dd1bf19c8f64cecb049a
@@ -16,5 +16,5 @@ EBUILD boost-1.82.0-r1.ebuild 11360 BLAKE2B 0b42b206ee6dd64ea8fbcb48b717f91b4a71
 EBUILD boost-1.83.0-r1.ebuild 11579 BLAKE2B 4dc543767181261fd3777c48524c99e215e354bfd5627a789282b7afbdee7510a9bc01fa3879b785fe9137090b7b9608c5ffa65648eced500dd86a209233cd32 SHA512 d24e18961775931cb8de8875004ba02ec86923ce511e282176c1c15758dac0d20b45300ccd9e9d5a5aff0ae16d618517a2df5c04f3682f588e4c6fd8cc84eab0
 EBUILD boost-1.83.0-r2.ebuild 11627 BLAKE2B 2bc11d9a44247459daf262343d332ce15d3e4f6d1cfd3f613cdc2bc6f9f10c95df0441ed90ad134e3f50a45599c3b65869a94ffd62d481d4494e8f6ac9603286 SHA512 fc246d5b54fa4f08a588608322373fa2f3895ff74f4cbe2dbc02b8841fc2296cfb8534d5ba07bf889ec37abdb634faf40f52fd07364d561d7580c76921189119
 EBUILD boost-1.83.0-r3.ebuild 11672 BLAKE2B b7a30aa91c971072ef7e8a95c384a865aeedbbe7fedc1d7f7a3fefca8fccccf5be6b56d68de7fc75a639279eb83c752b6c828e9ba98b4d27fffe7f62124efa08 SHA512 0e7006907408ecb70e8331883331c6d75a2676e5b2298af4b1eda29dccc76b38ecb1e307a1168deac258e5761a4df37ef775ca5be994d9c4b48739377206ebcf
-EBUILD boost-1.84.0-r1.ebuild 11739 BLAKE2B 2bdea09837552537f4bb239f7424bd7f84601fe50904e5be053d92ecc73362a65334fd78a07e68b17ebdef960174f3eb227ab80c3cbf1cf272f0a92d095cfca2 SHA512 0c8cade93027d16e18a61bde9ec30df95ff2287717cb6c19643f0db4706d76543007599b3bac3791ef01441f6791b0d5613b2378407fd38bff81b25b11c495cd
+EBUILD boost-1.84.0-r1.ebuild 11739 BLAKE2B 82e03a9b5c3938b2dc2c9cf14b590438b1b1e1d36fa1736fd98c9760b92fe5d2722390eaabd17a82707501fe54cde3068d38bb3d44fc30ac3e1319bb6c12778c SHA512 84b3858bc3b72fdd3563c408193d50b31f23c4e8eb271c11f8790081315b346dac8339c9ed1e6f2bc3973ddfcb4e21b0bc5eb7adf81dc395b17e2bc793904de0
 MISC metadata.xml 9162 BLAKE2B c8df087c7fe1e4af3a59f21763777d3f1318aebcd524e077b6a93c374e0910ff31b1e73b8b4908130d63c2bb7d060348602cffd215648f09afd8015c782e2340 SHA512 3c45d74e046e0fd09f152fcfa7af942c9097e3ed91a0915a2541caad14a8b94b9faceccdbc74bf8aa7c8f7b383db7e91e09babba9c2c28fd7855a7b809616839
diff --git a/dev-libs/boost/boost-1.84.0-r1.ebuild b/dev-libs/boost/boost-1.84.0-r1.ebuild
index 4b95253ac198..a9eadf2838c9 100644
--- a/dev-libs/boost/boost-1.84.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.84.0-r1.ebuild
@@ -49,7 +49,6 @@ BDEPEND=">=dev-build/b2-4.9.2"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
 	"${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
 	# Boost.MPI's __init__.py doesn't work on Py3
 	"${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
@@ -57,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch
 
 	# upstreamed
+	"${FILESDIR}"/${PN}-1.79.0-context-x32.patch
 	"${FILESDIR}"/${PN}-1.84.0-signals2-patch1.patch
 	"${FILESDIR}"/${PN}-1.84.0-signals2-patch2.patch
 )
diff --git a/dev-libs/boost/files/boost-1.79.0-context-x32.patch b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
index 9ee3d545d618..625599152328 100644
--- a/dev-libs/boost/files/boost-1.79.0-context-x32.patch
+++ b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
@@ -1,3 +1,10 @@
+https://github.com/boostorg/context/pull/247
+
+From 922e033fa1464e506c82a0d6980103268f7197cf Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Tue, 23 Jan 2024 13:23:29 +0100
+Subject: [PATCH] Fix x32 build on x86-64
+
 --- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
 +++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
 @@ -24,6 +24,10 @@
@@ -11,7 +18,7 @@
  .file "jump_i386_sysv_elf_gas.S"
  .text
  .globl jump_fcontext
-@@ -81,3 +85,5 @@
+@@ -91,3 +95,5 @@ jump_fcontext:
  
  /* Mark that we don't need executable stack.  */
  .section .note.GNU-stack,"",%progbits
@@ -30,7 +37,7 @@
  .file "make_i386_sysv_elf_gas.S"
  .text
  .globl make_fcontext
-@@ -105,3 +109,5 @@
+@@ -111,3 +115,5 @@ finish:
  
  /* Mark that we don't need executable stack.  */
  .section .note.GNU-stack,"",%progbits