gentoo auto-resync : 21:09:2022 - 05:25:18

3 files changed, 21 insertions, 15 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 04e00916e157..df399032aa59 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 492ac52e70d5..071b9c46b3c7 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -5,6 +5,7 @@ AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
+DIST pari-2.15.0.tar.gz 5172089 BLAKE2B 30a39542186a84470bf3dfffe3234f8e4e80ab767d4550a1b274d651a741e009fd20d50ff35bff06ed679cd13ae44ae173f3a9b48326ef8011849de62ad2f437 SHA512 6366734f7746a3982c464646e42b67382d5e5473709b192a359791621be14bb0e7521481a42c35f9a28ac6428485307472eb3fc8bd877bf3466f3610368a9f09
 EBUILD pari-2.13.4-r1.ebuild 3669 BLAKE2B 50694a82d37f3d7315e61f804029a6271afc2193a28378e8321cef7d4cedac8f04b4e972547427f58712e3b003eea7371df7a2f21f990eb81e8ec667bca62e06 SHA512 d58c360d15d93cc4131a3f54438e34522ccdb1b42b5298551f73f86e619f8b6219e6472c97e44bb3a3bb22c9bd0b5bc174a85a38e15f3415e89fcda53293debf
-EBUILD pari-2.13.4.ebuild 3420 BLAKE2B 5c30dcb0cc91164956ce0ba5425d591dccbfda71b45991f3620129400a4924934ce857a0bd6758b10a0677ff560ef0295fba04ac3e2536897278ea9a9dec6cc3 SHA512 c18904b5fc26f7d32e8dbc8360f1daeebf2f16ff24760037780512bb85c3470df540d1f56a0b777cf71fa825c2058a8153e3fb5af50c586357fcffa0ee012535
+EBUILD pari-2.15.0.ebuild 3675 BLAKE2B c7cc9d29d7bb60856905b32d64578a2fef367ca74dc27bec8d989ec98d165f8659f8a11009c3f91ec7917d1aedd20bba68023420e02f42e5fdda78f62dd4077b SHA512 292496875ba48172d00ce1bb7a67a916e3d21730ae1941aad77f299990c23a6deba73d54823e33e6bbe754635946c1cbd985d6f730beb5fd22982a8297d85415
 MISC metadata.xml 1765 BLAKE2B 5d45009ff34f4d7780e70d2cdd94a5c60ebef674c235ba84d0989485dec62e83d15b9be7cbcbd583bf258fc936c5aff3d610ca8ea682323b07430fc2e71ee225 SHA512 32f560edbcfcf283b7f6a907277c584e5e9a33044b334e66818bc3529fb49a8709888aa27332da3f46e8c80971711403f333de3616132a47c34b9a1413237772
diff --git a/sci-mathematics/pari/pari-2.13.4.ebuild b/sci-mathematics/pari/pari-2.15.0.ebuild
index 2b6dd7c50043..212fed3f24df 100644
--- a/sci-mathematics/pari/pari-2.13.4.ebuild
+++ b/sci-mathematics/pari/pari-2.15.0.ebuild
@@ -13,8 +13,8 @@ LICENSE="GPL-2"
 
 # The subslot is the value of $soname_num obtained from
 # upstream's config/version script.
-SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/8"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
@@ -48,6 +48,15 @@ src_prepare() {
 		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
 		-e 's:"acroread":"xdg-open":' \
 		doc/gphelp.in || die "Failed to fix doc dir"
+
+	# These tests fail when LaTeX is not installed (which we don't
+	# require without USE=doc), most likely due to output formatting
+	# issues but I haven't deleted my LaTeX installation to check.
+	# There's no real upstream support for enabling/disabling the LaTeX
+	# docs, so this is probably the correctest way to skip these tests.
+	if ! use doc; then
+		rm src/test/{in,32}/help || die
+	fi
 }
 
 src_configure() {
@@ -65,13 +74,13 @@ src_configure() {
 	fi
 
 	# sysdatadir installs a pari.cfg stuff which is informative only.
-	# It is supposed to be for "architecture-dependent" data.
-	# It needs to be easily discoverable for downstream packages such as gp2c.
-	# We set LD to "" so that it is set to the value of the compiler used
-	# which is how a normal end user is expected to configure it. pari's build
-	# system do not cope very well with a naked linker, it is expecting a
-	# compiler driver. See https://bugs.gentoo.org/722090
-	LD="" ./Configure \
+	# It is supposed to be for "architecture-dependent" data.  It needs
+	# to be easily discoverable for downstream packages such as gp2c.
+	# We set LD="" and DLLD="$CC" so that the "shared library linker"
+	# always gets set to the value of the compiler used. Pari's build
+	# system does not cope very well with a naked linker, it is
+	# expecting a compiler driver. See bugs 722090 and 871117.
+	LD="" DLLD="$(tc-getCC)" ./Configure \
 		--prefix="${EPREFIX}"/usr \
 		--datadir="${EPREFIX}/usr/share/${PN}" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -88,11 +97,7 @@ src_configure() {
 }
 
 src_compile() {
-	local mymake=""
-	use hppa && \
-		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
-	emake ${mymake} gp
+	emake gp
 
 	if use doc; then
 		# To prevent sandbox violations by metafont