gentoo auto-resync : 13:01:2025 - 06:41:32

4 files changed, 57 insertions, 1 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ec24c5288fc3..a05c06f89e4d 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index c717bcb665e6..6f336b33ab49 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,5 +1,6 @@
+AUX pari-2.17.1-gcc15-swap-conflict.patch 1758 BLAKE2B da6a57ea6ba9e73cf2b4a00eae52aaba5a19a129a8d5c5cc59b3e2c61fd52b877ea6890feffecf515f3d00f63958c2dedcd512d58c6c2e7ae8acd2a9bf8e208a SHA512 17697a81722b7fd01855b871e61e9d8054c3771f9b2be738bb31966cd8a8ed572e6453011be4f2519639bdc67a9403b95e10aec3fc39d80502c649fbead9d92c
 DIST pari-2.15.5.tar.gz 5186798 BLAKE2B b253c6d8ad38462e81852d7bb364d06a7cbaae7b085672653da8d9f91f0173cfdef8f537ebc7313b6484f610d43e10fb0547f5d920789b95c8d0027dd52e8312 SHA512 59b2ebed43176f1ee750146053644bffbf673b4b4810134bc39132665941152772afb7a9332b842fc64e5ab8d5747a872c1b8ff327d3bd5eedaa1591691fff13
 DIST pari-2.17.1.tar.gz 5325234 BLAKE2B a5d20e5c69235ae815291bef377c195888dcac9e802583ea91e88a16c4eed5f178dcea447524fbcb5b7ea9ef12bbccc6d665eaee582e1e7782b54ba256c56a87 SHA512 77211fe7282558058f69c69889be3f23f7a173939ae8f24897b3df9715eef1bf0378916537eca2a54198b6d0c1860d386db250efafafe936437dc8c1e3cb0253
 EBUILD pari-2.15.5.ebuild 4451 BLAKE2B 49cf3a7b8e77b636d9df3e4138bbf2a2c7d213aa965735a6d5e460e6ff8069afc390918dea9e0f66220692326a2fdf2111b1f1e28f94740454ca6210ad555a24 SHA512 0823698827deb12cc960965859d6b77c3ecbc99476c0d16e70ac92ead36bc64125aa0566439a9b0a668edbe6a5636302206e70c2b61e721563e94058db41c95f
-EBUILD pari-2.17.1.ebuild 4453 BLAKE2B 763afeb12935a148c9c4680f1c040fa76dece9dc728001a2dfdf6ead9cfd605a2dd8d36c8cc3647ca5b71cf1de04d41aa8a66cf55c6570daaaa541f278250656 SHA512 49ab497460929253daac99d63fec71eeaf53d8a5d407032bcfa6fcbc7f7728d307f12727dbbd9b77aea006a9858ae24a75a9e3a3f6f812a10a77bb16293a52fa
+EBUILD pari-2.17.1.ebuild 4511 BLAKE2B 7aed7bf90d14c29649af94c2d308109a0c85140d0c895c256fc02a82227bbb5b7bf2d4360c2c4a2acfbdae8bf352f471574df2f0a7f211b5b38f12f1c660ddfc SHA512 150ed065ba7c88dc85bf3bd2ecc37955a24f0d98a6e5fc3e20c0c5a5364b640149e8ecaac53a58aaa4e3a3a1806871d980c569c84a4fa06bd300d9a0fca2c5e3
 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee
diff --git a/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch b/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch
new file mode 100644
index 000000000000..7e26784cd91c
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.17.1-gcc15-swap-conflict.patch
@@ -0,0 +1,53 @@
+From 4cce8c7b9107053ffd1bb0d6510797dafd632151 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 12 Jan 2025 21:02:40 -0500
+Subject: [PATCH] src/graph/plotfltk.c: swap PARI and FLTK includes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PARI defines a swap() macro that conflicts with the swap() function
+declared in some C++ headers used by FLTK. This can lead to build
+failures like
+
+  /usr/lib/gcc/x86_64-pc-linux-gnu/15/include/g++-v15/bits/alloc_traits.h
+  :1005:46:error: macro ‘swap’ requires 2 arguments, but only 1 given
+   1005 |                 __c.get_allocator()).swap(__c);
+        |                                              ^
+
+when using the forthcoming g++-15 to build PARI. Basically this fails
+because the macro is defined before the C++ headers are included. If
+we swap the includes, then the macro clobbers the function, but that's
+okay because PARI only expects the macro to be in scope.
+---
+ src/graph/plotfltk.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/graph/plotfltk.c b/src/graph/plotfltk.c
+index f81515d..e95275e 100644
+--- a/src/graph/plotfltk.c
++++ b/src/graph/plotfltk.c
+@@ -18,16 +18,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+ //
+ //  Based on plotQt by Nils-Peter Skoruppa (www.countnumber.de)
+ /////////////////////////////////////////////////////////////////////////////
++#include <FL/Fl.H>
++#include <FL/Fl_Window.H>
++#include <FL/fl_draw.H>
++
+ extern "C" {
+ #include "pari.h"
+ #include "paripriv.h"
+ #include "rect.h"
+ }
+ 
+-#include <FL/Fl.H>
+-#include <FL/Fl_Window.H>
+-#include <FL/fl_draw.H>
+-
+ class Plotter: public Fl_Window {
+ 
+ public:
+-- 
+2.47.1
+
diff --git a/sci-mathematics/pari/pari-2.17.1.ebuild b/sci-mathematics/pari/pari-2.17.1.ebuild
index 87d6c983af01..d67e5caa41c3 100644
--- a/sci-mathematics/pari/pari-2.17.1.ebuild
+++ b/sci-mathematics/pari/pari-2.17.1.ebuild
@@ -33,6 +33,8 @@ DEPEND="
 	X? ( x11-libs/libX11:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-gcc15-swap-conflict.patch" )
+
 src_prepare() {
 	default