gentoo auto-resync : 02:08:2023 - 16:50:29

2 files changed, 15 insertions, 3 deletions

diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 42ae28943e74..274c6ad30af5 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -4,5 +4,5 @@ AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058
 DIST pari-2.15.3.tar.gz 5178288 BLAKE2B d9cc11526360e9fc7688e0a3195a85302d6bf95039051c9419aa18c5bf91eff837d64d9acabb0a51a6e15a3614a5cab4acbf0a502dba5417982514f27721d47d SHA512 9e127850759bac0c0a9b32c6660a55018ec6c6781aaa14c42667f26655444f55c08e100fe186aec8ad1f574d883d76888b13fbafb65d1f4741e2018b78ff307b
 DIST pari-2.15.4.tar.gz 5183685 BLAKE2B 2e20b6dc073ce69bc098dd849e6ab43cb38b05d30ff5f72a31272cd24ef01aa515d4e2a4948264ca89169a6980cd9d76f86c7fbb9aad5be604680569950d9c25 SHA512 2b9f0c1fe7198406df8e6ceb3fcdc8bfb75f5c7ebfb963f023a1eebfff0bcc26e3b690941e188d6b9f8dfb6cddf4ce4c00f2cc320ebe47d42ae7596c774ed6cc
 EBUILD pari-2.15.3.ebuild 4004 BLAKE2B 9a024a99f7059e85f77282fb799f75ae525b7167b982aa2fa1e5f32c4a05a4c7f37b0eb81a24036d4cbaf0e45c8ed6d68b7106b652a53b64330a15368ff8072d SHA512 9aba44c7d0af9b6c6ddca06e5f6336cfeba02ceadc8723a68cc971209ec13802ebb1addf41864505d64a870975a9f404682c71f06e3fc83af91f3a44e0190214
-EBUILD pari-2.15.4.ebuild 3969 BLAKE2B 9e1c0cd9a59fc09b2983d73a910d2f86d927dd1649958b4c3f14e878546c0582488a7027d1484c19eb78e233203a6b222c02f18c837945e7cf370d7aee0373a4 SHA512 f65090ed242a3c218f1a13c9696e33c630949e21cda096ea521ae5c1a76215bd23c8ddbb28f73c9288ae80d02fac5093c2b14c8f745db1eb82be9b8922e97412
+EBUILD pari-2.15.4-r1.ebuild 4659 BLAKE2B 8c4d1d7014d4a00cbee8d4b66d6598eaed36d634362f3ee17a01f4cb9e5e62a82f7141997c3a208aae33f2d1c7a19339f0b398c7509fe43455ed5722d6602e05 SHA512 d51192bba28522b70ca54ea37fe08787b96d194c21b8605ee747950e8125b7d13417670ac509aa7a7caef11a4e34a6dd22cd6459e9ecd107d758fdd944032748
 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee
diff --git a/sci-mathematics/pari/pari-2.15.4.ebuild b/sci-mathematics/pari/pari-2.15.4-r1.ebuild
index 4869bbe3d995..f7363f67f698 100644
--- a/sci-mathematics/pari/pari-2.15.4.ebuild
+++ b/sci-mathematics/pari/pari-2.15.4-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0/8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="data doc examples fltk gmp test threads X"
+REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -31,6 +32,9 @@ DEPEND="
 	X? ( x11-libs/libX11:0= )"
 RDEPEND="${DEPEND}"
 
+# Both of these should be obsolete in the next version. I've sent the
+# fltk CXXFLAGS bit upstream, and using --graphic=<foo> hopefully works
+# around the automagic parts.
 PATCHES=(
 	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
 	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
@@ -71,6 +75,13 @@ src_configure() {
 	# expecting a compiler driver. See bugs 722090 and 871117.
 	# DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would
 	# be in a less-weird build system.
+	#
+	# There's a lot of automagic involved in the graphics detection.  We
+	# first pass --graphic=none, which disables some of it. We then pass
+	# --graphic=fltk (or --graphic=X11) only if USE=fltk (or USE=X) is
+	# set. This is a stronger hint to the build system than --with-fltk
+	# would be, and importantly does not rely on the corresponding but
+	# nonexistent(!) option option for X11.
 	LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \
 		--prefix="${EPREFIX}"/usr \
 		--datadir="${EPREFIX}/usr/share/${PN}" \
@@ -80,9 +91,10 @@ src_configure() {
 		--with-readline="${EPREFIX}"/usr \
 		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
 		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with fltk) \
+		--graphic=none \
+		$(usex X --graphic=X11 "" "" "") \
+		$(usex fltk --graphic=fltk "" "" "") \
 		$(use_with gmp) \
-		--without-qt \
 		$(usex threads "--mt=pthread" "" "" "") \
 		|| die "./Configure failed"
 }