gentoo auto-resync : 06:10:2024 - 04:27:04

3 files changed, 49 insertions, 2 deletions

diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index eb4c57d1c9bf..afffdccc6244 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,9 +2,10 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-find-name.patch 433 BLAKE2B 452e286223f4607f42e0895bba443c1534e491dc5e182f6f14c1d5d0d63c5992684b36ad0d028b68c286644e7ccc84786b0e49c311fcbe0fa6151a60ee3001d9 SHA512 f561189e887af930fa09ffa8870e9fbc4e5d5ed1b1a1b81c2001ea3d2a404b025a640eb7a4d504e448a60be4c58af3a3d00421abb48762bb2b32357e862252fc
 AUX gfan-0.6.2-fix-0602ResultantFanProjection.patch 689 BLAKE2B 4531bd59dc7a356b2907b043dc71a5e34e647dd15822d3e3846785bb27162ba607eea8492b972574c1f64a227d428b1db0b385a7a54624f5d33b3f4522bd7fe6 SHA512 0de03e0f40f7cde6ae8709a8c6f26cd39458752d1480c49635e58ce57c0b0ff1c03382bd41097af7609ee6320f98d83f600e7dde842fe545b758982e704e52eb
 AUX gfan-0.6.2-fix-spelling-errors.patch 2826 BLAKE2B 1a5b662dafd42834c9254d79cad84717d5b407c0fd14bf3f58320203b847953284597aa2add8dcb7eaa40700fa2a5c6e1c0ba99c2715d7fb0c6deedc45c44c8e SHA512 a30947bda62723f0d5a916d1a05de52fd67a2a3d4303b5774e7517407f531df67eb2968be255aab91634d46fdb61243e8b38ac355eef02c01c4ee95576e10159
+AUX gfan-0.6.2-glibcxx-assertions.patch 1473 BLAKE2B 7b78600ca7bdc5cd23b5d0b0799756cc95d95bdc5f951cb8f2c8a589ce0ea452ecbf22d1435d39d217d3e5301565b5c11eec2d33f8e6a6934a6108792ca7b1a0 SHA512 802527986dc9c783d016648b4cce986cea3f76c38cb631a6e90569569b136880c14c5fbfe0f5d5de0c838cc149ac6313a85e2fefd5d2117b5999771688921e82
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
 EBUILD gfan-0.6.2-r4.ebuild 2007 BLAKE2B 21d014cbabb76f661135ffc1c1ce72b016448511e0ec7cb71cffc6f68fec9328c140f268ae3dce2a7ed58ee5559f56c274fb9ce1f7edcc000a9f0606f013bd3d SHA512 76b1e4b63458d5992b5036a7fff2f0e9be5ec0269fcd8a3d2854db21a89f8efd54b9d043049e9e9ac969852f975a8774735c6c426ac03068078c75c1517d0f2a
-EBUILD gfan-0.6.2-r5.ebuild 1971 BLAKE2B b50e2c1bbcbd4269850575bd4f36bb42dcad534d3a55e4257bf3281e907dfe0730deb81fbb66373356ec474e9273b4c9b40ae227842edce682e68530be0de2f6 SHA512 5eed708f34f910390a024e45b9a613ab424729122f58bae8573832f4f217c3f6424309c7f068f162d797a0c19f8d56926b97054c4ece1d9d62094a8848a913e3
+EBUILD gfan-0.6.2-r6.ebuild 2203 BLAKE2B 5656e7f447f44a8a2a080d7f369fdfb0b391f946386c6794744531bbdcab190177834c46c59e53e49dce27160879208a4d0158f3e15a210ffc094f45941c1c04 SHA512 f2832bb4d281566178925912bdbdf9c68b4f59235d231186c2caefb7422776b4501cf7722ad7539840a349e2cc16ccd00d2fba4bd0b0982e3f861e7367026967
 MISC metadata.xml 1344 BLAKE2B 1a1d24099e2338877b068dee2b9e17feb4063de3a681a3b8d6a707c863708d6f380bb4864eb2fd5fef8ed49d6b1a770a8d1b4c12ce722b4f7fe113876de0b792 SHA512 8d5c93337a82b132c66c8d7e64c97deedcfdc724e9874bf308e6d817f71e663bc2b281ea133ae15e30096f5c801f88116b11e4d36dd8dd8eec526b5bc16d5f54
diff --git a/sci-mathematics/gfan/files/gfan-0.6.2-glibcxx-assertions.patch b/sci-mathematics/gfan/files/gfan-0.6.2-glibcxx-assertions.patch
new file mode 100644
index 000000000000..00c616d036fe
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.6.2-glibcxx-assertions.patch
@@ -0,0 +1,39 @@
+From f0e9e24f1f20801bd49c78b30b951433f834a2c7 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 5 Oct 2024 08:48:57 -0400
+Subject: [PATCH] src/gfanlib_tropicalhomotopy.h: avoid out-of-bounds vector
+ indexes
+
+Add a check to ensure that we don't try to access the -1st element of
+a vector. The code would be trying to subtract zero from the entry, so
+it was "harmless," but it does crash glibcxx when assertions are
+enabled (as they are on hardened Gentoo). This should allow the
+SageMath "mixed volume" tests to pass.
+---
+ src/gfanlib_tropicalhomotopy.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/gfanlib_tropicalhomotopy.h b/src/gfanlib_tropicalhomotopy.h
+index f3127ba..f6db26e 100644
+--- a/src/gfanlib_tropicalhomotopy.h
++++ b/src/gfanlib_tropicalhomotopy.h
+@@ -454,10 +454,12 @@ template<class mvtyp, class mvtypDouble, class mvtypDivisor>
+ 			//chioices are "relative" so no update is needed.
+ 
+ 			choices=parent.choices;
+-			int numberToDrop=(subconfigurationIndex!=0) ? numberToDrop=k+1 : 0;
+-
+-			choices[subconfigurationIndex-1].first-=numberToDrop;
+-			choices[subconfigurationIndex-1].second-=numberToDrop;
++			int numberToDrop = 0;
++			if (subconfigurationIndex != 0) {
++				numberToDrop=k+1;
++				choices[subconfigurationIndex-1].first-=numberToDrop;
++				choices[subconfigurationIndex-1].second-=numberToDrop;
++			}
+ 
+ 			denominator=parent.denominator;
+ 			int offsetOld=0;
+-- 
+2.45.2
+
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r5.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild
index 47fbcc3b8e1d..538326ff4359 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r5.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r6.ebuild
@@ -16,7 +16,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-BDEPEND="doc? ( virtual/latex-base )"
+# texlive-plaingeneric is needed for \usepackage{ulem} in
+# the manual. ghostscript-gpl provides the "dvipdf" command.
+BDEPEND="doc? (
+	app-text/ghostscript-gpl
+	dev-texlive/texlive-plaingeneric
+	virtual/latex-base
+)"
 DEPEND="dev-libs/gmp:0=[cxx(+)]
 	sci-libs/cddlib:0="
 RDEPEND="${DEPEND}"
@@ -27,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.6.2-fix-0602ResultantFanProjection.patch"
 	"${FILESDIR}/${PN}-0.6.2-fix-spelling-errors.patch"
 	"${FILESDIR}/${PN}-0.6.2-find-name.patch"
+	"${FILESDIR}/${PN}-0.6.2-glibcxx-assertions.patch"
 )
 
 pkg_setup() {