gentoo auto-resync : 05:10:2022 - 07:19:11

3 files changed, 25 insertions, 1 deletions

diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 3b6f23ddfbf2..f3b87c6c47e3 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -1,12 +1,13 @@
 AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b05151b126cf74a5bccf5036e1fd3aa97f12fd91808fab7fe23a3194e6a4a7a9f12be5b69a5dfda5aedec8a0117c SHA512 56102439f05f0e27bda49f1e9803bbba7921c87eab383fc2f068ccca6ef598f11e35d00f5a737076a6a41df08ef9065e567cb84030ba6ea928520f371d51b9ed
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
+AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
 DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
 DIST giac_1.7.0-47.tar.gz 96787570 BLAKE2B b05b3f44f10695a5d085df0a0db9aba761ac011964caeb247bd6034ca2a41505e5eb30df0de494826270703d9b62fbb3b9d4869f4cdd32d1d88636f374fbae16 SHA512 60a8550f7da2a163365759266660421c936797a9d52c3ba3802b5e00610fc460b49ccef44df809331abb1cbb65432e283fb4484b1efffb577c4802ab44fecff7
 DIST giac_1.9.0-21.tar.gz 103871108 BLAKE2B 2db4a930b8acb2304456c85437b50504a25df3d0395115c8e71906b8608a38f034de0b9474115f87d4169a8eaa2039c200101696abb98f47123037aa1ef47630 SHA512 b14e41cf2f94d6e73417d5908ae77a503b3ab191bca7e7e5b07659516cbc4f6081a199175f3f5fdb12608c6100291081d234b94cecd0e30ac822c37b50e95821
 DIST giac_1.9.0-5.tar.gz 97863572 BLAKE2B 8766061ace737972b5f47cd7d9f92b0002fa6c94a754dd723fb06001560cc62c60631163bd038b2e7b50919088d8bc669e61582189084395ad2aacf39865cb52 SHA512 86a6edc31797bd3d6ec0ac9ed93c092bbe77cb056269be64c9a23304fcc8ce56c521d829d61ffeac98efd2995ef8371500360462815d61ba97d0cd7bd3b86976
 EBUILD giac-1.7.0.13-r1.ebuild 4257 BLAKE2B af1277a69e3a27cf215e870fe6dab127d4ac7edc0fd1e8905498e5b745bc92133d7f4f725fc096c4a83bd649fd5ba3731d16c86688f3bee1a9f8e4b7b1bd2aaf SHA512 351d891b219e15c24cae84e5ef1e1063a702c36d0fc6a6f9955f0eb3b1d16cb179e0fdbfd39bd6f820929fbe9d259a3ab91e71976cdb1a270cedbb66ec6fff83
 EBUILD giac-1.7.0.47.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
-EBUILD giac-1.9.0.21.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
+EBUILD giac-1.9.0.21.ebuild 4533 BLAKE2B 7db2cf6c7e495d74f3022c0d89d5ec39775e436d37f655ceb0044d95b9fea680cad8a14bc8c0b733c565f88533bf46e7044defd5634f92b812a0a900e7c8bb44 SHA512 04cdf58fc5fdb821a102b21241824d8b37de5efdd3c1552a8144bfdb8ecdea7f80526726587a80422482e7ca0d6be637905d9a2d2b6a3794c50117029469e937
 EBUILD giac-1.9.0.5.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/files/giac-1.9.0.21-pari-2.15.patch b/sci-mathematics/giac/files/giac-1.9.0.21-pari-2.15.patch
new file mode 100644
index 000000000000..c1df76ea7048
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.21-pari-2.15.patch
@@ -0,0 +1,17 @@
+--- a/src/pari.cc
++++ b/src/pari.cc
+@@ -39,6 +39,14 @@ using namespace std;
+ #endif
+ 
+ #ifdef HAVE_LIBPARI
++#if !defined ANYARG
++// Anyarg disappeared from PARI 2.15.0
++#ifdef __cplusplus
++#  define ANYARG ...
++#else
++#  define ANYARG
++#endif
++#endif
+ 
+ #ifdef HAVE_PTHREAD_H
+ #include <pthread.h>
diff --git a/sci-mathematics/giac/giac-1.9.0.21.ebuild b/sci-mathematics/giac/giac-1.9.0.21.ebuild
index bf7ed2bdb24c..a079e6b8a510 100644
--- a/sci-mathematics/giac/giac-1.9.0.21.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.21.ebuild
@@ -49,6 +49,7 @@ BDEPEND="dev-tex/hevea
 PATCHES=(
 	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
 	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
+	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
 )
 
 REQUIRED_USE="test? ( gui )"
@@ -74,6 +75,11 @@ src_configure() {
 
 		# Get the big-L flags from fltk's LDFLAGS.
 		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
+	else
+		# see https://trac.sagemath.org/ticket/31563#comment:91 onwards.
+		# Unless this variable is defined a non existent function will be requested.
+		# The spelling is correct - upstream is French.
+		append-cppflags -DUSE_OBJET_BIDON=1
 	fi
 
 	# Using libsamplerate is currently broken